Test

iguana/exchanges/LP_prices.c

@@ -221,12 +221,12 @@ cJSON *LP_pubkeyjson(struct LP_pubkeyinfo *pubp)
     {
         if ( pubp->rmd160[i] != 0 )
         {
+            init_hexbytes_noT(hexstr,pubp->rmd160,sizeof(pubp->rmd160));
+            jaddstr(obj,"rmd160",hexstr);
             for (j=0; i<sizeof(pubp->pubsecp); i++)
             {
                 if ( pubp->pubsecp[i] != 0 )
                 {
-                    init_hexbytes_noT(hexstr,pubp->rmd160,sizeof(pubp->rmd160));
-                    jaddstr(obj,"rmd160",hexstr);
                     init_hexbytes_noT(hexstr2,pubp->pubsecp,sizeof(pubp->pubsecp));
                     jaddstr(obj,"pubsecp",hexstr2);
                     //printf("nonz rmd160 (%s %s)\n",hexstr,hexstr2);
@@ -618,12 +618,8 @@ cJSON *LP_orderbookjson(char *symbol,struct LP_orderbookentry *op)
         jaddstr(item,"address",op->coinaddr);
         jaddnum(item,"price",op->price);
         jaddnum(item,"numutxos",op->numutxos);
-        //if ( op->minsatoshis != 0 )
         jaddnum(item,"minvolume",dstr(op->minsatoshis));
-        //if ( op->maxsatoshis != 0 )
         jaddnum(item,"maxvolume",dstr(op->maxsatoshis));
-        //jaddbits256(item,"txid",op->txid);
-        //jaddnum(item,"vout",op->vout);
         jaddbits256(item,"pubkey",op->pubkey);
         jaddnum(item,"age",time(NULL)-op->timestamp);
     }
@@ -635,10 +631,6 @@ struct LP_orderbookentry *LP_orderbookentry(char *address,char *base,char *rel,d
     struct LP_orderbookentry *op;
     if ( (op= calloc(1,sizeof(*op))) != 0 )
     {
-        //op->txid = txid;
-        //op->vout = vout;
-        //op->txid2 = txid2;
-        //op->vout2 = vout2;
         safecopy(op->coinaddr,address,sizeof(op->coinaddr));
         op->price = price;
         op->numutxos = numutxos;
@@ -650,15 +642,6 @@ struct LP_orderbookentry *LP_orderbookentry(char *address,char *base,char *rel,d
     return(op);
 }
 
-/*int32_t LP_orderbookfind(struct LP_orderbookentry **array,int32_t num,bits256 txid,int32_t vout)
-{
-    int32_t i;
-    for (i=0; i<num; i++)
-        if ( (array[i]->vout == vout && bits256_cmp(array[i]->txid,txid) == 0) || (array[i]->vout2 == vout && bits256_cmp(array[i]->txid2,txid) == 0) )
-            return(i);
-    return(-1);
-}*/
-
 int32_t LP_orderbook_utxoentries(uint32_t now,int32_t polarity,char *base,char *rel,struct LP_orderbookentry *(**arrayp),int32_t num,int32_t cachednum,int32_t duration)
 {
     char coinaddr[64]; uint8_t zeroes[20]; struct LP_pubkeyinfo *pubp=0,*tmp; struct LP_priceinfo *basepp; struct LP_orderbookentry *op; struct LP_address *ap; struct iguana_info *basecoin; uint32_t oldest; double price; int32_t baseid,relid,n; uint64_t minsatoshis,maxsatoshis;
@@ -672,18 +655,14 @@ int32_t LP_orderbook_utxoentries(uint32_t now,int32_t polarity,char *base,char *
     memset(zeroes,0,sizeof(zeroes));
     HASH_ITER(hh,LP_pubkeyinfos,pubp,tmp)
     {
-        //if ( pubp->timestamp < oldest )
-        //    continue;
         if ( memcmp(zeroes,pubp->rmd160,sizeof(pubp->rmd160)) == 0 )
+        {
+            printf("skip pubp since no rmd160\n");
             continue;
+        }
         bitcoin_address(coinaddr,basecoin->taddr,basecoin->pubtype,pubp->rmd160,sizeof(pubp->rmd160));
         minsatoshis = maxsatoshis = n = 0;
         ap = 0;
-        //char str[65],str2[65]; printf("check utxo.%s/v%d from %s\n",bits256_str(str,utxo->payment.txid),utxo->payment.vout,bits256_str(str2,utxo->pubkey));
-        //if ( strcmp(base,utxo->coin) == 0 && LP_isavailable(utxo) > 0 && pubp != 0 && (price= pubp->matrix[baseid][relid]) > SMALLVAL )
-        //if ( polarity > 0 )
-        //    minsatoshis = utxo->S.satoshis;
-        //else minsatoshis = utxo->S.satoshis * price;
         if ( (price= pubp->matrix[baseid][relid]) > SMALLVAL )
         {
             if ( (ap= LP_addressfind(basecoin,coinaddr)) != 0 )
@@ -694,29 +673,13 @@ int32_t LP_orderbook_utxoentries(uint32_t now,int32_t polarity,char *base,char *
                     minsatoshis *= price;
                     maxsatoshis *= price;
                 }
-                printf("%s/%s %s n.%d ap->n.%d %.8f\n",base,rel,coinaddr,n,ap->n,dstr(ap->total));
+                //printf("%s/%s %s n.%d ap->n.%d %.8f\n",base,rel,coinaddr,n,ap->n,dstr(ap->total));
             }
             if ( (op= LP_orderbookentry(coinaddr,base,rel,polarity > 0 ? price : 1./price,n,minsatoshis,maxsatoshis,pubp->pubkey,pubp->timestamp)) != 0 )
             {
                 *arrayp = realloc(*arrayp,sizeof(*(*arrayp)) * (num+1));
                 (*arrayp)[num++] = op;
             }
-            /*if ( LP_orderbookfind(*arrayp,cachednum,utxo->payment.txid,utxo->payment.vout) < 0 )
-            {
-                if ( LP_iseligible(&val,&val2,utxo->iambob,utxo->coin,utxo->payment.txid,utxo->payment.vout,utxo->S.satoshis,utxo->deposit.txid,utxo->deposit.vout) == 0 )
-                    continue;
-                if ( polarity > 0 )
-                    basesatoshis = utxo->S.satoshis;
-                else basesatoshis = utxo->S.satoshis * price;
-                //char str[65]; printf("found utxo not in orderbook %s/v%d %.8f %.8f\n",bits256_str(str,utxo->payment.txid),utxo->payment.vout,dstr(basesatoshis),polarity > 0 ? price : 1./price);
-                if ( (op= LP_orderbookentry(base,rel,utxo->payment.txid,utxo->payment.vout,utxo->deposit.txid,utxo->deposit.vout,polarity > 0 ? price : 1./price,basesatoshis,utxo->pubkey,now - pubp->timestamp)) != 0 )
-                {
-                    *arrayp = realloc(*arrayp,sizeof(*(*arrayp)) * (num+1));
-                    (*arrayp)[num++] = op;
-                    if ( LP_ismine(utxo) > 0 && utxo->T.lasttime == 0 )
-                        LP_utxo_clientpublish(utxo);
-                }
-            }*/
         }
         //printf("pubp.(%s) %.8f %p\n",coinaddr,price,ap);
     }

iguana/exchanges/LP_statemachine.c

@@ -1900,6 +1900,35 @@ int32_t LP_peer_utxosquery(struct LP_peerinfo *mypeer,uint16_t myport,int32_t pu
  }
  }*/
 
+/*int32_t LP_orderbookfind(struct LP_orderbookentry **array,int32_t num,bits256 txid,int32_t vout)
+ {
+ int32_t i;
+ for (i=0; i<num; i++)
+ if ( (array[i]->vout == vout && bits256_cmp(array[i]->txid,txid) == 0) || (array[i]->vout2 == vout && bits256_cmp(array[i]->txid2,txid) == 0) )
+ return(i);
+ return(-1);
+ }*/
+//char str[65],str2[65]; printf("check utxo.%s/v%d from %s\n",bits256_str(str,utxo->payment.txid),utxo->payment.vout,bits256_str(str2,utxo->pubkey));
+//if ( strcmp(base,utxo->coin) == 0 && LP_isavailable(utxo) > 0 && pubp != 0 && (price= pubp->matrix[baseid][relid]) > SMALLVAL )
+//if ( polarity > 0 )
+//    minsatoshis = utxo->S.satoshis;
+//else minsatoshis = utxo->S.satoshis * price;
+/*if ( LP_orderbookfind(*arrayp,cachednum,utxo->payment.txid,utxo->payment.vout) < 0 )
+ {
+ if ( LP_iseligible(&val,&val2,utxo->iambob,utxo->coin,utxo->payment.txid,utxo->payment.vout,utxo->S.satoshis,utxo->deposit.txid,utxo->deposit.vout) == 0 )
+ continue;
+ if ( polarity > 0 )
+ basesatoshis = utxo->S.satoshis;
+ else basesatoshis = utxo->S.satoshis * price;
+ //char str[65]; printf("found utxo not in orderbook %s/v%d %.8f %.8f\n",bits256_str(str,utxo->payment.txid),utxo->payment.vout,dstr(basesatoshis),polarity > 0 ? price : 1./price);
+ if ( (op= LP_orderbookentry(base,rel,utxo->payment.txid,utxo->payment.vout,utxo->deposit.txid,utxo->deposit.vout,polarity > 0 ? price : 1./price,basesatoshis,utxo->pubkey,now - pubp->timestamp)) != 0 )
+ {
+ *arrayp = realloc(*arrayp,sizeof(*(*arrayp)) * (num+1));
+ (*arrayp)[num++] = op;
+ if ( LP_ismine(utxo) > 0 && utxo->T.lasttime == 0 )
+ LP_utxo_clientpublish(utxo);
+ }
+ }*/
 
 #ifdef oldway
 struct LP_utxoinfo *LP_bestutxo(double *ordermatchpricep,int64_t *bestsatoshisp,int64_t *bestdestsatoshisp,struct LP_utxoinfo *autxo,char *base,double maxprice,int32_t duration,uint64_t txfee,uint64_t desttxfee,uint64_t maxdestsatoshis)

iguana/exchanges/LP_utxo.c

@@ -310,7 +310,7 @@ int32_t LP_unspents_array(struct iguana_info *coin,char *coinaddr,cJSON *array)
     int32_t i,n,v,ht,errs,height,count=0; uint64_t value,val; cJSON *item,*txobj; bits256 txid;
     if ( (n= cJSON_GetArraySize(array)) <= 0 )
         return(0);
-    printf("%s %s LP_unspents.(%s)\n",coin->symbol,coinaddr,jprint(array,0));
+    //printf("%s %s LP_unspents.(%s)\n",coin->symbol,coinaddr,jprint(array,0));
     for (i=0; i<n; i++)
     {
         errs = 0;