|
|
@ -1004,7 +1004,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti |
|
|
|
} |
|
|
|
if ( rswap.sentflags[BASILISK_ALICECLAIM] == 0 && rswap.sentflags[BASILISK_BOBDEPOSIT] != 0 && bits256_nonz(rswap.txids[BASILISK_BOBDEPOSIT]) != 0 && bits256_nonz(rswap.depositspent) == 0 ) |
|
|
|
{ |
|
|
|
if ( time(NULL) > rswap.expiration ) |
|
|
|
if ( time(NULL) > rswap.expiration+777 ) |
|
|
|
{ |
|
|
|
flag = 0; |
|
|
|
if ( bob->electrum == 0 ) |
|
|
@ -1093,7 +1093,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti |
|
|
|
free_json(txoutobj), flag = 0; |
|
|
|
else flag = -1, rswap.paymentspent = deadtxid; |
|
|
|
} |
|
|
|
if ( flag == 0 && time(NULL) > rswap.expiration ) |
|
|
|
if ( flag == 0 && time(NULL) > rswap.expiration+777 ) |
|
|
|
{ |
|
|
|
// bobreclaim
|
|
|
|
redeemlen = basilisk_swap_bobredeemscript(0,&secretstart,redeemscript,rswap.plocktime,rswap.pubA0,rswap.pubB0,rswap.pubB1,zero,rswap.privBn,rswap.secretAm,rswap.secretAm256,rswap.secretBn,rswap.secretBn256); |
|
|
@ -1122,7 +1122,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti |
|
|
|
free_json(txoutobj), flag = 0; |
|
|
|
else flag = -1, rswap.depositspent = deadtxid; |
|
|
|
} |
|
|
|
if ( flag == 0 && (bits256_nonz(rswap.Apaymentspent) != 0 || time(NULL) > rswap.expiration) ) |
|
|
|
if ( flag == 0 && (bits256_nonz(rswap.Apaymentspent) != 0 || time(NULL) > rswap.expiration+777) ) |
|
|
|
{ |
|
|
|
printf("do the refund! paymentspent.%s now.%u vs expiration.%u\n",bits256_str(str,rswap.paymentspent),(uint32_t)time(NULL),rswap.expiration); |
|
|
|
//if ( txbytes[BASILISK_BOBREFUND] == 0 )
|
|
|
|