Merge testnet/donut into chore/read-state-donut-upgrade

Resolves three conflicts:
- app/app.go: keep UcallbackKeeper from develop
- constants.go: keep both 0xC2 = UNIVERSAL_CALLBACK and 0xCA = USigVerifier
- constants_test.go: occupied set is the union of both sides

Author: 0xNilesh

.github/workflows/release.yml

@@ -123,6 +123,7 @@ jobs:
       - name: Patch chain ID for production
         run: |
           sed -i 's/"localchain_9000-1"/"push_42101-1"/' app/app.go
+          sed -i 's/EVMChainID = uint64(9000)/EVMChainID = uint64(42101)/' app/app.go
           grep -n "ChainID" app/app.go
 
       - name: Build Linux binary
@@ -247,6 +248,7 @@ jobs:
       - name: Patch chain ID for production
         run: |
           sed -i 's/"localchain_9000-1"/"push_42101-1"/' app/app.go
+          sed -i 's/EVMChainID = uint64(9000)/EVMChainID = uint64(42101)/' app/app.go
           grep -n "ChainID" app/app.go
 
       - name: Build Linux ARM64 binary
@@ -390,6 +392,7 @@ jobs:
       - name: Patch chain ID for production
         run: |
           sed -i '' 's/"localchain_9000-1"/"push_42101-1"/' app/app.go
+          sed -i '' 's/EVMChainID = uint64(9000)/EVMChainID = uint64(42101)/' app/app.go
           grep -n "ChainID" app/app.go
 
       - name: Build Mac Binary (ARM64 only - native build)

app/README.md

@@ -148,9 +148,10 @@ Push Chain ships exactly one custom precompile:
 
 | Address | Name | Purpose |
 |---|---|---|
-| `0xEC00000000000000000000000000000000000001` | `usigverifier` | Ed25519 signature verification (Solana signatures over `bytes32` digests), registered at the reserved Push range |
+| `0x00000000000000000000000000000000000000ca` | `usigverifier` (legacy) | Ed25519 signature verification (Solana signatures over `bytes32` digests) |
+| `0xEC00000000000000000000000000000000000001` | `usigverifier` (v2) | Same implementation, registered at the reserved Push range |
 
-Gas cost: `4000` per `verifyEd25519` call. See [`precompiles/usigverifier/README.md`](../precompiles/usigverifier/README.md).
+Both addresses are registered simultaneously for backward compatibility with deployed contracts that have the legacy address hardcoded. Gas cost: `4000` per `verifyEd25519` call. See [`precompiles/usigverifier/README.md`](../precompiles/usigverifier/README.md).
 
 The baseline EVM precompiles (`bech32`, `p256`, `staking`, `distribution`, `ics20`, `bank`, `gov`, `slashing`, `evidence`) are wired in via `app/precompiles.go:NewAvailableStaticPrecompiles`.
 

app/app.go

