Merge pull request #522 from jl777/spvdex

fix swap memleaks

iguana/exchanges/LP_include.h

@@ -180,12 +180,12 @@ struct vin_info
     uint8_t rmd160[20],spendscript[10000],p2shscript[10000],userdata[10000];
 };
 
-struct basilisk_swapmessage
+/*struct basilisk_swapmessage
 {
     bits256 srchash,desthash;
     uint32_t crc32,msgbits,quoteid,datalen;
     uint8_t *data;
-};
+};*/
 
 struct basilisk_swap;
 
@@ -383,7 +383,7 @@ struct basilisk_swap
     struct basilisk_swapinfo I;
     struct basilisk_rawtx bobdeposit,bobpayment,alicepayment,myfee,otherfee,aliceclaim,alicespend,bobreclaim,bobspend,bobrefund,alicereclaim;
     bits256 privkeys[INSTANTDEX_DECKSIZE];
-    struct basilisk_swapmessage *messages; int32_t nummessages,sentflag;
+    //struct basilisk_swapmessage *messages; int32_t nummessages,sentflag;
     char Bdeposit[64],Bpayment[64];
     uint64_t aliceid,otherdeck[INSTANTDEX_DECKSIZE][2],deck[INSTANTDEX_DECKSIZE][2];
     uint8_t persistent_pubkey33[33],persistent_other33[33],changermd160[20],pad[15],verifybuf[100000];

iguana/exchanges/LP_remember.c

@@ -728,7 +728,11 @@ int32_t LP_swap_load(struct LP_swap_remember *rswap,int32_t forceflag)
                     rswap->iambob = jint(txobj,"iambob");
                 txid = jbits256(txobj,"txid");
                 if ( bits256_nonz(txid) == 0 )
+                {
+                    free(fstr);
+                    free_json(txobj);
                     continue;
+                }
                 rswap->txids[i] = txid;
                 if ( jstr(txobj,"Apayment") != 0 )
                     safecopy(rswap->alicepaymentaddr,jstr(txobj,"Apayment"),sizeof(rswap->alicepaymentaddr));

iguana/exchanges/LP_swap.c

@@ -126,8 +126,8 @@ void basilisk_rawtx_purge(struct basilisk_rawtx *rawtx)
 
 void basilisk_swap_finished(struct basilisk_swap *swap)
 {
-    int32_t i;
-    /*if ( swap->utxo != 0 && swap->sentflag == 0 )
+    /*int32_t i;
+    if ( swap->utxo != 0 && swap->sentflag == 0 )
     {
         LP_availableset(swap->utxo);
         swap->utxo = 0;
@@ -159,11 +159,11 @@ void basilisk_swap_finished(struct basilisk_swap *swap)
     basilisk_rawtx_purge(&swap->bobspend);
     basilisk_rawtx_purge(&swap->bobrefund);
     basilisk_rawtx_purge(&swap->alicereclaim);
-    for (i=0; i<swap->nummessages; i++)
+    /*for (i=0; i<swap->nummessages; i++)
         if ( swap->messages[i].data != 0 )
             free(swap->messages[i].data), swap->messages[i].data = 0;
     free(swap->messages), swap->messages = 0;
-    swap->nummessages = 0;
+    swap->nummessages = 0;*/
     if ( swap->N.pair >= 0 )
         nn_close(swap->N.pair), swap->N.pair = -1;
 }
@@ -837,7 +837,7 @@ void LP_bobloop(void *_swap)
                         printf("error sending bobpayment\n");
                     //if ( LP_waitfor(swap->N.pair,swap,10,LP_verify_alicespend) < 0 )
                     //    printf("error waiting for alicespend\n");
-                    swap->sentflag = 1;
+                    //swap->sentflag = 1;
                     swap->bobreclaim.utxovout = 0;
                     swap->bobreclaim.utxotxid = swap->bobpayment.I.signedtxid;
                     basilisk_bobpayment_reclaim(swap,swap->I.callduration);
@@ -848,10 +848,11 @@ void LP_bobloop(void *_swap)
                 }
             }
         }
-        basilisk_swap_finished(swap);
-        free(swap);
     } else printf("swap timed out\n");
     G.LP_pendingswaps--;
+    basilisk_swap_finished(swap);
+    free(swap);
+    free(data);
 }
 
 void LP_aliceloop(void *_swap)
@@ -904,7 +905,7 @@ void LP_aliceloop(void *_swap)
                         char str[65];printf("%d wait for alicepayment %s numconfs.%d %s %s\n",n,swap->alicepayment.I.destaddr,m,swap->I.alicestr,bits256_str(str,swap->alicepayment.I.signedtxid));
                         sleep(10);
                     }
