diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 88acaa74e0a..fe5f9fac6b0 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -130,7 +130,7 @@ class CMainParams : public CChainParams { consensus.FortCanningParkHeight = 1503143; consensus.FortCanningHillHeight = 1604999; // Feb 7, 2022. consensus.FortCanningRoadHeight = 1786000; // April 11, 2022. - consensus.FortCanningSpiceGardenHeight = 1936000; // June 2, 2022. + consensus.FortCanningCrunchHeight = 1936000; // June 2, 2022. consensus.GreatWorldHeight = std::numeric_limits::max(); consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); @@ -360,7 +360,7 @@ class CTestNetParams : public CChainParams { consensus.FortCanningParkHeight = 828800; consensus.FortCanningHillHeight = 828900; consensus.FortCanningRoadHeight = 893700; - consensus.FortCanningSpiceGardenHeight = 1011600; + consensus.FortCanningCrunchHeight = 1011600; consensus.GreatWorldHeight = std::numeric_limits::max(); consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); @@ -551,7 +551,7 @@ class CDevNetParams : public CChainParams { consensus.FortCanningParkHeight = std::numeric_limits::max(); consensus.FortCanningHillHeight = std::numeric_limits::max(); consensus.FortCanningRoadHeight = std::numeric_limits::max(); - consensus.FortCanningSpiceGardenHeight = std::numeric_limits::max(); + consensus.FortCanningCrunchHeight = std::numeric_limits::max(); consensus.GreatWorldHeight = std::numeric_limits::max(); consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); @@ -734,7 +734,7 @@ class CRegTestParams : public CChainParams { consensus.FortCanningParkHeight = 10000000; consensus.FortCanningHillHeight = 10000000; consensus.FortCanningRoadHeight = 10000000; - consensus.FortCanningSpiceGardenHeight = 10000000; + consensus.FortCanningCrunchHeight = 10000000; consensus.GreatWorldHeight = 10000000; consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); @@ -956,7 +956,7 @@ void CRegTestParams::UpdateActivationParametersFromArgs() UpdateHeightValidation("Fort Canning Park", "-fortcanningparkheight", consensus.FortCanningParkHeight); UpdateHeightValidation("Fort Canning Hill", "-fortcanninghillheight", consensus.FortCanningHillHeight); UpdateHeightValidation("Fort Canning Road", "-fortcanningroadheight", consensus.FortCanningRoadHeight); - UpdateHeightValidation("Fort Canning Split", "-fortcanningspicegardenheight", consensus.FortCanningSpiceGardenHeight); + UpdateHeightValidation("Fort Canning Crunch", "-fortcanningcrunchheight", consensus.FortCanningCrunchHeight); UpdateHeightValidation("Great World", "-greatworldheight", consensus.GreatWorldHeight); if (gArgs.GetBoolArg("-simulatemainnet", false)) { diff --git a/src/consensus/params.h b/src/consensus/params.h index 03170fa36c4..b55c2120977 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -95,7 +95,7 @@ struct Params { int FortCanningParkHeight; int FortCanningHillHeight; int FortCanningRoadHeight; - int FortCanningSpiceGardenHeight; + int FortCanningCrunchHeight; int GreatWorldHeight; /** Foundation share after AMK, normalized to COIN = 100% */ diff --git a/src/consensus/tx_check.cpp b/src/consensus/tx_check.cpp index 86f566c8e5c..39716eb3a42 100644 --- a/src/consensus/tx_check.cpp +++ b/src/consensus/tx_check.cpp @@ -117,9 +117,9 @@ bool IsAnchorRewardTxPlus(CTransaction const & tx, std::vector & return result; } -bool IsTokenSplitTx(CTransaction const & tx, std::vector & metadata, bool fortCanningGreen) +bool IsTokenSplitTx(CTransaction const & tx, std::vector & metadata, bool fortCanningCrunch) { - if (!fortCanningGreen) { + if (!fortCanningCrunch) { return false; } if (!tx.IsCoinBase() || tx.vout.size() != 1 || tx.vout[0].nValue != 0) { diff --git a/src/consensus/tx_check.h b/src/consensus/tx_check.h index 5eb7012f73e..eac08d11edc 100644 --- a/src/consensus/tx_check.h +++ b/src/consensus/tx_check.h @@ -31,6 +31,6 @@ bool ParseScriptByMarker(CScript const & script, bool& hasAdditionalOpcodes); bool IsAnchorRewardTx(CTransaction const & tx, std::vector & metadata, bool fortCanning = false); bool IsAnchorRewardTxPlus(CTransaction const & tx, std::vector & metadata, bool fortCanning = false); -bool IsTokenSplitTx(CTransaction const & tx, std::vector & metadata, bool fortCanningGreen = true); +bool IsTokenSplitTx(CTransaction const & tx, std::vector & metadata, bool fortCanningCrunch = true); #endif // DEFI_CONSENSUS_TX_CHECK_H diff --git a/src/init.cpp b/src/init.cpp index cff74a1d75a..78cb828fcdf 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -477,7 +477,7 @@ void SetupServerArgs() gArgs.AddArg("-fortcanningparkheight", "Fort Canning Park fork activation height (regtest only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS); gArgs.AddArg("-fortcanninghillheight", "Fort Canning Hill fork activation height (regtest only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS); gArgs.AddArg("-fortcanningroadheight", "Fort Canning Road fork activation height (regtest only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS); - gArgs.AddArg("-fortcanningspicegardenheight", "Fort Canning Spice Garden fork activation height (regtest only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS); + gArgs.AddArg("-fortcanningcrunchheight", "Fort Canning Crunch fork activation height (regtest only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS); gArgs.AddArg("-greatworldheight", "Great World fork activation height (regtest only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS); gArgs.AddArg("-jellyfish_regtest", "Configure the regtest network for jellyfish testing", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS); gArgs.AddArg("-simulatemainnet", "Configure the regtest network to mainnet target timespan and spacing ", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS); diff --git a/src/masternodes/govvariables/attributes.cpp b/src/masternodes/govvariables/attributes.cpp index d3bbb26061b..b0365186065 100644 --- a/src/masternodes/govvariables/attributes.cpp +++ b/src/masternodes/govvariables/attributes.cpp @@ -744,8 +744,8 @@ Res ATTRIBUTES::Validate(const CCustomCSView & view) const case TokenKeys::LoanCollateralFactor: case TokenKeys::LoanMintingEnabled: case TokenKeys::LoanMintingInterest: { - if (view.GetLastHeight() < Params().GetConsensus().FortCanningSpiceGardenHeight) { - return Res::Err("Cannot be set before FortCanningSpiceGarden"); + if (view.GetLastHeight() < Params().GetConsensus().FortCanningCrunchHeight) { + return Res::Err("Cannot be set before FortCanningCrunch"); } if (!VerifyToken(view, attrV0->typeId)) { return Res::Err("No such token (%d)", attrV0->typeId); @@ -758,8 +758,8 @@ Res ATTRIBUTES::Validate(const CCustomCSView & view) const break; } case TokenKeys::FixedIntervalPriceId: - if (view.GetLastHeight() < Params().GetConsensus().FortCanningSpiceGardenHeight) { - return Res::Err("Cannot be set before FortCanningSpiceGarden"); + if (view.GetLastHeight() < Params().GetConsensus().FortCanningCrunchHeight) { + return Res::Err("Cannot be set before FortCanningCrunch"); } if (!VerifyToken(view, attrV0->typeId)) { return Res::Err("No such token (%d)", attrV0->typeId); @@ -783,8 +783,8 @@ Res ATTRIBUTES::Validate(const CCustomCSView & view) const break; case AttributeTypes::Oracles: - if (view.GetLastHeight() < Params().GetConsensus().FortCanningSpiceGardenHeight) { - return Res::Err("Cannot be set before FortCanningSpiceGarden"); + if (view.GetLastHeight() < Params().GetConsensus().FortCanningCrunchHeight) { + return Res::Err("Cannot be set before FortCanningCrunch"); } if (attrV0->typeId == OracleIDs::Splits) { const auto splitMap = boost::get(&attribute.second); @@ -845,8 +845,8 @@ Res ATTRIBUTES::Validate(const CCustomCSView & view) const break; case AttributeTypes::Locks: - if (view.GetLastHeight() < Params().GetConsensus().FortCanningSpiceGardenHeight) { - return Res::Err("Cannot be set before FortCanningSpiceGarden"); + if (view.GetLastHeight() < Params().GetConsensus().FortCanningCrunchHeight) { + return Res::Err("Cannot be set before FortCanningCrunch"); } if (attrV0->typeId != ParamIDs::TokenID) { return Res::Err("Unrecognised locks id"); diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp index eb826707073..fd52cce7c91 100644 --- a/src/masternodes/mn_checks.cpp +++ b/src/masternodes/mn_checks.cpp @@ -249,9 +249,9 @@ class CCustomMetadataParseVisitor : public boost::static_visitor return Res::Ok(); } - Res isPostFortCanningSpiceGardenFork() const { - if(static_cast(height) < consensus.FortCanningSpiceGardenHeight) { - return Res::Err("called before FortCanningSpiceGarden height"); + Res isPostFortCanningCrunchFork() const { + if(static_cast(height) < consensus.FortCanningCrunchHeight) { + return Res::Err("called before FortCanningCrunch height"); } return Res::Ok(); } @@ -539,8 +539,8 @@ class CCustomMetadataParseVisitor : public boost::static_visitor auto res = isPostFortCanningFork(); if (!res) return res; - res = isPostFortCanningSpiceGardenFork(); - return res ? Res::Err("called after FortCanningSpiceGarden height") : serialize(obj); + res = isPostFortCanningCrunchFork(); + return res ? Res::Err("called after FortCanningCrunch height") : serialize(obj); } Res operator()(CLoanSchemeMessage& obj) const { @@ -2307,7 +2307,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor if (!HasFoundationAuth()) return Res::Err("tx not from foundation member!"); - if (height >= static_cast(consensus.FortCanningSpiceGardenHeight)) + if (height >= static_cast(consensus.FortCanningCrunchHeight)) { const auto& tokenId = obj.idToken.v; @@ -2379,7 +2379,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor if (!HasFoundationAuth()) return Res::Err("tx not from foundation member!"); - if (height >= static_cast(consensus.FortCanningSpiceGardenHeight)) + if (height >= static_cast(consensus.FortCanningCrunchHeight)) { CTokenImplementation token; token.symbol = trim_ws(obj.symbol).substr(0, CToken::MAX_TOKEN_SYMBOL_LENGTH); diff --git a/src/masternodes/tokens.cpp b/src/masternodes/tokens.cpp index 0f12fd00391..2c6364659d6 100644 --- a/src/masternodes/tokens.cpp +++ b/src/masternodes/tokens.cpp @@ -299,7 +299,7 @@ inline Res CTokenImplementation::IsValidSymbol() const if (symbol.find('#') != std::string::npos) { return Res::Err("token symbol should not contain '#'"); } - if (creationHeight >= Params().GetConsensus().FortCanningSpiceGardenHeight && symbol.find('/') != std::string::npos) { + if (creationHeight >= Params().GetConsensus().FortCanningCrunchHeight && symbol.find('/') != std::string::npos) { return Res::Err("token symbol should not contain '/'"); } return Res::Ok(); diff --git a/src/miner.cpp b/src/miner.cpp index f867335f520..aadb024b45d 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -221,7 +221,7 @@ std::unique_ptr BlockAssembler::CreateNewBlock(const CScript& sc addPackageTxs(nPackagesSelected, nDescendantsUpdated, nHeight, mnview); // TXs for the creationTx field in new tokens created via token split - if (nHeight >= chainparams.GetConsensus().FortCanningSpiceGardenHeight) { + if (nHeight >= chainparams.GetConsensus().FortCanningCrunchHeight) { const auto attributes = mnview.GetAttributes(); if (attributes) { CDataStructureV0 splitKey{AttributeTypes::Oracles, OracleIDs::Splits, static_cast(nHeight)}; diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 12af6b304ee..1326ce89160 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1336,7 +1336,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request) BuriedForkDescPushBack(softforks, "fortcanningpark", consensusParams.FortCanningParkHeight); BuriedForkDescPushBack(softforks, "fortcanninghill", consensusParams.FortCanningHillHeight); BuriedForkDescPushBack(softforks, "fortcanningroad", consensusParams.FortCanningRoadHeight); - BuriedForkDescPushBack(softforks, "fortcanningspicegarden", consensusParams.FortCanningSpiceGardenHeight); + BuriedForkDescPushBack(softforks, "fortcanningcrunch", consensusParams.FortCanningCrunchHeight); BuriedForkDescPushBack(softforks, "greatworld", consensusParams.GreatWorldHeight); BIP9SoftForkDescPushBack(softforks, "testdummy", consensusParams, Consensus::DEPLOYMENT_TESTDUMMY); obj.pushKV("softforks", softforks); diff --git a/src/validation.cpp b/src/validation.cpp index ee58633c184..10772e11f0a 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2350,7 +2350,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl int64_t nTimeStart = GetTimeMicros(); // Interrupt on hash or height requested. Invalidate the block. - if (StopOrInterruptConnect(pindex, state)) + if (StopOrInterruptConnect(pindex, state)) return false; // Reset phanton TX to block TX count @@ -3648,7 +3648,7 @@ void CChainState::ProcessTokenToGovVar(const CBlockIndex* pindex, CCustomCSView& // Migrate at +1 height so that GetLastHeight() in Gov var // Validate() has a height equal to the GW fork. - if (pindex->nHeight != chainparams.GetConsensus().FortCanningSpiceGardenHeight + 1) { + if (pindex->nHeight != chainparams.GetConsensus().FortCanningCrunchHeight + 1) { return; } @@ -4068,7 +4068,7 @@ static Res VaultSplits(CCustomCSView& view, ATTRIBUTES& attributes, const DCT_ID } void CChainState::ProcessTokenSplits(const CBlock& block, const CBlockIndex* pindex, CCustomCSView& cache, const CreationTxs& creationTxs, const CChainParams& chainparams) { - if (pindex->nHeight < chainparams.GetConsensus().FortCanningSpiceGardenHeight) { + if (pindex->nHeight < chainparams.GetConsensus().FortCanningCrunchHeight) { return; } const auto attributes = cache.GetAttributes(); @@ -5536,7 +5536,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P if (block.vtx[i]->IsCoinBase() && !IsAnchorRewardTx(*block.vtx[i], dummy, height >= consensusParams.FortCanningHeight) && !IsAnchorRewardTxPlus(*block.vtx[i], dummy, height >= consensusParams.FortCanningHeight) && - !IsTokenSplitTx(*block.vtx[i], dummy, height >= consensusParams.FortCanningSpiceGardenHeight)) + !IsTokenSplitTx(*block.vtx[i], dummy, height >= consensusParams.FortCanningCrunchHeight)) return state.Invalid(ValidationInvalidReason::CONSENSUS, false, REJECT_INVALID, "bad-cb-multiple", "more than one coinbase"); } } diff --git a/test/functional/feature_loan_setcollateraltoken.py b/test/functional/feature_loan_setcollateraltoken.py index 2c4b7fffa11..758d4c8acd0 100755 --- a/test/functional/feature_loan_setcollateraltoken.py +++ b/test/functional/feature_loan_setcollateraltoken.py @@ -19,7 +19,7 @@ def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True self.extra_args = [ - ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=50', '-fortcanningheight=50', '-fortcanninghillheight=50', '-fortcanningspicegardenheight=150', '-txindex=1']] + ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=50', '-fortcanningheight=50', '-fortcanninghillheight=50', '-fortcanningcrunchheight=150', '-txindex=1']] def run_test(self): assert_equal(len(self.nodes[0].listtokens()), 1) # only one token == DFI diff --git a/test/functional/feature_loan_setloantoken.py b/test/functional/feature_loan_setloantoken.py index 33b2ff32816..4bb1b788207 100755 --- a/test/functional/feature_loan_setloantoken.py +++ b/test/functional/feature_loan_setloantoken.py @@ -19,7 +19,7 @@ def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True self.extra_args = [ - ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=50', '-fortcanningheight=50', '-fortcanninghillheight=50', '-fortcanningspicegardenheight=110', '-txindex=1']] + ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=50', '-fortcanningheight=50', '-fortcanninghillheight=50', '-fortcanningcrunchheight=110', '-txindex=1']] def run_test(self): assert_equal(len(self.nodes[0].listtokens()), 1) # only one token == DFI diff --git a/test/functional/feature_loan_vault.py b/test/functional/feature_loan_vault.py index a9eb7d4f2cf..6de4d45d588 100755 --- a/test/functional/feature_loan_vault.py +++ b/test/functional/feature_loan_vault.py @@ -18,8 +18,8 @@ def set_test_params(self): self.num_nodes = 2 self.setup_clean_chain = True self.extra_args = [ - ['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-bayfrontgardensheight=1', '-eunosheight=1', '-txindex=1', '-fortcanningheight=1', '-fortcanninghillheight=300', '-fortcanningspicegardenheight=1700', '-jellyfish_regtest=1', '-simulatemainnet'], - ['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-bayfrontgardensheight=1', '-eunosheight=1', '-txindex=1', '-fortcanningheight=1', '-fortcanninghillheight=300', '-fortcanningspicegardenheight=1700', '-jellyfish_regtest=1', '-simulatemainnet'] + ['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-bayfrontgardensheight=1', '-eunosheight=1', '-txindex=1', '-fortcanningheight=1', '-fortcanninghillheight=300', '-fortcanningcrunchheight=1700', '-jellyfish_regtest=1', '-simulatemainnet'], + ['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-bayfrontgardensheight=1', '-eunosheight=1', '-txindex=1', '-fortcanningheight=1', '-fortcanninghillheight=300', '-fortcanningcrunchheight=1700', '-jellyfish_regtest=1', '-simulatemainnet'] ] self.vaults = [] self.owner_addresses = [] @@ -750,7 +750,7 @@ def loan_and_collateral_token_to_govvar(self): self.move_to_gw_fork() # Try and call disabled RPC calls - assert_raises_rpc_error(-32600, 'called after FortCanningSpiceGarden height', self.nodes[0].updateloantoken, "DUSD", { + assert_raises_rpc_error(-32600, 'called after FortCanningCrunch height', self.nodes[0].updateloantoken, "DUSD", { 'symbol': "DUSD", 'name': "DUSD stable token", 'fixedIntervalPriceId': "DUSD/USD", diff --git a/test/functional/feature_setgov.py b/test/functional/feature_setgov.py index a4fa1c6ef19..ea1fd9f2543 100755 --- a/test/functional/feature_setgov.py +++ b/test/functional/feature_setgov.py @@ -21,8 +21,8 @@ def set_test_params(self): self.num_nodes = 2 self.setup_clean_chain = True self.extra_args = [ - ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=200', '-fortcanningheight=400', '-fortcanninghillheight=1110', '-fortcanningroadheight=1150', '-fortcanningspicegardenheight=1200', '-subsidytest=1'], - ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=200', '-fortcanningheight=400', '-fortcanninghillheight=1110', '-fortcanningroadheight=1150', '-fortcanningspicegardenheight=1200', '-subsidytest=1']] + ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=200', '-fortcanningheight=400', '-fortcanninghillheight=1110', '-fortcanningroadheight=1150', '-fortcanningcrunchheight=1200', '-subsidytest=1'], + ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-eunosheight=200', '-fortcanningheight=400', '-fortcanninghillheight=1110', '-fortcanningroadheight=1150', '-fortcanningcrunchheight=1200', '-subsidytest=1']] def run_test(self): @@ -630,13 +630,13 @@ def run_test(self): assert_equal(result, [[{'ICX_TAKERFEE_PER_BTC': Decimal('0.00200000')}], [{'LP_DAILY_LOAN_TOKEN_REWARD': Decimal('13020.86331792')}], [{'LP_LOAN_TOKEN_SPLITS': {'1': Decimal('0.10000000'), '2': Decimal('0.20000000'), '3': Decimal('0.70000000')}}], [{'LP_DAILY_DFI_REWARD': Decimal('13427.10581184')}], [{'LOAN_LIQUIDATION_PENALTY': Decimal('0.01000000')}], [{'LP_SPLITS': {'1': Decimal('0.70000000'), '2': Decimal('0.20000000'), '3': Decimal('0.10000000')}}], [{'ORACLE_BLOCK_INTERVAL': 30}], [{'ORACLE_DEVIATION': Decimal('0.07000000')}], [{'ATTRIBUTES': {'v0/params/dfip2201/active': 'true', 'v0/params/dfip2201/premium': '0.025', 'v0/params/dfip2201/minswap': '0.001', 'v0/params/dfip2203/active': 'true', 'v0/params/dfip2203/reward_pct': '0.05', 'v0/params/dfip2203/block_period': '20160', 'v0/token/5/payback_dfi': 'true', 'v0/token/5/payback_dfi_fee_pct': '0.33', 'v0/token/5/loan_payback/1': 'true', 'v0/token/5/loan_payback/2': 'true', 'v0/token/5/loan_payback_fee_pct/1': '0.25', 'v0/token/5/dex_in_fee_pct': '0.6', 'v0/token/5/dex_out_fee_pct': '0.12', 'v0/token/5/dfip2203': 'true'}}]]) # Check errors - assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningSpiceGarden", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/locks/token/5':'true'}}) - assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningSpiceGarden", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/oracles/splits/4000': '1/50'}}) - assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningSpiceGarden", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/token/5/fixed_interval_price_id':'TSLA/USD'}}) - assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningSpiceGarden", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/token/5/loan_collateral_enabled':'true'}}) - assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningSpiceGarden", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/token/5/loan_collateral_factor':'1.00000000'}}) - assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningSpiceGarden", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/token/5/loan_minting_enabled':'true'}}) - assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningSpiceGarden", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/token/5/loan_minting_interest':'5.00000000'}}) + assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningCrunch", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/locks/token/5':'true'}}) + assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningCrunch", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/oracles/splits/4000': '1/50'}}) + assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningCrunch", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/token/5/fixed_interval_price_id':'TSLA/USD'}}) + assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningCrunch", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/token/5/loan_collateral_enabled':'true'}}) + assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningCrunch", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/token/5/loan_collateral_factor':'1.00000000'}}) + assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningCrunch", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/token/5/loan_minting_enabled':'true'}}) + assert_raises_rpc_error(-32600, "ATTRIBUTES: Cannot be set before FortCanningCrunch", self.nodes[0].setgov, {"ATTRIBUTES":{'v0/token/5/loan_minting_interest':'5.00000000'}}) # Move to GW fork self.nodes[0].generate(1200 - self.nodes[0].getblockcount()) diff --git a/test/functional/feature_token_lock.py b/test/functional/feature_token_lock.py index e89fe5edb0f..20f9d05b6e5 100644 --- a/test/functional/feature_token_lock.py +++ b/test/functional/feature_token_lock.py @@ -15,7 +15,7 @@ class TokenLockTest(DefiTestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True - self.extra_args = [['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-eunosheight=1', '-fortcanningheight=1', '-fortcanninghillheight=1', '-fortcanningroadheight=1', '-fortcanningspicegardenheight=200', '-subsidytest=1']] + self.extra_args = [['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-eunosheight=1', '-fortcanningheight=1', '-fortcanninghillheight=1', '-fortcanningroadheight=1', '-fortcanningcrunchheight=200', '-subsidytest=1']] def run_test(self): self.nodes[0].generate(150) diff --git a/test/functional/feature_token_split.py b/test/functional/feature_token_split.py index a6f09e99a17..29b3ce00fd7 100644 --- a/test/functional/feature_token_split.py +++ b/test/functional/feature_token_split.py @@ -20,7 +20,7 @@ def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True self.extra_args = [ - ['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-eunosheight=1', '-fortcanningheight=1', '-fortcanningmuseumheight=1', '-fortcanninghillheight=1', '-fortcanningroadheight=1', '-fortcanningspicegardenheight=150', '-subsidytest=1']] + ['-txnotokens=0', '-amkheight=1', '-bayfrontheight=1', '-eunosheight=1', '-fortcanningheight=1', '-fortcanningmuseumheight=1', '-fortcanninghillheight=1', '-fortcanningroadheight=1', '-fortcanningcrunchheight=150', '-subsidytest=1']] def run_test(self): self.setup_test_tokens() diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py index f97c296e625..43d45049add 100755 --- a/test/functional/rpc_blockchain.py +++ b/test/functional/rpc_blockchain.py @@ -136,7 +136,7 @@ def _test_getblockchaininfo(self): 'fortcanningpark': {'type': 'buried', 'active': False, 'height': 10000000}, 'fortcanninghill': {'type': 'buried', 'active': False, 'height': 10000000}, 'fortcanningroad': {'type': 'buried', 'active': False, 'height': 10000000}, - 'fortcanningspicegarden': {'type': 'buried', 'active': False, 'height': 10000000}, + 'fortcanningcrunch': {'type': 'buried', 'active': False, 'height': 10000000}, 'greatworld': {'type': 'buried', 'active': False, 'height': 10000000}, 'testdummy': { 'type': 'bip9',