From 04dda714022ce3960fa890b8613ddbfbb83a53f1 Mon Sep 17 00:00:00 2001 From: Arya Lanjewar <102943033+AryaLanjewar3005@users.noreply.github.com> Date: Tue, 24 Feb 2026 00:26:40 +0530 Subject: [PATCH 1/3] feat: baseFeeBurn evm update --- app/upgrades.go | 2 ++ app/upgrades/fee-burn/upgrade.go | 40 ++++++++++++++++++++++++++++++++ go.mod | 2 +- go.sum | 4 ++-- testnet/core/post-setup/node.sh | 2 +- 5 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 app/upgrades/fee-burn/upgrade.go diff --git a/app/upgrades.go b/app/upgrades.go index 4c37278bb..521998dce 100755 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -9,6 +9,7 @@ import ( 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" + feeburn "github.com/pushchain/push-chain-node/app/upgrades/fee-burn" 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" @@ -39,6 +40,7 @@ var Upgrades = []upgrades.Upgrade{ outbound.NewUpgrade(), universaltxv1.NewUpgrade(), proxybytecodefix.NewUpgrade(), + feeburn.NewUpgrade(), } // RegisterUpgradeHandlers registers the chain upgrade handlers diff --git a/app/upgrades/fee-burn/upgrade.go b/app/upgrades/fee-burn/upgrade.go new file mode 100644 index 000000000..3b6b88b7a --- /dev/null +++ b/app/upgrades/fee-burn/upgrade.go @@ -0,0 +1,40 @@ +package feeburn + +import ( + "context" + + 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" +) + +const UpgradeName = "fee-burn" + +// NewUpgrade constructs the upgrade definition +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) { + sdkCtx := sdk.UnwrapSDKContext(ctx) + sdkCtx.Logger().Info("🔧 Running upgrade:", "name", UpgradeName) + + return mm.RunMigrations(ctx, configurator, fromVM) + } +} diff --git a/go.mod b/go.mod index dba2d1844..5944b597e 100755 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ replace ( cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.1.4 github.com/CosmWasm/wasmd => github.com/CosmWasm/wasmd v0.55.0 // Keep v0.55.0 github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.50.10 // Use stable v0.50.10 - github.com/cosmos/evm => github.com/pushchain/evm v0.2.1-0.20260128122156-da26ca2dd904 + github.com/cosmos/evm => github.com/pushchain/evm v0.2.1-0.20260218064719-823606aa137a github.com/ethereum/go-ethereum => github.com/cosmos/go-ethereum v1.10.26-evmos-rc4.0.20250402013457-cf9d288f0147 github.com/spf13/viper => github.com/spf13/viper v1.17.0 github.com/strangelove-ventures/tokenfactory => github.com/strangelove-ventures/tokenfactory v0.50.7-wasmvm2 diff --git a/go.sum b/go.sum index d7621d76e..feba7e360 100755 --- a/go.sum +++ b/go.sum @@ -1752,8 +1752,8 @@ github.com/prysmaticlabs/gohashtree v0.0.4-beta.0.20240624100937-73632381301b h1 github.com/prysmaticlabs/gohashtree v0.0.4-beta.0.20240624100937-73632381301b/go.mod h1:HRuvtXLZ4WkaB1MItToVH2e8ZwKwZPY5/Rcby+CvvLY= github.com/prysmaticlabs/prysm/v5 v5.3.0 h1:7Lr8ndapBTZg00YE+MgujN6+yvJR6Bdfn28ZDSJ00II= github.com/prysmaticlabs/prysm/v5 v5.3.0/go.mod h1:r1KhlduqDMIGZ1GhR5pjZ2Ko8Q89noTDYTRoPKwf1+c= -github.com/pushchain/evm v0.2.1-0.20260128122156-da26ca2dd904 h1:PADdhOufsnZosT+vjrtmJ9tB2CpktwAzmolunuF2Teg= -github.com/pushchain/evm v0.2.1-0.20260128122156-da26ca2dd904/go.mod h1:/4D24vd1xRnUVaXzfNryxTo5Gn1c/phJG5FvpH9OvLQ= +github.com/pushchain/evm v0.2.1-0.20260218064719-823606aa137a h1:lrclI7NrN6aSDHTAW08W+f+OWHclxxgs5IwMzGr/5Hs= +github.com/pushchain/evm v0.2.1-0.20260218064719-823606aa137a/go.mod h1:/4D24vd1xRnUVaXzfNryxTo5Gn1c/phJG5FvpH9OvLQ= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg= diff --git a/testnet/core/post-setup/node.sh b/testnet/core/post-setup/node.sh index 3d91fe83b..654658fcf 100755 --- a/testnet/core/post-setup/node.sh +++ b/testnet/core/post-setup/node.sh @@ -18,7 +18,7 @@ LOG_FILE="$APP_DIR/logs/pchaind.log" SERVICE_NAME="pchaind" BINARY="$APP_DIR/binary/pchaind" NODE_HOME="$APP_DIR/.pchain" -UPGRADE_NAME="remove-fee-abs-v1" +UPGRADE_NAME="fee-burn" # Setup cosmovisor and directory structure do_setup() { From 1d759417ea4b129e3b4439bb2ed70aaf8f06ad4e Mon Sep 17 00:00:00 2001 From: Nilesh Gupta Date: Tue, 24 Feb 2026 10:18:18 +0530 Subject: [PATCH 2/3] feat: removed fee-burn upgrade handler --- app/upgrades.go | 2 -- app/upgrades/fee-burn/upgrade.go | 40 -------------------------------- 2 files changed, 42 deletions(-) delete mode 100644 app/upgrades/fee-burn/upgrade.go diff --git a/app/upgrades.go b/app/upgrades.go index 521998dce..4c37278bb 100755 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -9,7 +9,6 @@ import ( 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" - feeburn "github.com/pushchain/push-chain-node/app/upgrades/fee-burn" 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" @@ -40,7 +39,6 @@ var Upgrades = []upgrades.Upgrade{ outbound.NewUpgrade(), universaltxv1.NewUpgrade(), proxybytecodefix.NewUpgrade(), - feeburn.NewUpgrade(), } // RegisterUpgradeHandlers registers the chain upgrade handlers diff --git a/app/upgrades/fee-burn/upgrade.go b/app/upgrades/fee-burn/upgrade.go deleted file mode 100644 index 3b6b88b7a..000000000 --- a/app/upgrades/fee-burn/upgrade.go +++ /dev/null @@ -1,40 +0,0 @@ -package feeburn - -import ( - "context" - - 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" -) - -const UpgradeName = "fee-burn" - -// NewUpgrade constructs the upgrade definition -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) { - sdkCtx := sdk.UnwrapSDKContext(ctx) - sdkCtx.Logger().Info("🔧 Running upgrade:", "name", UpgradeName) - - return mm.RunMigrations(ctx, configurator, fromVM) - } -} From 4fd35c9a827da674ed97e2761475e87a532c6a25 Mon Sep 17 00:00:00 2001 From: Nilesh Gupta Date: Tue, 24 Feb 2026 10:19:33 +0530 Subject: [PATCH 3/3] feat: rolled back post-setup testnet changes --- testnet/core/post-setup/node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testnet/core/post-setup/node.sh b/testnet/core/post-setup/node.sh index 654658fcf..3d91fe83b 100755 --- a/testnet/core/post-setup/node.sh +++ b/testnet/core/post-setup/node.sh @@ -18,7 +18,7 @@ LOG_FILE="$APP_DIR/logs/pchaind.log" SERVICE_NAME="pchaind" BINARY="$APP_DIR/binary/pchaind" NODE_HOME="$APP_DIR/.pchain" -UPGRADE_NAME="fee-burn" +UPGRADE_NAME="remove-fee-abs-v1" # Setup cosmovisor and directory structure do_setup() {