Skip to content

[Consensus] Introduce 5.2 nuparams and use them to guard new P2CS rules #2428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
furszy merged 2 commits into from
Jun 19, 2021
Merged

[Consensus] Introduce 5.2 nuparams and use them to guard new P2CS rules #2428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e0c0b6
[Consensus] Introduce V5.2 network-upgrade params
random-zebra Jun 18, 2021
c85dc14
[Consensus] use v5.2 params to guard new cold-staking rules
random-zebra Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ class CMainParams : public CChainParams
consensus.vUpgrades[Consensus::UPGRADE_V3_4].nActivationHeight = 1967000;
consensus.vUpgrades[Consensus::UPGRADE_V4_0].nActivationHeight = 2153200;
consensus.vUpgrades[Consensus::UPGRADE_V5_0].nActivationHeight = 2700500;
consensus.vUpgrades[Consensus::UPGRADE_V5_2].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;

Expand Down Expand Up @@ -338,6 +340,8 @@ class CTestNetParams : public CChainParams
consensus.vUpgrades[Consensus::UPGRADE_V3_4].nActivationHeight = 201;
consensus.vUpgrades[Consensus::UPGRADE_V4_0].nActivationHeight = 201;
consensus.vUpgrades[Consensus::UPGRADE_V5_0].nActivationHeight = 201;
consensus.vUpgrades[Consensus::UPGRADE_V5_2].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;

Expand Down Expand Up @@ -469,6 +473,7 @@ class CRegTestParams : public CChainParams
consensus.vUpgrades[Consensus::UPGRADE_V4_0].nActivationHeight =
Consensus::NetworkUpgrade::ALWAYS_ACTIVE;
consensus.vUpgrades[Consensus::UPGRADE_V5_0].nActivationHeight = 300;
consensus.vUpgrades[Consensus::UPGRADE_V5_2].nActivationHeight = 300;
consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;

