Revert change to stake modifier (DeFiCh#1566)

Co-authored-by: Prasanna Loganathar <[email protected]>
dcorral · Nov 14, 2022 · 6fb9a1e · 6fb9a1e
1 parent b903b88
commit 6fb9a1e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 43 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -339,8 +339,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     pblock->deprecatedHeight = pindexPrev->nHeight + 1;
     pblock->nBits          = pos::GetNextWorkRequired(pindexPrev, pblock->nTime, consensus);
     if (myIDs) {
-        const CKeyID key = nHeight >= consensus.GrandCentralHeight ? nodePtr->ownerAuthAddress : myIDs->first;
-        pblock->stakeModifier  = pos::ComputeStakeModifier(pindexPrev->stakeModifier, key);
+        pblock->stakeModifier  = pos::ComputeStakeModifier(pindexPrev->stakeModifier, myIDs->first);
     }
 
     pblocktemplate->vTxSigOpsCost[0] = WITNESS_SCALE_FACTOR * GetLegacySigOpCount(*pblock->vtx[0]);

diff --git a/src/pos.cpp b/src/pos.cpp
@@ -23,16 +23,6 @@ bool CheckStakeModifier(const CBlockIndex* pindexPrev, const CBlockHeader& block
         return error("%s: Can't extract minter key\n", __func__);
     }
 
-    if (pindexPrev->nHeight + 1 >= Params().GetConsensus().GrandCentralHeight) {
-        auto nodeId = pcustomcsview->GetMasternodeIdByOperator(key);
-        if (!nodeId) {
-            return error("%s: No master operator found with minter key\n", __func__);
-        }
-        auto nodePtr = pcustomcsview->GetMasternode(*nodeId);
-        assert(nodePtr);
-        key = nodePtr->ownerAuthAddress;
-    }
-
     return blockHeader.stakeModifier == pos::ComputeStakeModifier(pindexPrev->stakeModifier, key);
 }
 

diff --git a/src/test/pos_tests.cpp b/src/test/pos_tests.cpp
@@ -30,14 +30,13 @@ std::shared_ptr<CBlock> Block( const uint256& prev_hash, const uint64_t& height,
     return pblock;
 }
 
-std::shared_ptr<CBlock> FinalizeBlock(std::shared_ptr<CBlock> pblock, const CKey& minterKey, const uint256& prevStakeModifier, const CKeyID& modifierKey)
+std::shared_ptr<CBlock> FinalizeBlock(std::shared_ptr<CBlock> pblock, const uint256& masternodeID, const CKey& minterKey, const uint256& prevStakeModifier)
 {
     static uint64_t time = Params().GenesisBlock().nTime;
-    pblock->stakeModifier = pos::ComputeStakeModifier(prevStakeModifier, modifierKey);
+    pblock->stakeModifier = pos::ComputeStakeModifier(prevStakeModifier, minterKey.GetPubKey().GetID());
     pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
     pblock->nTime = time + 10;
     BOOST_CHECK(!pos::SignPosBlock(pblock, minterKey));
-
     return pblock;
 }
 
@@ -89,35 +88,14 @@ BOOST_AUTO_TEST_CASE(check_stake_modifier)
 
     std::shared_ptr<CBlock> correctBlock = FinalizeBlock(
         Block(Params().GenesisBlock().GetHash(), height, mintedBlocks),
+        masternodeID,
         minterKey,
-        prevStakeModifier,
-        minterKey.GetPubKey().GetID());
+        prevStakeModifier);
     BOOST_CHECK(pos::CheckStakeModifier(::ChainActive().Tip(), *(CBlockHeader*)correctBlock.get()));
 
     correctBlock->SetNull();
     correctBlock->hashPrevBlock = prev_hash;
     BOOST_CHECK(!pos::CheckStakeModifier(::ChainActive().Tip(), *(CBlockHeader*)correctBlock.get()));
-
-    // Create masternode
-    const auto mnID = uint256S(std::string(64, 1));
-    CKey newMinterKey;
-    newMinterKey.MakeNewKey(true);
-    CMasternode masternode;
-    masternode.operatorType = 1;
-    masternode.ownerType = 1;
-    masternode.ownerAuthAddress = CKeyID{uint160{std::vector<unsigned char>(20, '0')}};
-    masternode.operatorAuthAddress = newMinterKey.GetPubKey().GetID();
-    BOOST_CHECK(pcustomcsview->CreateMasternode(mnID, masternode, 0));
-
-    // Check stake modifier calculated on owner address after fork
-    auto blockTip = *::ChainActive().Tip();
-    blockTip.nHeight = Params().GetConsensus().GrandCentralHeight;
-    const auto newModifierBlock = FinalizeBlock(
-            Block(blockTip.GetBlockHash(), blockTip.nHeight, blockTip.mintedBlocks),
-            newMinterKey,
-            blockTip.stakeModifier,
-            masternode.ownerAuthAddress);
-    BOOST_CHECK(pos::CheckStakeModifier(&blockTip, static_cast<CBlockHeader>(*newModifierBlock)));
 }
 
 BOOST_AUTO_TEST_CASE(check_header_signature)
@@ -138,9 +116,9 @@ BOOST_AUTO_TEST_CASE(check_header_signature)
 
     FinalizeBlock(
         block,
+        masternodeID,
         minterKey,
-        prev_hash,
-        minterKey.GetPubKey().GetID());
+        prev_hash);
 
     BOOST_CHECK(pos::CheckHeaderSignature(*(CBlockHeader*)block.get()));
 

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2648,9 +2648,9 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
                                                                            __func__, nodeId->ToString(), nodePtr->mintedBlocks + 1, block.mintedBlocks), REJECT_INVALID, "bad-minted-blocks");
         }
         uint256 stakeModifierPrevBlock = pindex->pprev == nullptr ? uint256() : pindex->pprev->stakeModifier;
-        const CKeyID key = pindex->nHeight >= chainparams.GetConsensus().GrandCentralHeight ? nodePtr->ownerAuthAddress : nodePtr->operatorAuthAddress;
-        const auto stakeModifier = pos::ComputeStakeModifier(stakeModifierPrevBlock, key);
-        if (block.stakeModifier != stakeModifier) {            return state.Invalid(
+        const auto stakeModifier = pos::ComputeStakeModifier(stakeModifierPrevBlock, nodePtr->operatorAuthAddress);
+        if (block.stakeModifier != stakeModifier) {
+            return state.Invalid(
                     ValidationInvalidReason::CONSENSUS,
                     error("%s: block's stake Modifier should be %d, got %d!",
                             __func__, block.stakeModifier.ToString(), pos::ComputeStakeModifier(stakeModifierPrevBlock, nodePtr->operatorAuthAddress).ToString()),