From 9a90d4186eb2e6d4a64db4d08f379c72e3b6ed65 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Tue, 10 Dec 2019 11:31:34 -0500 Subject: [PATCH] pow.cpp changes --- src/pow.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/pow.cpp b/src/pow.cpp index cabea5351..e402cb63f 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -780,6 +780,8 @@ int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33, int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],uint32_t blocktimes[66],int32_t height,uint8_t pubkey33[33],uint32_t blocktime); int32_t komodo_currentheight(); void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height); +bool komodo_checkopret(CBlock *pblock, CScript &merkleroot); +CScript komodo_makeopret(CBlock *pblock, bool fNew); extern int32_t KOMODO_CHOSEN_ONE; extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; #define KOMODO_ELECTION_GAP 2000 @@ -840,8 +842,16 @@ bool CheckProofOfWork(const CBlockHeader &blkHeader, uint8_t *pubkey33, int32_t } if ( (flag != 0 || special2 > 0) && special2 != -2 ) { - //fprintf(stderr,"EASY MINING ht.%d\n",height); bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow); + /* + const void* pblock = &blkHeader; + CScript merkleroot = CScript(); + if ( height > nDecemberHardforkHeight && !komodo_checkopret((CBlock*)pblock, merkleroot) ) // December 2019 hardfork + { + fprintf(stderr, "failed or missing expected.%s != %s\n", komodo_makeopret((CBlock*)pblock, false).ToString().c_str(), merkleroot.ToString().c_str()); + return false; + } + */ } } }