From 727bba40c93c8a2d1623f30a637a895350fca786 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 22 Nov 2018 00:46:28 -1100 Subject: [PATCH] Test edge detection --- src/chainparams.cpp | 1 + src/main.cpp | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 372a764a7..e8e560cbb 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -217,6 +217,7 @@ void komodo_setactivation(int32_t height) { mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = height; mainParams.consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = height; + ASSETCHAINS_SAPLING = activation; } void *chainparams_commandline(void *ptr) diff --git a/src/main.cpp b/src/main.cpp index 5133adefc..4f2776d58 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3780,7 +3780,10 @@ int32_t komodo_activate_sapling(CBlockIndex *pindex) { uint32_t blocktime,prevtime; CBlockIndex *prev; int32_t i,transition=0,height,prevht,activation = 0; if ( pindex == 0 ) + { + fprintf(stderr,"komodo_activate_sapling null pindex\n"); return(0); + } for (i=0; i<60; i++) { if ( (prev= pindex->pprev) == 0 ) @@ -3794,12 +3797,14 @@ int32_t komodo_activate_sapling(CBlockIndex *pindex) } height = pindex->GetHeight(); blocktime = (uint32_t)pindex->nTime; + fprintf(stderr,"starting blocktime %u cmp.%d\n",blocktime,blocktime > KOMODO_SAPLING_ACTIVATION); if ( blocktime > KOMODO_SAPLING_ACTIVATION ) // find the earliest transition { while ( (prev= pindex->pprev) != 0 ) { prevht = prev->GetHeight(); prevtime = (uint32_t)prev->nTime; + fprintf(stderr,"(%d, %u) -> (%d, %u)\n",prevht,prevtime,height,blocktime); if ( prevht+1 != height ) { fprintf(stderr,"komodo_activate_sapling: unexpected non-contiguous ht %d vs %d\n",prevht,height); @@ -3816,6 +3821,7 @@ int32_t komodo_activate_sapling(CBlockIndex *pindex) height = prevht; blocktime = prevtime; } + fprintf(stderr,"ht.%d %u, transition.%d\n",height,blocktime,transition); if ( transition != 0 ) { activation = transition + 60; @@ -3824,10 +3830,7 @@ int32_t komodo_activate_sapling(CBlockIndex *pindex) } if ( activation != 0 ) { - komodo_setactivation(activation); - //Params().GetConsensus().vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = activation; - //Params().GetConsensus().vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = activation; - ASSETCHAINS_SAPLING = activation; + //komodo_setactivation(activation); fprintf(stderr,"%s sapling activation at %d\n",ASSETCHAINS_SYMBOL,activation); } }