Upgrade validator smart contract

common/constants.go

@@ -52,6 +52,7 @@ var BerlinBlock = big.NewInt(76321000)   // Target 19th June 2024
 var LondonBlock = big.NewInt(76321000)   // Target 19th June 2024
 var MergeBlock = big.NewInt(76321000)    // Target 19th June 2024
 var ShanghaiBlock = big.NewInt(76321000) // Target 19th June 2024
+var ValidtorV2SMCBlock = big.NewInt(9999999999)
 
 var TIPXDCXTestnet = big.NewInt(38383838)
 var IsTestnet bool = false

common/constants/constants.go.devnet

@@ -52,6 +52,7 @@ var LondonBlock = big.NewInt(16832700)
 var MergeBlock = big.NewInt(16832700)
 var ShanghaiBlock = big.NewInt(16832700)
 var Eip1559Block = big.NewInt(9999999999)
+var ValidtorV2SMCBlock = big.NewInt(22320000)
 
 var TIPXDCXTestnet = big.NewInt(0)
 var IsTestnet bool = false
@@ -77,6 +78,7 @@ var TRC21IssuerSMCTestNet = HexToAddress("0x0E2C88753131CE01c7551B726b28BFD04e44
 var TRC21IssuerSMC = HexToAddress("0x8c0faeb5C6bEd2129b8674F262Fd45c4e9468bee")
 var XDCXListingSMC = HexToAddress("0xDE34dD0f536170993E8CFF639DdFfCF1A85D3E53")
 var XDCXListingSMCTestNet = HexToAddress("0x14B2Bf043b9c31827A472CE4F94294fE9a6277e0")
+
 var TRC21GasPriceBefore = big.NewInt(2500)
 var TRC21GasPrice = big.NewInt(250000000)
 var RateTopUp = big.NewInt(90) // 90%

common/constants/constants.go.testnet

@@ -52,6 +52,7 @@ var LondonBlock = big.NewInt(61290000)
 var MergeBlock = big.NewInt(61290000)
 var ShanghaiBlock = big.NewInt(61290000) // Target 31st March 2024
 var Eip1559Block = big.NewInt(9999999999)
+var ValidtorV2SMCBlock = big.NewInt(9999999999)
 
 var TIPXDCXTestnet = big.NewInt(23779191)
 var IsTestnet bool = true

consensus/XDPoS/engines/engine_v2/engine.go

@@ -394,6 +394,13 @@ func (x *XDPoS_v2) Finalize(chain consensus.ChainReader, header *types.Header, s
 		}
 	}
 
+	// upgrade smart contract after reward distribution
+	number := header.Number.Uint64()
+	log.Info("poc", "fun", "Finalize", "number", number)
+	if number == common.ValidtorV2SMCBlock.Uint64() {
+		UpgradeXDCValidtorV2(state)
+	}
+
 	// the state remains as is and uncles are dropped
 	header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
 	header.UncleHash = types.CalcUncleHash(nil)
@@ -1111,3 +1118,11 @@ func (x *XDPoS_v2) periodicJob() {
 func (x *XDPoS_v2) GetLatestCommittedBlockInfo() *types.BlockInfo {
 	return x.highestCommitBlock
 }
+
+func UpgradeXDCValidtorV2(statedb *state.StateDB) {
+	log.Info("poc", "MasternodeVotingSMC", common.MasternodeVotingSMC, "step", 1)
+	addr := common.HexToAddress(common.MasternodeVotingSMC)
+	// upgrade code
+	statedb.SetCode(addr, common.FromHex(common.XDCValidatorV2Code))
+	log.Info("poc", "MasternodeVotingSMC", common.XDCValidatorV2Code, "step", 2)
+}

contracts/validator/contract/XDCValidator.sol → contracts/validator/contract/XDCValidatorLegacy.sol

@@ -300,4 +300,4 @@ contract XDCValidator {
         msg.sender.transfer(cap);
         emit Withdraw(msg.sender, _blockNumber, cap);
     }
-}
+}

contracts/validator/contract_v2/migrate/test/.env.example

@@ -0,0 +1,6 @@
+O1_PRIVATE_KEY=0x0000
+O2_PRIVATE_KEY=0x
+O3_PRIVATE_KEY=0x
+O4_PRIVATE_KEY=0x
+O5_PRIVATE_KEY=0x
+RPC_URL=https://devnetstats.apothem.network/devnet

contracts/validator/contract_v2/migrate/test/.gitignore

@@ -0,0 +1,7 @@
+.env
+cache/
+artifacts/
+node_modules/
+.vscode/
+abigen
+yarn.lock

contracts/validator/contract_v2/migrate/test/README.md

@@ -0,0 +1,59 @@
+Here's a `README.md` file that outlines the steps you've provided:
+
+```markdown
+# Project Setup and Testing
+
+This repository contains scripts for testing various workflows in a development environment. The steps below will guide you through setting up the environment, installing dependencies, and running tests.
+
+## Prerequisites
+
+- **Node.js**: Ensure that you have Node.js version 20 installed.
+- **Yarn**: Yarn is used for managing dependencies.
+
+## Environment Setup
+
+1. **Create a `.env` file** in the root of your project directory. This file will contain the following environment variables:
+
+   ```env
+   RPC_URL=<Your Devnet RPC URL>
+   M1_PRIVETE_KEY=<Owner 1 Private Key>
+   M2_PRIVETE_KEY=<Owner 2 Private Key>
+   M3_PRIVETE_KEY=<Owner 3 Private Key>
+   M4_PRIVETE_KEY=<Owner 4 Private Key>
+   M5_PRIVETE_KEY=<Owner 5 Private Key>
+   ```
+
+   Replace the placeholders with the appropriate values.
+
+## Installation
+
+1. **Install dependencies** by running the following command:
+
+   ```bash
+   yarn
+   ```
+
+   This will install all the required packages for the project.
+
+## Running Tests
+
+### Test Main Workflow
+
+To test the main workflow, execute the following command:
+
+```bash
+node scripts/testMainWorkFlow.js
+```
+
+### Test KYC Invalid Flow
+
+To test the KYC invalid flow, execute the following command:
+
+```bash
+node scripts/testKycInvalidFlow.js
+```
+
+## Notes
+
+- Ensure that the `.env` file is correctly configured with the required RPC URL and masternode private keys before running the tests.
+- If any issues arise during the testing process, double-check the environment variables and dependency installation.