Remove activation and checks

PIVX-Project · Feb 19, 2024 · 314d0a8 · 314d0a8
1 parent 9a60dd8
commit 314d0a8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -293,7 +293,6 @@ class CMainParams : public CChainParams
  consensus.vUpgrades[Consensus::UPGRADE_V5_2].nActivationHeight = 2927000;
  consensus.vUpgrades[Consensus::UPGRADE_V5_3].nActivationHeight = 3014000;
  consensus.vUpgrades[Consensus::UPGRADE_V5_5].nActivationHeight = 3715200;
- consensus.vUpgrades[Consensus::UPGRADE_V5_6].nActivationHeight = 4281680; // Estimate Feb 29th 12:00 UTC
  consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight =
  Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
 
@@ -453,7 +452,6 @@ class CTestNetParams : public CChainParams
  consensus.vUpgrades[Consensus::UPGRADE_V5_2].nActivationHeight = 262525;
  consensus.vUpgrades[Consensus::UPGRADE_V5_3].nActivationHeight = 332300;
  consensus.vUpgrades[Consensus::UPGRADE_V5_5].nActivationHeight = 925056;
- consensus.vUpgrades[Consensus::UPGRADE_V5_6].nActivationHeight = 1624280; // Estimate Feb 23 Midnight UTC
  consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight =
  Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
 
@@ -605,7 +603,6 @@ class CRegTestParams : public CChainParams
  consensus.vUpgrades[Consensus::UPGRADE_V5_2].nActivationHeight = 300;
  consensus.vUpgrades[Consensus::UPGRADE_V5_3].nActivationHeight = 251;
  consensus.vUpgrades[Consensus::UPGRADE_V5_5].nActivationHeight = 576;
- consensus.vUpgrades[Consensus::UPGRADE_V5_6].nActivationHeight = 1000;
  consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight =
  Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
 

diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -37,7 +37,6 @@ enum UpgradeIndex : uint32_t {
  UPGRADE_V5_2,
  UPGRADE_V5_3,
  UPGRADE_V5_5,
- UPGRADE_V5_6,
  UPGRADE_V6_0,
  UPGRADE_TESTDUMMY,
  // NOTE: Also add new upgrades to NetworkUpgradeInfo in upgrades.cpp

diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
@@ -116,9 +116,6 @@ bool CheckTransaction(const CTransaction& tx, CValidationState& state, bool fCol
  }
 
  bool hasExchangeUTXOs = tx.HasExchangeAddr();
- int nTxHeight = chainActive.Height();
- if (hasExchangeUTXOs && !Params().GetConsensus().NetworkUpgradeActive(nTxHeight, Consensus::UPGRADE_V5_6))
- return state.DoS(100, false, REJECT_INVALID, "bad-exchange-address-not-started");
 
  if (tx.IsCoinBase()) {
  if (tx.vin[0].scriptSig.size() < 2 || tx.vin[0].scriptSig.size() > 150)