From 8efc12ae8556a1acc73e7bcb9cb7ad497df23d55 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Sat, 15 Sep 2018 05:14:41 +0800 Subject: [PATCH 01/22] remove MoMoM --- iguana/dpow/dpow_rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_rpc.c b/iguana/dpow/dpow_rpc.c index 7fcbc1c4b..536ddec03 100755 --- a/iguana/dpow/dpow_rpc.c +++ b/iguana/dpow/dpow_rpc.c @@ -289,7 +289,7 @@ int32_t dpow_paxpending(struct supernet_info *myinfo,uint8_t *hex,int32_t hexsiz MoMdepth = (MoMdepth & 0xffff) | ((uint32_t)CCid<<16); n += iguana_rwnum(1,&hex[n],sizeof(MoMdepth),(uint32_t *)&MoMdepth); //( ) - if ( ( (strncmp(bp->srccoin->symbol, "STKD", 4) == 0) || (strncmp(bp->srccoin->symbol, "STAKED", 6) == 0) ) && src_or_dest == 0 && strcmp(bp->destcoin->symbol,"KMD") == 0 ) + if ( ( (strncmp(bp->srccoin->symbol, "STKE", 4) == 0) || (strncmp(bp->srccoin->symbol, "STAKEE", 6) == 0) ) && src_or_dest == 0 && strcmp(bp->destcoin->symbol,"KMD") == 0 ) { kmdcoin = bp->destcoin; if ( (infojson= dpow_getinfo(myinfo,kmdcoin)) != 0 ) From 7d80031469b5f10c5bf89f345ade40394701ac22 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Mon, 17 Sep 2018 21:31:34 +0800 Subject: [PATCH 02/22] enable MoMoM --- iguana/dpow/dpow_rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_rpc.c b/iguana/dpow/dpow_rpc.c index 536ddec03..7fcbc1c4b 100755 --- a/iguana/dpow/dpow_rpc.c +++ b/iguana/dpow/dpow_rpc.c @@ -289,7 +289,7 @@ int32_t dpow_paxpending(struct supernet_info *myinfo,uint8_t *hex,int32_t hexsiz MoMdepth = (MoMdepth & 0xffff) | ((uint32_t)CCid<<16); n += iguana_rwnum(1,&hex[n],sizeof(MoMdepth),(uint32_t *)&MoMdepth); //( ) - if ( ( (strncmp(bp->srccoin->symbol, "STKE", 4) == 0) || (strncmp(bp->srccoin->symbol, "STAKEE", 6) == 0) ) && src_or_dest == 0 && strcmp(bp->destcoin->symbol,"KMD") == 0 ) + if ( ( (strncmp(bp->srccoin->symbol, "STKD", 4) == 0) || (strncmp(bp->srccoin->symbol, "STAKED", 6) == 0) ) && src_or_dest == 0 && strcmp(bp->destcoin->symbol,"KMD") == 0 ) { kmdcoin = bp->destcoin; if ( (infojson= dpow_getinfo(myinfo,kmdcoin)) != 0 ) From 3a8f0ea57323e70d6667217ad2b9332aa4a6420b Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Mon, 17 Sep 2018 21:45:46 +0800 Subject: [PATCH 03/22] try lockuspent function from Decker --- iguana/dpow/dpow_rpc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/iguana/dpow/dpow_rpc.c b/iguana/dpow/dpow_rpc.c index 7fcbc1c4b..9f5ae3cf3 100755 --- a/iguana/dpow/dpow_rpc.c +++ b/iguana/dpow/dpow_rpc.c @@ -466,6 +466,23 @@ cJSON *dpow_gettxout(struct supernet_info *myinfo,struct iguana_info *coin,bits2 return(json); } +cJSON *dpow_lockunspent(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr,char *txid,int32_t vout) +{ + char buf[128],*retstr; cJSON *json = 0; + if ( coin->FULLNODE < 0 ) + { + sprintf(buf,"false, [{\"txid\":\"%s\",\"vout\":%d}]", txid, vout); + if ( (retstr= bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"lockunspent",buf)) != 0 ) + { + printf("RESULT.(%s)\n",retstr); + json = cJSON_Parse(retstr); + free(retstr); + return(json); + } else printf("%s null retstr from (%s)n",coin->symbol,buf); + } + return(0); +} + char *dpow_decoderawtransaction(struct supernet_info *myinfo,struct iguana_info *coin,char *rawtx) { char *retstr,*paramstr; cJSON *array; From 68901595806b7c5f37dcd0b4433b1ddda8e84171 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Mon, 17 Sep 2018 22:49:06 +0800 Subject: [PATCH 04/22] add print of signed hex for mismatched txid --- iguana/dpow/dpow_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_tx.c b/iguana/dpow/dpow_tx.c index 9ffa025f6..ade70eb8b 100755 --- a/iguana/dpow/dpow_tx.c +++ b/iguana/dpow/dpow_tx.c @@ -614,7 +614,7 @@ void dpow_sigscheck(struct supernet_info *myinfo,struct dpow_info *dp,struct dpo else { bp->state = 0xffffffff; - printf("dpow_sigscheck: mismatched txid.%s vs %s\n",bits256_str(str,txid),retstr); + printf("dpow_sigscheck: mismatched txid.%s vs %s \n signedtx.(%s)\n",bits256_str(str,txid),retstr,bp->signedtx)); } free(retstr); retstr = 0; From 26918653f3ba528b05018e2cf3c3f2225c926f7b Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Mon, 17 Sep 2018 22:51:14 +0800 Subject: [PATCH 05/22] fix --- iguana/dpow/dpow_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_tx.c b/iguana/dpow/dpow_tx.c index ade70eb8b..12643c4ba 100755 --- a/iguana/dpow/dpow_tx.c +++ b/iguana/dpow/dpow_tx.c @@ -614,7 +614,7 @@ void dpow_sigscheck(struct supernet_info *myinfo,struct dpow_info *dp,struct dpo else { bp->state = 0xffffffff; - printf("dpow_sigscheck: mismatched txid.%s vs %s \n signedtx.(%s)\n",bits256_str(str,txid),retstr,bp->signedtx)); + printf("dpow_sigscheck: mismatched txid.%s vs %s \n signedtx.(%s)\n",bits256_str(str,txid),retstr,bp->signedtx); } free(retstr); retstr = 0; From 72d1ff3a5ec89bf25cccd982aaf6c763005e5b2a Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Mon, 17 Sep 2018 23:42:13 +0800 Subject: [PATCH 06/22] print utxo selection ? --- iguana/dpow/dpow_fsm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index c531c27a7..cee934691 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -487,6 +487,8 @@ void dpow_statemachinestart(void *ptr) bp->notaries[myind].ratifysrcvout = ep->src.prev_vout; bp->notaries[myind].ratifydestutxo = ep->dest.prev_hash; bp->notaries[myind].ratifydestvout = ep->dest.prev_vout; + printf("src.prev_hash.(%s) vout.(%d)",ep->src.prev_hash,ep->src.prev_vout); + printf("dest.prev_hash.(%s) vout.(%d)",ep->dest.prev_hash,ep->dest.prev_vout); } else { @@ -598,4 +600,3 @@ void dpow_statemachinestart(void *ptr) bp->state = 0xffffffff; free(ptr); } - From 4a2565ed72a4394d414eb9921e3a609a38eb3002 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Mon, 17 Sep 2018 23:56:32 +0800 Subject: [PATCH 07/22] try again --- iguana/dpow/dpow_fsm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index cee934691..3ed3b4bce 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -487,8 +487,7 @@ void dpow_statemachinestart(void *ptr) bp->notaries[myind].ratifysrcvout = ep->src.prev_vout; bp->notaries[myind].ratifydestutxo = ep->dest.prev_hash; bp->notaries[myind].ratifydestvout = ep->dest.prev_vout; - printf("src.prev_hash.(%s) vout.(%d)",ep->src.prev_hash,ep->src.prev_vout); - printf("dest.prev_hash.(%s) vout.(%d)",ep->dest.prev_hash,ep->dest.prev_vout); + printf("Use srcutxo.(%s) vout.(%d) destutxo.(%s) vout.(%d)\n",bits256_str(str,ep->src.prev_hash),ep->src.prev_vout,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); } else { From 9a6d9b8d90647546791d82101113e772e21c0501 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 00:15:59 +0800 Subject: [PATCH 08/22] try another place --- iguana/dpow/dpow_fsm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index 3ed3b4bce..6f2627a7d 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -487,7 +487,6 @@ void dpow_statemachinestart(void *ptr) bp->notaries[myind].ratifysrcvout = ep->src.prev_vout; bp->notaries[myind].ratifydestutxo = ep->dest.prev_hash; bp->notaries[myind].ratifydestvout = ep->dest.prev_vout; - printf("Use srcutxo.(%s) vout.(%d) destutxo.(%s) vout.(%d)\n",bits256_str(str,ep->src.prev_hash),ep->src.prev_vout,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); } else { @@ -502,6 +501,7 @@ void dpow_statemachinestart(void *ptr) bp->desttxid = bp->notaries[myind].src.prev_hash; dpow_signedtxgen(myinfo,dp,src,bp,bp->myind,1LL<myind,bp->myind,DPOW_SIGCHANNEL,0,0); }*/ + printf("Use srcutxo.(%s) vout.(%d) destutxo.(%s) vout.(%d)\n",bits256_str(str,bp->notaries[myind].ratifysrcutxo),bp->notaries[myind].ratifysrcvout,bits256_str(str2,ep->bp->notaries[myind].ratifydestutxo),bp->notaries[myind].ratifydestvout); bp->recvmask |= (1LL << myind); bp->notaries[myind].othermask |= (1LL << myind); dp->checkpoint = checkpoint; @@ -595,6 +595,7 @@ void dpow_statemachinestart(void *ptr) printf("[%d] END isratify.%d:%d bestk.%d %llx sigs.%llx state.%x machine ht.%d completed state.%x %s.%s %s.%s recvmask.%llx paxwdcrc.%x %p %p\n",Numallocated,bp->isratify,dp->ratifying,bp->bestk,(long long)bp->bestmask,(long long)(bp->bestk>=0?bp->destsigsmasks[bp->bestk]:0),bp->state,bp->height,bp->state,dp->dest,bits256_str(str,bp->desttxid),dp->symbol,bits256_str(str2,bp->srctxid),(long long)bp->recvmask,bp->paxwdcrc,src,dest); dp->lastrecvmask = bp->recvmask; dp->ratifying -= bp->isratify; + // call unlock unspent here // dp->blocks[bp->height] = 0; bp->state = 0xffffffff; free(ptr); From c5758e2b7608a7005a36a281ce238bd101fa04fa Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 00:17:56 +0800 Subject: [PATCH 09/22] oops --- iguana/dpow/dpow_fsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index 6f2627a7d..4964fa1e4 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -501,7 +501,7 @@ void dpow_statemachinestart(void *ptr) bp->desttxid = bp->notaries[myind].src.prev_hash; dpow_signedtxgen(myinfo,dp,src,bp,bp->myind,1LL<myind,bp->myind,DPOW_SIGCHANNEL,0,0); }*/ - printf("Use srcutxo.(%s) vout.(%d) destutxo.(%s) vout.(%d)\n",bits256_str(str,bp->notaries[myind].ratifysrcutxo),bp->notaries[myind].ratifysrcvout,bits256_str(str2,ep->bp->notaries[myind].ratifydestutxo),bp->notaries[myind].ratifydestvout); + printf("Use srcutxo.(%s) vout.(%d) destutxo.(%s) vout.(%d)\n",bits256_str(str,bp->notaries[myind].ratifysrcutxo),bp->notaries[myind].ratifysrcvout,bits256_str(str2,bp->notaries[myind].ratifydestutxo),bp->notaries[myind].ratifydestvout); bp->recvmask |= (1LL << myind); bp->notaries[myind].othermask |= (1LL << myind); dp->checkpoint = checkpoint; From 23a034249d863ce9172c478a9337657b0db61539 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 00:29:41 +0800 Subject: [PATCH 10/22] try again --- iguana/dpow/dpow_fsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index 4964fa1e4..5db46e9e4 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -501,7 +501,7 @@ void dpow_statemachinestart(void *ptr) bp->desttxid = bp->notaries[myind].src.prev_hash; dpow_signedtxgen(myinfo,dp,src,bp,bp->myind,1LL<myind,bp->myind,DPOW_SIGCHANNEL,0,0); }*/ - printf("Use srcutxo.(%s) vout.(%d) destutxo.(%s) vout.(%d)\n",bits256_str(str,bp->notaries[myind].ratifysrcutxo),bp->notaries[myind].ratifysrcvout,bits256_str(str2,bp->notaries[myind].ratifydestutxo),bp->notaries[myind].ratifydestvout); + printf("Use srcutxo.(%s) vout.(%d) destutxo.(%s) vout.(%d)\n",bits256_str(str,ep->src.prev_hash),ep->src.prev_vout,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); bp->recvmask |= (1LL << myind); bp->notaries[myind].othermask |= (1LL << myind); dp->checkpoint = checkpoint; From 0908bca5c1feb249e6c0ca275bbea27356ad9623 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 01:00:07 +0800 Subject: [PATCH 11/22] remove nosplit all together :d SPEED! --- iguana/dpow/dpow_fsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index 5db46e9e4..c2383db7f 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -467,14 +467,14 @@ void dpow_statemachinestart(void *ptr) } else { - if ( dpow_checkutxo(myinfo,dp,bp,bp->destcoin,&ep->dest.prev_hash,&ep->dest.prev_vout,destaddr,src->symbol) < 0 ) + if ( dpow_haveutxo(myinfo,bp->destcoin,&ep->dest.prev_hash,&ep->dest.prev_vout,destaddr,src->symbol) < 0 ) { printf("dont have %s %s utxo, please send funds\n",dp->dest,destaddr); dp->ratifying -= bp->isratify; free(ptr); return; } - if ( dpow_checkutxo(myinfo,dp,bp,bp->srccoin,&ep->src.prev_hash,&ep->src.prev_vout,srcaddr,"") < 0 ) + if ( dpow_haveutxo(myinfo,bp->srccoin,&ep->src.prev_hash,&ep->src.prev_vout,srcaddr,"") < 0 ) { printf("dont have %s %s utxo, please send funds\n",dp->symbol,srcaddr); dp->ratifying -= bp->isratify; From 5ed5086c94b67764530e2799cec286415c73a43b Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 02:35:23 +0800 Subject: [PATCH 12/22] will this work -- I bet not --- iguana/dpow/dpow_fsm.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index c2383db7f..d349d1bc1 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -265,6 +265,7 @@ void dpow_statemachinestart(void *ptr) void **ptrs = ptr; struct supernet_info *myinfo; struct dpow_info *dp; struct dpow_checkpoint checkpoint; int32_t i,j,ht,extralen,destprevvout0,srcprevvout0,src_or_dest,numratified=0,kmdheight,myind = -1; uint8_t extras[10000],pubkeys[64][33]; cJSON *ratified=0,*item; struct iguana_info *src,*dest; char *jsonstr,*handle,*hexstr,str[65],str2[65],srcaddr[64],destaddr[64]; bits256 zero,MoM,merkleroot,srchash,destprevtxid0,srcprevtxid0; struct dpow_block *bp; struct dpow_entry *ep = 0; uint32_t MoMdepth,duration,minsigs,starttime,srctime; + char *destlockunspent *srclockunspent; memset(&zero,0,sizeof(zero)); MoM = zero; srcprevtxid0 = destprevtxid0 = zero; @@ -501,7 +502,21 @@ void dpow_statemachinestart(void *ptr) bp->desttxid = bp->notaries[myind].src.prev_hash; dpow_signedtxgen(myinfo,dp,src,bp,bp->myind,1LL<myind,bp->myind,DPOW_SIGCHANNEL,0,0); }*/ - printf("Use srcutxo.(%s) vout.(%d) destutxo.(%s) vout.(%d)\n",bits256_str(str,ep->src.prev_hash),ep->src.prev_vout,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + + //printf("Use srcutxo.(%s) vout.(%d) destutxo.(%s) vout.(%d)\n",bits256_str(str,ep->src.prev_hash),ep->src.prev_vout,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + + // lock the dest coun selected utxo + destlockunspent = dpow_lockunspent(myinfo,bp->destcoin,destaddr,ep->dest.prev_hash,ep->dest.prev_vout); + if (strncmp(destlockunspent,"true", 4) == 0 ) + print(">>>>LOCKED DEST UTXO.(%s) vout.(%d)",bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + free(destlockunspent); + + // lock the src selected utxo + srclockunspent = dpow_lockunspent(myinfo,bp->srccoin,srcaddr,ep->src.prev_hash,ep->src.prev_vout); + if (strncmp(srclockunspent,"true", 4) == 0 ) + print(">>>>LOCKED SRC UTXO.(%s) vout.(%d)",bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + free(srclockunspent); + bp->recvmask |= (1LL << myind); bp->notaries[myind].othermask |= (1LL << myind); dp->checkpoint = checkpoint; From 157efa9c638ddd70dc8801ad4775760d300f38e8 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 02:41:02 +0800 Subject: [PATCH 13/22] yep :D --- iguana/dpow/dpow_fsm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index d349d1bc1..aff45f7ec 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -265,7 +265,7 @@ void dpow_statemachinestart(void *ptr) void **ptrs = ptr; struct supernet_info *myinfo; struct dpow_info *dp; struct dpow_checkpoint checkpoint; int32_t i,j,ht,extralen,destprevvout0,srcprevvout0,src_or_dest,numratified=0,kmdheight,myind = -1; uint8_t extras[10000],pubkeys[64][33]; cJSON *ratified=0,*item; struct iguana_info *src,*dest; char *jsonstr,*handle,*hexstr,str[65],str2[65],srcaddr[64],destaddr[64]; bits256 zero,MoM,merkleroot,srchash,destprevtxid0,srcprevtxid0; struct dpow_block *bp; struct dpow_entry *ep = 0; uint32_t MoMdepth,duration,minsigs,starttime,srctime; - char *destlockunspent *srclockunspent; + char *destlockunspent,*srclockunspent; memset(&zero,0,sizeof(zero)); MoM = zero; srcprevtxid0 = destprevtxid0 = zero; @@ -506,15 +506,15 @@ void dpow_statemachinestart(void *ptr) //printf("Use srcutxo.(%s) vout.(%d) destutxo.(%s) vout.(%d)\n",bits256_str(str,ep->src.prev_hash),ep->src.prev_vout,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); // lock the dest coun selected utxo - destlockunspent = dpow_lockunspent(myinfo,bp->destcoin,destaddr,ep->dest.prev_hash,ep->dest.prev_vout); + destlockunspent = dpow_lockunspent(myinfo,bp->destcoin,destaddr,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); if (strncmp(destlockunspent,"true", 4) == 0 ) - print(">>>>LOCKED DEST UTXO.(%s) vout.(%d)",bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + printf(">>>>LOCKED DEST UTXO.(%s) vout.(%d)",bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); free(destlockunspent); // lock the src selected utxo - srclockunspent = dpow_lockunspent(myinfo,bp->srccoin,srcaddr,ep->src.prev_hash,ep->src.prev_vout); + srclockunspent = dpow_lockunspent(myinfo,bp->srccoin,srcaddr,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); if (strncmp(srclockunspent,"true", 4) == 0 ) - print(">>>>LOCKED SRC UTXO.(%s) vout.(%d)",bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + printf(">>>>LOCKED SRC UTXO.(%s) vout.(%d)",bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); free(srclockunspent); bp->recvmask |= (1LL << myind); From 57060c7d50ad5a8d59191cefe2ec05d9aa7d00c3 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 02:42:58 +0800 Subject: [PATCH 14/22] try this --- iguana/dpow/dpow_rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_rpc.c b/iguana/dpow/dpow_rpc.c index 9f5ae3cf3..80a000ded 100755 --- a/iguana/dpow/dpow_rpc.c +++ b/iguana/dpow/dpow_rpc.c @@ -466,7 +466,7 @@ cJSON *dpow_gettxout(struct supernet_info *myinfo,struct iguana_info *coin,bits2 return(json); } -cJSON *dpow_lockunspent(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr,char *txid,int32_t vout) +*dpow_lockunspent(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr,char *txid,int32_t vout) { char buf[128],*retstr; cJSON *json = 0; if ( coin->FULLNODE < 0 ) From 50bd2ee7f9ea53f389491d1d5a21adf7663b4070 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 02:48:05 +0800 Subject: [PATCH 15/22] change it all to a string. --- iguana/dpow/dpow_rpc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/iguana/dpow/dpow_rpc.c b/iguana/dpow/dpow_rpc.c index 80a000ded..76e919c06 100755 --- a/iguana/dpow/dpow_rpc.c +++ b/iguana/dpow/dpow_rpc.c @@ -468,16 +468,14 @@ cJSON *dpow_gettxout(struct supernet_info *myinfo,struct iguana_info *coin,bits2 *dpow_lockunspent(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr,char *txid,int32_t vout) { - char buf[128],*retstr; cJSON *json = 0; + char buf[128],*retstr; if ( coin->FULLNODE < 0 ) { sprintf(buf,"false, [{\"txid\":\"%s\",\"vout\":%d}]", txid, vout); if ( (retstr= bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"lockunspent",buf)) != 0 ) { printf("RESULT.(%s)\n",retstr); - json = cJSON_Parse(retstr); - free(retstr); - return(json); + return(retstr); } else printf("%s null retstr from (%s)n",coin->symbol,buf); } return(0); From a6001538fde9dffd970a0668e5c7d1fae5390abe Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 02:52:59 +0800 Subject: [PATCH 16/22] char --- iguana/dpow/dpow_rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_rpc.c b/iguana/dpow/dpow_rpc.c index 76e919c06..bae736a65 100755 --- a/iguana/dpow/dpow_rpc.c +++ b/iguana/dpow/dpow_rpc.c @@ -466,7 +466,7 @@ cJSON *dpow_gettxout(struct supernet_info *myinfo,struct iguana_info *coin,bits2 return(json); } -*dpow_lockunspent(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr,char *txid,int32_t vout) +char *dpow_lockunspent(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr,char *txid,int32_t vout) { char buf[128],*retstr; if ( coin->FULLNODE < 0 ) From 18ad76773b7e69d2e4114a7c9cae166199878ea3 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 11:15:16 +0800 Subject: [PATCH 17/22] Try to only lock KMD utxo's and unlock them when we are finished --- iguana/dpow/dpow_fsm.c | 49 ++++++++++++++++++++++++++++++++---------- iguana/dpow/dpow_rpc.c | 15 +++++++++++++ 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index aff45f7ec..f074e355f 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -505,17 +505,27 @@ void dpow_statemachinestart(void *ptr) //printf("Use srcutxo.(%s) vout.(%d) destutxo.(%s) vout.(%d)\n",bits256_str(str,ep->src.prev_hash),ep->src.prev_vout,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); - // lock the dest coun selected utxo - destlockunspent = dpow_lockunspent(myinfo,bp->destcoin,destaddr,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); - if (strncmp(destlockunspent,"true", 4) == 0 ) - printf(">>>>LOCKED DEST UTXO.(%s) vout.(%d)",bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); - free(destlockunspent); + if (strcmp("KMD",dest->symbol) == 0 ) + { + // lock the dest coin selected utxo + destlockunspent = dpow_lockunspent(myinfo,bp->destcoin,destaddr,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + if (strncmp(destlockunspent,"true", 4) == 0 ) + { + printf(">>>> LOCKED %s UTXO.(%s) vout.(%d)",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + //free(destlockunspent); + } else printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + } - // lock the src selected utxo - srclockunspent = dpow_lockunspent(myinfo,bp->srccoin,srcaddr,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); - if (strncmp(srclockunspent,"true", 4) == 0 ) - printf(">>>>LOCKED SRC UTXO.(%s) vout.(%d)",bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); - free(srclockunspent); + if ( strcmp("BTC",dest->symbol) == 0 ) + { + // lock the src coin selected utxo + srclockunspent = dpow_lockunspent(myinfo,bp->srccoin,srcaddr,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + if (strncmp(srclockunspent,"true", 4) == 0 ) + { + printf(">>>> LOCKED %s UTXO.(%s) vout.(%d)",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + //free(srclockunspent); + } else printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + } bp->recvmask |= (1LL << myind); bp->notaries[myind].othermask |= (1LL << myind); @@ -610,7 +620,24 @@ void dpow_statemachinestart(void *ptr) printf("[%d] END isratify.%d:%d bestk.%d %llx sigs.%llx state.%x machine ht.%d completed state.%x %s.%s %s.%s recvmask.%llx paxwdcrc.%x %p %p\n",Numallocated,bp->isratify,dp->ratifying,bp->bestk,(long long)bp->bestmask,(long long)(bp->bestk>=0?bp->destsigsmasks[bp->bestk]:0),bp->state,bp->height,bp->state,dp->dest,bits256_str(str,bp->desttxid),dp->symbol,bits256_str(str2,bp->srctxid),(long long)bp->recvmask,bp->paxwdcrc,src,dest); dp->lastrecvmask = bp->recvmask; dp->ratifying -= bp->isratify; - // call unlock unspent here + + // unlock the dest utxo if it was locked. + if (strncmp(destlockunspent,"true",4) == 0) + { + destlockunspent = dpow_unlockunspent(myinfo,bp->destcoin,destaddr,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + if (strncmp(destlockunspent,"true", 4) == 0 ) + printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + } + + // unlock the src selected utxo, if it was locked + if (strncmp(srclockunspent,"true",4) == 0) + { + srclockunspent = dpow_unlockunspent(myinfo,bp->srccoin,srcaddr,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + if (strncmp(srclockunspent,"true", 4) == 0 ) + printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + } + free(destlockunspent); + free(srclockunspent); // dp->blocks[bp->height] = 0; bp->state = 0xffffffff; free(ptr); diff --git a/iguana/dpow/dpow_rpc.c b/iguana/dpow/dpow_rpc.c index bae736a65..fd106b4f8 100755 --- a/iguana/dpow/dpow_rpc.c +++ b/iguana/dpow/dpow_rpc.c @@ -481,6 +481,21 @@ char *dpow_lockunspent(struct supernet_info *myinfo,struct iguana_info *coin,cha return(0); } +char *dpow_unlockunspent(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr,char *txid,int32_t vout) +{ + char buf[128],*retstr; + if ( coin->FULLNODE < 0 ) + { + sprintf(buf,"true, [{\"txid\":\"%s\",\"vout\":%d}]", txid, vout); + if ( (retstr= bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"lockunspent",buf)) != 0 ) + { + printf("RESULT.(%s)\n",retstr); + return(retstr); + } else printf("%s null retstr from (%s)n",coin->symbol,buf); + } + return(0); +} + char *dpow_decoderawtransaction(struct supernet_info *myinfo,struct iguana_info *coin,char *rawtx) { char *retstr,*paramstr; cJSON *array; From 91b465648c918b24baf196e72b58ec7c8110e2ec Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 11:17:06 +0800 Subject: [PATCH 18/22] fix print format --- iguana/dpow/dpow_fsm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index f074e355f..c8a556b29 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -511,9 +511,9 @@ void dpow_statemachinestart(void *ptr) destlockunspent = dpow_lockunspent(myinfo,bp->destcoin,destaddr,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); if (strncmp(destlockunspent,"true", 4) == 0 ) { - printf(">>>> LOCKED %s UTXO.(%s) vout.(%d)",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + printf(">>>> LOCKED %s UTXO.(%s) vout.(%d)\n",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); //free(destlockunspent); - } else printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + } else printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)\n",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); } if ( strcmp("BTC",dest->symbol) == 0 ) @@ -522,9 +522,9 @@ void dpow_statemachinestart(void *ptr) srclockunspent = dpow_lockunspent(myinfo,bp->srccoin,srcaddr,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); if (strncmp(srclockunspent,"true", 4) == 0 ) { - printf(">>>> LOCKED %s UTXO.(%s) vout.(%d)",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + printf(">>>> LOCKED %s UTXO.(%s) vout.(%d\n",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); //free(srclockunspent); - } else printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + } else printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)\n",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); } bp->recvmask |= (1LL << myind); @@ -626,7 +626,7 @@ void dpow_statemachinestart(void *ptr) { destlockunspent = dpow_unlockunspent(myinfo,bp->destcoin,destaddr,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); if (strncmp(destlockunspent,"true", 4) == 0 ) - printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)\n",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); } // unlock the src selected utxo, if it was locked @@ -634,7 +634,7 @@ void dpow_statemachinestart(void *ptr) { srclockunspent = dpow_unlockunspent(myinfo,bp->srccoin,srcaddr,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); if (strncmp(srclockunspent,"true", 4) == 0 ) - printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)\n",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); } free(destlockunspent); free(srclockunspent); From 9334e97438c4291dafe2b185d1187ff5af7a46b9 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 11:22:28 +0800 Subject: [PATCH 19/22] fix invaild pointer --- iguana/dpow/dpow_fsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index c8a556b29..2183ff3d4 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -627,6 +627,7 @@ void dpow_statemachinestart(void *ptr) destlockunspent = dpow_unlockunspent(myinfo,bp->destcoin,destaddr,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); if (strncmp(destlockunspent,"true", 4) == 0 ) printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)\n",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + free(destlockunspent); } // unlock the src selected utxo, if it was locked @@ -635,9 +636,8 @@ void dpow_statemachinestart(void *ptr) srclockunspent = dpow_unlockunspent(myinfo,bp->srccoin,srcaddr,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); if (strncmp(srclockunspent,"true", 4) == 0 ) printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)\n",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + free(srclockunspent); } - free(destlockunspent); - free(srclockunspent); // dp->blocks[bp->height] = 0; bp->state = 0xffffffff; free(ptr); From 01b3b3e86e85d6a28721835c10802653f5205742 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 16:31:22 +0800 Subject: [PATCH 20/22] fix possible memleak. Thanks Decker! --- iguana/dpow/dpow_fsm.c | 46 ++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index 2183ff3d4..e8a519d86 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -265,7 +265,7 @@ void dpow_statemachinestart(void *ptr) void **ptrs = ptr; struct supernet_info *myinfo; struct dpow_info *dp; struct dpow_checkpoint checkpoint; int32_t i,j,ht,extralen,destprevvout0,srcprevvout0,src_or_dest,numratified=0,kmdheight,myind = -1; uint8_t extras[10000],pubkeys[64][33]; cJSON *ratified=0,*item; struct iguana_info *src,*dest; char *jsonstr,*handle,*hexstr,str[65],str2[65],srcaddr[64],destaddr[64]; bits256 zero,MoM,merkleroot,srchash,destprevtxid0,srcprevtxid0; struct dpow_block *bp; struct dpow_entry *ep = 0; uint32_t MoMdepth,duration,minsigs,starttime,srctime; - char *destlockunspent,*srclockunspent; + char *destlockunspent,*srclockunspent,*destunlockunspent,*srcunlockunspent; memset(&zero,0,sizeof(zero)); MoM = zero; srcprevtxid0 = destprevtxid0 = zero; @@ -507,26 +507,25 @@ void dpow_statemachinestart(void *ptr) if (strcmp("KMD",dest->symbol) == 0 ) { - // lock the dest coin selected utxo + // lock the dest utxo if destination coin is KMD.s destlockunspent = dpow_lockunspent(myinfo,bp->destcoin,destaddr,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); if (strncmp(destlockunspent,"true", 4) == 0 ) - { printf(">>>> LOCKED %s UTXO.(%s) vout.(%d)\n",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); - //free(destlockunspent); - } else printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)\n",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + else + printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)\n",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); } if ( strcmp("BTC",dest->symbol) == 0 ) { - // lock the src coin selected utxo + // lock the src coin selected utxo if the source coin is KMD. srclockunspent = dpow_lockunspent(myinfo,bp->srccoin,srcaddr,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); if (strncmp(srclockunspent,"true", 4) == 0 ) - { printf(">>>> LOCKED %s UTXO.(%s) vout.(%d\n",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); - //free(srclockunspent); - } else printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)\n",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + else + printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)\n",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); } - + free(destlockunspent); + free(srclockunspent); bp->recvmask |= (1LL << myind); bp->notaries[myind].othermask |= (1LL << myind); dp->checkpoint = checkpoint; @@ -621,23 +620,18 @@ void dpow_statemachinestart(void *ptr) dp->lastrecvmask = bp->recvmask; dp->ratifying -= bp->isratify; - // unlock the dest utxo if it was locked. - if (strncmp(destlockunspent,"true",4) == 0) - { - destlockunspent = dpow_unlockunspent(myinfo,bp->destcoin,destaddr,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); - if (strncmp(destlockunspent,"true", 4) == 0 ) - printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)\n",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); - free(destlockunspent); - } + // unlock the dest utxo regardless if it was locked or not it does not matter. + destunlockunspent = dpow_unlockunspent(myinfo,bp->destcoin,destaddr,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + if (strncmp(destunlockunspent,"true", 4) == 0 ) + printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)\n",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + free(destunlockunspent); + + // unlock the src selected utxo, if it was locked or not it does not matter. + srcunlockunspent = dpow_unlockunspent(myinfo,bp->srccoin,srcaddr,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + if (strncmp(srcunlockunspent,"true", 4) == 0 ) + printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)\n",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + free(srcunlockunspent); - // unlock the src selected utxo, if it was locked - if (strncmp(srclockunspent,"true",4) == 0) - { - srclockunspent = dpow_unlockunspent(myinfo,bp->srccoin,srcaddr,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); - if (strncmp(srclockunspent,"true", 4) == 0 ) - printf(">>>>UNLOCKED %s UTXO.(%s) vout.(%d)\n",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); - free(srclockunspent); - } // dp->blocks[bp->height] = 0; bp->state = 0xffffffff; free(ptr); From 5c817a30e6bf081b586993845c6fd1af04d7df65 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 16:50:58 +0800 Subject: [PATCH 21/22] fix pointer --- iguana/dpow/dpow_fsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index e8a519d86..a334bb62d 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -513,6 +513,7 @@ void dpow_statemachinestart(void *ptr) printf(">>>> LOCKED %s UTXO.(%s) vout.(%d)\n",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); else printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)\n",dest->symbol,bits256_str(str2,ep->dest.prev_hash),ep->dest.prev_vout); + free(destlockunspent); } if ( strcmp("BTC",dest->symbol) == 0 ) @@ -523,9 +524,8 @@ void dpow_statemachinestart(void *ptr) printf(">>>> LOCKED %s UTXO.(%s) vout.(%d\n",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); else printf("<<<< FAILED TO LOCK %s UTXO.(%s) vout.(%d)\n",src->symbol,bits256_str(str2,ep->src.prev_hash),ep->src.prev_vout); + free(srclockunspent); } - free(destlockunspent); - free(srclockunspent); bp->recvmask |= (1LL << myind); bp->notaries[myind].othermask |= (1LL << myind); dp->checkpoint = checkpoint; From aa4f168facb6761762ffb374c706ba02d04785ca Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Tue, 18 Sep 2018 17:07:30 +0800 Subject: [PATCH 22/22] remove pointless print --- iguana/dpow/dpow_rpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iguana/dpow/dpow_rpc.c b/iguana/dpow/dpow_rpc.c index fd106b4f8..d7dc35014 100755 --- a/iguana/dpow/dpow_rpc.c +++ b/iguana/dpow/dpow_rpc.c @@ -474,7 +474,7 @@ char *dpow_lockunspent(struct supernet_info *myinfo,struct iguana_info *coin,cha sprintf(buf,"false, [{\"txid\":\"%s\",\"vout\":%d}]", txid, vout); if ( (retstr= bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"lockunspent",buf)) != 0 ) { - printf("RESULT.(%s)\n",retstr); + //printf("RESULT.(%s)\n",retstr); return(retstr); } else printf("%s null retstr from (%s)n",coin->symbol,buf); } @@ -489,7 +489,7 @@ char *dpow_unlockunspent(struct supernet_info *myinfo,struct iguana_info *coin,c sprintf(buf,"true, [{\"txid\":\"%s\",\"vout\":%d}]", txid, vout); if ( (retstr= bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"lockunspent",buf)) != 0 ) { - printf("RESULT.(%s)\n",retstr); + //printf("RESULT.(%s)\n",retstr); return(retstr); } else printf("%s null retstr from (%s)n",coin->symbol,buf); }