diff --git a/app/ante/eip712.go b/app/ante/eip712.go
index 86dc4c0b..eaf03334 100644
--- a/app/ante/eip712.go
+++ b/app/ante/eip712.go
@@ -2,6 +2,7 @@ package ante
 
 import (
 	"fmt"
+	"math/big"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -37,13 +38,15 @@ func init() {
 // CONTRACT: Tx must implement SigVerifiableTx interface
 type Eip712SigVerificationDecorator struct {
 	ak              evmtypes.AccountKeeper
+	evmKeeper       EVMKeeper
 	signModeHandler authsigning.SignModeHandler
 }
 
 // NewEip712SigVerificationDecorator creates a new Eip712SigVerificationDecorator
-func NewEip712SigVerificationDecorator(ak evmtypes.AccountKeeper, signModeHandler authsigning.SignModeHandler) Eip712SigVerificationDecorator {
+func NewEip712SigVerificationDecorator(ak evmtypes.AccountKeeper, evmKeeper EVMKeeper, signModeHandler authsigning.SignModeHandler) Eip712SigVerificationDecorator {
 	return Eip712SigVerificationDecorator{
 		ak:              ak,
+		evmKeeper:       evmKeeper,
 		signModeHandler: signModeHandler,
 	}
 }
@@ -110,7 +113,8 @@ func (svd Eip712SigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx,
 
 	// retrieve signer data
 	genesis := ctx.BlockHeight() == 0
-	chainID := ctx.ChainID()
+	evmParams := svd.evmKeeper.GetParams(ctx)
+	ethChainId := evmParams.GetChainConfig().EthereumConfig().ChainID.String()
 
 	var accNum uint64
 	if !genesis {
@@ -118,7 +122,7 @@ func (svd Eip712SigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx,
 	}
 
 	signerData := authsigning.SignerData{
-		ChainID:       chainID,
+		ChainID:       ethChainId,
 		AccountNumber: accNum,
 		Sequence:      acc.GetSequence(),
 	}
@@ -128,7 +132,7 @@ func (svd Eip712SigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx,
 	}
 
 	if err := VerifySignature(pubKey, signerData, sig.Data, svd.signModeHandler, authSignTx); err != nil {
-		errMsg := fmt.Errorf("signature verification failed; please verify account number (%d) and chain-id (%s): %w", accNum, chainID, err)
+		errMsg := fmt.Errorf("signature verification failed; please verify account number (%d) and chain-id (%s): %w", accNum, ethChainId, err)
 		return ctx, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, errMsg.Error())
 	}
 
@@ -175,9 +179,9 @@ func VerifySignature(
 			msgs, tx.GetMemo(),
 		)
 
-		signerChainID, err := stratos.ParseChainID(signerData.ChainID)
-		if err != nil {
-			return sdkerrors.Wrapf(err, "failed to parse chainID: %s", signerData.ChainID)
+		signerChainID, ok := new(big.Int).SetString(signerData.ChainID, 10)
+		if !ok {
+			return sdkerrors.Wrapf(sdkerrors.ErrUnknownExtensionOptions, "failed to parse chainID: %s", signerData.ChainID)
 		}
 
 		txWithExtensions, ok := tx.(authante.HasExtensionOptionsTx)
diff --git a/app/ante/eth.go b/app/ante/eth.go
index 16e0510b..b354e489 100644
--- a/app/ante/eth.go
+++ b/app/ante/eth.go
@@ -35,11 +35,9 @@ func NewEthSigVerificationDecorator(ek EVMKeeper) EthSigVerificationDecorator {
 // Failure in RecheckTx will prevent tx to be included into block, especially when CheckTx succeed, in which case user
 // won't see the error message.
 func (esvd EthSigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
-	chainID := esvd.evmKeeper.ChainID()
-
 	params := esvd.evmKeeper.GetParams(ctx)
 
-	ethCfg := params.ChainConfig.EthereumConfig(chainID)
+	ethCfg := params.ChainConfig.EthereumConfig()
 	blockNum := big.NewInt(ctx.BlockHeight())
 	signer := ethtypes.MakeSigner(ethCfg, blockNum)
 
@@ -164,7 +162,7 @@ func NewEthGasConsumeDecorator(
 func (egcd EthGasConsumeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
 	params := egcd.evmKeeper.GetParams(ctx)
 
-	ethCfg := params.ChainConfig.EthereumConfig(egcd.evmKeeper.ChainID())
+	ethCfg := params.ChainConfig.EthereumConfig()
 
 	blockHeight := big.NewInt(ctx.BlockHeight())
 	homestead := ethCfg.IsHomestead(blockHeight)
@@ -252,7 +250,7 @@ func NewCanTransferDecorator(evmKeeper EVMKeeper) CanTransferDecorator {
 // see if the address can execute the transaction.
 func (ctd CanTransferDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (sdk.Context, error) {
 	params := ctd.evmKeeper.GetParams(ctx)
-	ethCfg := params.ChainConfig.EthereumConfig(ctd.evmKeeper.ChainID())
+	ethCfg := params.ChainConfig.EthereumConfig()
 	signer := ethtypes.MakeSigner(ethCfg, big.NewInt(ctx.BlockHeight()))
 
 	for _, msg := range tx.GetMsgs() {
@@ -411,8 +409,7 @@ func (vbd EthValidateBasicDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simu
 		txGasLimit := uint64(0)
 
 		params := vbd.evmKeeper.GetParams(ctx)
-		chainID := vbd.evmKeeper.ChainID()
-		ethCfg := params.ChainConfig.EthereumConfig(chainID)
+		ethCfg := params.ChainConfig.EthereumConfig()
 		baseFee := vbd.evmKeeper.GetBaseFee(ctx, ethCfg)
 
 		for _, msg := range protoTx.GetMsgs() {
@@ -517,7 +514,7 @@ func NewEthMempoolFeeDecorator(ek EVMKeeper) EthMempoolFeeDecorator {
 func (mfd EthMempoolFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
 	if ctx.IsCheckTx() && !simulate {
 		params := mfd.evmKeeper.GetParams(ctx)
-		ethCfg := params.ChainConfig.EthereumConfig(mfd.evmKeeper.ChainID())
+		ethCfg := params.ChainConfig.EthereumConfig()
 		baseFee := mfd.evmKeeper.GetBaseFee(ctx, ethCfg)
 		if baseFee == nil {
 			for _, msg := range tx.GetMsgs() {
diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go
index b6411e22..bada4e11 100644
--- a/app/ante/handler_options.go
+++ b/app/ante/handler_options.go
@@ -94,7 +94,7 @@ func newCosmosAnteHandlerEip712(options HandlerOptions) sdk.AnteHandler {
 		ante.NewValidateSigCountDecorator(options.AccountKeeper),
 		ante.NewSigGasConsumeDecorator(options.AccountKeeper, options.SigGasConsumer),
 		// Note: signature verification uses EIP instead of the cosmos signature validator
-		NewEip712SigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
+		NewEip712SigVerificationDecorator(options.AccountKeeper, options.EvmKeeper, options.SignModeHandler),
 		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
 		ibcante.NewAnteDecorator(options.IBCKeeper),
 	)
diff --git a/app/ante/interfaces.go b/app/ante/interfaces.go
index f3a5a777..877c2674 100644
--- a/app/ante/interfaces.go
+++ b/app/ante/interfaces.go
@@ -19,7 +19,6 @@ import (
 type EVMKeeper interface {
 	statedb.Keeper
 
-	ChainID() *big.Int
 	GetParams(ctx sdk.Context) evmtypes.Params
 	NewEVM(ctx sdk.Context, msg core.Message, cfg *evmtypes.EVMConfig, tracer vm.EVMLogger, stateDB vm.StateDB) *vm.EVM
 	DeductTxCostsFromUserBalance(
diff --git a/client/config.go b/client/config.go
index 5b30ee36..0f391d26 100644
--- a/client/config.go
+++ b/client/config.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"fmt"
 	"os"
 	"path"
 
@@ -11,8 +10,6 @@ import (
 	"github.com/tendermint/tendermint/libs/cli"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
-
-	stratos "github.com/stratosnet/stratos-chain/types"
 )
 
 // InitConfig adds the chain-id, encoding and output flags to the persistent flag set.
@@ -46,23 +43,3 @@ func InitConfig(cmd *cobra.Command) error {
 
 	return viper.BindPFlag(cli.OutputFlag, cmd.PersistentFlags().Lookup(cli.OutputFlag))
 }
-
-// ValidateChainID wraps a cobra command with a RunE function with base 10 integer chain-id verification.
-func ValidateChainID(baseCmd *cobra.Command) *cobra.Command {
-	// Copy base run command to be used after chain verification
-	baseRunE := baseCmd.RunE
-
-	// Function to replace command's RunE function
-	validateFn := func(cmd *cobra.Command, args []string) error {
-		chainID, _ := cmd.Flags().GetString(flags.FlagChainID)
-
-		if !stratos.IsValidChainID(chainID) {
-			return fmt.Errorf("invalid chain-id format: %s", chainID)
-		}
-
-		return baseRunE(cmd, args)
-	}
-
-	baseCmd.RunE = validateFn
-	return baseCmd
-}
diff --git a/cmd/stchaind/root.go b/cmd/stchaind/root.go
index c05c35c7..ad8544da 100644
--- a/cmd/stchaind/root.go
+++ b/cmd/stchaind/root.go
@@ -99,9 +99,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
 
 func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 	rootCmd.AddCommand(
-		stratosclient.ValidateChainID(
-			genutilcli.InitCmd(app.ModuleBasics, app.DefaultNodeHome),
-		),
+		genutilcli.InitCmd(app.ModuleBasics, app.DefaultNodeHome),
 		genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome),
 		genutilcli.MigrateGenesisCmd(),
 		genutilcli.GenTxCmd(app.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome),
diff --git a/proto/stratos/evm/v1/evm.proto b/proto/stratos/evm/v1/evm.proto
index 06731540..8d5dfe35 100644
--- a/proto/stratos/evm/v1/evm.proto
+++ b/proto/stratos/evm/v1/evm.proto
@@ -33,91 +33,97 @@ message Params {
 // ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int values
 // instead of *big.Int.
 message ChainConfig {
+  // chainId identifies the current chain and is used for replay protection
+  string chain_id = 1 [
+    (gogoproto.customname) = "ChainID",
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags) = "yaml:\"chain_id\""
+  ];
   // Homestead switch block (nil no fork, 0 = already homestead)
-  string homestead_block = 1 [
+  string homestead_block = 2 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"homestead_block\""
   ];
   // TheDAO hard-fork switch block (nil no fork)
-  string dao_fork_block = 2 [
+  string dao_fork_block = 3 [
     (gogoproto.customname) = "DAOForkBlock",
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"dao_fork_block\""
   ];
   // Whether the nodes supports or opposes the DAO hard-fork
-  bool dao_fork_support = 3 [
+  bool dao_fork_support = 4 [
     (gogoproto.customname) = "DAOForkSupport",
     (gogoproto.moretags) = "yaml:\"dao_fork_support\""
   ];
   // EIP150 implements the Gas price changes
   // (https://github.com/ethereum/EIPs/issues/150) EIP150 HF block (nil no fork)
-  string eip150_block = 4 [
+  string eip150_block = 5 [
     (gogoproto.customname) = "EIP150Block",
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"eip150_block\""
   ];
   // EIP150 HF hash (needed for header only clients as only gas pricing changed)
-  string eip150_hash = 5 [
+  string eip150_hash = 6 [
     (gogoproto.customname) = "EIP150Hash",
     (gogoproto.moretags) = "yaml:\"byzantium_block\""
   ];
   // EIP155Block HF block
-  string eip155_block = 6 [
+  string eip155_block = 7 [
     (gogoproto.customname) = "EIP155Block",
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"eip155_block\""
   ];
   // EIP158 HF block
-  string eip158_block = 7 [
+  string eip158_block = 8 [
     (gogoproto.customname) = "EIP158Block",
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"eip158_block\""
   ];
   // Byzantium switch block (nil no fork, 0 = already on byzantium)
-  string byzantium_block = 8 [
+  string byzantium_block = 9 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"byzantium_block\""
   ];
   // Constantinople switch block (nil no fork, 0 = already activated)
-  string constantinople_block = 9 [
+  string constantinople_block = 10 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"constantinople_block\""
   ];
   // Petersburg switch block (nil same as Constantinople)
-  string petersburg_block = 10 [
+  string petersburg_block = 11 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"petersburg_block\""
   ];
   // Istanbul switch block (nil no fork, 0 = already on istanbul)
-  string istanbul_block = 11 [
+  string istanbul_block = 12 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"istanbul_block\""
   ];
   // Eip-2384 (bomb delay) switch block (nil no fork, 0 = already activated)
-  string muir_glacier_block = 12 [
+  string muir_glacier_block = 13 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"muir_glacier_block\""
   ];
   // Berlin switch block (nil = no fork, 0 = already on berlin)
-  string berlin_block = 13 [
+  string berlin_block = 14 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"berlin_block\""
   ];
   // DEPRECATED: EWASM, YOLOV3 and Catalyst block have been deprecated
-  reserved 14, 15, 16;
+  reserved 15, 16, 17;
   reserved "yolo_v3_block", "ewasm_block", "catalyst_block";
   // London switch block (nil = no fork, 0 = already on london)
-  string london_block = 17 [
+  string london_block = 18 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"london_block\""
   ];
   // Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already activated)
-  string arrow_glacier_block = 18 [
+  string arrow_glacier_block = 19 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"arrow_glacier_block\""
   ];
   // EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in merge proceedings)
-  string merge_fork_block = 19 [
+  string merge_fork_block = 20 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"merge_fork_block\""
   ];
diff --git a/rpc/apis.go b/rpc/apis.go
index 432b0128..0db90903 100644
--- a/rpc/apis.go
+++ b/rpc/apis.go
@@ -54,6 +54,7 @@ func init() {
 		EthNamespace: func(ctx *server.Context, clientCtx client.Context, tmWSClient *rpcclient.WSClient) []rpc.API {
 			nonceLock := new(types.AddrLocker)
 			evmBackend := backend.NewBackend(ctx, ctx.Logger, clientCtx)
+			clientCtx = clientCtx.WithChainID(evmBackend.ChainConfig().ChainID.String())
 			return []rpc.API{
 				{
 					Namespace: EthNamespace,
@@ -79,7 +80,9 @@ func init() {
 				},
 			}
 		},
-		NetNamespace: func(_ *server.Context, clientCtx client.Context, _ *rpcclient.WSClient) []rpc.API {
+		NetNamespace: func(ctx *server.Context, clientCtx client.Context, _ *rpcclient.WSClient) []rpc.API {
+			evmBackend := backend.NewBackend(ctx, ctx.Logger, clientCtx)
+			clientCtx = clientCtx.WithChainID(evmBackend.ChainConfig().ChainID.String())
 			return []rpc.API{
 				{
 					Namespace: NetNamespace,
@@ -91,6 +94,7 @@ func init() {
 		},
 		PersonalNamespace: func(ctx *server.Context, clientCtx client.Context, _ *rpcclient.WSClient) []rpc.API {
 			evmBackend := backend.NewBackend(ctx, ctx.Logger, clientCtx)
+			clientCtx = clientCtx.WithChainID(evmBackend.ChainConfig().ChainID.String())
 			return []rpc.API{
 				{
 					Namespace: PersonalNamespace,
@@ -112,6 +116,7 @@ func init() {
 		},
 		DebugNamespace: func(ctx *server.Context, clientCtx client.Context, _ *rpcclient.WSClient) []rpc.API {
 			evmBackend := backend.NewBackend(ctx, ctx.Logger, clientCtx)
+			clientCtx = clientCtx.WithChainID(evmBackend.ChainConfig().ChainID.String())
 			return []rpc.API{
 				{
 					Namespace: DebugNamespace,
@@ -123,6 +128,7 @@ func init() {
 		},
 		MinerNamespace: func(ctx *server.Context, clientCtx client.Context, _ *rpcclient.WSClient) []rpc.API {
 			evmBackend := backend.NewBackend(ctx, ctx.Logger, clientCtx)
+			clientCtx = clientCtx.WithChainID(evmBackend.ChainConfig().ChainID.String())
 			return []rpc.API{
 				{
 					Namespace: MinerNamespace,
diff --git a/rpc/backend/backend.go b/rpc/backend/backend.go
index 0a8f7d85..e7952f1d 100644
--- a/rpc/backend/backend.go
+++ b/rpc/backend/backend.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/stratosnet/stratos-chain/rpc/types"
 	"github.com/stratosnet/stratos-chain/server/config"
-	stratos "github.com/stratosnet/stratos-chain/types"
 	evmtypes "github.com/stratosnet/stratos-chain/x/evm/types"
 )
 
@@ -93,17 +92,11 @@ type Backend struct {
 	clientCtx   client.Context
 	queryClient *types.QueryClient // gRPC query client
 	logger      log.Logger
-	chainID     *big.Int
 	cfg         config.Config
 }
 
 // NewBackend creates a new Backend instance for cosmos and ethereum namespaces
 func NewBackend(ctx *server.Context, logger log.Logger, clientCtx client.Context) *Backend {
-	chainID, err := stratos.ParseChainID(clientCtx.ChainID)
-	if err != nil {
-		panic(err)
-	}
-
 	appConf := config.GetConfig(ctx.Viper)
 
 	return &Backend{
@@ -111,7 +104,6 @@ func NewBackend(ctx *server.Context, logger log.Logger, clientCtx client.Context
 		clientCtx:   clientCtx,
 		queryClient: types.NewQueryClient(clientCtx),
 		logger:      logger.With("module", "backend"),
-		chainID:     chainID,
 		cfg:         appConf,
 	}
 }
diff --git a/rpc/backend/evm_backend.go b/rpc/backend/evm_backend.go
index 998649c4..cf02f35a 100644
--- a/rpc/backend/evm_backend.go
+++ b/rpc/backend/evm_backend.go
@@ -585,7 +585,7 @@ func (b *Backend) GetTransactionByHash(txHash common.Hash) (*types.RPCTransactio
 					common.Hash{},
 					uint64(0),
 					uint64(0),
-					b.chainID,
+					b.ChainConfig().ChainID,
 				)
 				if err != nil {
 					return nil, err
@@ -653,7 +653,7 @@ func (b *Backend) GetTransactionByHash(txHash common.Hash) (*types.RPCTransactio
 		common.BytesToHash(block.BlockID.Hash.Bytes()),
 		uint64(res.Height),
 		txIndex,
-		b.chainID,
+		b.ChainConfig().ChainID,
 	)
 }
 
@@ -876,7 +876,7 @@ func (b *Backend) ChainConfig() *params.ChainConfig {
 		return nil
 	}
 
-	return params.Params.ChainConfig.EthereumConfig(b.chainID)
+	return params.Params.ChainConfig.EthereumConfig()
 }
 
 // SuggestGasTipCap returns the suggested tip cap
diff --git a/rpc/backend/utils.go b/rpc/backend/utils.go
index c76821eb..c403b2ae 100644
--- a/rpc/backend/utils.go
+++ b/rpc/backend/utils.go
@@ -161,7 +161,8 @@ func (b *Backend) SetTxDefaults(args evmtypes.TransactionArgs) (evmtypes.Transac
 	}
 
 	if args.ChainID == nil {
-		args.ChainID = (*hexutil.Big)(b.chainID)
+		ethChainId := b.ChainConfig().ChainID
+		args.ChainID = (*hexutil.Big)(ethChainId)
 	}
 
 	return args, nil
@@ -206,7 +207,7 @@ func (b *Backend) getAccountNonce(accAddr common.Address, pending bool, height i
 				break
 			}
 
-			sender, err := ethMsg.GetSender(b.chainID)
+			sender, err := ethMsg.GetSender(b.ChainConfig().ChainID)
 			if err != nil {
 				continue
 			}
diff --git a/rpc/namespaces/ethereum/eth/api.go b/rpc/namespaces/ethereum/eth/api.go
index 649f018a..eeef2037 100644
--- a/rpc/namespaces/ethereum/eth/api.go
+++ b/rpc/namespaces/ethereum/eth/api.go
@@ -59,11 +59,6 @@ func NewPublicAPI(
 	backend backend.EVMBackend,
 	nonceLock *rpctypes.AddrLocker,
 ) *PublicAPI {
-	eip155ChainID, err := stratos.ParseChainID(clientCtx.ChainID)
-	if err != nil {
-		panic(err)
-	}
-
 	algos, _ := clientCtx.Keyring.SupportedAlgorithms()
 
 	if !algos.Contains(hd.EthSecp256k1) {
@@ -85,7 +80,7 @@ func NewPublicAPI(
 	// signers to be backwards-compatible with old transactions.
 	cfg := backend.ChainConfig()
 	if cfg == nil {
-		cfg = evmtypes.DefaultChainConfig().EthereumConfig(eip155ChainID)
+		cfg = evmtypes.DefaultChainConfig().EthereumConfig()
 	}
 
 	signer := ethtypes.LatestSigner(cfg)
@@ -94,7 +89,7 @@ func NewPublicAPI(
 		ctx:          context.Background(),
 		clientCtx:    clientCtx,
 		queryClient:  rpctypes.NewQueryClient(clientCtx),
-		chainIDEpoch: eip155ChainID,
+		chainIDEpoch: cfg.ChainID,
 		logger:       logger.With("client", "json-rpc"),
 		backend:      backend,
 		nonceLock:    nonceLock,
diff --git a/rpc/namespaces/ethereum/net/api.go b/rpc/namespaces/ethereum/net/api.go
index ac8b6e78..40a908f8 100644
--- a/rpc/namespaces/ethereum/net/api.go
+++ b/rpc/namespaces/ethereum/net/api.go
@@ -3,12 +3,11 @@ package net
 import (
 	"context"
 	"fmt"
-
-	"github.com/cosmos/cosmos-sdk/client"
+	"math/big"
 
 	rpcclient "github.com/tendermint/tendermint/rpc/client"
 
-	stratos "github.com/stratosnet/stratos-chain/types"
+	"github.com/cosmos/cosmos-sdk/client"
 )
 
 // PublicAPI is the eth_ prefixed set of APIs in the Web3 JSON-RPC spec.
@@ -19,14 +18,13 @@ type PublicAPI struct {
 
 // NewPublicAPI creates an instance of the public Net Web3 API.
 func NewPublicAPI(clientCtx client.Context) *PublicAPI {
-	// parse the chainID from a integer string
-	chainIDEpoch, err := stratos.ParseChainID(clientCtx.ChainID)
-	if err != nil {
-		panic(err)
+	eip155ChainId, ok := new(big.Int).SetString(clientCtx.ChainID, 10)
+	if !ok {
+		panic("failed to parse chainID")
 	}
 
 	return &PublicAPI{
-		networkVersion: chainIDEpoch.Uint64(),
+		networkVersion: eip155ChainId.Uint64(),
 		tmClient:       clientCtx.Client,
 	}
 }
diff --git a/server/start.go b/server/start.go
index 87a695e4..a971e2c3 100644
--- a/server/start.go
+++ b/server/start.go
@@ -414,13 +414,6 @@ func startInProcess(ctx *server.Context, clientCtx client.Context, appCreator ty
 	)
 
 	if config.JSONRPC.Enable {
-		genDoc, err := genDocProvider()
-		if err != nil {
-			return err
-		}
-
-		clientCtx := clientCtx.WithChainID(genDoc.ChainID)
-
 		tmEndpoint := "/websocket"
 		tmRPCAddr := cfg.RPC.ListenAddress
 		httpSrv, httpSrvDone, err = StartJSONRPC(ctx, clientCtx, tmRPCAddr, tmEndpoint, config)
diff --git a/types/chain_id.go b/types/chain_id.go
deleted file mode 100644
index 3c5e766f..00000000
--- a/types/chain_id.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package types
-
-import (
-	"fmt"
-	"math/big"
-	"regexp"
-	"strings"
-
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-)
-
-var (
-	regexChainID         = `[a-z]{1,}`
-	regexEIP155Separator = `_{1}`
-	regexEIP155          = `[1-9][0-9]*`
-	regexEpochSeparator  = `-{1}`
-	regexEpoch           = `[1-9][0-9]*`
-	stratosChainID       = regexp.MustCompile(fmt.Sprintf(`^(%s)%s(%s)%s(%s)$`, regexChainID, regexEIP155Separator, regexEIP155, regexEpochSeparator, regexEpoch))
-)
-
-// IsValidChainID returns false if the given chain identifier is incorrectly formatted.
-func IsValidChainID(chainID string) bool {
-	if len(chainID) > 48 {
-		return false
-	}
-
-	return stratosChainID.MatchString(chainID)
-}
-
-// ParseChainID parses a string chain identifier's epoch to an Ethereum-compatible
-// chain-id in *big.Int format. The function returns an error if the chain-id has an invalid format
-func ParseChainID(chainID string) (*big.Int, error) {
-	chainID = strings.TrimSpace(chainID)
-	if len(chainID) > 48 {
-		return nil, sdkerrors.Wrapf(ErrInvalidChainID, "chain-id '%s' cannot exceed 48 chars", chainID)
-	}
-
-	matches := stratosChainID.FindStringSubmatch(chainID)
-	if matches == nil || len(matches) != 4 || matches[1] == "" {
-		return nil, sdkerrors.Wrapf(ErrInvalidChainID, "%s: %v", chainID, matches)
-	}
-
-	// verify that the chain-id entered is a base 10 integer
-	chainIDInt, ok := new(big.Int).SetString(matches[2], 10)
-	if !ok {
-		return nil, sdkerrors.Wrapf(ErrInvalidChainID, "epoch %s must be base-10 integer format", matches[2])
-	}
-
-	return chainIDInt, nil
-}
diff --git a/x/evm/genesis.go b/x/evm/genesis.go
index e6a8bbcd..f05b67c9 100644
--- a/x/evm/genesis.go
+++ b/x/evm/genesis.go
@@ -24,7 +24,6 @@ func InitGenesis(
 	data types.GenesisState,
 ) []abci.ValidatorUpdate {
 	k.SetBlockGasUsed(ctx, data.BlockGas)
-	k.WithChainID(ctx)
 
 	k.SetParams(ctx, data.Params)
 
diff --git a/x/evm/keeper/abci.go b/x/evm/keeper/abci.go
index 5c3a1cb6..7634ef35 100644
--- a/x/evm/keeper/abci.go
+++ b/x/evm/keeper/abci.go
@@ -13,8 +13,6 @@ import (
 
 // BeginBlock sets the sdk Context and EIP155 chain id to the Keeper.
 func (k *Keeper) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) {
-	k.WithChainID(ctx)
-
 	baseFee := k.CalculateBaseFee(ctx)
 
 	// return immediately if base fee is nil
diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go
index 4833114b..7bd8fb63 100644
--- a/x/evm/keeper/grpc_query.go
+++ b/x/evm/keeper/grpc_query.go
@@ -494,7 +494,7 @@ func (k *Keeper) traceTx(
 	}
 
 	if traceConfig != nil && traceConfig.Overrides != nil {
-		overrides = traceConfig.Overrides.EthereumConfig(cfg.ChainConfig.ChainID)
+		overrides = traceConfig.Overrides.EthereumConfig()
 	}
 
 	switch {
@@ -587,7 +587,7 @@ func (k Keeper) BaseFee(c context.Context, _ *types.QueryBaseFeeRequest) (*types
 	ctx := sdk.UnwrapSDKContext(c)
 
 	params := k.GetParams(ctx)
-	ethCfg := params.ChainConfig.EthereumConfig(k.eip155ChainID)
+	ethCfg := params.ChainConfig.EthereumConfig()
 	baseFee := k.GetBaseFee(ctx, ethCfg)
 
 	res := &types.QueryBaseFeeResponse{}
diff --git a/x/evm/keeper/keeper.go b/x/evm/keeper/keeper.go
index 58db2c11..a1afccf3 100644
--- a/x/evm/keeper/keeper.go
+++ b/x/evm/keeper/keeper.go
@@ -45,9 +45,6 @@ type Keeper struct {
 	// access historical headers for EVM state transition execution
 	stakingKeeper types.StakingKeeper
 
-	// chain ID number obtained from the context's chain id
-	eip155ChainID *big.Int
-
 	// Tracer used to collect execution traces from the EVM transaction execution
 	tracer string
 
@@ -90,25 +87,6 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger {
 	return ctx.Logger().With("module", types.ModuleName)
 }
 
-// WithChainID sets the chain id to the local variable in the keeper
-func (k *Keeper) WithChainID(ctx sdk.Context) {
-	chainID, err := stratos.ParseChainID(ctx.ChainID())
-	if err != nil {
-		panic(err)
-	}
-
-	if k.eip155ChainID != nil && k.eip155ChainID.Cmp(chainID) != 0 {
-		panic("chain id already set")
-	}
-
-	k.eip155ChainID = chainID
-}
-
-// ChainID returns the EIP155 chain ID for the EVM context
-func (k Keeper) ChainID() *big.Int {
-	return k.eip155ChainID
-}
-
 // ----------------------------------------------------------------------------
 // Block Bloom
 // Required by Web3 API.
diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go
index f9310756..aa0cdfb4 100644
--- a/x/evm/keeper/state_transition.go
+++ b/x/evm/keeper/state_transition.go
@@ -38,7 +38,7 @@ func GasToRefund(availableRefund, gasConsumed, refundQuotient uint64) uint64 {
 // EVMConfig creates the EVMConfig based on current state
 func (k *Keeper) EVMConfig(ctx sdk.Context) (*types.EVMConfig, error) {
 	params := k.GetParams(ctx)
-	ethCfg := params.ChainConfig.EthereumConfig(k.eip155ChainID)
+	ethCfg := params.ChainConfig.EthereumConfig()
 
 	// get the coinbase address from the block proposer
 	coinbase, err := k.GetCoinbaseAddress(ctx)
diff --git a/x/evm/simulation/operations.go b/x/evm/simulation/operations.go
index ae75dfd4..ae5c59c8 100644
--- a/x/evm/simulation/operations.go
+++ b/x/evm/simulation/operations.go
@@ -210,8 +210,8 @@ func CreateRandomValidEthTx(ctx *simulateContext, from, to *common.Address, amou
 	}
 	// we suppose that gasLimit should be larger than estimateGas to ensure tx validity
 	gasLimit := estimateGas + uint64(ctx.rand.Intn(int(sdktx.MaxGasWanted-estimateGas)))
-	ethChainID := ctx.keeper.ChainID()
-	chainConfig := ctx.keeper.GetParams(ctx.context).ChainConfig.EthereumConfig(ethChainID)
+	chainConfig := ctx.keeper.GetParams(ctx.context).ChainConfig.EthereumConfig()
+	ethChainID := chainConfig.ChainID
 	gasPrice := ctx.keeper.GetBaseFee(ctx.context, chainConfig)
 	gasFeeCap := new(big.Int).Add(gasPrice, big.NewInt(int64(ctx.rand.Int())))
 	gasTipCap := big.NewInt(int64(ctx.rand.Int()))
@@ -279,7 +279,9 @@ func GetSignedTx(ctx *simulateContext, txBuilder client.TxBuilder, msg *types.Ms
 	}
 	builder.SetExtensionOptions(option)
 
-	if err := msg.Sign(ethtypes.LatestSignerForChainID(ctx.keeper.ChainID()), tests.NewSigner(prv)); err != nil {
+	params := ctx.keeper.GetParams(ctx.context)
+
+	if err := msg.Sign(ethtypes.LatestSignerForChainID(params.GetChainConfig().EthereumConfig().ChainID), tests.NewSigner(prv)); err != nil {
 		return nil, err
 	}
 
@@ -292,7 +294,7 @@ func GetSignedTx(ctx *simulateContext, txBuilder client.TxBuilder, msg *types.Ms
 		return nil, err
 	}
 
-	fees := sdk.NewCoins(sdk.NewCoin(ctx.keeper.GetParams(ctx.context).EvmDenom, sdk.NewIntFromBigInt(txData.Fee())))
+	fees := sdk.NewCoins(sdk.NewCoin(params.EvmDenom, sdk.NewIntFromBigInt(txData.Fee())))
 	builder.SetFeeAmount(fees)
 	builder.SetGasLimit(msg.GetGas())
 
diff --git a/x/evm/types/chain_config.go b/x/evm/types/chain_config.go
index fbc0288f..c9059e7b 100644
--- a/x/evm/types/chain_config.go
+++ b/x/evm/types/chain_config.go
@@ -13,9 +13,9 @@ import (
 
 // EthereumConfig returns an Ethereum ChainConfig for EVM state transitions.
 // All the negative or nil values are converted to nil
-func (cc ChainConfig) EthereumConfig(chainID *big.Int) *params.ChainConfig {
+func (cc ChainConfig) EthereumConfig() *params.ChainConfig {
 	return &params.ChainConfig{
-		ChainID:                 chainID,
+		ChainID:                 getBlockValue(cc.ChainID),
 		HomesteadBlock:          getBlockValue(cc.HomesteadBlock),
 		DAOForkBlock:            getBlockValue(cc.DAOForkBlock),
 		DAOForkSupport:          cc.DAOForkSupport,
@@ -40,6 +40,7 @@ func (cc ChainConfig) EthereumConfig(chainID *big.Int) *params.ChainConfig {
 
 // DefaultChainConfig returns default evm parameters.
 func DefaultChainConfig() ChainConfig {
+	chainId := sdk.NewInt(1)
 	homesteadBlock := sdk.ZeroInt()
 	daoForkBlock := sdk.ZeroInt()
 	eip150Block := sdk.ZeroInt()
@@ -56,6 +57,7 @@ func DefaultChainConfig() ChainConfig {
 	mergeForkBlock := sdk.ZeroInt()
 
 	return ChainConfig{
+		ChainID:             &chainId,
 		HomesteadBlock:      &homesteadBlock,
 		DAOForkBlock:        &daoForkBlock,
 		DAOForkSupport:      true,
@@ -86,6 +88,9 @@ func getBlockValue(block *sdk.Int) *big.Int {
 // Validate performs a basic validation of the ChainConfig params. The function will return an error
 // if any of the block values is uninitialized (i.e nil) or if the EIP150Hash is an invalid hash.
 func (cc ChainConfig) Validate() error {
+	if err := validateChainId(cc.ChainID); err != nil {
+		return err
+	}
 	if err := validateBlock(cc.HomesteadBlock); err != nil {
 		return sdkerrors.Wrap(err, "homesteadBlock")
 	}
@@ -133,12 +138,19 @@ func (cc ChainConfig) Validate() error {
 	}
 
 	// NOTE: chain ID is not needed to check config order
-	if err := cc.EthereumConfig(nil).CheckConfigForkOrder(); err != nil {
+	if err := cc.EthereumConfig().CheckConfigForkOrder(); err != nil {
 		return sdkerrors.Wrap(err, "invalid config fork order")
 	}
 	return nil
 }
 
+func validateChainId(chainId *sdk.Int) error {
+	if chainId.LTE(sdk.ZeroInt()) {
+		return sdkerrors.Wrap(ErrInvalidChainConfig, "eip155 chain id should greater than 0")
+	}
+	return nil
+}
+
 func validateHash(hex string) error {
 	if hex != "" && strings.TrimSpace(hex) == "" {
 		return sdkerrors.Wrap(ErrInvalidChainConfig, "hash cannot be blank")
diff --git a/x/evm/types/evm.pb.go b/x/evm/types/evm.pb.go
index ff544635..dc6e18f2 100644
--- a/x/evm/types/evm.pb.go
+++ b/x/evm/types/evm.pb.go
@@ -118,39 +118,41 @@ func (m *Params) GetFeeMarketParams() FeeMarketParams {
 // ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int values
 // instead of *big.Int.
 type ChainConfig struct {
+	// chainId identifies the current chain and is used for replay protection
+	ChainID *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"chain_id,omitempty" yaml:"chain_id"`
 	// Homestead switch block (nil no fork, 0 = already homestead)
-	HomesteadBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=homestead_block,json=homesteadBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"homestead_block,omitempty" yaml:"homestead_block"`
+	HomesteadBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=homestead_block,json=homesteadBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"homestead_block,omitempty" yaml:"homestead_block"`
 	// TheDAO hard-fork switch block (nil no fork)
-	DAOForkBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=dao_fork_block,json=daoForkBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"dao_fork_block,omitempty" yaml:"dao_fork_block"`
+	DAOForkBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=dao_fork_block,json=daoForkBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"dao_fork_block,omitempty" yaml:"dao_fork_block"`
 	// Whether the nodes supports or opposes the DAO hard-fork
-	DAOForkSupport bool `protobuf:"varint,3,opt,name=dao_fork_support,json=daoForkSupport,proto3" json:"dao_fork_support,omitempty" yaml:"dao_fork_support"`
+	DAOForkSupport bool `protobuf:"varint,4,opt,name=dao_fork_support,json=daoForkSupport,proto3" json:"dao_fork_support,omitempty" yaml:"dao_fork_support"`
 	// EIP150 implements the Gas price changes
 	// (https://github.com/ethereum/EIPs/issues/150) EIP150 HF block (nil no fork)
-	EIP150Block *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=eip150_block,json=eip150Block,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"eip150_block,omitempty" yaml:"eip150_block"`
+	EIP150Block *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=eip150_block,json=eip150Block,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"eip150_block,omitempty" yaml:"eip150_block"`
 	// EIP150 HF hash (needed for header only clients as only gas pricing changed)
-	EIP150Hash string `protobuf:"bytes,5,opt,name=eip150_hash,json=eip150Hash,proto3" json:"eip150_hash,omitempty" yaml:"byzantium_block"`
+	EIP150Hash string `protobuf:"bytes,6,opt,name=eip150_hash,json=eip150Hash,proto3" json:"eip150_hash,omitempty" yaml:"byzantium_block"`
 	// EIP155Block HF block
-	EIP155Block *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=eip155_block,json=eip155Block,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"eip155_block,omitempty" yaml:"eip155_block"`
+	EIP155Block *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=eip155_block,json=eip155Block,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"eip155_block,omitempty" yaml:"eip155_block"`
 	// EIP158 HF block
-	EIP158Block *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=eip158_block,json=eip158Block,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"eip158_block,omitempty" yaml:"eip158_block"`
+	EIP158Block *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,8,opt,name=eip158_block,json=eip158Block,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"eip158_block,omitempty" yaml:"eip158_block"`
 	// Byzantium switch block (nil no fork, 0 = already on byzantium)
-	ByzantiumBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,8,opt,name=byzantium_block,json=byzantiumBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"byzantium_block,omitempty" yaml:"byzantium_block"`
+	ByzantiumBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=byzantium_block,json=byzantiumBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"byzantium_block,omitempty" yaml:"byzantium_block"`
 	// Constantinople switch block (nil no fork, 0 = already activated)
-	ConstantinopleBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=constantinople_block,json=constantinopleBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"constantinople_block,omitempty" yaml:"constantinople_block"`
+	ConstantinopleBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,10,opt,name=constantinople_block,json=constantinopleBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"constantinople_block,omitempty" yaml:"constantinople_block"`
 	// Petersburg switch block (nil same as Constantinople)
-	PetersburgBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,10,opt,name=petersburg_block,json=petersburgBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"petersburg_block,omitempty" yaml:"petersburg_block"`
+	PetersburgBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,11,opt,name=petersburg_block,json=petersburgBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"petersburg_block,omitempty" yaml:"petersburg_block"`
 	// Istanbul switch block (nil no fork, 0 = already on istanbul)
-	IstanbulBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,11,opt,name=istanbul_block,json=istanbulBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"istanbul_block,omitempty" yaml:"istanbul_block"`
+	IstanbulBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,12,opt,name=istanbul_block,json=istanbulBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"istanbul_block,omitempty" yaml:"istanbul_block"`
 	// Eip-2384 (bomb delay) switch block (nil no fork, 0 = already activated)
-	MuirGlacierBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,12,opt,name=muir_glacier_block,json=muirGlacierBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"muir_glacier_block,omitempty" yaml:"muir_glacier_block"`
+	MuirGlacierBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,13,opt,name=muir_glacier_block,json=muirGlacierBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"muir_glacier_block,omitempty" yaml:"muir_glacier_block"`
 	// Berlin switch block (nil = no fork, 0 = already on berlin)
-	BerlinBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,13,opt,name=berlin_block,json=berlinBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"berlin_block,omitempty" yaml:"berlin_block"`
+	BerlinBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,14,opt,name=berlin_block,json=berlinBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"berlin_block,omitempty" yaml:"berlin_block"`
 	// London switch block (nil = no fork, 0 = already on london)
-	LondonBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,17,opt,name=london_block,json=londonBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"london_block,omitempty" yaml:"london_block"`
+	LondonBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,18,opt,name=london_block,json=londonBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"london_block,omitempty" yaml:"london_block"`
 	// Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already activated)
-	ArrowGlacierBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,18,opt,name=arrow_glacier_block,json=arrowGlacierBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"arrow_glacier_block,omitempty" yaml:"arrow_glacier_block"`
+	ArrowGlacierBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,19,opt,name=arrow_glacier_block,json=arrowGlacierBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"arrow_glacier_block,omitempty" yaml:"arrow_glacier_block"`
 	// EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in merge proceedings)
-	MergeForkBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,19,opt,name=merge_fork_block,json=mergeForkBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"merge_fork_block,omitempty" yaml:"merge_fork_block"`
+	MergeForkBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,20,opt,name=merge_fork_block,json=mergeForkBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"merge_fork_block,omitempty" yaml:"merge_fork_block"`
 }
 
 func (m *ChainConfig) Reset()         { *m = ChainConfig{} }
@@ -743,110 +745,112 @@ func init() {
 func init() { proto.RegisterFile("stratos/evm/v1/evm.proto", fileDescriptor_6ee18d4714e9d670) }
 
 var fileDescriptor_6ee18d4714e9d670 = []byte{
-	// 1643 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcf, 0x6e, 0xe3, 0xb8,
-	0x19, 0x4f, 0x62, 0x27, 0x91, 0x69, 0xc7, 0x56, 0x98, 0xec, 0xd4, 0x3b, 0x01, 0xa2, 0x40, 0x05,
-	0xda, 0x1c, 0x76, 0xe2, 0xcd, 0x0c, 0x82, 0x4e, 0xb7, 0xd8, 0x43, 0x9c, 0x64, 0x76, 0x92, 0xce,
-	0x6c, 0x03, 0xce, 0x14, 0x05, 0xda, 0x83, 0x40, 0x4b, 0x8c, 0xac, 0x46, 0x12, 0x0d, 0x92, 0xf2,
-	0xda, 0x45, 0x1f, 0xa0, 0xbd, 0xf5, 0x11, 0xfa, 0x02, 0x3d, 0xf4, 0x15, 0x7a, 0x5a, 0xf4, 0xb4,
-	0xc7, 0xa2, 0x07, 0xa1, 0xc8, 0xdc, 0x72, 0xcc, 0x13, 0x14, 0xfa, 0x48, 0xcb, 0x7f, 0x26, 0x58,
-	0x4c, 0x72, 0x12, 0xbf, 0x7f, 0xbf, 0x1f, 0xf9, 0xf1, 0xa3, 0x3e, 0x12, 0xb5, 0xa5, 0x12, 0x54,
-	0x71, 0xd9, 0x61, 0xc3, 0xa4, 0x33, 0x3c, 0x2c, 0x3e, 0x07, 0x03, 0xc1, 0x15, 0xc7, 0x4d, 0x63,
-	0x39, 0x28, 0x54, 0xc3, 0xc3, 0xa7, 0xdb, 0x21, 0x0f, 0x39, 0x98, 0x3a, 0xc5, 0x48, 0x7b, 0xb9,
-	0xff, 0xaa, 0xa0, 0xb5, 0x4b, 0x2a, 0x68, 0x22, 0xf1, 0x21, 0xaa, 0xb1, 0x61, 0xe2, 0x05, 0x2c,
-	0xe5, 0x49, 0x7b, 0x79, 0x6f, 0x79, 0xbf, 0xd6, 0xdd, 0xbe, 0xcb, 0x1d, 0x7b, 0x4c, 0x93, 0xf8,
-	0x2b, 0xb7, 0x34, 0xb9, 0xc4, 0x62, 0xc3, 0xe4, 0xb4, 0x18, 0xe2, 0xaf, 0xd1, 0x06, 0x4b, 0x69,
-	0x2f, 0x66, 0x9e, 0x2f, 0x18, 0x55, 0xac, 0xbd, 0xb2, 0xb7, 0xbc, 0x6f, 0x75, 0xdb, 0x77, 0xb9,
-	0xb3, 0x6d, 0xc2, 0x66, 0xcd, 0x2e, 0x69, 0x68, 0xf9, 0x04, 0x44, 0xfc, 0x0b, 0x54, 0x9f, 0xd8,
-	0x69, 0x1c, 0xb7, 0x2b, 0x10, 0xfc, 0xe4, 0x2e, 0x77, 0xf0, 0x7c, 0x30, 0x8d, 0x63, 0x97, 0x20,
-	0x13, 0x4a, 0xe3, 0x18, 0x1f, 0x23, 0xc4, 0x46, 0x4a, 0x50, 0x8f, 0x45, 0x03, 0xd9, 0xae, 0xee,
-	0x55, 0xf6, 0x2b, 0x5d, 0xf7, 0x26, 0x77, 0x6a, 0x67, 0x85, 0xf6, 0xec, 0xfc, 0x52, 0xde, 0xe5,
-	0xce, 0xa6, 0x01, 0x29, 0x1d, 0x5d, 0x52, 0x03, 0xe1, 0x2c, 0x1a, 0x48, 0xfc, 0x07, 0xd4, 0xf0,
-	0xfb, 0x34, 0x4a, 0x3d, 0x9f, 0xa7, 0x57, 0x51, 0xd8, 0x5e, 0xdd, 0x5b, 0xde, 0xaf, 0x3f, 0xdf,
-	0x39, 0x98, 0xcf, 0xda, 0xc1, 0x49, 0xe1, 0x73, 0x02, 0x2e, 0xdd, 0x9d, 0xef, 0x73, 0x67, 0xe9,
-	0x2e, 0x77, 0xb6, 0x34, 0xf0, 0x6c, 0xb8, 0x4b, 0xea, 0xfe, 0xd4, 0x13, 0x27, 0x68, 0xf3, 0x8a,
-	0x31, 0x2f, 0xa1, 0xe2, 0x9a, 0x29, 0x6f, 0x00, 0xf9, 0x6d, 0xaf, 0x01, 0x83, 0xb3, 0xc8, 0xf0,
-	0x8a, 0xb1, 0xb7, 0xe0, 0xa7, 0xb7, 0xa1, 0xbb, 0x67, 0x58, 0xda, 0x9a, 0xe5, 0x23, 0x1c, 0x97,
-	0xb4, 0xae, 0xe6, 0x43, 0xdc, 0x7f, 0x36, 0x51, 0xfd, 0x64, 0x8e, 0xbe, 0xd5, 0xe7, 0x09, 0x93,
-	0x8a, 0xd1, 0xc0, 0xeb, 0xc5, 0xdc, 0xbf, 0x36, 0xfb, 0x79, 0xfa, 0xdf, 0xdc, 0xf9, 0x59, 0x18,
-	0xa9, 0x7e, 0xd6, 0x3b, 0xf0, 0x79, 0xd2, 0xf1, 0xb9, 0x4c, 0xb8, 0x34, 0x9f, 0x67, 0x32, 0xb8,
-	0xee, 0xa8, 0xf1, 0x80, 0xc9, 0x83, 0xf3, 0x54, 0xdd, 0xe5, 0xce, 0x13, 0x3d, 0x83, 0x05, 0x28,
-	0x97, 0x34, 0x4b, 0x4d, 0xb7, 0x50, 0xe0, 0x31, 0x6a, 0x06, 0x94, 0x7b, 0x57, 0x5c, 0x5c, 0x1b,
-	0xb6, 0x15, 0x60, 0x7b, 0xf7, 0xe9, 0x6c, 0x37, 0xb9, 0xd3, 0x38, 0x3d, 0xfe, 0xcd, 0x2b, 0x2e,
-	0xae, 0x01, 0xf3, 0x2e, 0x77, 0x3e, 0xd3, 0xec, 0xf3, 0xc8, 0x2e, 0x69, 0x04, 0x94, 0x97, 0x6e,
-	0xf8, 0x77, 0xc8, 0x2e, 0x1d, 0x64, 0x36, 0x18, 0x70, 0xa1, 0x4c, 0x19, 0x3d, 0xbb, 0xc9, 0x9d,
-	0xa6, 0x81, 0x7c, 0xa7, 0x2d, 0x77, 0xb9, 0xf3, 0x93, 0x05, 0x50, 0x13, 0xe3, 0x92, 0xa6, 0x81,
-	0x35, 0xae, 0x58, 0xa2, 0x06, 0x8b, 0x06, 0x87, 0x47, 0x5f, 0x9a, 0x15, 0x55, 0x61, 0x45, 0x97,
-	0x0f, 0x5a, 0x51, 0xfd, 0xec, 0xfc, 0xf2, 0xf0, 0xe8, 0xcb, 0xc9, 0x82, 0x4c, 0xd9, 0xcc, 0xc2,
-	0xba, 0xa4, 0xae, 0x45, 0xbd, 0x9a, 0x73, 0x64, 0x44, 0xaf, 0x4f, 0x65, 0x1f, 0x4a, 0xb2, 0xd6,
-	0xdd, 0xbf, 0xc9, 0x1d, 0xa4, 0x91, 0x5e, 0x53, 0xd9, 0x9f, 0xee, 0x4b, 0x6f, 0xfc, 0x27, 0x9a,
-	0xaa, 0x28, 0x4b, 0x26, 0x58, 0x48, 0x07, 0x17, 0x5e, 0xe5, 0xfc, 0x8f, 0xcc, 0xfc, 0xd7, 0x1e,
-	0x3d, 0xff, 0xa3, 0xfb, 0xe6, 0x7f, 0x34, 0x3f, 0x7f, 0xed, 0x53, 0x92, 0xbe, 0x34, 0xa4, 0xeb,
-	0x8f, 0x26, 0x7d, 0x79, 0x1f, 0xe9, 0xcb, 0x79, 0x52, 0xed, 0x53, 0x14, 0xfb, 0x42, 0x26, 0xda,
-	0xd6, 0xe3, 0x8b, 0xfd, 0xa3, 0xa4, 0x36, 0x4b, 0x8d, 0xa6, 0xfb, 0x33, 0xda, 0xf6, 0x79, 0x2a,
-	0x55, 0xa1, 0x4b, 0xf9, 0x20, 0x66, 0x86, 0xb3, 0x06, 0x9c, 0xe7, 0x0f, 0xe2, 0xdc, 0x31, 0x3f,
-	0x92, 0x7b, 0xf0, 0x5c, 0xb2, 0x35, 0xaf, 0xd6, 0xec, 0x03, 0x64, 0x0f, 0x98, 0x62, 0x42, 0xf6,
-	0x32, 0x11, 0x1a, 0x66, 0x04, 0xcc, 0x67, 0x0f, 0x62, 0x36, 0xe7, 0x60, 0x11, 0xcb, 0x25, 0xad,
-	0xa9, 0x4a, 0x33, 0xfe, 0x11, 0x35, 0xa3, 0x62, 0x1a, 0xbd, 0x2c, 0x36, 0x7c, 0x75, 0xe0, 0x3b,
-	0x79, 0x10, 0x9f, 0x39, 0xcc, 0xf3, 0x48, 0x2e, 0xd9, 0x98, 0x28, 0x34, 0x57, 0x86, 0x70, 0x92,
-	0x45, 0xc2, 0x0b, 0x63, 0xea, 0x47, 0x4c, 0x18, 0xbe, 0x06, 0xf0, 0x7d, 0xf3, 0x20, 0xbe, 0xcf,
-	0x35, 0xdf, 0xc7, 0x68, 0x2e, 0xb1, 0x0b, 0xe5, 0x37, 0x5a, 0xa7, 0x69, 0x03, 0xd4, 0xe8, 0x31,
-	0x11, 0x47, 0xa9, 0x21, 0xdc, 0x00, 0xc2, 0xe3, 0x07, 0x11, 0x9a, 0x3a, 0x9d, 0xc5, 0x71, 0x49,
-	0x5d, 0x8b, 0x25, 0x4b, 0xcc, 0xd3, 0x80, 0x4f, 0x58, 0x36, 0x1f, 0xcf, 0x32, 0x8b, 0xe3, 0x92,
-	0xba, 0x16, 0x35, 0xcb, 0x08, 0x6d, 0x51, 0x21, 0xf8, 0x77, 0x0b, 0x39, 0xc4, 0x40, 0xf6, 0xfa,
-	0x41, 0x64, 0x4f, 0x35, 0xd9, 0x3d, 0x70, 0x2e, 0xd9, 0x04, 0xed, 0x5c, 0x16, 0x39, 0xb2, 0x13,
-	0x26, 0x42, 0x36, 0xdb, 0x07, 0xb6, 0x1e, 0x5f, 0x9a, 0x8b, 0x58, 0x2e, 0x69, 0x82, 0xaa, 0xfc,
-	0xf7, 0x5f, 0x54, 0xad, 0xa6, 0xdd, 0xba, 0xa8, 0x5a, 0x2d, 0xdb, 0xbe, 0xa8, 0x5a, 0xb6, 0xbd,
-	0x49, 0x36, 0xc6, 0x3c, 0xe6, 0xde, 0xf0, 0x85, 0x8e, 0x20, 0x75, 0xf6, 0x1d, 0x95, 0xe6, 0x20,
-	0x93, 0xa6, 0x4f, 0x15, 0x8d, 0xc7, 0x52, 0x19, 0xb8, 0x0e, 0x5a, 0x7d, 0xa7, 0x8a, 0x4b, 0x88,
-	0x8d, 0x2a, 0xd7, 0x6c, 0xac, 0x1b, 0x24, 0x29, 0x86, 0x78, 0x1b, 0xad, 0x0e, 0x69, 0x9c, 0xe9,
-	0xdb, 0x4c, 0x8d, 0x68, 0xc1, 0xfd, 0x16, 0xb5, 0xde, 0x0b, 0x9a, 0x4a, 0xea, 0xab, 0x88, 0xa7,
-	0x6f, 0x78, 0x28, 0x31, 0x46, 0x55, 0xf8, 0x51, 0xeb, 0x58, 0x18, 0xe3, 0x9f, 0xa3, 0x6a, 0xcc,
-	0x43, 0xd9, 0x5e, 0xd9, 0xab, 0xec, 0xd7, 0x9f, 0x6f, 0x2d, 0x76, 0xfb, 0x37, 0x3c, 0x24, 0xe0,
-	0xe0, 0xfe, 0x7b, 0x05, 0x55, 0xde, 0xf0, 0x10, 0xb7, 0xd1, 0x3a, 0x0d, 0x02, 0xc1, 0xa4, 0x34,
-	0x38, 0x13, 0x11, 0x3f, 0x41, 0x6b, 0x8a, 0x0f, 0x22, 0x5f, 0x83, 0xd5, 0x88, 0x91, 0x0a, 0xda,
-	0x80, 0x2a, 0x0a, 0x8d, 0xae, 0x41, 0x60, 0x8c, 0x9f, 0xa3, 0x06, 0xac, 0xcb, 0x4b, 0xb3, 0xa4,
-	0xc7, 0x04, 0xf4, 0xab, 0x6a, 0xb7, 0x75, 0x9b, 0x3b, 0x75, 0xd0, 0x7f, 0x0b, 0x6a, 0x32, 0x2b,
-	0xe0, 0x2f, 0xd0, 0xba, 0x1a, 0xcd, 0xb6, 0x9a, 0xad, 0xdb, 0xdc, 0x69, 0xa9, 0xe9, 0x22, 0x8b,
-	0x4e, 0x42, 0xd6, 0xd4, 0x08, 0x3a, 0x4a, 0x07, 0x59, 0x6a, 0xe4, 0x45, 0x69, 0xc0, 0x46, 0xd0,
-	0x4d, 0xaa, 0xdd, 0xed, 0xdb, 0xdc, 0xb1, 0x67, 0xdc, 0xcf, 0x0b, 0x1b, 0x59, 0x57, 0x23, 0x18,
-	0xe0, 0x2f, 0x10, 0xd2, 0x53, 0x02, 0x06, 0xdd, 0x0b, 0x36, 0x6e, 0x73, 0xa7, 0x06, 0x5a, 0xc0,
-	0x9e, 0x0e, 0xb1, 0x8b, 0x56, 0x35, 0xb6, 0x05, 0xd8, 0x8d, 0xdb, 0xdc, 0xb1, 0x62, 0x1e, 0x6a,
-	0x4c, 0x6d, 0x2a, 0x52, 0x25, 0x58, 0xc2, 0x87, 0x2c, 0x80, 0xdf, 0xad, 0x45, 0x26, 0xa2, 0xfb,
-	0xd7, 0x15, 0x64, 0xbd, 0x1f, 0x11, 0x26, 0xb3, 0x58, 0xe1, 0x57, 0xc8, 0xf6, 0x79, 0xaa, 0x04,
-	0xf5, 0x95, 0x37, 0x97, 0xda, 0xee, 0xce, 0xb4, 0xbe, 0x16, 0x3d, 0x5c, 0xd2, 0x9a, 0xa8, 0x8e,
-	0x4d, 0xfe, 0xb7, 0xd1, 0x6a, 0x2f, 0xe6, 0x3c, 0x81, 0x3a, 0x68, 0x10, 0x2d, 0xe0, 0x4b, 0xc8,
-	0x1a, 0xec, 0x71, 0xe5, 0xfe, 0x1b, 0xdd, 0x42, 0x99, 0x74, 0x9f, 0x98, 0x1b, 0x5d, 0x53, 0x33,
-	0x9b, 0x68, 0xb7, 0xc8, 0x2c, 0x94, 0x91, 0x8d, 0x2a, 0x82, 0x29, 0xd8, 0xb2, 0x06, 0x29, 0x86,
-	0xf8, 0x29, 0xb2, 0x04, 0x1b, 0x32, 0xa1, 0x58, 0x00, 0x5b, 0x63, 0x91, 0x52, 0xc6, 0x9f, 0x23,
-	0x2b, 0xa4, 0xd2, 0xcb, 0x24, 0x0b, 0xf4, 0x3e, 0x90, 0xf5, 0x90, 0xca, 0xdf, 0x4a, 0x16, 0x7c,
-	0x55, 0xfd, 0xcb, 0xdf, 0x9d, 0x25, 0x97, 0xa2, 0xfa, 0xb1, 0xef, 0x33, 0x29, 0xdf, 0x67, 0x83,
-	0x98, 0xfd, 0x48, 0x7d, 0x3d, 0x47, 0x0d, 0xa9, 0xb8, 0xa0, 0x21, 0xf3, 0xae, 0xd9, 0xd8, 0x54,
-	0x99, 0xae, 0x19, 0xa3, 0xff, 0x35, 0x1b, 0x4b, 0x32, 0x2b, 0x18, 0x8a, 0xbc, 0x82, 0xea, 0xef,
-	0x05, 0xf5, 0x99, 0xb9, 0x70, 0x16, 0x95, 0x5a, 0x88, 0xc2, 0x50, 0x18, 0xa9, 0xe0, 0x56, 0x51,
-	0xc2, 0x78, 0xa6, 0xcc, 0x59, 0x9a, 0x88, 0x45, 0x84, 0x60, 0x6c, 0xc4, 0x7c, 0x48, 0x62, 0x95,
-	0x18, 0x09, 0x1f, 0xa1, 0x8d, 0x20, 0x92, 0x70, 0xed, 0x97, 0x8a, 0xfa, 0xd7, 0x7a, 0xf9, 0x5d,
-	0xfb, 0x36, 0x77, 0x1a, 0xc6, 0xf0, 0xae, 0xd0, 0x93, 0x39, 0x09, 0xff, 0x0a, 0xb5, 0xa6, 0x61,
-	0x30, 0x5b, 0xc8, 0x8d, 0xd5, 0xc5, 0xb7, 0xb9, 0xd3, 0x2c, 0x5d, 0xc1, 0x42, 0x16, 0xe4, 0x62,
-	0x9f, 0x03, 0xd6, 0xcb, 0x42, 0x28, 0x3d, 0x8b, 0x68, 0xa1, 0xd0, 0xc6, 0x51, 0x12, 0x29, 0x28,
-	0xb5, 0x55, 0xa2, 0x05, 0xfc, 0x4b, 0x54, 0xe3, 0x43, 0x26, 0x44, 0x14, 0x30, 0x09, 0x9d, 0xf7,
-	0xc7, 0xdf, 0x0c, 0x64, 0xea, 0x5d, 0x2c, 0xcd, 0x3c, 0x68, 0x12, 0x96, 0x70, 0x31, 0x86, 0x46,
-	0x6a, 0x96, 0xa6, 0x0d, 0x6f, 0x41, 0x4f, 0xe6, 0x24, 0xdc, 0x45, 0xd8, 0x84, 0x09, 0xa6, 0x32,
-	0x91, 0x7a, 0x70, 0xf6, 0x1b, 0x10, 0x0b, 0x27, 0x50, 0x5b, 0x09, 0x18, 0x4f, 0xa9, 0xa2, 0xe4,
-	0x23, 0xcd, 0x45, 0xd5, 0xaa, 0xda, 0xab, 0x17, 0x55, 0x6b, 0xdd, 0xb6, 0xca, 0xd5, 0x9b, 0x59,
-	0x90, 0xad, 0x89, 0x3c, 0x03, 0xef, 0xfe, 0x63, 0x05, 0xb5, 0x16, 0x1e, 0x26, 0x78, 0x17, 0xd5,
-	0x53, 0xee, 0xf5, 0xa8, 0x64, 0xde, 0x15, 0x63, 0xb0, 0xd3, 0x16, 0xa9, 0xa5, 0xbc, 0x4b, 0x25,
-	0x7b, 0xc5, 0x18, 0xfe, 0x1a, 0xed, 0x4c, 0x8c, 0x9e, 0xdf, 0xa7, 0x69, 0xc8, 0xf4, 0x83, 0x31,
-	0x4a, 0xa9, 0xe2, 0x02, 0x0a, 0x60, 0x83, 0xb4, 0x7b, 0xda, 0xfb, 0x04, 0x1c, 0x4e, 0xa7, 0x76,
-	0xfc, 0x02, 0x7d, 0xc6, 0x62, 0x2a, 0x55, 0xe4, 0x47, 0x6a, 0xec, 0x25, 0x59, 0xac, 0xa2, 0x41,
-	0x1c, 0x31, 0x01, 0x05, 0xb2, 0x41, 0xb6, 0xa7, 0xc6, 0xb7, 0xa5, 0x0d, 0xff, 0xb4, 0xcc, 0x69,
-	0x9f, 0x45, 0x61, 0x5f, 0x41, 0xb9, 0x54, 0x26, 0x19, 0x7c, 0x0d, 0x3a, 0x7c, 0x8e, 0xac, 0x72,
-	0xd6, 0xfa, 0x1e, 0x7c, 0x50, 0x9c, 0xc8, 0x4f, 0xef, 0x4a, 0x64, 0xdd, 0xcc, 0x5a, 0x27, 0x92,
-	0xd8, 0x51, 0x1a, 0xa9, 0x88, 0xc6, 0x65, 0x32, 0xba, 0xe7, 0xdf, 0xdf, 0xec, 0x2e, 0xff, 0x70,
-	0xb3, 0xbb, 0xfc, 0xbf, 0x9b, 0xdd, 0xe5, 0xbf, 0x7d, 0xd8, 0x5d, 0xfa, 0xe1, 0xc3, 0xee, 0xd2,
-	0x7f, 0x3e, 0xec, 0x2e, 0xfd, 0xbe, 0x33, 0x43, 0x61, 0xea, 0x24, 0x65, 0x6a, 0x32, 0x7c, 0x06,
-	0xaf, 0xc6, 0xce, 0x08, 0x9e, 0xef, 0xc0, 0xd7, 0x5b, 0x83, 0x87, 0xf9, 0x8b, 0xff, 0x07, 0x00,
-	0x00, 0xff, 0xff, 0xfb, 0x04, 0x5c, 0x3f, 0xda, 0x0f, 0x00, 0x00,
+	// 1677 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x4f, 0x6f, 0x1b, 0xb9,
+	0x15, 0xb7, 0x2d, 0xd9, 0x1a, 0x51, 0xb2, 0x34, 0xa6, 0xb5, 0xa9, 0x36, 0x06, 0x3c, 0xc6, 0x14,
+	0x68, 0x7d, 0xd8, 0x58, 0xeb, 0x04, 0x46, 0xd3, 0x2d, 0xf6, 0x60, 0xd9, 0xce, 0x46, 0x6e, 0xb2,
+	0x35, 0x98, 0x14, 0x05, 0xda, 0xc3, 0x80, 0x9a, 0xa1, 0x47, 0x53, 0xcf, 0x0c, 0x05, 0x92, 0xd2,
+	0x4a, 0x45, 0x3f, 0x40, 0x7b, 0xeb, 0xa9, 0xe7, 0x7e, 0x81, 0x7e, 0x89, 0x9e, 0x16, 0x3d, 0xed,
+	0xb1, 0xe8, 0x61, 0x50, 0x38, 0x37, 0x1f, 0xf5, 0x09, 0x8a, 0x79, 0xa4, 0xfe, 0xc6, 0x58, 0xc4,
+	0x3e, 0x99, 0xef, 0xdf, 0xef, 0xf7, 0xf8, 0xf8, 0xa8, 0xc7, 0x31, 0x6a, 0x4a, 0x25, 0xa8, 0xe2,
+	0xb2, 0xc5, 0x86, 0x49, 0x6b, 0x78, 0x9c, 0xff, 0x39, 0xea, 0x0b, 0xae, 0x38, 0xae, 0x19, 0xcb,
+	0x51, 0xae, 0x1a, 0x1e, 0x3f, 0x6d, 0x84, 0x3c, 0xe4, 0x60, 0x6a, 0xe5, 0x2b, 0xed, 0xe5, 0xfe,
+	0xab, 0x80, 0xb6, 0xae, 0xa8, 0xa0, 0x89, 0xc4, 0xc7, 0xa8, 0xcc, 0x86, 0x89, 0x17, 0xb0, 0x94,
+	0x27, 0xcd, 0xf5, 0x83, 0xf5, 0xc3, 0x72, 0xbb, 0x31, 0xc9, 0x1c, 0x7b, 0x4c, 0x93, 0xf8, 0x2b,
+	0x77, 0x66, 0x72, 0x89, 0xc5, 0x86, 0xc9, 0x79, 0xbe, 0xc4, 0x5f, 0xa3, 0x6d, 0x96, 0xd2, 0x6e,
+	0xcc, 0x3c, 0x5f, 0x30, 0xaa, 0x58, 0x73, 0xe3, 0x60, 0xfd, 0xd0, 0x6a, 0x37, 0x27, 0x99, 0xd3,
+	0x30, 0x61, 0x8b, 0x66, 0x97, 0x54, 0xb5, 0x7c, 0x06, 0x22, 0xfe, 0x05, 0xaa, 0x4c, 0xed, 0x34,
+	0x8e, 0x9b, 0x05, 0x08, 0x7e, 0x32, 0xc9, 0x1c, 0xbc, 0x1c, 0x4c, 0xe3, 0xd8, 0x25, 0xc8, 0x84,
+	0xd2, 0x38, 0xc6, 0xa7, 0x08, 0xb1, 0x91, 0x12, 0xd4, 0x63, 0x51, 0x5f, 0x36, 0x8b, 0x07, 0x85,
+	0xc3, 0x42, 0xdb, 0xbd, 0xcd, 0x9c, 0xf2, 0x45, 0xae, 0xbd, 0xe8, 0x5c, 0xc9, 0x49, 0xe6, 0xec,
+	0x18, 0x90, 0x99, 0xa3, 0x4b, 0xca, 0x20, 0x5c, 0x44, 0x7d, 0x89, 0xff, 0x80, 0xaa, 0x7e, 0x8f,
+	0x46, 0xa9, 0xe7, 0xf3, 0xf4, 0x3a, 0x0a, 0x9b, 0x9b, 0x07, 0xeb, 0x87, 0x95, 0xe7, 0x7b, 0x47,
+	0xcb, 0x55, 0x3b, 0x3a, 0xcb, 0x7d, 0xce, 0xc0, 0xa5, 0xbd, 0xf7, 0x7d, 0xe6, 0xac, 0x4d, 0x32,
+	0x67, 0x57, 0x03, 0x2f, 0x86, 0xbb, 0xa4, 0xe2, 0xcf, 0x3d, 0x71, 0x82, 0x76, 0xae, 0x19, 0xf3,
+	0x12, 0x2a, 0x6e, 0x98, 0xf2, 0xfa, 0x50, 0xdf, 0xe6, 0x16, 0x30, 0x38, 0xab, 0x0c, 0xaf, 0x18,
+	0x7b, 0x0b, 0x7e, 0xfa, 0x18, 0xda, 0x07, 0x86, 0xa5, 0xa9, 0x59, 0x3e, 0xc2, 0x71, 0x49, 0xfd,
+	0x7a, 0x39, 0xc4, 0xfd, 0x7b, 0x1d, 0x55, 0x16, 0x12, 0xc5, 0x3e, 0xb2, 0x74, 0x72, 0x51, 0x60,
+	0x0e, 0xf2, 0xf5, 0x7f, 0x33, 0xe7, 0x67, 0x61, 0xa4, 0x7a, 0x83, 0xee, 0x91, 0xcf, 0x93, 0x96,
+	0xcf, 0x65, 0xc2, 0xa5, 0xf9, 0xf3, 0x4c, 0x06, 0x37, 0x2d, 0x35, 0xee, 0x33, 0x79, 0xd4, 0x49,
+	0xd5, 0x6d, 0xe6, 0x94, 0x00, 0xac, 0x73, 0x3e, 0xc9, 0x9c, 0xfa, 0xe2, 0x5e, 0xa3, 0xc0, 0x25,
+	0x25, 0x58, 0x76, 0x02, 0x9c, 0xa0, 0x7a, 0x8f, 0x27, 0x4c, 0x2a, 0x46, 0x03, 0xaf, 0x1b, 0x73,
+	0xff, 0x06, 0x4e, 0xbf, 0xdc, 0x3e, 0xff, 0x74, 0xae, 0x49, 0xe6, 0x3c, 0xd1, 0x04, 0x2b, 0x50,
+	0x2e, 0xa9, 0xcd, 0x34, 0xed, 0x5c, 0x81, 0xc7, 0xa8, 0x16, 0x50, 0xee, 0x5d, 0x73, 0x71, 0x63,
+	0xd8, 0x0a, 0xc0, 0xf6, 0xee, 0x41, 0x3b, 0xab, 0x9e, 0x9f, 0xfe, 0xe6, 0x15, 0x17, 0x37, 0x80,
+	0x39, 0xc9, 0x9c, 0xcf, 0x34, 0xfb, 0x32, 0xb2, 0x4b, 0xaa, 0x01, 0xe5, 0x33, 0x37, 0xfc, 0x3b,
+	0x64, 0xcf, 0x1c, 0xe4, 0xa0, 0xdf, 0xe7, 0x42, 0x35, 0x8b, 0xd0, 0xab, 0xcf, 0x6e, 0x33, 0xa7,
+	0x66, 0x20, 0xdf, 0x69, 0xcb, 0x24, 0x73, 0x7e, 0xb2, 0x02, 0x6a, 0x62, 0x5c, 0x52, 0x33, 0xb0,
+	0xc6, 0x15, 0x4b, 0x54, 0x65, 0x51, 0xff, 0xf8, 0xe4, 0x4b, 0xb3, 0xa3, 0x4d, 0xd8, 0xd1, 0xd5,
+	0x83, 0x76, 0x54, 0xb9, 0xe8, 0x5c, 0x1d, 0x9f, 0x7c, 0x39, 0xdd, 0x90, 0xe9, 0xcd, 0x45, 0x58,
+	0x97, 0x54, 0xb4, 0xa8, 0x77, 0xd3, 0x41, 0x46, 0xf4, 0x7a, 0x54, 0xf6, 0xa0, 0x2b, 0xcb, 0xed,
+	0xc3, 0xdb, 0xcc, 0x41, 0x1a, 0xe9, 0x35, 0x95, 0xbd, 0xf9, 0xb9, 0x74, 0xc7, 0x7f, 0xa2, 0xa9,
+	0x8a, 0x06, 0xc9, 0x14, 0x0b, 0xe9, 0xe0, 0xdc, 0x6b, 0x96, 0xff, 0x89, 0xc9, 0xbf, 0xf4, 0xe8,
+	0xfc, 0x4f, 0xee, 0xcb, 0xff, 0x64, 0x39, 0x7f, 0xed, 0x33, 0x23, 0x7d, 0x69, 0x48, 0xad, 0x47,
+	0x93, 0xbe, 0xbc, 0x8f, 0xf4, 0xe5, 0x32, 0xa9, 0xf6, 0xc9, 0x9b, 0x7d, 0xa5, 0x12, 0xcd, 0xf2,
+	0xe3, 0x9b, 0xfd, 0xa3, 0xa2, 0xd6, 0x66, 0x1a, 0x4d, 0xf7, 0x67, 0xd4, 0xf0, 0x79, 0x2a, 0x55,
+	0xae, 0x4b, 0x79, 0x3f, 0x66, 0x86, 0x13, 0x01, 0x67, 0xe7, 0x41, 0x9c, 0x7b, 0xe6, 0x06, 0xdf,
+	0x83, 0xe7, 0x92, 0xdd, 0x65, 0xb5, 0x66, 0xef, 0x23, 0xbb, 0xcf, 0x14, 0x13, 0xb2, 0x3b, 0x10,
+	0xa1, 0x61, 0xae, 0x00, 0xf3, 0xc5, 0x83, 0x98, 0xcd, 0x3d, 0x58, 0xc5, 0x72, 0x49, 0x7d, 0xae,
+	0xd2, 0x8c, 0x7f, 0x44, 0xb5, 0x28, 0x4f, 0xa3, 0x3b, 0x88, 0x0d, 0x5f, 0x15, 0xf8, 0xce, 0x1e,
+	0xc4, 0x67, 0x2e, 0xf3, 0x32, 0x92, 0x4b, 0xb6, 0xa7, 0x0a, 0xcd, 0x35, 0x40, 0x38, 0x19, 0x44,
+	0xc2, 0x0b, 0x63, 0xea, 0x47, 0x4c, 0x18, 0xbe, 0x6d, 0xe0, 0xfb, 0xe6, 0x41, 0x7c, 0x9f, 0x6b,
+	0xbe, 0x8f, 0xd1, 0x5c, 0x62, 0xe7, 0xca, 0x6f, 0xb4, 0x4e, 0xd3, 0x06, 0xa8, 0xda, 0x65, 0x22,
+	0x8e, 0x52, 0x43, 0x58, 0x03, 0xc2, 0xd3, 0x07, 0x11, 0x9a, 0x3e, 0x5d, 0xc4, 0x71, 0x49, 0x45,
+	0x8b, 0x33, 0x96, 0x98, 0xa7, 0x01, 0x9f, 0xb2, 0xe0, 0xc7, 0xb3, 0x2c, 0xe2, 0xb8, 0xa4, 0xa2,
+	0x45, 0xcd, 0x32, 0x42, 0xbb, 0x54, 0x08, 0xfe, 0xdd, 0x4a, 0x0d, 0x77, 0x1f, 0x3a, 0x6a, 0x26,
+	0x99, 0xf3, 0x54, 0x93, 0xdd, 0x03, 0xe7, 0x92, 0x1d, 0xd0, 0x2e, 0x55, 0x91, 0x23, 0x3b, 0x61,
+	0x22, 0x64, 0x8b, 0x73, 0xa0, 0xf1, 0xf8, 0xd6, 0x5c, 0xc5, 0x72, 0x49, 0x0d, 0x54, 0xb3, 0xdf,
+	0xfe, 0xcb, 0xa2, 0x55, 0xb7, 0xed, 0xcb, 0xa2, 0x65, 0xdb, 0x3b, 0x97, 0x45, 0x6b, 0xc7, 0xc6,
+	0x64, 0x7b, 0xcc, 0x63, 0xee, 0x0d, 0x5f, 0xe8, 0x08, 0x52, 0x61, 0xdf, 0x51, 0x69, 0x2e, 0x32,
+	0xa9, 0xf9, 0x54, 0xd1, 0x78, 0x2c, 0x95, 0x81, 0x6b, 0xa1, 0xcd, 0x77, 0x2a, 0x7f, 0xe9, 0xd8,
+	0xa8, 0x70, 0xc3, 0xc6, 0x7a, 0x18, 0x93, 0x7c, 0x89, 0x1b, 0x68, 0x73, 0x48, 0xe3, 0x81, 0x7e,
+	0x32, 0x95, 0x89, 0x16, 0xdc, 0x6f, 0x51, 0xfd, 0xbd, 0xa0, 0xa9, 0xa4, 0xbe, 0x8a, 0x78, 0xfa,
+	0x86, 0x87, 0x12, 0x63, 0x54, 0x84, 0x1f, 0x6a, 0x1d, 0x0b, 0x6b, 0xfc, 0x73, 0x54, 0x8c, 0x79,
+	0x28, 0x9b, 0x1b, 0x07, 0x85, 0xc3, 0xca, 0xf3, 0xdd, 0xd5, 0x27, 0xc5, 0x1b, 0x1e, 0x12, 0x70,
+	0x70, 0xff, 0xbd, 0x81, 0x0a, 0x6f, 0x78, 0x88, 0x9b, 0xa8, 0x44, 0x83, 0x40, 0x30, 0x29, 0x0d,
+	0xce, 0x54, 0xc4, 0x4f, 0xd0, 0x96, 0xe2, 0xfd, 0xc8, 0xd7, 0x60, 0x65, 0x62, 0xa4, 0x9c, 0x36,
+	0xa0, 0x8a, 0xc2, 0x94, 0xad, 0x12, 0x58, 0xe3, 0xe7, 0xa8, 0x0a, 0xfb, 0xf2, 0xd2, 0x41, 0xd2,
+	0x65, 0x02, 0x86, 0x60, 0xb1, 0x5d, 0xbf, 0xcb, 0x9c, 0x0a, 0xe8, 0xbf, 0x05, 0x35, 0x59, 0x14,
+	0xf0, 0x17, 0xa8, 0xa4, 0x46, 0x7a, 0xd4, 0xe8, 0xf1, 0xb6, 0x7b, 0x97, 0x39, 0x75, 0x35, 0xdf,
+	0x64, 0x3e, 0x49, 0xc8, 0x96, 0x1a, 0xc1, 0x44, 0x69, 0x21, 0x4b, 0x8d, 0xbc, 0x28, 0x0d, 0xd8,
+	0x08, 0x26, 0x53, 0xb1, 0xdd, 0xb8, 0xcb, 0x1c, 0x7b, 0xc1, 0xbd, 0x93, 0xdb, 0x48, 0x49, 0x8d,
+	0x60, 0x81, 0xbf, 0x40, 0x48, 0xa7, 0x04, 0x0c, 0x7a, 0x00, 0x6d, 0xdf, 0x65, 0x4e, 0x19, 0xb4,
+	0x80, 0x3d, 0x5f, 0x62, 0x17, 0x6d, 0x6a, 0x6c, 0x0b, 0xb0, 0xab, 0x77, 0x99, 0x63, 0xc5, 0x3c,
+	0xd4, 0x98, 0xda, 0x94, 0x97, 0x4a, 0xb0, 0x84, 0x0f, 0x59, 0x00, 0x3f, 0xf1, 0x16, 0x99, 0x8a,
+	0xee, 0x5f, 0x37, 0x90, 0xf5, 0x7e, 0x44, 0x98, 0x1c, 0xc4, 0x0a, 0xbf, 0x42, 0xb6, 0xcf, 0x53,
+	0x25, 0xa8, 0xaf, 0xbc, 0xa5, 0xd2, 0xb6, 0xf7, 0xe6, 0xfd, 0xb5, 0xea, 0xe1, 0x92, 0xfa, 0x54,
+	0x75, 0x6a, 0xea, 0xdf, 0x40, 0x9b, 0xdd, 0x98, 0xf3, 0x04, 0xfa, 0xa0, 0x4a, 0xb4, 0x80, 0xaf,
+	0xa0, 0x6a, 0x70, 0xc6, 0x85, 0xfb, 0x9f, 0x8d, 0x2b, 0x6d, 0xd2, 0x7e, 0x62, 0x9e, 0x8d, 0x35,
+	0xcd, 0x6c, 0xa2, 0xdd, 0xbc, 0xb2, 0xd0, 0x46, 0x36, 0x2a, 0x08, 0xa6, 0xdf, 0x2d, 0x55, 0x92,
+	0x2f, 0xf1, 0x53, 0x64, 0x09, 0x36, 0x64, 0x42, 0xb1, 0x00, 0x8e, 0xc6, 0x22, 0x33, 0x19, 0x7f,
+	0x8e, 0xac, 0x90, 0x4a, 0x6f, 0x20, 0x59, 0xa0, 0xcf, 0x81, 0x94, 0x42, 0x2a, 0x7f, 0x2b, 0x59,
+	0xf0, 0x55, 0xf1, 0x2f, 0xff, 0x70, 0xd6, 0x5c, 0x8a, 0x2a, 0xa7, 0xbe, 0xcf, 0xa4, 0x7c, 0x3f,
+	0xe8, 0xc7, 0xec, 0x47, 0xfa, 0xeb, 0x39, 0xaa, 0x4a, 0xc5, 0x05, 0x0d, 0x99, 0x77, 0xc3, 0xc6,
+	0xa6, 0xcb, 0x74, 0xcf, 0x18, 0xfd, 0xaf, 0xd9, 0x58, 0x92, 0x45, 0xc1, 0x50, 0x64, 0x05, 0x54,
+	0x79, 0x2f, 0xa8, 0xcf, 0xcc, 0xab, 0x36, 0xef, 0xd4, 0x5c, 0x14, 0x86, 0xc2, 0x48, 0x39, 0xb7,
+	0x8a, 0x12, 0xc6, 0x07, 0xca, 0xdc, 0xa5, 0xa9, 0x98, 0x47, 0x08, 0xc6, 0x46, 0xcc, 0x87, 0x22,
+	0x16, 0x89, 0x91, 0xf0, 0x09, 0xda, 0x0e, 0x22, 0x09, 0xdf, 0x16, 0x52, 0x51, 0xf3, 0xf0, 0xb2,
+	0xda, 0xf6, 0x5d, 0xe6, 0x54, 0x8d, 0xe1, 0x5d, 0xae, 0x27, 0x4b, 0x12, 0xfe, 0x15, 0xaa, 0xcf,
+	0xc3, 0x20, 0x5b, 0xa8, 0x8d, 0xd5, 0xc6, 0x77, 0x99, 0x53, 0x9b, 0xb9, 0x82, 0x85, 0xac, 0xc8,
+	0xf9, 0x39, 0x07, 0xac, 0x3b, 0x08, 0xa1, 0xf5, 0x2c, 0xa2, 0x85, 0x5c, 0x1b, 0x47, 0x49, 0xa4,
+	0xa0, 0xd5, 0x36, 0x89, 0x16, 0xf0, 0x2f, 0x51, 0x99, 0x0f, 0x99, 0x10, 0x51, 0xc0, 0x24, 0xcc,
+	0xfc, 0x1f, 0xff, 0x30, 0x21, 0x73, 0xef, 0x7c, 0x6b, 0xe6, 0xab, 0x29, 0x61, 0x09, 0x17, 0x63,
+	0x18, 0xdc, 0x66, 0x6b, 0xda, 0xf0, 0x16, 0xf4, 0x64, 0x49, 0xc2, 0x6d, 0x84, 0x4d, 0x98, 0x60,
+	0x6a, 0x20, 0x52, 0x0f, 0xee, 0x7e, 0x15, 0x62, 0xe1, 0x06, 0x6a, 0x2b, 0x01, 0xe3, 0x39, 0x55,
+	0x94, 0x7c, 0xa4, 0xb9, 0x2c, 0x5a, 0x45, 0x7b, 0xf3, 0xb2, 0x68, 0x95, 0x6c, 0x6b, 0xb6, 0x7b,
+	0x93, 0x05, 0xd9, 0x9d, 0xca, 0x0b, 0xf0, 0xee, 0x3f, 0x37, 0x50, 0x7d, 0xe5, 0xeb, 0x07, 0xef,
+	0xa3, 0x4a, 0xca, 0xbd, 0x2e, 0x95, 0xcc, 0xbb, 0x66, 0x0c, 0x4e, 0xda, 0x22, 0xe5, 0x94, 0xb7,
+	0xa9, 0x64, 0xaf, 0x18, 0xc3, 0x5f, 0xa3, 0xbd, 0xa9, 0xd1, 0xf3, 0x7b, 0x34, 0x0d, 0x99, 0xfe,
+	0x2a, 0x8d, 0x52, 0xaa, 0xb8, 0x80, 0x06, 0xd8, 0x26, 0xcd, 0xae, 0xf6, 0x3e, 0x03, 0x87, 0xf3,
+	0xb9, 0x1d, 0xbf, 0x40, 0x9f, 0xb1, 0x98, 0x4a, 0x15, 0xf9, 0x91, 0x1a, 0x7b, 0xc9, 0x20, 0x56,
+	0x51, 0x3f, 0x8e, 0x98, 0x80, 0x06, 0xd9, 0x26, 0x8d, 0xb9, 0xf1, 0xed, 0xcc, 0x86, 0x7f, 0x3a,
+	0xab, 0x69, 0x8f, 0x45, 0x61, 0x4f, 0x41, 0xbb, 0x14, 0xa6, 0x15, 0x7c, 0x0d, 0x3a, 0xdc, 0x41,
+	0xd6, 0x2c, 0x6b, 0xfd, 0xa6, 0x3e, 0xca, 0x6f, 0xe4, 0xa7, 0x4f, 0x25, 0x52, 0x32, 0x59, 0xeb,
+	0x42, 0x12, 0x3b, 0x4a, 0x23, 0x15, 0xd1, 0x78, 0x56, 0x8c, 0x76, 0xe7, 0xfb, 0xdb, 0xfd, 0xf5,
+	0x1f, 0x6e, 0xf7, 0xd7, 0xff, 0x77, 0xbb, 0xbf, 0xfe, 0xb7, 0x0f, 0xfb, 0x6b, 0x3f, 0x7c, 0xd8,
+	0x5f, 0xfb, 0xcf, 0x87, 0xfd, 0xb5, 0xdf, 0xb7, 0x16, 0x28, 0x4c, 0x9f, 0xa4, 0x4c, 0x4d, 0x97,
+	0xcf, 0xe0, 0x93, 0xad, 0x35, 0x82, 0xff, 0x11, 0x00, 0x5f, 0x77, 0x0b, 0xbe, 0xfe, 0x5f, 0xfc,
+	0x3f, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xc3, 0x75, 0x8b, 0x3f, 0x10, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
@@ -970,7 +974,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x1
 		i--
-		dAtA[i] = 0x9a
+		dAtA[i] = 0xa2
 	}
 	if m.ArrowGlacierBlock != nil {
 		{
@@ -984,7 +988,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x1
 		i--
-		dAtA[i] = 0x92
+		dAtA[i] = 0x9a
 	}
 	if m.LondonBlock != nil {
 		{
@@ -998,7 +1002,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x1
 		i--
-		dAtA[i] = 0x8a
+		dAtA[i] = 0x92
 	}
 	if m.BerlinBlock != nil {
 		{
@@ -1010,7 +1014,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintEvm(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x6a
+		dAtA[i] = 0x72
 	}
 	if m.MuirGlacierBlock != nil {
 		{
@@ -1022,7 +1026,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintEvm(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x62
+		dAtA[i] = 0x6a
 	}
 	if m.IstanbulBlock != nil {
 		{
@@ -1034,7 +1038,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintEvm(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x5a
+		dAtA[i] = 0x62
 	}
 	if m.PetersburgBlock != nil {
 		{
@@ -1046,7 +1050,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintEvm(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x52
+		dAtA[i] = 0x5a
 	}
 	if m.ConstantinopleBlock != nil {
 		{
@@ -1058,7 +1062,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintEvm(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x4a
+		dAtA[i] = 0x52
 	}
 	if m.ByzantiumBlock != nil {
 		{
@@ -1070,7 +1074,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintEvm(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x42
+		dAtA[i] = 0x4a
 	}
 	if m.EIP158Block != nil {
 		{
@@ -1082,7 +1086,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintEvm(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x3a
+		dAtA[i] = 0x42
 	}
 	if m.EIP155Block != nil {
 		{
@@ -1094,14 +1098,14 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintEvm(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x32
+		dAtA[i] = 0x3a
 	}
 	if len(m.EIP150Hash) > 0 {
 		i -= len(m.EIP150Hash)
 		copy(dAtA[i:], m.EIP150Hash)
 		i = encodeVarintEvm(dAtA, i, uint64(len(m.EIP150Hash)))
 		i--
-		dAtA[i] = 0x2a
+		dAtA[i] = 0x32
 	}
 	if m.EIP150Block != nil {
 		{
@@ -1113,7 +1117,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintEvm(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x22
+		dAtA[i] = 0x2a
 	}
 	if m.DAOForkSupport {
 		i--
@@ -1123,7 +1127,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			dAtA[i] = 0
 		}
 		i--
-		dAtA[i] = 0x18
+		dAtA[i] = 0x20
 	}
 	if m.DAOForkBlock != nil {
 		{
@@ -1135,7 +1139,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintEvm(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x12
+		dAtA[i] = 0x1a
 	}
 	if m.HomesteadBlock != nil {
 		{
@@ -1147,6 +1151,18 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintEvm(dAtA, i, uint64(size))
 		}
 		i--
+		dAtA[i] = 0x12
+	}
+	if m.ChainID != nil {
+		{
+			size := m.ChainID.Size()
+			i -= size
+			if _, err := m.ChainID.MarshalTo(dAtA[i:]); err != nil {
+				return 0, err
+			}
+			i = encodeVarintEvm(dAtA, i, uint64(size))
+		}
+		i--
 		dAtA[i] = 0xa
 	}
 	return len(dAtA) - i, nil
@@ -1640,6 +1656,10 @@ func (m *ChainConfig) Size() (n int) {
 	}
 	var l int
 	_ = l
+	if m.ChainID != nil {
+		l = m.ChainID.Size()
+		n += 1 + l + sovEvm(uint64(l))
+	}
 	if m.HomesteadBlock != nil {
 		l = m.HomesteadBlock.Size()
 		n += 1 + l + sovEvm(uint64(l))
@@ -2198,6 +2218,42 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 		}
 		switch fieldNum {
 		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ChainID", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowEvm
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthEvm
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthEvm
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			var v github_com_cosmos_cosmos_sdk_types.Int
+			m.ChainID = &v
+			if err := m.ChainID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field HomesteadBlock", wireType)
 			}
@@ -2233,7 +2289,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 2:
+		case 3:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field DAOForkBlock", wireType)
 			}
@@ -2269,7 +2325,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 3:
+		case 4:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field DAOForkSupport", wireType)
 			}
@@ -2289,7 +2345,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				}
 			}
 			m.DAOForkSupport = bool(v != 0)
-		case 4:
+		case 5:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field EIP150Block", wireType)
 			}
@@ -2325,7 +2381,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 5:
+		case 6:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field EIP150Hash", wireType)
 			}
@@ -2357,7 +2413,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 			}
 			m.EIP150Hash = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 6:
+		case 7:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field EIP155Block", wireType)
 			}
@@ -2393,7 +2449,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 7:
+		case 8:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field EIP158Block", wireType)
 			}
@@ -2429,7 +2485,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 8:
+		case 9:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field ByzantiumBlock", wireType)
 			}
@@ -2465,7 +2521,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 9:
+		case 10:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field ConstantinopleBlock", wireType)
 			}
@@ -2501,7 +2557,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 10:
+		case 11:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field PetersburgBlock", wireType)
 			}
@@ -2537,7 +2593,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 11:
+		case 12:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field IstanbulBlock", wireType)
 			}
@@ -2573,7 +2629,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 12:
+		case 13:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field MuirGlacierBlock", wireType)
 			}
@@ -2609,7 +2665,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 13:
+		case 14:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field BerlinBlock", wireType)
 			}
@@ -2645,7 +2701,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 17:
+		case 18:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field LondonBlock", wireType)
 			}
@@ -2681,7 +2737,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 18:
+		case 19:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field ArrowGlacierBlock", wireType)
 			}
@@ -2717,7 +2773,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 19:
+		case 20:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field MergeForkBlock", wireType)
 			}