Test

iguana/exchanges/LP_swap.c

@@ -731,7 +731,7 @@ void LP_bobloop(void *_swap)
                     if ( strcmp(swap->alicecoin.symbol,"BTC") == 0 )
                         m = 0;
                     else m = 1;
-                    while ( (n= LP_numconfirms(swap->alicecoin.symbol,swap->alicepayment.I.destaddr,swap->alicepayment.I.signedtxid,1)) < m ) // sync with alice
+                    while ( (n= LP_numconfirms(swap->alicecoin.symbol,swap->alicepayment.I.destaddr,swap->alicepayment.I.signedtxid,0,1)) < m ) // sync with alice
                     {
                         char str[65];printf("%d waiting for alicepayment to be confirmed.%d %s %s\n",n,1,swap->alicecoin.symbol,bits256_str(str,swap->alicepayment.I.signedtxid));
                         sleep(3);
@@ -784,7 +784,7 @@ void LP_aliceloop(void *_swap)
                 if ( strcmp(swap->alicecoin.symbol,"BTC") == 0 )
                     m = 0;
                 else m = 1;
-                while ( (n= LP_numconfirms(swap->alicecoin.symbol,swap->alicepayment.I.destaddr,swap->alicepayment.I.signedtxid,1)) < m )
+                while ( (n= LP_numconfirms(swap->alicecoin.symbol,swap->alicepayment.I.destaddr,swap->alicepayment.I.signedtxid,0,1)) < m )
                 {
                     char str[65];printf("%d waiting for alicepayment to be confirmed.%d %s %s\n",n,1,swap->alicecoin.symbol,bits256_str(str,swap->alicepayment.I.signedtxid));
                     sleep(10);
@@ -794,14 +794,14 @@ void LP_aliceloop(void *_swap)
                     printf("error waiting for bobpayment\n");
                 else
                 {
-                    while ( (n= LP_numconfirms(swap->bobcoin.symbol,swap->bobpayment.I.destaddr,swap->bobpayment.I.signedtxid,1)) < swap->I.bobconfirms )
+                    while ( (n= LP_numconfirms(swap->bobcoin.symbol,swap->bobpayment.I.destaddr,swap->bobpayment.I.signedtxid,0,1)) < swap->I.bobconfirms )
                     {
                         char str[65];printf("%d waiting for bobpayment to be confirmed.%d %s %s\n",n,swap->I.bobconfirms,swap->bobcoin.symbol,bits256_str(str,swap->bobpayment.I.signedtxid));
                         sleep(LP_SWAPSTEP_TIMEOUT);
                     }
                     if ( LP_swapdata_rawtxsend(swap->N.pair,swap,0x20000,data,maxlen,&swap->alicespend,0x40000,0) == 0 )
                         printf("error sending alicespend\n");
-                    while ( (n= LP_numconfirms(swap->alicecoin.symbol,swap->alicespend.I.destaddr,swap->alicespend.I.signedtxid,1)) < swap->I.aliceconfirms )
+                    while ( (n= LP_numconfirms(swap->alicecoin.symbol,swap->alicespend.I.destaddr,swap->alicespend.I.signedtxid,0,1)) < swap->I.aliceconfirms )
                     {
                         char str[65];printf("%d waiting for alicespend to be confirmed.%d %s %s\n",n,swap->I.aliceconfirms,swap->bobcoin.symbol,bits256_str(str,swap->alicespend.I.signedtxid));
                         sleep(LP_SWAPSTEP_TIMEOUT);

iguana/exchanges/LP_utxo.c

@@ -457,7 +457,7 @@ int32_t LP_txheight(struct iguana_info *coin,bits256 txid)
     return(height);
 }
 
-int32_t LP_numconfirms(char *symbol,char *coinaddr,bits256 txid,int32_t mempool)
+int32_t LP_numconfirms(char *symbol,char *coinaddr,bits256 txid,int32_t vout,int32_t mempool)
 {
     struct iguana_info *coin; int32_t ht,numconfirms = 100;
     //#ifndef BASILISK_DISABLEWAITTX
@@ -467,11 +467,9 @@ int32_t LP_numconfirms(char *symbol,char *coinaddr,bits256 txid,int32_t mempool)
     if ( coin->electrum == 0 )
     {
         numconfirms = -1;
-        if ( (txobj= LP_gettx(symbol,txid)) != 0 )
+        if ( (txobj= LP_gettxout(symbol,txid,vout)) != 0 )
         {
-            if ( coin->electrum == 0 )
             numconfirms = jint(txobj,"confirmations");
-            else numconfirms = coin->height - jint(txobj,"height");
             free_json(txobj);
         }
         else if ( mempool != 0 && LP_mempoolscan(symbol,txid) >= 0 )

iguana/exchanges/LP_utxos.c

@@ -407,12 +407,12 @@ struct LP_utxoinfo *LP_utxoadd(int32_t iambob,int32_t mypubsock,char *symbol,bit
             printf("iambob.%d utxoadd %s inactive.%u got ineligible txid value %.8f:%.8f, value2 %.8f:%.8f, tmpsatoshis %.8f\n",iambob,symbol,coin->inactive,dstr(value),dstr(val),dstr(value2),dstr(val2),dstr(tmpsatoshis));
             return(0);
         }
-        if ( (numconfirms= LP_numconfirms(symbol,coinaddr,txid,0)) <= 0 )
+        if ( (numconfirms= LP_numconfirms(symbol,coinaddr,txid,vout,0)) <= 0 )
         {
             printf("LP_utxoadd reject numconfirms.%d %s.%s\n",numconfirms,symbol,bits256_str(str,txid));
             return(0);
         }
-        if ( (numconfirms= LP_numconfirms(symbol,coinaddr,txid2,0)) <= 0 )
+        if ( (numconfirms= LP_numconfirms(symbol,coinaddr,txid2,vout2,0)) <= 0 )
         {
             printf("LP_utxoadd reject2 numconfirms.%d\n",numconfirms);
             return(0);