|
@ -3064,7 +3064,7 @@ cJSON *basilisk_remember(struct supernet_info *myinfo,uint64_t *KMDtotals,uint64 |
|
|
free(fstr); |
|
|
free(fstr); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
printf("iambob.%d src.%s dest.%s bob.%s alice.%s\n",iambob,src,dest,bobcoin,alicecoin); |
|
|
printf("iambob.%d src.%s dest.%s bob.%s alice.%s pubA0.(%s)\n",iambob,src,dest,bobcoin,alicecoin,bits256_str(str,pubA0)); |
|
|
strcpy(bobcoin,"KMD"); |
|
|
strcpy(bobcoin,"KMD"); |
|
|
strcpy(alicecoin,"BTC"); |
|
|
strcpy(alicecoin,"BTC"); |
|
|
if ( bobcoin[0] != 0 && alicecoin[0] != 0 ) |
|
|
if ( bobcoin[0] != 0 && alicecoin[0] != 0 ) |
|
@ -3138,6 +3138,8 @@ cJSON *basilisk_remember(struct supernet_info *myinfo,uint64_t *KMDtotals,uint64 |
|
|
} |
|
|
} |
|
|
else if ( iambob == 1 ) |
|
|
else if ( iambob == 1 ) |
|
|
{ |
|
|
{ |
|
|
|
|
|
printf("privAm.(%s)\n",bits256_str(str,privAm)); |
|
|
|
|
|
printf("pubB0.(%s)\n",bits256_str(str,pubB0)); |
|
|
if ( sentflags[BASILISK_BOBSPEND] == 0 ) |
|
|
if ( sentflags[BASILISK_BOBSPEND] == 0 ) |
|
|
{ |
|
|
{ |
|
|
if ( sentflags[BASILISK_ALICEPAYMENT] != 0 ) |
|
|
if ( sentflags[BASILISK_ALICEPAYMENT] != 0 ) |
|
@ -3173,7 +3175,7 @@ cJSON *basilisk_remember(struct supernet_info *myinfo,uint64_t *KMDtotals,uint64 |
|
|
rev.bytes[i] = privBn.bytes[31-i]; |
|
|
rev.bytes[i] = privBn.bytes[31-i]; |
|
|
len = basilisk_swapuserdata(userdata,rev,0,myprivs[0],redeemscript,redeemlen); |
|
|
len = basilisk_swapuserdata(userdata,rev,0,myprivs[0],redeemscript,redeemlen); |
|
|
if ( (txbytes[BASILISK_BOBREFUND]= basilisk_swap_bobtxspend("bobrefund",myinfo,bobcoin,myprivs[0],0,redeemscript,redeemlen,userdata,len,txids[BASILISK_BOBDEPOSIT],0,pubkey33)) != 0 ) |
|
|
if ( (txbytes[BASILISK_BOBREFUND]= basilisk_swap_bobtxspend("bobrefund",myinfo,bobcoin,myprivs[0],0,redeemscript,redeemlen,userdata,len,txids[BASILISK_BOBDEPOSIT],0,pubkey33)) != 0 ) |
|
|
printf("privBn.(%s) bobrefund.(%s)\n",bits256_str(str,privBn),txbytes[BASILISK_ALICECLAIM]); |
|
|
printf("pubB1.(%s) bobrefund.(%s)\n",bits256_str(str,pubB1),txbytes[BASILISK_ALICECLAIM]); |
|
|
} |
|
|
} |
|
|
if ( 0 && txbytes[BASILISK_BOBREFUND] != 0 ) |
|
|
if ( 0 && txbytes[BASILISK_BOBREFUND] != 0 ) |
|
|
basilisk_swap_sendrawtransaction(myinfo,"bobrefund",bobcoin,txbytes[BASILISK_BOBREFUND]); |
|
|
basilisk_swap_sendrawtransaction(myinfo,"bobrefund",bobcoin,txbytes[BASILISK_BOBREFUND]); |
|
|