@@ -186,8 +186,8 @@ const (
 	NodeDir      = ".pchain"
 	Bech32Prefix = "push"
 
-	ChainID    = "localchain_9000-1"
-	EVMChainID = uint64(9000)
+	ChainID    = "push_42101-1"
+	EVMChainID = uint64(42101)
 )
 
 var (
@@ -837,8 +837,17 @@ func NewChainApp(
 		appCodec,
 	)
 
-	// usigverifier precompile (0xEC..01) — core precompile range
-	usigverifierPrecompileV2, err := usigverifierprecompile.NewPrecompile()
+	// Add the usigverifier precompile for Ed25519 verification (old address: 0xCA)
+	usigverifierPrecompile, err := usigverifierprecompile.NewPrecompile()
+	if err != nil {
+		panic(fmt.Errorf("failed to instantiate usigverifier precompile: %w", err))
+	}
+	corePrecompiles[usigverifierPrecompile.Address()] = usigverifierPrecompile
+
+	// New address (0xEC..01) — reserved Push precompile range.
+	// Both old and new addresses are registered simultaneously for backward compatibility
+	// with deployed contracts that have old addresses hardcoded in their bytecode.
+	usigverifierPrecompileV2, err := usigverifierprecompile.NewPrecompileV2()
 	if err != nil {
 		panic(fmt.Errorf("failed to instantiate usigverifier v2 precompile: %w", err))
 	}
@@ -1490,24 +1499,6 @@ func (a *ChainApp) DefaultGenesis() map[string]json.RawMessage {
 	mintGenState.Params.MintDenom = BaseDenom
 	genesis[minttypes.ModuleName] = a.appCodec.MustMarshalJSON(mintGenState)
 
-	// Register bank denom metadata for the EVM base denom. In cosmos/evm v0.5
-	// the EVM module's InitGenesis derives coin info (decimals/display) from this
-	// metadata via LoadEvmCoinInfo, so a fresh chain must carry it in genesis.
-	var bankGenState banktypes.GenesisState
-	a.appCodec.MustUnmarshalJSON(genesis[banktypes.ModuleName], &bankGenState)
-	bankGenState.DenomMetadata = append(bankGenState.DenomMetadata, banktypes.Metadata{
-		Description: "Native token of Push Chain",
-		DenomUnits: []*banktypes.DenomUnit{
-			{Denom: BaseDenom, Exponent: 0},
-			{Denom: DisplayDenom, Exponent: 18},
-		},
-		Base:    BaseDenom,
-		Display: DisplayDenom,
-		Name:    "Push Chain",
-		Symbol:  "PC",
-	})
-	genesis[banktypes.ModuleName] = a.appCodec.MustMarshalJSON(&bankGenState)
-
 	evmGenState := evmtypes.DefaultGenesisState()
 	evmGenState.Params.ActiveStaticPrecompiles = evmtypes.AvailableStaticPrecompiles
 	evmGenState.Params.EvmDenom = BaseDenom
@@ -1659,7 +1650,7 @@ func BlockedAddresses() map[string]bool {
 	}
 
 	for _, precompile := range blockedPrecompilesHex {
-		blockedAddrs[cosmosevmutils.EthHexToCosmosAddr(precompile).String()] = true
+		blockedAddrs[cosmosevmutils.Bech32StringFromHexAddress(precompile)] = true
 	}
 
 	return blockedAddrs

app/config.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"maps"
 
-	"github.com/cosmos/cosmos-sdk/codec"
 	addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
+	"github.com/cosmos/cosmos-sdk/codec"
 	distributionkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"

app/precompiles.go

@@ -46,6 +46,7 @@ import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 
 	evmtypes "github.com/cosmos/evm/x/vm/types"
+
 	uregistrytypes "github.com/pushchain/push-chain-node/x/uregistry/types"
 	utsstypes "github.com/pushchain/push-chain-node/x/utss/types"
 	uvalidatortypes "github.com/pushchain/push-chain-node/x/uvalidator/types"

app/test_helpers.go

@@ -6,11 +6,95 @@ import (
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 
 	"github.com/pushchain/push-chain-node/app/upgrades"
+	aiauditfixes "github.com/pushchain/push-chain-node/app/upgrades/ai-audit-fixes"
+	aiauditfixes2 "github.com/pushchain/push-chain-node/app/upgrades/ai-audit-fixes-2"
+	ceagasandpayload "github.com/pushchain/push-chain-node/app/upgrades/cea-gas-and-payload"
+	ceapayloadverificationfix "github.com/pushchain/push-chain-node/app/upgrades/cea-payload-verification-fix"
+	chainmeta "github.com/pushchain/push-chain-node/app/upgrades/chain-meta"
+	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"
+	ethhashfix "github.com/pushchain/push-chain-node/app/upgrades/eth-hash-fix"
+	evmblockscoutfix "github.com/pushchain/push-chain-node/app/upgrades/evm-blockscout-fix"
+	evmchainidffix "github.com/pushchain/push-chain-node/app/upgrades/evm-chainid-fix"
+	evmparamsmigration "github.com/pushchain/push-chain-node/app/upgrades/evm-params-migration"
+	evmpreinstalls "github.com/pushchain/push-chain-node/app/upgrades/evm-preinstalls"
+	evmrpcfix "github.com/pushchain/push-chain-node/app/upgrades/evm-rpc-fix"
+	evmv040 "github.com/pushchain/push-chain-node/app/upgrades/evm-v0-4-0"
+	evmv050 "github.com/pushchain/push-chain-node/app/upgrades/evm-v0-5-0"
+	evmderivedgasprice "github.com/pushchain/push-chain-node/app/upgrades/evm-derived-gas-price"
+	evmv060 "github.com/pushchain/push-chain-node/app/upgrades/evm-v0-6-0"
+	feeabs "github.com/pushchain/push-chain-node/app/upgrades/fee-abs"
+	gasoracle "github.com/pushchain/push-chain-node/app/upgrades/gas-oracle"
 	"github.com/pushchain/push-chain-node/app/upgrades/noop"
+	outbound "github.com/pushchain/push-chain-node/app/upgrades/outbound"
+	pcmintcap "github.com/pushchain/push-chain-node/app/upgrades/pc-mint-cap"
+	pc20 "github.com/pushchain/push-chain-node/app/upgrades/pc20"
+	proxybytecodefix "github.com/pushchain/push-chain-node/app/upgrades/proxy-bytecode-fix"
+	purgeexpiredoutbounds "github.com/pushchain/push-chain-node/app/upgrades/purge-expired-outbounds"
+	removefeeabsv1 "github.com/pushchain/push-chain-node/app/upgrades/remove-fee-abs-v1"
+	removeutxverifier "github.com/pushchain/push-chain-node/app/upgrades/remove-utxverifier"
+	sdkv053 "github.com/pushchain/push-chain-node/app/upgrades/sdk-v0-53"
+	securityauditfixes "github.com/pushchain/push-chain-node/app/upgrades/security-audit-fixes"
+	solanafix "github.com/pushchain/push-chain-node/app/upgrades/solana-fix"
+	supplyburn "github.com/pushchain/push-chain-node/app/upgrades/supply-burn"
+	supplyslash "github.com/pushchain/push-chain-node/app/upgrades/supply-slash"
+	tsscore "github.com/pushchain/push-chain-node/app/upgrades/tss-core"
+	tsscoreevmparamsfix "github.com/pushchain/push-chain-node/app/upgrades/tss-core-evm-params-fix"
+	tsscorefix "github.com/pushchain/push-chain-node/app/upgrades/tss-core-fix"
+	tssfundmigrationfixes "github.com/pushchain/push-chain-node/app/upgrades/tss-fund-migration-fixes"
+	tssmigration "github.com/pushchain/push-chain-node/app/upgrades/tss-migration"
+	tssvotegasless "github.com/pushchain/push-chain-node/app/upgrades/tss-vote-gasless"
+	ueamigration "github.com/pushchain/push-chain-node/app/upgrades/uea-migration"
+	universaltxv1 "github.com/pushchain/push-chain-node/app/upgrades/universal-tx-v1"
 )
 
 // Upgrades list of chain upgrades
-var Upgrades = []upgrades.Upgrade{}
+var Upgrades = []upgrades.Upgrade{
+	feeabs.NewUpgrade(),
+	solanafix.NewUpgrade(),
+	ethhashfix.NewUpgrade(),
+	gasoracle.NewUpgrade(),
+	pcmintcap.NewUpgrade(),
+	tsscore.NewUpgrade(),
+	tsscorefix.NewUpgrade(),
+	tsscoreevmparamsfix.NewUpgrade(),
+	evmrpcfix.NewUpgrade(),
+	evmblockscoutfix.NewUpgrade(),
+	tssvotegasless.NewUpgrade(),
+	removefeeabsv1.NewUpgrade(),
+	outbound.NewUpgrade(),
+	universaltxv1.NewUpgrade(),
+	proxybytecodefix.NewUpgrade(),
+	supplyslash.NewUpgrade(),
+	supplyburn.NewUpgrade(),
+	chainmeta.NewUpgrade(),
+	chainmetavotegasless.NewUpgrade(),
+	ceagasandpayload.NewUpgrade(),
+	ceapayloadverificationfix.NewUpgrade(),
+	aiauditfixes.NewUpgrade(),
+	aiauditfixes2.NewUpgrade(),
+	ueamigration.NewUpgrade(),
+	tssmigration.NewUpgrade(),
+	purgeexpiredoutbounds.NewUpgrade(),
+	removeutxverifier.NewUpgrade(),
+	tssfundmigrationfixes.NewUpgrade(),
+	contractauditchanges.NewUpgrade(),
+	evmv040.NewUpgrade(),
+	evmparamsmigration.NewUpgrade(),
+	evmchainidffix.NewUpgrade(),
+	evmpreinstalls.NewUpgrade(),
+	evmv050.NewUpgrade(),
+	securityauditfixes.NewUpgrade(),
+	// cosmos/evm v0.6.0 — runs the standard transfer module v5->v6 migration
+	evmv060.NewUpgrade(),
+	// pc20 — no-op binary swap; VAULT_PC/VAULT_PC20 deployed separately from EVM side
+	pc20.NewUpgrade(),
+	// sdk-v0.53 — Cosmos SDK v0.50.10 -> v0.53.7; no-op (no module ConsensusVersion changes)
+	sdkv053.NewUpgrade(),
+	// evm-derived-gas-price — cosmos/evm bump for the derived-tx gas price fix;
+	// no-op (JSON-RPC reporting only, no module ConsensusVersion changes)
+	evmderivedgasprice.NewUpgrade(),
+}
 
 // RegisterUpgradeHandlers registers the chain upgrade handlers
 func (app *ChainApp) RegisterUpgradeHandlers() {
@@ -28,6 +112,7 @@ func (app *ChainApp) RegisterUpgradeHandlers() {
 		Codec:                 app.appCodec,
 		GetStoreKey:           app.GetKey,
 		EVMKeeper:             app.EVMKeeper,
+		Erc20Keeper:           &app.Erc20Keeper,
 		BankKeeper:            app.BankKeeper,
 
 		// Module keepers

app/upgrades.go

@@ -0,0 +1,69 @@
+package contractauditchanges
+
+import (
+	"context"
+	"fmt"
+
+	storetypes "cosmossdk.io/store/types"
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+
+	"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 = "changes"
+
+func NewUpgrade() upgrades.Upgrade {
+	return upgrades.Upgrade{
+		UpgradeName:          UpgradeName,
+		CreateUpgradeHandler: CreateUpgradeHandler,
+		StoreUpgrades: storetypes.StoreUpgrades{
+			Added:   []string{},
+			Deleted: []string{},
+		},
+	}
+}
+
+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) {
+		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]")
+
+		// 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)
+		}
+
+		logger.Info("Upgrade complete", "upgrade", UpgradeName)
+		return versionMap, nil
+	}
+}

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

@@ -0,0 +1,34 @@
+package evmblockscoutfix
+
+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-blockscout-fix"
+
+func NewUpgrade() upgrades.Upgrade {
+	return upgrades.Upgrade{
+		UpgradeName:          UpgradeName,
+		CreateUpgradeHandler: CreateUpgradeHandler,
+		StoreUpgrades: storetypes.StoreUpgrades{
+			Added:   []string{},
+			Deleted: []string{},
+		},
+	}
+}
+
+func CreateUpgradeHandler(
+	mm upgrades.ModuleManager,
+	configurator module.Configurator,
+	ak *upgrades.AppKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		return mm.RunMigrations(ctx, configurator, fromVM)
+	}
+}

app/upgrades/evm-blockscout-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)
+	}
+}