Browse Source

Test

etomic
jl777 8 years ago
parent
commit
53904191a8
  1. 6
      basilisk/basilisk_swap.c
  2. 2
      iguana/iguana_payments.c
  3. 2
      iguana/iguana_unspents.c

6
basilisk/basilisk_swap.c

@ -1785,11 +1785,13 @@ uint32_t basilisk_swapdata_rawtxsend(struct supernet_info *myinfo,struct basilis
if ( rawtx == &swap->alicepayment ) if ( rawtx == &swap->alicepayment )
{ {
basilisk_dontforget(myinfo,swap,&swap->alicepayment,0,triggertxid); basilisk_dontforget(myinfo,swap,&swap->alicepayment,0,triggertxid);
basilisk_alicepayment_spend(myinfo,swap,&swap->alicereclaim);
basilisk_dontforget(myinfo,swap,&swap->alicereclaim,0,swap->bobrefund.I.actualtxid);
} }
else if ( rawtx == &swap->alicespend ) else if ( rawtx == &swap->alicespend )
{
basilisk_dontforget(myinfo,swap,&swap->alicespend,0,triggertxid); basilisk_dontforget(myinfo,swap,&swap->alicespend,0,triggertxid);
//basilisk_alicepayment_spend(myinfo,swap,&swap->alicereclaim);
basilisk_dontforget(myinfo,swap,&swap->alicereclaim,0,swap->bobrefund.I.actualtxid);
}
} }
//printf("sendlen.%d datalen.%d redeemlen.%d\n",sendlen,rawtx->datalen,rawtx->redeemlen); //printf("sendlen.%d datalen.%d redeemlen.%d\n",sendlen,rawtx->datalen,rawtx->redeemlen);
if ( suppress_swapsend == 0 ) if ( suppress_swapsend == 0 )

2
iguana/iguana_payments.c

@ -175,7 +175,7 @@ int32_t iguana_RTbestunspent(struct supernet_info *myinfo,struct iguana_info *co
} }
if ( iguana_RTunspent_check(myinfo,coin,unspents[i]) != 0 ) if ( iguana_RTunspent_check(myinfo,coin,unspents[i]) != 0 )
{ {
//printf("(%d u%d) %.8f already used\n",unspents[i].hdrsi,unspents[i].unspentind,dstr(atx_value)); printf("(%d u%d) %.8f already used\n",unspents[i].hdrsi,unspents[i].unspentind,dstr(atx_value));
continue; continue;
} }
if ( maxmode == 0 ) if ( maxmode == 0 )

2
iguana/iguana_unspents.c

@ -913,7 +913,7 @@ void iguana_unspents_mark(struct supernet_info *myinfo,struct iguana_info *coin,
{ {
if ( firstslot >= 0 ) if ( firstslot >= 0 )
{ {
//printf("slot.[%d] <- %s/v%d\n",firstslot,bits256_str(str,txid),vout); printf("slot.[%d] <- %s/v%d\n",firstslot,bits256_str(str,txid),vout);
coin->markedunspents[firstslot] = txid; coin->markedunspents[firstslot] = txid;
coin->markedunspents[firstslot].ushorts[15] = vout; coin->markedunspents[firstslot].ushorts[15] = vout;
if ( (0) && coin->utxofp == 0 ) if ( (0) && coin->utxofp == 0 )

Loading…
Cancel
Save