stratosnet · Xiong-stratos · Jul 14, 2022 · Jul 6, 2022
diff --git 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,15 +113,16 @@ 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 {
 		accNum = acc.GetAccountNumber()
 	}
 
 	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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,25 +92,18 @@ 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{
 		ctx:         context.Background(),
 		clientCtx:   clientCtx,
 		queryClient: types.NewQueryClient(clientCtx),
 		logger:      logger.With("module", "backend"),
-		chainID:     chainID,
 		cfg:         appConf,
 	}
 }