-                    swap->sentflag = 1;
+                    //swap->sentflag = 1;
                     LP_swap_critical = (uint32_t)time(NULL);
                     if ( LP_waitfor(swap->N.pair,swap,1800,LP_verify_bobpayment) < 0 )
                         printf("error waiting for bobpayment\n");
@@ -925,6 +926,7 @@ void LP_aliceloop(void *_swap)
                          }*/
                         if ( swap->N.pair >= 0 )
                             nn_close(swap->N.pair), swap->N.pair = -1;
+                        LP_swap_endcritical = (uint32_t)time(NULL);
                         LP_swapwait(swap,swap->I.req.requestid,swap->I.req.quoteid,LP_atomic_locktime(swap->I.bobstr,swap->I.alicestr)*2,swap->I.aliceconfirms == 0 ? 3 : 30);
                     }
                 }
@@ -932,11 +934,6 @@ void LP_aliceloop(void *_swap)
         }
     }
     free(data);
-    if ( swap->N.pair >= 0 )
-    {
-        nn_close(swap->N.pair);
-        swap->N.pair = -1;
-    }
     basilisk_swap_finished(swap);
     printf("finish swap.%p\n",swap);
     free(swap);

iguana/exchanges/LP_transaction.c

@@ -477,7 +477,7 @@ int32_t bitcoin_verifyvins(void *ctx,char *symbol,uint8_t taddr,uint8_t pubtype,
         }
     }
     iguana_msgtx_Vset(serialized,maxlen,msgtx,V);
-    cJSON *txobj = cJSON_CreateObject();
+    cJSON *txobj = 0;//cJSON_CreateObject();
     *signedtx = iguana_rawtxbytes(symbol,taddr,pubtype,p2shtype,isPoS,height,txobj,msgtx,suppress_pubkeys,zcash);
     //printf("SIGNEDTX.(%s)\n",jprint(txobj,1));
     *signedtxidp = msgtx->txid;
@@ -733,11 +733,11 @@ char *iguana_validaterawtx(void *ctx,struct iguana_info *coin,struct iguana_msgt
                 else complete = 1;
                 jadd(retjson,"interpreter",log);
                 jadd(retjson,"complete",complete!=0?jtrue():jfalse());
-                free(serialized), free(serialized2);
                 if ( signedtx != 0 )
                     free(signedtx);
                 free(V);
             }
+            free(serialized), free(serialized2);
         }
         //char str[65]; printf("got txid.(%s)\n",bits256_str(str,txid));
     }
@@ -1194,7 +1194,7 @@ char *LP_createrawtransaction(cJSON **txobjp,int32_t *numvinsp,struct iguana_inf
         {
             if ( LP_address_isvalid(coin->symbol,coinaddr) <= 0 )
             {
-                printf("LP_createrawtransaction %s i.%d of %d is invalid\n",coinaddr,i,numvouts);
+                printf("%s LP_createrawtransaction %s i.%d of %d is invalid\n",coin->symbol,coinaddr,i,numvouts);
                 return(0);
             }
             if ( (value= SATOSHIDEN * jdouble(item,coinaddr)) <= 0 )
@@ -1255,6 +1255,7 @@ char *LP_createrawtransaction(cJSON **txobjp,int32_t *numvinsp,struct iguana_inf
             if ( (value= SATOSHIDEN * jdouble(item,coinaddr)) <= 0 )
             {
                 printf("cant get value i.%d of %d %s\n",i,numvouts,jprint(outputs,0));
+                free_json(txobj);
                 return(0);
             }
             bitcoin_addr2rmd160(coin->taddr,&addrtype,rmd160,coinaddr);
@@ -1272,6 +1273,7 @@ char *LP_createrawtransaction(cJSON **txobjp,int32_t *numvinsp,struct iguana_inf
         else
         {
             printf("cant get fieldname.%d of %d %s\n",i,numvouts,jprint(outputs,0));
+            free_json(txobj);
             return(0);
         }
     }
@@ -1325,6 +1327,7 @@ char *LP_withdraw(struct iguana_info *coin,cJSON *argjson)
         if ( (ap= LP_address_utxo_reset(coin)) == 0 )
         {
             printf("LP_withdraw error utxo reset %s\n",coin->symbol);
+            free(V);
             return(0);
         }
         privkeys = cJSON_CreateArray();
@@ -1363,6 +1366,8 @@ char *LP_withdraw(struct iguana_info *coin,cJSON *argjson)
         free_json(privkeys), privkeys = 0;
         if ( rawtx != 0 )
             free(rawtx), rawtx = 0;
+        if ( signedtx != 0 )
+            free(signedtx), signedtx = 0;
     }
     free(V);
     if ( vins != 0 )