|
|
@ -930,11 +930,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti |
|
|
|
//return(cJSON_Parse("{\"error\":\"mismatched bob/alice vs src/dest coins??\"}"));
|
|
|
|
} |
|
|
|
alice = LP_coinfind(rswap.alicecoin); |
|
|
|
if ( alice->etomic[0] != 0 ) |
|
|
|
alice = LP_coinfind("ETOMIC"); |
|
|
|
bob = LP_coinfind(rswap.bobcoin); |
|
|
|
if ( bob->etomic[0] != 0 ) |
|
|
|
bob = LP_coinfind("ETOMIC"); |
|
|
|
rswap.Atxfee = LP_txfeecalc(alice,rswap.Atxfee,0); |
|
|
|
rswap.Btxfee = LP_txfeecalc(bob,rswap.Btxfee,0); |
|
|
|
if ( rswap.iambob == 0 ) |
|
|
@ -944,7 +940,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti |
|
|
|
bitcoin_address(alice->symbol,otheraddr,alice->taddr,alice->pubtype,rswap.other33,33); |
|
|
|
destBdest = otheraddr; |
|
|
|
destAdest = rswap.Adestaddr; |
|
|
|
if ( LP_TECHSUPPORT == 0 && strcmp(alice->smartaddr,rswap.Adestaddr) != 0 ) |
|
|
|
if ( LP_TECHSUPPORT == 0 && alice->etomic[0] == 0 && strcmp(alice->smartaddr,rswap.Adestaddr) != 0 ) |
|
|
|
{ |
|
|
|
printf("this isnt my swap! alice.(%s vs %s)\n",alice->smartaddr,rswap.Adestaddr); |
|
|
|
cJSON *retjson = cJSON_CreateObject(); |
|
|
@ -968,7 +964,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti |
|
|
|
bitcoin_address(bob->symbol,otheraddr,bob->taddr,bob->pubtype,rswap.other33,33); |
|
|
|
srcAdest = otheraddr; |
|
|
|
srcBdest = rswap.destaddr; |
|
|
|
if ( LP_TECHSUPPORT == 0 && strcmp(bob->smartaddr,rswap.destaddr) != 0 ) |
|
|
|
if ( LP_TECHSUPPORT == 0 && bob->etomic[0] == 0 && strcmp(bob->smartaddr,rswap.destaddr) != 0 ) |
|
|
|
{ |
|
|
|
printf("this isnt my swap! bob.(%s vs %s)\n",bob->smartaddr,rswap.destaddr); |
|
|
|
cJSON *retjson = cJSON_CreateObject(); |
|
|
|