Expand Down
1 change: 1 addition & 0 deletions src/consensus/params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ enum UpgradeIndex : uint32_t {
UPGRADE_V3_4,
UPGRADE_V4_0,
UPGRADE_V5_0,
UPGRADE_V5_2,
UPGRADE_V6_0,
UPGRADE_TESTDUMMY,
// NOTE: Also add new upgrades to NetworkUpgradeInfo in upgrades.cpp
Expand Down
4 changes: 4 additions & 0 deletions src/consensus/upgrades.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
/*.strName =*/ "v5_shield",
/*.strInfo =*/ "Sapling Shield - start block v8 - start transaction v3",
},
{
/*.strName =*/ "PIVX_v5.2",
/*.strInfo =*/ "new cold-staking rules",
},
{
/*.strName =*/ "v6_evo",
/*.strInfo =*/ "Deterministic Masternodes",
Expand Down
2 changes: 1 addition & 1 deletion src/script/interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,7 @@ bool TransactionSignatureChecker::CheckLockTime(const CScriptNum& nLockTime) con

bool TransactionSignatureChecker::CheckColdStake(bool fAllowLastOutputFree, const CScript& prevoutScript, std::vector<valtype>& stack, unsigned int flags, ScriptError* serror) const
{
if (g_IsV6Active) {
if (g_newP2CSRules) {
// the stack can contain only <sig> <pk> <pkh> at this point
if ((int)stack.size() != 3) {
return set_error(serror, SCRIPT_ERR_INVALID_STACK_OPERATION);
Expand Down
14 changes: 7 additions & 7 deletions src/script/script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,22 +227,22 @@ bool CScript::IsPayToScriptHash() const
}

// contextual flag to guard the new rules for P2CS.
// can be removed once v6 enforcement is activated.
std::atomic<bool> g_IsV6Active{false};
// can be removed once v5.2 enforcement is activated.
std::atomic<bool> g_newP2CSRules{false};

// P2CS script: either with or without last output free
bool CScript::IsPayToColdStaking() const
{
return (this->size() == 51 &&
(!g_IsV6Active || (*this)[0] == OP_DUP) &&
(!g_IsV6Active || (*this)[1] == OP_HASH160) &&
(!g_newP2CSRules || (*this)[0] == OP_DUP) &&
(!g_newP2CSRules || (*this)[1] == OP_HASH160) &&
(*this)[2] == OP_ROT &&
(!g_IsV6Active || (*this)[3] == OP_IF) &&
(!g_newP2CSRules || (*this)[3] == OP_IF) &&
((*this)[4] == OP_CHECKCOLDSTAKEVERIFY || (*this)[4] == OP_CHECKCOLDSTAKEVERIFY_LOF) &&
(*this)[5] == 0x14 &&
(!g_IsV6Active || (*this)[26] == OP_ELSE) &&
(!g_newP2CSRules || (*this)[26] == OP_ELSE) &&
(*this)[27] == 0x14 &&
(!g_IsV6Active || (*this)[48] == OP_ENDIF) &&
(!g_newP2CSRules || (*this)[48] == OP_ENDIF) &&
(*this)[49] == OP_EQUALVERIFY &&
(*this)[50] == OP_CHECKSIG);
}
Expand Down
4 changes: 2 additions & 2 deletions src/script/script.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ class CScript : public CScriptBase
};

// contextual flag to guard the new rules for P2CS.
// can be removed once v6 enforcement is activated.
extern std::atomic<bool> g_IsV6Active;
// can be removed once v5.2 enforcement is activated.
extern std::atomic<bool> g_newP2CSRules;

#endif // BITCOIN_SCRIPT_SCRIPT_H
8 changes: 4 additions & 4 deletions src/test/script_P2CS_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ static void setupWallet(CWallet& wallet)

BOOST_AUTO_TEST_CASE(fake_script_test)
{
BOOST_ASSERT(!g_IsV6Active);
BOOST_ASSERT(!g_newP2CSRules);

CWallet& wallet = *pwalletMain;
LOCK(wallet.cs_wallet);
Expand All @@ -322,7 +322,7 @@ BOOST_AUTO_TEST_CASE(fake_script_test)
const CScript& scriptP2CS = GetFakeLockingScript(stakerId, ownerId);

// Create prev transaction:
// It has two outputs. The first one is spent before v6.
// It has two outputs. The first one is spent before v5.2.
// The second one is tested after v6 enforcement.
CMutableTransaction txFrom;
txFrom.vout.resize(2);
Expand Down Expand Up @@ -361,8 +361,8 @@ BOOST_AUTO_TEST_CASE(fake_script_test)
wallet.AddToWallet({&wallet, MakeTransactionRef(CTransaction(tx))});
BOOST_CHECK_EQUAL(wallet.GetWalletTx(txFrom.GetHash())->GetAvailableCredit(false, ISMINE_SPENDABLE_TRANSPARENT), amtIn);

// Now let's activate v6
g_IsV6Active = true;
// Now let's activate new rules
g_newP2CSRules = true;

// it does NOT pass IsPayToColdStaking
BOOST_CHECK_MESSAGE(!scriptP2CS.IsPayToColdStaking(), "Fake script passes as P2CS");
Expand Down
4 changes: 2 additions & 2 deletions src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1921,7 +1921,7 @@ void static UpdateTip(CBlockIndex* pindexNew)
{
AssertLockHeld(cs_main);
chainActive.SetTip(pindexNew);
g_IsV6Active = Params().GetConsensus().NetworkUpgradeActive(pindexNew->nHeight, Consensus::UPGRADE_V6_0);
g_newP2CSRules = Params().GetConsensus().NetworkUpgradeActive(pindexNew->nHeight, Consensus::UPGRADE_V5_2);

// New best block
mempool.AddTransactionsUpdated(1);
Expand Down Expand Up @@ -3625,7 +3625,7 @@ bool LoadChainTip(const CChainParams& chainparams)
const CBlockIndex* pChainTip = chainActive.Tip();

// initial global flag update
g_IsV6Active = Params().GetConsensus().NetworkUpgradeActive(pChainTip->nHeight, Consensus::UPGRADE_V5_0);
g_newP2CSRules = Params().GetConsensus().NetworkUpgradeActive(pChainTip->nHeight, Consensus::UPGRADE_V5_2);

LogPrintf("Loaded best chain: hashBestChain=%s height=%d date=%s progress=%f\n",
pChainTip->GetBlockHash().GetHex(), pChainTip->nHeight,
Expand Down