Skip to content

Commit 749e504

Browse files
fix: chainID config for EVM
1 parent 39c85b7 commit 749e504

3 files changed

Lines changed: 35 additions & 1 deletion

File tree

app/upgrades.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
chainmetavotegasless "github.com/pushchain/push-chain-node/app/upgrades/chain-meta-vote-gasless"
2020
contractauditchanges "github.com/pushchain/push-chain-node/app/upgrades/contract-audit-changes"
2121
evmparamsmigration "github.com/pushchain/push-chain-node/app/upgrades/evm-params-migration"
22+
evmchainidffix "github.com/pushchain/push-chain-node/app/upgrades/evm-chainid-fix"
2223
ethhashfix "github.com/pushchain/push-chain-node/app/upgrades/eth-hash-fix"
2324
evmrpcfix "github.com/pushchain/push-chain-node/app/upgrades/evm-rpc-fix"
2425
feeabs "github.com/pushchain/push-chain-node/app/upgrades/fee-abs"
@@ -69,6 +70,7 @@ var Upgrades = []upgrades.Upgrade{
6970
tssfundmigrationfixes.NewUpgrade(),
7071
contractauditchanges.NewUpgrade(),
7172
evmparamsmigration.NewUpgrade(),
73+
evmchainidffix.NewUpgrade(),
7274
}
7375

7476
// RegisterUpgradeHandlers registers the chain upgrade handlers
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package evmchainidffix
2+
3+
import (
4+
"context"
5+
6+
storetypes "cosmossdk.io/store/types"
7+
upgradetypes "cosmossdk.io/x/upgrade/types"
8+
9+
"github.com/cosmos/cosmos-sdk/types/module"
10+
11+
"github.com/pushchain/push-chain-node/app/upgrades"
12+
)
13+
14+
const UpgradeName = "evm-chainid-fix"
15+
16+
func NewUpgrade() upgrades.Upgrade {
17+
return upgrades.Upgrade{
18+
UpgradeName: UpgradeName,
19+
CreateUpgradeHandler: CreateUpgradeHandler,
20+
StoreUpgrades: storetypes.StoreUpgrades{},
21+
}
22+
}
23+
24+
func CreateUpgradeHandler(
25+
mm upgrades.ModuleManager,
26+
configurator module.Configurator,
27+
_ *upgrades.AppKeepers,
28+
) upgradetypes.UpgradeHandler {
29+
return func(ctx context.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
30+
return mm.RunMigrations(ctx, configurator, fromVM)
31+
}
32+
}

scripts/test_node.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ from_scratch () {
113113

114114
update_test_genesis `printf '.app_state["evm"]["params"]["evm_denom"]="%s"' $DENOM`
115115
update_test_genesis '.app_state["evm"]["params"]["active_static_precompiles"]=["0x00000000000000000000000000000000000000CB","0x00000000000000000000000000000000000000ca","0x0000000000000000000000000000000000000100","0x0000000000000000000000000000000000000400","0x0000000000000000000000000000000000000800","0x0000000000000000000000000000000000000801","0x0000000000000000000000000000000000000802","0x0000000000000000000000000000000000000803","0x0000000000000000000000000000000000000804","0x0000000000000000000000000000000000000805"]'
116-
update_test_genesis '.app_state["erc20"]["params"]["native_precompiles"]=["0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"]' # https://eips.ethereum.org/EIPS/eip-7528
116+
update_test_genesis '.app_state["erc20"]["native_precompiles"]=["0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"]' # https://eips.ethereum.org/EIPS/eip-7528
117117
update_test_genesis `printf '.app_state["erc20"]["token_pairs"]=[{contract_owner:1,erc20_address:"0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",denom:"%s",enabled:true}]' $DENOM`
118118
update_test_genesis '.app_state["feemarket"]["params"]["no_base_fee"]=false'
119119
update_test_genesis '.app_state["feemarket"]["params"]["base_fee"]="1000000000.000000000000000000"'

0 commit comments

Comments
 (0)