diff --git a/basilisk/basilisk.h b/basilisk/basilisk.h index e9c2634d9..4cbade539 100755 --- a/basilisk/basilisk.h +++ b/basilisk/basilisk.h @@ -30,7 +30,7 @@ #define BASILISK_HDROFFSET ((int32_t)(sizeof(bits256)+sizeof(struct iguana_msghdr)+sizeof(uint32_t))) #define INSTANTDEX_DECKSIZE 777 -#define INSTANTDEX_LOCKTIME (7200 + 600*2) +#define INSTANTDEX_LOCKTIME 300 //(7200 + 600*2) #define INSTANTDEX_INSURANCEDIV ((7 * INSTANTDEX_DECKSIZE) >> 3) #define INSTANTDEX_PUBKEY "03bc2c7ba671bae4a6fc835244c9762b41647b9827d4780a89a949b984a8ddcc06" #define INSTANTDEX_RMD160 "ca1e04745e8ca0c60d8c5881531d51bec470743f" diff --git a/basilisk/basilisk_swap.c b/basilisk/basilisk_swap.c index d8d3e204c..8a5b6d7ae 100755 --- a/basilisk/basilisk_swap.c +++ b/basilisk/basilisk_swap.c @@ -127,6 +127,7 @@ int32_t basilisk_rawtx_spend(struct supernet_info *myinfo,struct basilisk_swap * V.signers[1].privkey = *privkey2; bitcoin_priv2wif(wifstr,*privkey2,rawtx->coin->chain->wiftype); jaddistr(privkeys,wifstr); + printf("add second privkey.(%s)\n",jprint(privkeys,0)); } V.suppress_pubkeys = dest->suppress_pubkeys; if ( userdata != 0 && userdatalen > 0 ) @@ -301,7 +302,7 @@ int32_t basilisk_privAm_extract(struct supernet_info *myinfo,struct basilisk_swa { // need to scan blockchain for alicespend of bobpayment // search for swap->bobpayment.actualtxid in spends - basilisk_alicepayment_spend(myinfo,swap,&swap->bobspend); + //basilisk_alicepayment_spend(myinfo,swap,&swap->bobspend); return(-1); } @@ -612,7 +613,9 @@ struct basilisk_swap *bitcoin_swapinit(struct supernet_info *myinfo,struct basil basilisk_rawtx_setparms("alicepayment",myinfo,swap,&swap->alicepayment,swap->alicecoin,swap->aliceconfirms,0,swap->alicesatoshis,2,0); basilisk_rawtx_setparms("bobspend",myinfo,swap,&swap->bobspend,swap->alicecoin,swap->aliceconfirms,2,swap->alicesatoshis-swap->alicecoin->txfee,1,bobpub33); + swap->bobspend.suppress_pubkeys = 1; basilisk_rawtx_setparms("alicereclaim",myinfo,swap,&swap->alicereclaim,swap->alicecoin,swap->aliceconfirms,2,swap->alicesatoshis-swap->alicecoin->txfee,1,alicepub33); + swap->alicereclaim.suppress_pubkeys = 1; swap->sleeptime = 3 - swap->iambob; return(swap); }