lukechilds
/
SuperNET
mirror of https://github.com/lukechilds/SuperNET.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Test

dev
jl777 7 years ago
parent
1927d5bb91
commit
d459aee96d
2 changed files with 4 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      iguana/exchanges/LP_remember.c
  2. 3
      iguana/exchanges/LP_transaction.c

6
iguana/exchanges/LP_remember.c
View File

@ -1084,7 +1084,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
free_json(txoutobj), flag = 0; free_json(txoutobj), flag = 0;
else flag = -1, rswap.depositspent = deadtxid; else flag = -1, rswap.depositspent = deadtxid;
} }
//if ( flag == 0 ) if ( flag == 0 )
{ {
if ( rswap.Dredeemlen != 0 ) if ( rswap.Dredeemlen != 0 )
redeemlen = rswap.Dredeemlen, memcpy(redeemscript,rswap.Dredeemscript,rswap.Dredeemlen); redeemlen = rswap.Dredeemlen, memcpy(redeemscript,rswap.Dredeemscript,rswap.Dredeemlen);
@ -1161,7 +1161,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
free_json(txoutobj), flag = 0; free_json(txoutobj), flag = 0;
else flag = -1, rswap.paymentspent = deadtxid; else flag = -1, rswap.paymentspent = deadtxid;
} }
if ( time(NULL) > rswap.expiration+777 ) if ( flag == 0 && time(NULL) > rswap.expiration+777 )
{ {
// bobreclaim // 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); 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);
@ -1192,7 +1192,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
free_json(txoutobj), flag = 0; free_json(txoutobj), flag = 0;
else flag = -1, rswap.depositspent = deadtxid; else flag = -1, rswap.depositspent = deadtxid;
} }
if ( bits256_nonz(rswap.Apaymentspent) != 0 || time(NULL) > rswap.expiration+777 ) 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); //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 ) //if ( txbytes[BASILISK_BOBREFUND] == 0 )

3
iguana/exchanges/LP_transaction.c
View File

@ -124,8 +124,7 @@ bits256 LP_broadcast(char *txname,char *symbol,char *txbytes,bits256 expectedtxi
totalretries++; totalretries++;
i--; i--;
} }
} } else printf("broadcast error.(%s)\n",retstr);
else printf("broadcast error.(%s)\n",retstr);
} }
free_json(retjson); free_json(retjson);
} }

Write Preview
Loading…
Cancel
Save