From 749e504529fd380fe5ed2d4b48e04c8d38620e2a Mon Sep 17 00:00:00 2001
From: Arya Lanjewar <102943033+AryaLanjewar3005@users.noreply.github.com>
Date: Wed, 13 May 2026 19:06:18 +0530
Subject: [PATCH] fix: chainID config for EVM

---
 app/upgrades.go                         |  2 ++
 app/upgrades/evm-chainid-fix/upgrade.go | 32 +++++++++++++++++++++++++
 scripts/test_node.sh                    |  2 +-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 app/upgrades/evm-chainid-fix/upgrade.go

diff --git a/app/upgrades.go b/app/upgrades.go
index 226d27318..9525acb67 100755
--- a/app/upgrades.go
+++ b/app/upgrades.go
@@ -19,6 +19,7 @@ import (
 	chainmetavotegasless "github.com/pushchain/push-chain-node/app/upgrades/chain-meta-vote-gasless"
 	contractauditchanges "github.com/pushchain/push-chain-node/app/upgrades/contract-audit-changes"
 	evmparamsmigration "github.com/pushchain/push-chain-node/app/upgrades/evm-params-migration"
+	evmchainidffix "github.com/pushchain/push-chain-node/app/upgrades/evm-chainid-fix"
 	ethhashfix "github.com/pushchain/push-chain-node/app/upgrades/eth-hash-fix"
 	evmrpcfix "github.com/pushchain/push-chain-node/app/upgrades/evm-rpc-fix"
 	feeabs "github.com/pushchain/push-chain-node/app/upgrades/fee-abs"
@@ -69,6 +70,7 @@ var Upgrades = []upgrades.Upgrade{
 	tssfundmigrationfixes.NewUpgrade(),
 	contractauditchanges.NewUpgrade(),
 	evmparamsmigration.NewUpgrade(),
+	evmchainidffix.NewUpgrade(),
 }
 
 // RegisterUpgradeHandlers registers the chain upgrade handlers
diff --git a/app/upgrades/evm-chainid-fix/upgrade.go b/app/upgrades/evm-chainid-fix/upgrade.go
new file mode 100644
index 000000000..dca0542ee
--- /dev/null
+++ b/app/upgrades/evm-chainid-fix/upgrade.go
@@ -0,0 +1,32 @@
+package evmchainidffix
+
+import (
+	"context"
+
+	storetypes "cosmossdk.io/store/types"
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+
+	"github.com/cosmos/cosmos-sdk/types/module"
+
+	"github.com/pushchain/push-chain-node/app/upgrades"
+)
+
+const UpgradeName = "evm-chainid-fix"
+
+func NewUpgrade() upgrades.Upgrade {
+	return upgrades.Upgrade{
+		UpgradeName:          UpgradeName,
+		CreateUpgradeHandler: CreateUpgradeHandler,
+		StoreUpgrades:        storetypes.StoreUpgrades{},
+	}
+}
+
+func CreateUpgradeHandler(
+	mm upgrades.ModuleManager,
+	configurator module.Configurator,
+	_ *upgrades.AppKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		return mm.RunMigrations(ctx, configurator, fromVM)
+	}
+}
diff --git a/scripts/test_node.sh b/scripts/test_node.sh
index 7446f8182..60f20c9cd 100755
--- a/scripts/test_node.sh
+++ b/scripts/test_node.sh
@@ -113,7 +113,7 @@ from_scratch () {
 
   update_test_genesis `printf '.app_state["evm"]["params"]["evm_denom"]="%s"' $DENOM`
   update_test_genesis '.app_state["evm"]["params"]["active_static_precompiles"]=["0x00000000000000000000000000000000000000CB","0x00000000000000000000000000000000000000ca","0x0000000000000000000000000000000000000100","0x0000000000000000000000000000000000000400","0x0000000000000000000000000000000000000800","0x0000000000000000000000000000000000000801","0x0000000000000000000000000000000000000802","0x0000000000000000000000000000000000000803","0x0000000000000000000000000000000000000804","0x0000000000000000000000000000000000000805"]'
-  update_test_genesis '.app_state["erc20"]["params"]["native_precompiles"]=["0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"]' # https://eips.ethereum.org/EIPS/eip-7528
+  update_test_genesis '.app_state["erc20"]["native_precompiles"]=["0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"]' # https://eips.ethereum.org/EIPS/eip-7528
   update_test_genesis `printf '.app_state["erc20"]["token_pairs"]=[{contract_owner:1,erc20_address:"0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",denom:"%s",enabled:true}]' $DENOM`
   update_test_genesis '.app_state["feemarket"]["params"]["no_base_fee"]=false'
   update_test_genesis '.app_state["feemarket"]["params"]["base_fee"]="1000000000.000000000000000000"'