Merge pull request #16 from jl777/dev

update dev

iguana/dpow/dpow_tx.c

@@ -329,7 +329,7 @@ bits256 dpow_notarytx(struct supernet_info *myinfo,char *signedtx,int32_t *numsi
                     memcpy(&serialized[len],sig,siglen);
                     len += siglen;
                     numsigs++;
-                } else printf("%s -> %s src_or_dest.%d Missing sig from k.%d\n",bp->srccoin->symbol,bp->destcoin->symbol,src_or_dest,k);
+                } //else printf("%s -> %s src_or_dest.%d Missing sig from k.%d\n",bp->srccoin->symbol,bp->destcoin->symbol,src_or_dest,k);
             } else serialized[len++] = 0;
             len += iguana_rwnum(1,&serialized[len],sizeof(sequenceid),&sequenceid);
             //printf("height.%d mod.%d VINI.%d <- i.%d j.%d\n",height,height % numnotaries,m,i,j);

iguana/exchanges/LP_nativeDEX.c

@@ -1126,6 +1126,7 @@ void LP_swapsloop(void *ctx)
                 if ( (sp->finished= LP_swapwait(0,sp->requestid,sp->quoteid,-1,0)) != 0 )
                 {
                 }
+                sleep(3);
             }
         }
         if ( nonz == 0 )
@@ -1136,7 +1137,7 @@ void LP_swapsloop(void *ctx)
                 LP_alice_eligible((uint32_t)time(NULL));
                 sleep(6);
             }
-        }
+        } else sleep(10);
         LP_gtc_iteration(ctx,LP_myipaddr,LP_mypubsock);
     }
 }

iguana/exchanges/LP_remember.c

@@ -429,9 +429,9 @@ int32_t basilisk_isbobcoin(int32_t iambob,int32_t ind)
         case BASILISK_OTHERFEE: return(!iambob); break;
         case BASILISK_BOBSPEND:
         case BASILISK_ALICEPAYMENT:
-        case BASILISK_ALICERECLAIM:
-        case BASILISK_ALICECLAIM: return(0);
+        case BASILISK_ALICERECLAIM: return(0);
             break;
+        case BASILISK_ALICECLAIM:
         case BASILISK_BOBDEPOSIT:
         case BASILISK_ALICESPEND:
         case BASILISK_BOBPAYMENT:
@@ -682,6 +682,7 @@ cJSON *LP_swap_json(struct LP_swap_remember *rswap)
     jaddbits256(item,"Apaymentspent",rswap->Apaymentspent);
     jaddbits256(item,"depositspent",rswap->depositspent);
     jaddbits256(item,"alicedexfee",rswap->iambob == 0 ? rswap->txids[BASILISK_MYFEE] : rswap->txids[BASILISK_OTHERFEE]);
+    
     return(item);
 }
 

iguana/exchanges/mshark

@@ -1,4 +1,4 @@
 #!/bin/bash
 source userpass
 # this will only work for watchonly addresses that have been rescanned and with active coins
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"fundvalue\",\"address\":\"RTu3JZZKLJTcfNwBa19dWRagEfQq49STqC\",\"holdings\":[{\"coin\":\"iota\",\"balance\":1500000}, {\"coin\":\"bitcoin-cash\",\"balance\":1200}, {\"coin\":\"bitcoin\",\"balance\":100}, {\"coin\":\"komodo\",\"balance\":100000}, {\"coin\":\"chips\",\"balance\":100000}],\"divisor\":1400000}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"fundvalue\",\"address\":\"RTu3JZZKLJTcfNwBa19dWRagEfQq49STqC\",\"holdings\":[{\"coin\":\"iota\",\"balance\":1500000}, {\"coin\":\"bitcoin-cash\",\"balance\":1200}, {\"coin\":\"bitcoin\",\"balance\":25}],\"divisor\":1400000}"

iguana/exchanges/prices/autoprice

@@ -35,7 +35,7 @@ source trackbtc
 #source revs
 #source trackbtc
 
-sharkholdings="{\"coin\":\"iota\",\"balance\":1500000}, {\"coin\":\"komodo\",\"balance\":120000}, {\"coin\":\"bitcoin-cash\",\"balance\":1200}, {\"coin\":\"bitcoin\",\"balance\":100}"
+sharkholdings="{\"coin\":\"iota\",\"balance\":1500000}, {\"coin\":\"bitcoin-cash\",\"balance\":1200}, {\"coin\":\"bitcoin\",\"balance\":25}"
 curl --url "http://127.0.0.1:7783" --data "{\"base\":\"MSHARK\",\"rel\":\"KMD\",\"fundvalue_bid\":\"NAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"margin\":$margin,\"address\":\"RTu3JZZKLJTcfNwBa19dWRagEfQq49STqC\",\"holdings\":[$sharkholdings],\"divisor\":1400000}"