refactor: merge upgrade handlers

Author: 0xNilesh

app/upgrades.go

@@ -11,7 +11,6 @@ import (
 	purgeexpiredoutbounds "github.com/pushchain/push-chain-node/app/upgrades/purge-expired-outbounds"
 	removeutxverifier "github.com/pushchain/push-chain-node/app/upgrades/remove-utxverifier"
 	tssfundmigrationfixes "github.com/pushchain/push-chain-node/app/upgrades/tss-fund-migration-fixes"
-	evmupgrade032 "github.com/pushchain/push-chain-node/app/upgrades/evm-upgrade032"
 	tssmigration "github.com/pushchain/push-chain-node/app/upgrades/tss-migration"
 	ueamigration "github.com/pushchain/push-chain-node/app/upgrades/uea-migration"
 	ceagasandpayload "github.com/pushchain/push-chain-node/app/upgrades/cea-gas-and-payload"
@@ -67,7 +66,6 @@ var Upgrades = []upgrades.Upgrade{
 	purgeexpiredoutbounds.NewUpgrade(),
 	removeutxverifier.NewUpgrade(),
 	tssfundmigrationfixes.NewUpgrade(),
-	evmupgrade032.NewUpgrade(),
 	contractauditchanges.NewUpgrade(),
 }
 

app/upgrades/contract-audit-changes/upgrade.go

@@ -13,12 +13,23 @@ import (
 	"github.com/pushchain/push-chain-node/app/upgrades"
 )
 
+// Upgrade for chain contract audit changes + evm version bump to 0.3.2
 // UpgradeName matches the chain-side change set that adapts the chain's
 // UniversalCore ABI + gas-fee read path to the post-audit smart-contract
 // No module ConsensusVersion is bumped for this upgrade — none of the chain
 // changes touch module storage schemas, so RunMigrations is a no-op for the
 // version map; this handler exists primarily as a coordination point so all
 // validators flip to the new ABI / gas-fee read at the same height.
+
+// Key changes in this library bump:
+//   - AccountKeeper now requires unordered-tx methods (satisfied via authKeeperEVMWrapper stub)
+//   - EVMKeeper constructor takes additional params: store keys map, ConsensusParamsKeeper
+//   - go-ethereum bumped to v1.15.11-cosmos-0; statedb.Account.Balance is now uint256.Int (not big.Int)
+//   - erc20 module: NativePrecompiles moved from Params to a top-level genesis field
+//   - Precompile constructors now require bankKeeper; gov precompile also requires appCodec
+//   - vm.NewAppModule signature updated to accept AddressCodec
+//
+// RunMigrations handles the erc20 state migration automatically (consensus version bump).
 const UpgradeName = "contract-audit-changes"
 
 func NewUpgrade() upgrades.Upgrade {
@@ -41,10 +52,12 @@ func CreateUpgradeHandler(
 		sdkCtx := sdk.UnwrapSDKContext(ctx)
 		logger := sdkCtx.Logger().With("upgrade", UpgradeName)
 		logger.Info("Starting upgrade handler")
+		logger.Info("cosmos/evm v0.2.x → v0.3.2: erc20 NativePrecompiles field migration, go-ethereum v1.15.11-cosmos-0")
+		logger.Info("UniversalCore audit: ABI gasLimitUsed output, setGasPrice removal, gas_fee.go reads results[5]")
 
-		// RunMigrations is a no-op for this upgrade (no module ConsensusVersion
-		// bumped) but we still call it so the version map is materialised
-		// correctly for any modules whose code may have changed underneath.
+		// erc20 module's ConsensusVersion bump (from EVM 0.3.2) drives the
+		// only on-chain state migration this upgrade requires; RunMigrations
+		// handles it. The chain's own modules don't bump versions here.
 		versionMap, err := mm.RunMigrations(ctx, configurator, fromVM)
 		if err != nil {
 			return nil, fmt.Errorf("RunMigrations: %w", err)