|
@ -548,7 +548,7 @@ int32_t LP_rswap_init(struct LP_swap_remember *rswap,uint32_t requestid,uint32_t |
|
|
break; |
|
|
break; |
|
|
if ( i < 33 ) |
|
|
if ( i < 33 ) |
|
|
memcpy(rswap->other33,other33,33); |
|
|
memcpy(rswap->other33,other33,33); |
|
|
//printf(" <- %s dest33\n",dest33);
|
|
|
printf(" <- %s other33\n",dest33); |
|
|
} |
|
|
} |
|
|
if ( (rswap->plocktime= juint(item,"plocktime")) == 0 ) |
|
|
if ( (rswap->plocktime= juint(item,"plocktime")) == 0 ) |
|
|
rswap->plocktime = LP_extract(requestid,quoteid,fname,"plocktime"); |
|
|
rswap->plocktime = LP_extract(requestid,quoteid,fname,"plocktime"); |
|
@ -860,6 +860,11 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti |
|
|
printf("Bob.%p is null or Alice.%p is null\n",bob,alice); |
|
|
printf("Bob.%p is null or Alice.%p is null\n",bob,alice); |
|
|
return(cJSON_Parse("{\"error\":\"null bob or alice coin\"}")); |
|
|
return(cJSON_Parse("{\"error\":\"null bob or alice coin\"}")); |
|
|
} |
|
|
} |
|
|
|
|
|
if ( rswap.iambob != 0 && rswap.Adestaddr[0] == 0 ) |
|
|
|
|
|
bitcoin_address(rswap.Adestaddr,alice->taddr,alice->pubtype,rswap.other33,33); |
|
|
|
|
|
if ( rswap.iambob == 0 && rswap.destaddr[0] == 0 ) |
|
|
|
|
|
bitcoin_address(rswap.destaddr,bob->taddr,bob->pubtype,rswap.other33,33); |
|
|
|
|
|
|
|
|
//printf("iambob.%d finishedflag.%d %s %.8f txfee, %s %.8f txfee\n",rswap.iambob,rswap.finishedflag,rswap.alicecoin,dstr(rswap.Atxfee),rswap.bobcoin,dstr(rswap.Btxfee));
|
|
|
//printf("iambob.%d finishedflag.%d %s %.8f txfee, %s %.8f txfee\n",rswap.iambob,rswap.finishedflag,rswap.alicecoin,dstr(rswap.Atxfee),rswap.bobcoin,dstr(rswap.Btxfee));
|
|
|
//printf("privAm.(%s) %p/%p\n",bits256_str(str,rswap.privAm),Adest,AAdest);
|
|
|
//printf("privAm.(%s) %p/%p\n",bits256_str(str,rswap.privAm),Adest,AAdest);
|
|
|
//printf("privBn.(%s) %p/%p\n",bits256_str(str,rswap.privBn),Bdest,ABdest);
|
|
|
//printf("privBn.(%s) %p/%p\n",bits256_str(str,rswap.privBn),Bdest,ABdest);
|
|
|