Test

iguana/exchanges/LP_swap.c

@@ -406,12 +406,13 @@ int32_t LP_waitfor(int32_t pairsock,struct basilisk_swap *swap,int32_t timeout,i
     {
         if ( (datalen= nn_recv(pairsock,&data,NN_MSG,0)) >= 0 )
         {
-            printf("received %d bytes\n",datalen);
+            printf("wait for got.%d\n",datalen);
             retval = (*verify)(swap,data,datalen);
             nn_freemsg(data);
             return(retval);
         } else printf("error nn_recv\n");
     }
+    printf("waitfor timedout\n");
     return(retval);
 }
 
@@ -551,6 +552,7 @@ void LP_bobloop(void *_utxo)
                 printf("error bobscripts payment\n");
             else if ( LP_swapdata_rawtxsend(utxo->pair,swap,0x8000,data,maxlen,&swap->bobpayment,0x4000,0) == 0 )
                 printf("error sending bobpayment\n");
+            printf("looping on swaplist\n");
             while ( 1 )
             {
                 if ( (retstr= basilisk_swaplist()) != 0 )
@@ -598,6 +600,7 @@ void LP_aliceloop(void *_qp)
                 printf("error sending alicepayment\n");
             else if ( LP_waitfor(qp->pair,swap,10,LP_verify_bobpayment) < 0 )
                 printf("error waiting for bobpayment\n");
+            printf("looping on swaplist\n");
             while ( 1 )
             {
                 if ( (retstr= basilisk_swaplist()) != 0 )

iguana/exchanges/LP_transaction.c

@@ -1443,17 +1443,17 @@ int32_t LP_verify_bobdeposit(struct basilisk_swap *swap,uint8_t *data,int32_t da
         memcpy(swap->I.userdata_aliceclaim,userdata,len);
         swap->I.userdata_aliceclaimlen = len;
         retval = 0;
-        //if ( (retval= basilisk_rawtx_sign(swap->bobcoin.symbol,swap->bobcoin.pubtype,swap->bobcoin.p2shtype,swap->bobcoin.isPoS,swap->bobcoin.wiftype,swap,&swap->aliceclaim,&swap->bobdeposit,swap->I.myprivs[0],0,userdata,len,1,swap->changermd160)) == 0 )
+        if ( (retval= basilisk_rawtx_sign(swap->bobcoin.symbol,swap->bobcoin.pubtype,swap->bobcoin.p2shtype,swap->bobcoin.isPoS,swap->bobcoin.wiftype,swap,&swap->aliceclaim,&swap->bobdeposit,swap->I.myprivs[0],0,userdata,len,1,swap->changermd160,swap->bobdeposit.I.destaddr)) == 0 )
         {
             for (i=0; i<swap->bobdeposit.I.datalen; i++)
                 printf("%02x",swap->bobdeposit.txbytes[i]);
             printf(" <- bobdeposit\n");
-            //for (i=0; i<swap->aliceclaim.I.datalen; i++)
+            for (i=0; i<swap->aliceclaim.I.datalen; i++)
-            //    printf("%02x",swap->aliceclaim.txbytes[i]);
+                printf("%02x",swap->aliceclaim.txbytes[i]);
-            //printf(" <- aliceclaim\n");
+            printf(" <- aliceclaim\n");
             //basilisk_txlog(swap,&swap->aliceclaim,swap->I.putduration+swap->I.callduration);
             return(retval);
-        } //else printf("error signing aliceclaim\n");
+        } else printf("error signing aliceclaim\n");
     }
     printf("error with bobdeposit\n");
     return(retval);