From 5caefd225bc0421dd79ce2eac4d18ba1aa42782f Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 09:59:31 -0300 Subject: [PATCH 01/18] test --- src/miner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/miner.cpp b/src/miner.cpp index 3f4a8975a..20a5cd51a 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -661,7 +661,7 @@ void static BitcoinMiner(CWallet *pwallet) int32_t nseconds = Mining_start+ROUNDROBIN_DELAY-time(NULL); if ( nseconds > 0 ) sleep(nseconds); - MilliSleep((rand() % 3700) + 1); + MilliSleep((rand() % 4700) + 1); } KOMODO_CHOSEN_ONE = 1; // Found a solution From b338ea90fa4c33d69aec31fc0abc26f25c4806cb Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 10:25:05 -0300 Subject: [PATCH 02/18] test --- src/komodo.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index 30fca14a8..aceaf1267 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -512,8 +512,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) } } numvalid = bitweight(signedmask); - //if ( height == 79633 ) - // notarized = 1; + printf("%s ht.%d txi.%d signedmask.%llx numvins.%d numvouts.%d\n",ASSETCHAINS_SYMBOL,height,i,(long long)signedmask,numvins,numvouts); if ( (((height < 90000 || (signedmask & 1) != 0) && numvalid >= KOMODO_MINRATIFY) || numvalid > (numnotaries/3)) ) { printf("%s ht.%d txi.%d signedmask.%llx numvins.%d numvouts.%d <<<<<<<<<<< notarized\n",ASSETCHAINS_SYMBOL,height,i,(long long)signedmask,numvins,numvouts); @@ -540,8 +539,11 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) } if ( notarized != 0 && (notarizedheight != 0 || specialtx != 0) ) { - //printf("%s NOTARY SIGNED.%llx numvins.%d ht.%d txi.%d notaryht.%d specialtx.%d\n",ASSETCHAINS_SYMBOL,(long long)signedmask,numvins,height,i,notarizedheight,specialtx); - //printf("ht.%d specialtx.%d isratification.%d numvouts.%d signed.%llx numnotaries.%d\n",height,specialtx,isratification,numvouts,(long long)signedmask,numnotaries); + if ( isratification != 0 ) + { + printf("%s NOTARY SIGNED.%llx numvins.%d ht.%d txi.%d notaryht.%d specialtx.%d\n",ASSETCHAINS_SYMBOL,(long long)signedmask,numvins,height,i,notarizedheight,specialtx); + printf("ht.%d specialtx.%d isratification.%d numvouts.%d signed.%llx numnotaries.%d\n",height,specialtx,isratification,numvouts,(long long)signedmask,numnotaries); + } if ( specialtx != 0 && isratification != 0 && numvouts > 2 ) { numvalid = 0; From 8985164dece9715b55b9544efd65a3be47588e2c Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 10:36:13 -0300 Subject: [PATCH 03/18] test --- src/komodo.h | 4 ++-- src/main.cpp | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index aceaf1267..d37ff0fc5 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -501,7 +501,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) numvouts = block.vtx[i].vout.size(); notaryid = -1; voutmask = specialtx = notarizedheight = isratification = notarized = 0; - signedmask = 1; + signedmask = (height < 100000) ? 1 : 0; numvins = block.vtx[i].vin.size(); for (j=0; j= KOMODO_MINRATIFY) || numvalid > (numnotaries/3)) ) { printf("%s ht.%d txi.%d signedmask.%llx numvins.%d numvouts.%d <<<<<<<<<<< notarized\n",ASSETCHAINS_SYMBOL,height,i,(long long)signedmask,numvins,numvouts); @@ -537,6 +536,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) } } } + printf("%s ht.%d txi.%d signedmask.%llx numvins.%d numvouts.%d notarized.%d special.%d isratification.%d\n",ASSETCHAINS_SYMBOL,height,i,(long long)signedmask,numvins,numvouts,notarized,specialtx,isratification); if ( notarized != 0 && (notarizedheight != 0 || specialtx != 0) ) { if ( isratification != 0 ) diff --git a/src/main.cpp b/src/main.cpp index e2da7de1b..9bc05a18c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2703,7 +2703,15 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo if (!DisconnectTip(state)) return false; } - +if ( 1 ) +{ + while (chainActive.Tip()->nHeight > 91419 ) + { + fprintf(stderr,"rewind ht.%d\n",chainActive.Tip()->nHeight); + if (!DisconnectTip(state)) + return false; + } +} // Build list of new blocks to connect. std::vector vpindexToConnect; bool fContinue = true; From 763747109f4daddab4fe7decc7bb21e6b06f00ad Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 10:43:35 -0300 Subject: [PATCH 04/18] test --- src/main.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 9bc05a18c..f2c3ae6f1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2555,6 +2555,7 @@ static int64_t nTimePostConnect = 0; * corresponding to pindexNew, to bypass loading it again from disk. */ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock *pblock) { + assert(pindexNew->pprev == chainActive.Tip()); mempool.check(pcoinsTip); // Read block from disk. @@ -2705,12 +2706,14 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo } if ( 1 ) { - while (chainActive.Tip()->nHeight > 91419 ) + while (chainActive.Tip()->nHeight > 91418 ) { fprintf(stderr,"rewind ht.%d\n",chainActive.Tip()->nHeight); - if (!DisconnectTip(state)) + if ( !DisconnectTip(state) ) return false; } + pindexOldTip = chainActive.Tip(); + pindexFork = chainActive.FindFork(pindexMostWork); } // Build list of new blocks to connect. std::vector vpindexToConnect; From 756271276c882e97b0a2933225bffe3839461286 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 10:45:56 -0300 Subject: [PATCH 05/18] test --- src/main.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f2c3ae6f1..bfbb6cc42 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2706,14 +2706,18 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo } if ( 1 ) { - while (chainActive.Tip()->nHeight > 91418 ) + static int32_t didinit; + if ( didinit++ == 0 ) { - fprintf(stderr,"rewind ht.%d\n",chainActive.Tip()->nHeight); - if ( !DisconnectTip(state) ) - return false; + while (chainActive.Tip()->nHeight > 91418 ) + { + fprintf(stderr,"rewind ht.%d\n",chainActive.Tip()->nHeight); + if ( !DisconnectTip(state) ) + return false; + } + pindexOldTip = chainActive.Tip(); + pindexFork = chainActive.FindFork(pindexMostWork); } - pindexOldTip = chainActive.Tip(); - pindexFork = chainActive.FindFork(pindexMostWork); } // Build list of new blocks to connect. std::vector vpindexToConnect; From bb1963caaabb7d088e7a8b6ab32836bffa9c1de8 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 10:52:50 -0300 Subject: [PATCH 06/18] test --- src/komodo.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/komodo.h b/src/komodo.h index d37ff0fc5..c6c2148f5 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -509,7 +509,14 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) { if ( (k= komodo_notarycmp(scriptPubKey,scriptlen,pubkeys,numnotaries,rmd160)) >= 0 ) signedmask |= (1LL << k); - } + else if ( numvins >= 17 ) + { + int32_t k; + for (k=0; k= KOMODO_MINRATIFY) || numvalid > (numnotaries/3)) ) From fb5b4d5e139622372e9c5be36ca0c084910e6886 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 10:57:33 -0300 Subject: [PATCH 07/18] test --- src/rpcblockchain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 70644aad7..a8a2dc7ce 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -682,7 +682,7 @@ int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid int32_t i,m; uint8_t *ptr; LOCK(cs_main); CCoins coins; - if ( 1 ) + if ( 0 ) { LOCK(mempool.cs); CCoinsViewMemPool view(pcoinsTip,mempool); From 517b16911ace4885d90971a0bf8a365148814f1c Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 11:08:18 -0300 Subject: [PATCH 08/18] test --- src/komodo.h | 2 +- src/rpcblockchain.cpp | 46 ++++++++++++++++++++++++++++--------------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index c6c2148f5..7896b14cc 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -501,7 +501,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) numvouts = block.vtx[i].vout.size(); notaryid = -1; voutmask = specialtx = notarizedheight = isratification = notarized = 0; - signedmask = (height < 100000) ? 1 : 0; + signedmask = (height < 91400) ? 1 : 0; numvins = block.vtx[i].vin.size(); for (j=0; jGetCoins(txid,coins) == 0 ) - return(-1); - if ( n < 0 || (unsigned int)n >= coins.vout.size() || coins.vout[n].IsNull() ) - return(-1); - ptr = (uint8_t *)coins.vout[n].scriptPubKey.data(); - m = coins.vout[n].scriptPubKey.size(); - for (i=0; iGetCoins(txid,coins) == 0 ) + { + fprintf(stderr,"cant get pcoinsTip->GetCoins\n"); + continue; + } + if ( n < 0 || (unsigned int)n >= coins.vout.size() || coins.vout[n].IsNull() ) + { + fprintf(stderr,"iter.%d n.%d vs voutsize.%d\n",iter,n,(int32_t)coins.vout.size()); + continue; + } + ptr = (uint8_t *)coins.vout[n].scriptPubKey.data(); + m = coins.vout[n].scriptPubKey.size(); + for (i=0; i Date: Thu, 1 Dec 2016 11:16:33 -0300 Subject: [PATCH 09/18] test --- src/rpcblockchain.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index f78c27cdd..b3e3a8912 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -711,6 +711,18 @@ int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid scriptPubKey[i] = ptr[i]; return(i); } + CTransaction tx; + uint256 hashBlock; + if ( GetTransaction(hash,tx,hashBlock,true) == 0 ) + return(-1); + else + { + ptr = (uint8_t *)tx.vout[n].scriptPubKey.data(); + m = tx.vout[n].scriptPubKey.size(); + for (i=0; i Date: Thu, 1 Dec 2016 11:16:59 -0300 Subject: [PATCH 10/18] test --- src/rpcblockchain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index b3e3a8912..903d651a6 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -690,14 +690,14 @@ int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid CCoinsViewMemPool view(pcoinsTip,mempool); if ( view.GetCoins(txid,coins) == 0 ) { - fprintf(stderr,"cant get view\n"); + //fprintf(stderr,"cant get view\n"); continue; } mempool.pruneSpent(txid, coins); // TODO: this should be done by the CCoinsViewMemPool } else if ( pcoinsTip->GetCoins(txid,coins) == 0 ) { - fprintf(stderr,"cant get pcoinsTip->GetCoins\n"); + //fprintf(stderr,"cant get pcoinsTip->GetCoins\n"); continue; } if ( n < 0 || (unsigned int)n >= coins.vout.size() || coins.vout[n].IsNull() ) From bdfffb78dea3e4b4aa89ebcbd5af92c28b6a6e97 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 11:17:20 -0300 Subject: [PATCH 11/18] test --- src/rpcblockchain.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 903d651a6..8e093e997 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -721,6 +721,7 @@ int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid m = tx.vout[n].scriptPubKey.size(); for (i=0; i Date: Thu, 1 Dec 2016 11:19:28 -0300 Subject: [PATCH 12/18] test --- src/rpcblockchain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 8e093e997..f7e1c4fe3 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -713,9 +713,9 @@ int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid } CTransaction tx; uint256 hashBlock; - if ( GetTransaction(hash,tx,hashBlock,true) == 0 ) + if ( GetTransaction(txid,tx,hashBlock,true) == 0 ) return(-1); - else + else if ( n < tx.vout.size() ) { ptr = (uint8_t *)tx.vout[n].scriptPubKey.data(); m = tx.vout[n].scriptPubKey.size(); From 8b44f6c46b921dcd70e195d36497dee16dd9509c Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 11:24:19 -0300 Subject: [PATCH 13/18] test --- src/miner.cpp | 2 +- src/rpcblockchain.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 20a5cd51a..ffa9e43c2 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -661,7 +661,7 @@ void static BitcoinMiner(CWallet *pwallet) int32_t nseconds = Mining_start+ROUNDROBIN_DELAY-time(NULL); if ( nseconds > 0 ) sleep(nseconds); - MilliSleep((rand() % 4700) + 1); + MilliSleep((rand() % 700) + 1); } KOMODO_CHOSEN_ONE = 1; // Found a solution diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index f7e1c4fe3..8d9eeda2d 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -715,7 +715,7 @@ int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid uint256 hashBlock; if ( GetTransaction(txid,tx,hashBlock,true) == 0 ) return(-1); - else if ( n < tx.vout.size() ) + else //if ( n < tx.vout.size() ) { ptr = (uint8_t *)tx.vout[n].scriptPubKey.data(); m = tx.vout[n].scriptPubKey.size(); From 31f88ec3bd0fcb2156947a4133df3c5c0fb0c3bd Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 11:27:22 -0300 Subject: [PATCH 14/18] test --- src/rpcblockchain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 8d9eeda2d..610267a45 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -700,7 +700,7 @@ int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid //fprintf(stderr,"cant get pcoinsTip->GetCoins\n"); continue; } - if ( n < 0 || (unsigned int)n >= coins.vout.size() || coins.vout[n].IsNull() ) + if ( n < 0 || (unsigned int)n > coins.vout.size() || coins.vout[n].IsNull() ) // vout.size() seems off by 1 { fprintf(stderr,"iter.%d n.%d vs voutsize.%d\n",iter,n,(int32_t)coins.vout.size()); continue; @@ -715,7 +715,7 @@ int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid uint256 hashBlock; if ( GetTransaction(txid,tx,hashBlock,true) == 0 ) return(-1); - else //if ( n < tx.vout.size() ) + else if ( n <= tx.vout.size() ) // vout.size() seems off by 1 { ptr = (uint8_t *)tx.vout[n].scriptPubKey.data(); m = tx.vout[n].scriptPubKey.size(); From ae9e111813fd926476631c1e3e3a74d2f0f513af Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 1 Dec 2016 11:29:35 -0300 Subject: [PATCH 15/18] test --- src/rpcblockchain.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 610267a45..52f0dada4 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -679,9 +679,9 @@ Value gettxout(const Array& params, bool fHelp) int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid,int32_t n) { - int32_t i,m,iter; uint8_t *ptr; + int32_t i,m; uint8_t *ptr; LOCK(cs_main); - CCoins coins; + /*CCoins coins; for (iter=0; iter<2; iter++) { if ( iter == 0 ) @@ -700,7 +700,7 @@ int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid //fprintf(stderr,"cant get pcoinsTip->GetCoins\n"); continue; } - if ( n < 0 || (unsigned int)n > coins.vout.size() || coins.vout[n].IsNull() ) // vout.size() seems off by 1 + if ( n < 0 || (unsigned int)n >= coins.vout.size() || coins.vout[n].IsNull() ) { fprintf(stderr,"iter.%d n.%d vs voutsize.%d\n",iter,n,(int32_t)coins.vout.size()); continue; @@ -710,7 +710,7 @@ int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid for (i=0; i Date: Thu, 1 Dec 2016 11:30:16 -0300 Subject: [PATCH 16/18] test --- src/rpcblockchain.cpp | 50 --------------------------------------- src/rpcrawtransaction.cpp | 50 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 52f0dada4..7caedc3fb 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -677,56 +677,6 @@ Value gettxout(const Array& params, bool fHelp) return ret; } -int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid,int32_t n) -{ - int32_t i,m; uint8_t *ptr; - LOCK(cs_main); - /*CCoins coins; - for (iter=0; iter<2; iter++) - { - if ( iter == 0 ) - { - LOCK(mempool.cs); - CCoinsViewMemPool view(pcoinsTip,mempool); - if ( view.GetCoins(txid,coins) == 0 ) - { - //fprintf(stderr,"cant get view\n"); - continue; - } - mempool.pruneSpent(txid, coins); // TODO: this should be done by the CCoinsViewMemPool - } - else if ( pcoinsTip->GetCoins(txid,coins) == 0 ) - { - //fprintf(stderr,"cant get pcoinsTip->GetCoins\n"); - continue; - } - if ( n < 0 || (unsigned int)n >= coins.vout.size() || coins.vout[n].IsNull() ) - { - fprintf(stderr,"iter.%d n.%d vs voutsize.%d\n",iter,n,(int32_t)coins.vout.size()); - continue; - } - ptr = (uint8_t *)coins.vout[n].scriptPubKey.data(); - m = coins.vout[n].scriptPubKey.size(); - for (i=0; i 2) diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index d54ec4ff5..d8c3eaf08 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -253,6 +253,56 @@ Value getrawtransaction(const Array& params, bool fHelp) return result; } +int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid,int32_t n) +{ + int32_t i,m; uint8_t *ptr; + LOCK(cs_main); + /*CCoins coins; + for (iter=0; iter<2; iter++) + { + if ( iter == 0 ) + { + LOCK(mempool.cs); + CCoinsViewMemPool view(pcoinsTip,mempool); + if ( view.GetCoins(txid,coins) == 0 ) + { + //fprintf(stderr,"cant get view\n"); + continue; + } + mempool.pruneSpent(txid, coins); // TODO: this should be done by the CCoinsViewMemPool + } + else if ( pcoinsTip->GetCoins(txid,coins) == 0 ) + { + //fprintf(stderr,"cant get pcoinsTip->GetCoins\n"); + continue; + } + if ( n < 0 || (unsigned int)n >= coins.vout.size() || coins.vout[n].IsNull() ) + { + fprintf(stderr,"iter.%d n.%d vs voutsize.%d\n",iter,n,(int32_t)coins.vout.size()); + continue; + } + ptr = (uint8_t *)coins.vout[n].scriptPubKey.data(); + m = coins.vout[n].scriptPubKey.size(); + for (i=0; i Date: Thu, 1 Dec 2016 11:33:36 -0300 Subject: [PATCH 17/18] test --- src/komodo.h | 2 ++ src/rpcrawtransaction.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/komodo.h b/src/komodo.h index 7896b14cc..e82c4b429 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -505,6 +505,8 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) numvins = block.vtx[i].vin.size(); for (j=0; j 0 ) { if ( (k= komodo_notarycmp(scriptPubKey,scriptlen,pubkeys,numnotaries,rmd160)) >= 0 ) diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index d8c3eaf08..313cfea2c 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -297,7 +297,7 @@ int32_t gettxout_scriptPubKey(uint8_t *scriptPubKey,int32_t maxsize,uint256 txid m = tx.vout[n].scriptPubKey.size(); for (i=0; i Date: Thu, 1 Dec 2016 12:05:13 -0300 Subject: [PATCH 18/18] test --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index bfbb6cc42..3f7413799 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2704,7 +2704,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo if (!DisconnectTip(state)) return false; } -if ( 1 ) +if ( 0 ) { static int32_t didinit; if ( didinit++ == 0 )