From 1d474f88196c528dd2410278f1031532967f078d Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 14 Mar 2017 22:04:55 +0200 Subject: [PATCH 01/12] Syntax --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 6f216b24d..57aeebdfe 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -495,7 +495,7 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to continue; { #ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE - if ( height > 236000 ) + if ( pax->height > 236000 ) { if ( kmdsp != 0 && kmdsp->NOTARIZED_HEIGHT >= pax->height ) pax->validated = pax->komodoshis; From e157400dcfb9d17850701b35e5f2b5187b299cc2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 01:39:44 +0200 Subject: [PATCH 02/12] Test --- src/komodo_pax.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/komodo_pax.h b/src/komodo_pax.h index 5ec7fdc10..49f508217 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -409,7 +409,7 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd); //fprintf(stderr,"ht.%d kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price); - //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); + fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); //price = (uint64_t)((long long)MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid])); } else price = (MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)); return(price); @@ -533,12 +533,12 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint { nonz++; sum += votes[numvotes-1-i]; - //if ( (i % 10) == 0 ) - // fprintf(stderr,"[%llu] ",(long long)votes[numvotes-1-i]); + if ( (i % 10) == 0 ) + fprintf(stderr,"[%llu] ",(long long)votes[numvotes-1-i]); } } - //fprintf(stderr,"kmdbtc %llu btcusd %llu ",(long long)kmdbtc,(long long)btcusd); - //fprintf(stderr,"komodo_paxprice nonz.%d of numvotes.%d seed.%llu %.8f\n",nonz,numvotes,(long long)seed,nonz!=0?dstr(1000. * (double)sum/nonz):0); + fprintf(stderr,"kmdbtc %llu btcusd %llu ",(long long)kmdbtc,(long long)btcusd); + fprintf(stderr,"komodo_paxprice nonz.%d of numvotes.%d seed.%llu %.8f\n",nonz,numvotes,(long long)seed,nonz!=0?dstr(1000. * (double)sum/nonz):0); if ( nonz <= (numvotes >> 1) ) { return(0); From dde5cc73e85117d41876c5ffbac369324e88f547 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 01:58:59 +0200 Subject: [PATCH 03/12] Test --- src/komodo_pax.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/komodo_pax.h b/src/komodo_pax.h index 49f508217..5ec7fdc10 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -409,7 +409,7 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd); //fprintf(stderr,"ht.%d kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price); - fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); + //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); //price = (uint64_t)((long long)MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid])); } else price = (MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)); return(price); @@ -533,12 +533,12 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint { nonz++; sum += votes[numvotes-1-i]; - if ( (i % 10) == 0 ) - fprintf(stderr,"[%llu] ",(long long)votes[numvotes-1-i]); + //if ( (i % 10) == 0 ) + // fprintf(stderr,"[%llu] ",(long long)votes[numvotes-1-i]); } } - fprintf(stderr,"kmdbtc %llu btcusd %llu ",(long long)kmdbtc,(long long)btcusd); - fprintf(stderr,"komodo_paxprice nonz.%d of numvotes.%d seed.%llu %.8f\n",nonz,numvotes,(long long)seed,nonz!=0?dstr(1000. * (double)sum/nonz):0); + //fprintf(stderr,"kmdbtc %llu btcusd %llu ",(long long)kmdbtc,(long long)btcusd); + //fprintf(stderr,"komodo_paxprice nonz.%d of numvotes.%d seed.%llu %.8f\n",nonz,numvotes,(long long)seed,nonz!=0?dstr(1000. * (double)sum/nonz):0); if ( nonz <= (numvotes >> 1) ) { return(0); From 52859ac8b98e81cf0d1806a072f0be5a4e1a22bf Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 10:02:50 +0200 Subject: [PATCH 04/12] Test --- src/miner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 597b5e400..41674062f 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -560,7 +560,7 @@ void static BitcoinMiner(CWallet *pwallet) //else solver = "default"; assert(solver == "tromp" || solver == "default"); LogPrint("pow", "Using Equihash solver \"%s\" with n = %u, k = %u\n", solver, n, k); - if ( ASSETCHAINS_SYMBOL[0] != 0 ) + //if ( ASSETCHAINS_SYMBOL[0] != 0 ) fprintf(stderr,"notaryid.%d Mining with %s\n",notaryid,solver.c_str()); std::mutex m_cs; bool cancelSolver = false; @@ -612,7 +612,7 @@ void static BitcoinMiner(CWallet *pwallet) Mining_height = pindexPrev->nHeight+1; Mining_start = (uint32_t)time(NULL); } - if ( ASSETCHAINS_SYMBOL[0] != 0 ) + //if ( ASSETCHAINS_SYMBOL[0] != 0 ) fprintf(stderr,"%s create new block ht.%d\n",ASSETCHAINS_SYMBOL,Mining_height); CBlockTemplate *ptr = CreateNewBlockWithKey(reservekey); if ( ptr == 0 ) From 9ee43671d20ada47ab55afc9f8627f1f7d66fbca Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 10:16:43 +0200 Subject: [PATCH 05/12] Test --- src/miner.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 41674062f..81109eb6c 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -560,7 +560,7 @@ void static BitcoinMiner(CWallet *pwallet) //else solver = "default"; assert(solver == "tromp" || solver == "default"); LogPrint("pow", "Using Equihash solver \"%s\" with n = %u, k = %u\n", solver, n, k); - //if ( ASSETCHAINS_SYMBOL[0] != 0 ) + if ( ASSETCHAINS_SYMBOL[0] != 0 ) fprintf(stderr,"notaryid.%d Mining with %s\n",notaryid,solver.c_str()); std::mutex m_cs; bool cancelSolver = false; @@ -572,7 +572,7 @@ void static BitcoinMiner(CWallet *pwallet) ); try { - if ( ASSETCHAINS_SYMBOL[0] != 0 ) + //if ( ASSETCHAINS_SYMBOL[0] != 0 ) fprintf(stderr,"try %s Mining with %s\n",ASSETCHAINS_SYMBOL,solver.c_str()); while (true) { @@ -582,7 +582,7 @@ void static BitcoinMiner(CWallet *pwallet) // break; // Busy-wait for the network to come online so we don't waste time mining // on an obsolete chain. In regtest mode we expect to fly solo. - //fprintf(stderr,"Wait for peers...\n"); + fprintf(stderr,"Wait for peers...\n"); do { bool fvNodesEmpty; { @@ -592,10 +592,10 @@ void static BitcoinMiner(CWallet *pwallet) if (!fvNodesEmpty && !IsInitialBlockDownload()) break; MilliSleep(5000); - //fprintf(stderr,"fvNodesEmpty %d IsInitialBlockDownload(%s) %d\n",(int32_t)fvNodesEmpty,ASSETCHAINS_SYMBOL,(int32_t)IsInitialBlockDownload()); + fprintf(stderr,"fvNodesEmpty %d IsInitialBlockDownload(%s) %d\n",(int32_t)fvNodesEmpty,ASSETCHAINS_SYMBOL,(int32_t)IsInitialBlockDownload()); } while (true); - //fprintf(stderr,"%s Found peers\n",ASSETCHAINS_SYMBOL); + fprintf(stderr,"%s Found peers\n",ASSETCHAINS_SYMBOL); } /*while ( ASSETCHAINS_SYMBOL[0] != 0 && chainActive.Tip()->nHeight < ASSETCHAINS_MINHEIGHT ) { From c10c5d1368479c0e63bca66e38cf9fa7d738633b Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 10:20:26 +0200 Subject: [PATCH 06/12] Test --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 31ee26c8e..c26aa990a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1544,12 +1544,12 @@ bool IsInitialBlockDownload() } bool state; if ( ASSETCHAINS_SYMBOL[0] == 0 ) - state = (chainActive.Height() > 236000 && chainActive.Height() < pindexBestHeader->nHeight - 24*6) || + state = (chainActive.Height() < pindexBestHeader->nHeight - 24*6) || pindexBestHeader->GetBlockTime() < (GetTime() - chainParams.MaxTipAge()); else state = (chainActive.Height() < pindexBestHeader->nHeight - 100); if (!state) { - //fprintf(stderr,"lockIBDState tru\n"); + fprintf(stderr,"lockIBDState true ht.%d t.%d\n",chainActive.Height(),pindexBestHeader->GetBlockTime()); lockIBDState = true; } return state; From ad84148d8b087b692178a82215da894edd794f7f Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 10:23:06 +0200 Subject: [PATCH 07/12] Test --- src/main.cpp | 2 +- src/miner.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index c26aa990a..e27561820 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1549,7 +1549,7 @@ bool IsInitialBlockDownload() else state = (chainActive.Height() < pindexBestHeader->nHeight - 100); if (!state) { - fprintf(stderr,"lockIBDState true ht.%d t.%d\n",chainActive.Height(),pindexBestHeader->GetBlockTime()); + fprintf(stderr,"lockIBDState true ht.%d t.%d\n",(int32_t)chainActive.Height(),(int32_t)pindexBestHeader->GetBlockTime()); lockIBDState = true; } return state; diff --git a/src/miner.cpp b/src/miner.cpp index 81109eb6c..597b5e400 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -572,7 +572,7 @@ void static BitcoinMiner(CWallet *pwallet) ); try { - //if ( ASSETCHAINS_SYMBOL[0] != 0 ) + if ( ASSETCHAINS_SYMBOL[0] != 0 ) fprintf(stderr,"try %s Mining with %s\n",ASSETCHAINS_SYMBOL,solver.c_str()); while (true) { @@ -582,7 +582,7 @@ void static BitcoinMiner(CWallet *pwallet) // break; // Busy-wait for the network to come online so we don't waste time mining // on an obsolete chain. In regtest mode we expect to fly solo. - fprintf(stderr,"Wait for peers...\n"); + //fprintf(stderr,"Wait for peers...\n"); do { bool fvNodesEmpty; { @@ -592,10 +592,10 @@ void static BitcoinMiner(CWallet *pwallet) if (!fvNodesEmpty && !IsInitialBlockDownload()) break; MilliSleep(5000); - fprintf(stderr,"fvNodesEmpty %d IsInitialBlockDownload(%s) %d\n",(int32_t)fvNodesEmpty,ASSETCHAINS_SYMBOL,(int32_t)IsInitialBlockDownload()); + //fprintf(stderr,"fvNodesEmpty %d IsInitialBlockDownload(%s) %d\n",(int32_t)fvNodesEmpty,ASSETCHAINS_SYMBOL,(int32_t)IsInitialBlockDownload()); } while (true); - fprintf(stderr,"%s Found peers\n",ASSETCHAINS_SYMBOL); + //fprintf(stderr,"%s Found peers\n",ASSETCHAINS_SYMBOL); } /*while ( ASSETCHAINS_SYMBOL[0] != 0 && chainActive.Tip()->nHeight < ASSETCHAINS_MINHEIGHT ) { @@ -612,7 +612,7 @@ void static BitcoinMiner(CWallet *pwallet) Mining_height = pindexPrev->nHeight+1; Mining_start = (uint32_t)time(NULL); } - //if ( ASSETCHAINS_SYMBOL[0] != 0 ) + if ( ASSETCHAINS_SYMBOL[0] != 0 ) fprintf(stderr,"%s create new block ht.%d\n",ASSETCHAINS_SYMBOL,Mining_height); CBlockTemplate *ptr = CreateNewBlockWithKey(reservekey); if ( ptr == 0 ) From a9a06711a54b9a6777f5abbbd48988ba60c79208 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 10:27:39 +0200 Subject: [PATCH 08/12] Test --- src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e27561820..f380dab81 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1528,18 +1528,18 @@ bool IsInitialBlockDownload() LOCK(cs_main); if (fImporting || fReindex) { - //fprintf(stderr,"fImporting %d || %d fReindex\n",(int32_t)fImporting,(int32_t)fReindex); + fprintf(stderr,"IsInitialBlockDownload: fImporting %d || %d fReindex\n",(int32_t)fImporting,(int32_t)fReindex); return true; } if (fCheckpointsEnabled && chainActive.Height() < Checkpoints::GetTotalBlocksEstimate(chainParams.Checkpoints())) { - //fprintf(stderr,"checkpoint -> initialdownload\n"); + fprintf(stderr,"IsInitialBlockDownload: checkpoint -> initialdownload\n"); return true; } static bool lockIBDState = false; if (lockIBDState) { - //fprintf(stderr,"lockIBDState true %d < %d\n",chainActive.Height(),pindexBestHeader->nHeight - 10); + fprintf(stderr,"lockIBDState true %d < %d\n",chainActive.Height(),pindexBestHeader->nHeight - 10); return false; } bool state; @@ -1547,9 +1547,9 @@ bool IsInitialBlockDownload() state = (chainActive.Height() < pindexBestHeader->nHeight - 24*6) || pindexBestHeader->GetBlockTime() < (GetTime() - chainParams.MaxTipAge()); else state = (chainActive.Height() < pindexBestHeader->nHeight - 100); + fprintf(stderr,"state.%d ht.%d t.%d\n",state,(int32_t)chainActive.Height(),(int32_t)pindexBestHeader->GetBlockTime()); if (!state) { - fprintf(stderr,"lockIBDState true ht.%d t.%d\n",(int32_t)chainActive.Height(),(int32_t)pindexBestHeader->GetBlockTime()); lockIBDState = true; } return state; From 8f9d4727e442de74425507f664cd8c4aabd54132 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 10:31:32 +0200 Subject: [PATCH 09/12] Test --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index f380dab81..fa7023d0d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1547,7 +1547,7 @@ bool IsInitialBlockDownload() state = (chainActive.Height() < pindexBestHeader->nHeight - 24*6) || pindexBestHeader->GetBlockTime() < (GetTime() - chainParams.MaxTipAge()); else state = (chainActive.Height() < pindexBestHeader->nHeight - 100); - fprintf(stderr,"state.%d ht.%d t.%d\n",state,(int32_t)chainActive.Height(),(int32_t)pindexBestHeader->GetBlockTime()); + fprintf(stderr,"state.%d ht.%d vs %d, t.%u %u\n",state,(int32_t)chainActive.Height(),(uint32_t)pindexBestHeader->nHeight,(int32_t)pindexBestHeader->GetBlockTime(),(uint32_t)(GetTime() - chainParams.MaxTipAge())); if (!state) { lockIBDState = true; From 034919503d0b48f45e218dd80ad3074c9c6b036f Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 10:42:10 +0200 Subject: [PATCH 10/12] Test --- src/main.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index fa7023d0d..835714099 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1528,26 +1528,28 @@ bool IsInitialBlockDownload() LOCK(cs_main); if (fImporting || fReindex) { - fprintf(stderr,"IsInitialBlockDownload: fImporting %d || %d fReindex\n",(int32_t)fImporting,(int32_t)fReindex); + //fprintf(stderr,"IsInitialBlockDownload: fImporting %d || %d fReindex\n",(int32_t)fImporting,(int32_t)fReindex); return true; } if (fCheckpointsEnabled && chainActive.Height() < Checkpoints::GetTotalBlocksEstimate(chainParams.Checkpoints())) { - fprintf(stderr,"IsInitialBlockDownload: checkpoint -> initialdownload\n"); + //fprintf(stderr,"IsInitialBlockDownload: checkpoint -> initialdownload\n"); return true; } static bool lockIBDState = false; if (lockIBDState) { - fprintf(stderr,"lockIBDState true %d < %d\n",chainActive.Height(),pindexBestHeader->nHeight - 10); + //fprintf(stderr,"lockIBDState true %d < %d\n",chainActive.Height(),pindexBestHeader->nHeight - 10); return false; } - bool state; + bool state; CBlockIndex *ptr = chainActive.Tip(); + if ( ptr == 0 ) + ptr = pindexBestHeader; if ( ASSETCHAINS_SYMBOL[0] == 0 ) - state = (chainActive.Height() < pindexBestHeader->nHeight - 24*6) || - pindexBestHeader->GetBlockTime() < (GetTime() - chainParams.MaxTipAge()); - else state = (chainActive.Height() < pindexBestHeader->nHeight - 100); - fprintf(stderr,"state.%d ht.%d vs %d, t.%u %u\n",state,(int32_t)chainActive.Height(),(uint32_t)pindexBestHeader->nHeight,(int32_t)pindexBestHeader->GetBlockTime(),(uint32_t)(GetTime() - chainParams.MaxTipAge())); + state = (chainActive.Height() < ptr->nHeight - 24*6) || + ptr->GetBlockTime() < (GetTime() - chainParams.MaxTipAge()); + else state = (chainActive.Height() < ptr->nHeight - 100); + fprintf(stderr,"state.%d ht.%d vs %d, t.%u %u\n",state,(int32_t)chainActive.Height(),(uint32_t)ptr->nHeight,(int32_t)ptr->GetBlockTime(),(uint32_t)(GetTime() - chainParams.MaxTipAge())); if (!state) { lockIBDState = true; From 7d935b7e762f368cd9de9d4915020044f7550343 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 10:45:40 +0200 Subject: [PATCH 11/12] Test --- src/komodo_gateway.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 57aeebdfe..016309a86 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -269,7 +269,7 @@ int32_t komodo_paxcmp(char *symbol,int32_t kmdheight,uint64_t value,uint64_t che return(0); else { - if ( kmdheight >= 86150 ) + if ( kmdheight >= 238000 ) printf("ht.%d ignore mismatched %s value %lld vs checkvalue %lld -> ratio.%d\n",kmdheight,symbol,(long long)value,(long long)checkvalue,ratio); return(-1); } @@ -878,7 +878,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 } } } - else if ( kmdheight > 182000 && (kmdheight > 214700 || strcmp(base,ASSETCHAINS_SYMBOL) == 0) ) //seed != 0 && + else if ( kmdheight > 238000 && (kmdheight > 214700 || strcmp(base,ASSETCHAINS_SYMBOL) == 0) ) //seed != 0 && printf("pax %s deposit %.8f rejected kmdheight.%d %.8f KMD check %.8f seed.%llu\n",base,dstr(fiatoshis),kmdheight,dstr(value),dstr(checktoshis),(long long)seed); } //else printf("paxdeposit height.%d vs kmdheight.%d\n",height,kmdheight); } From 1dcfdab765e5115a01859ced2c6901911819f82d Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 10:47:43 +0200 Subject: [PATCH 12/12] Test --- src/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 835714099..bfdab713f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1545,6 +1545,8 @@ bool IsInitialBlockDownload() bool state; CBlockIndex *ptr = chainActive.Tip(); if ( ptr == 0 ) ptr = pindexBestHeader; + else if ( pindexBestHeader != 0 && pindexBestHeader->nHeight > ptr->nHeight ) + ptr = pindexBestHeader; if ( ASSETCHAINS_SYMBOL[0] == 0 ) state = (chainActive.Height() < ptr->nHeight - 24*6) || ptr->GetBlockTime() < (GetTime() - chainParams.MaxTipAge());