From 7aaf724f4f97fd717fb6f012b1efaa0c0ac28826 Mon Sep 17 00:00:00 2001
From: Daniel Liu <liudaniel@qq.com>
Date: Sat, 12 Apr 2025 11:38:27 +0800
Subject: [PATCH] all: update parameters for rollback

---
 cicd/devnet/genesis.json    | 2 +-
 common/constants.devnet.go  | 8 ++++----
 common/constants.testnet.go | 2 +-
 genesis/devnet.json         | 2 +-
 params/config.go            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cicd/devnet/genesis.json b/cicd/devnet/genesis.json
index cdaf282409..ee67134682 100644
--- a/cicd/devnet/genesis.json
+++ b/cicd/devnet/genesis.json
@@ -7,7 +7,7 @@
     "eip155Block": 0,
     "eip158Block": 0,
     "byzantiumBlock": 0,
-    "eip1559Block": 0,
+    "eip1559Block": 32400,
     "XDPoS": {
       "period": 2,
       "epoch": 900,
diff --git a/common/constants.devnet.go b/common/constants.devnet.go
index cb59b2b382..53467df93c 100644
--- a/common/constants.devnet.go
+++ b/common/constants.devnet.go
@@ -16,18 +16,18 @@ var DevnetConstant = constant{
 	tipXDCX:                big.NewInt(0),
 	tipXDCXLending:         big.NewInt(0),
 	tipXDCXCancellationFee: big.NewInt(0),
-	tipTRC21Fee:            big.NewInt(13523400),
+	tipTRC21Fee:            big.NewInt(10800),
 	tipIncreaseMasternodes: big.NewInt(0),
 	berlinBlock:            big.NewInt(0),
 	londonBlock:            big.NewInt(0),
 	mergeBlock:             big.NewInt(0),
 	shanghaiBlock:          big.NewInt(0),
-	blockNumberGas50x:      big.NewInt(0),
+	blockNumberGas50x:      big.NewInt(21600),
 	TIPV2SwitchBlock:       big.NewInt(0),
 	tipXDCXMinerDisable:    big.NewInt(0),
 	tipXDCXReceiverDisable: big.NewInt(0),
-	eip1559Block:           big.NewInt(0),
-	cancunBlock:            big.NewInt(1702800),
+	eip1559Block:           big.NewInt(32400),
+	cancunBlock:            big.NewInt(43200),
 	tipUpgradeReward:       big.NewInt(1773000),
 	tipEpochHalving:        big.NewInt(9999999999),
 
diff --git a/common/constants.testnet.go b/common/constants.testnet.go
index da65895996..80b5622123 100644
--- a/common/constants.testnet.go
+++ b/common/constants.testnet.go
@@ -27,7 +27,7 @@ var TestnetConstant = constant{
 	tipXDCXMinerDisable:           big.NewInt(61290000), // Target 31st March 2024
 	tipXDCXReceiverDisable:        big.NewInt(66825000), // Target 26 Aug 2024
 	eip1559Block:                  big.NewInt(71550000), // Target 14th Feb 2025
-	cancunBlock:                   big.NewInt(73425600),
+	cancunBlock:                   big.NewInt(71550000),
 	tipUpgradeReward:              big.NewInt(9999999999),
 	tipEpochHalving:               big.NewInt(9999999999),
 
diff --git a/genesis/devnet.json b/genesis/devnet.json
index cdaf282409..ee67134682 100644
--- a/genesis/devnet.json
+++ b/genesis/devnet.json
@@ -7,7 +7,7 @@
     "eip155Block": 0,
     "eip158Block": 0,
     "byzantiumBlock": 0,
-    "eip1559Block": 0,
+    "eip1559Block": 32400,
     "XDPoS": {
       "period": 2,
       "epoch": 900,
diff --git a/params/config.go b/params/config.go
index bc74e4b5e6..94aaeff9f9 100644
--- a/params/config.go
+++ b/params/config.go
@@ -35,7 +35,7 @@ const (
 var (
 	MainnetGenesisHash = common.HexToHash("0x4a9d748bd78a8d0385b67788c2435dcdb914f98a96250b68863a1f8b7642d6b1") // XDC Mainnet genesis hash to enforce below configs on
 	TestnetGenesisHash = common.HexToHash("0xbdea512b4f12ff1135ec92c00dc047ffb93890c2ea1aa0eefe9b013d80640075") // XDC Testnet genesis hash to enforce below configs on
-	DevnetGenesisHash  = common.HexToHash("0x977c7a1b4ecbc40acc3963c1778666b62a95940a7fba6fec5867f78702835daf") // XDC Devnet genesis hash to enforce below configs on
+	DevnetGenesisHash  = common.HexToHash("0x3c636c841ebee9121374fa76bd5480d17a23e1ba61d425dde21d7b3caba864f4") // XDC Devnet genesis hash to enforce below configs on
 )
 
 var (