fix: chain-id in grpc query is not initialized without abci event

CHANGELOG.md

@@ -49,6 +49,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### API Breaking
 
 * (ante) [#1214](https://github.com/evmos/ethermint/pull/1214) Set mempool priority to EVM transactions.
+* (evm) [#1405](https://github.com/evmos/ethermint/pull/1405) Add parameter `chainID` to evm keeper's `EVMConfig` method, so caller can choose to not use the cached `eip155ChainID`.
 
 ### Improvements
 
@@ -81,6 +82,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (state) [#1320](https://github.com/evmos/ethermint/pull/1320) Fix codehash check mismatch when the code has been deleted in the evm state.
 * (rpc) [#1392](https://github.com/evmos/ethermint/pull/1392) Allow fill the proposer address in json-rpc through tendermint api, and pass explicitly to grpc query handler.
 * (rpc) [#1431](https://github.com/evmos/ethermint/pull/1431) Align hex-strings proof fields in `eth_getProof` as Ethereum.
+* (rpc) [#1405](https://github.com/evmos/ethermint/pull/1405) Fix uninitialized chain ID field in gRPC requests.
 
 ## [v0.19.3] - 2022-10-14
 

client/docs/swagger-ui/swagger.yaml

@@ -1301,6 +1301,18 @@ paths:
           required: false
           type: string
           format: uint64
+        - name: proposer_address
+          description: the proposer of the requested block.
+          in: query
+          required: false
+          type: string
+          format: byte
+        - name: chain_id
+          description: the eip155 chain id parsed from the requested block header.
+          in: query
+          required: false
+          type: string
+          format: int64
       tags:
         - Query
   /ethermint/evm/v1/eth_call:
@@ -1599,6 +1611,18 @@ paths:
           required: false
           type: string
           format: uint64
+        - name: proposer_address
+          description: the proposer of the requested block.
+          in: query
+          required: false
+          type: string
+          format: byte
+        - name: chain_id
+          description: the eip155 chain id parsed from the requested block header.
+          in: query
+          required: false
+          type: string
+          format: int64
       tags:
         - Query
   /ethermint/evm/v1/params:
@@ -1713,11 +1737,16 @@ paths:
                         title: >-
                           Eip-4345 (bomb delay) switch block (nil = no fork, 0 =
                           already activated)
-                      merge_fork_block:
+                      gray_glacier_block:
                         type: string
                         title: >-
-                          EIP-3675 (TheMerge) switch block (nil = no fork, 0 =
-                          already in merge proceedings)
+                          EIP-5133 (bomb delay) switch block (nil = no fork, 0 =
+                          already activated)
+                      merge_netsplit_block:
+                        type: string
+                        title: >-
+                          Virtual fork after The Merge to use as a network
+                          splitter
                     description: >-
                       ChainConfig defines the Ethereum ChainConfig parameters
                       using *sdk.Int values
@@ -1727,7 +1756,7 @@ paths:
                     type: boolean
                     description: >-
                       Allow unprotected transactions defines if replay-protected
-                      (i.e non EIP155 
+                      (i.e non EIP155
 
                       signed) transactions can be executed on the state machine.
                 title: Params defines the EVM module parameters
@@ -2481,10 +2510,15 @@ paths:
           in: query
           required: false
           type: string
-        - name: trace_config.overrides.merge_fork_block
+        - name: trace_config.overrides.gray_glacier_block
           description: >-
-            EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in
-            merge proceedings).
+            EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
+            activated).
+          in: query
+          required: false
+          type: string
+        - name: trace_config.overrides.merge_netsplit_block
+          description: Virtual fork after The Merge to use as a network splitter.
           in: query
           required: false
           type: string
@@ -2515,6 +2549,18 @@ paths:
           required: false
           type: string
           format: date-time
+        - name: proposer_address
+          description: the proposer of the requested block.
+          in: query
+          required: false
+          type: string
+          format: byte
+        - name: chain_id
+          description: the eip155 chain id parsed from the requested block header.
+          in: query
+          required: false
+          type: string
+          format: int64
       tags:
         - Query
   /ethermint/evm/v1/trace_tx:
@@ -2783,7 +2829,7 @@ paths:
           type: string
           format: byte
         - name: msg.size
-          description: encoded storage size of the transaction.
+          description: 'DEPRECATED: encoded storage size of the transaction.'
           in: query
           required: false
           type: number
@@ -2927,10 +2973,15 @@ paths:
           in: query
           required: false
           type: string
-        - name: trace_config.overrides.merge_fork_block
+        - name: trace_config.overrides.gray_glacier_block
           description: >-
-            EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in
-            merge proceedings).
+            EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
+            activated).
+          in: query
+          required: false
+          type: string
+        - name: trace_config.overrides.merge_netsplit_block
+          description: Virtual fork after The Merge to use as a network splitter.
           in: query
           required: false
           type: string
@@ -2961,6 +3012,18 @@ paths:
           required: false
           type: string
           format: date-time
+        - name: proposer_address
+          description: the proposer of the requested block.
+          in: query
+          required: false
+          type: string
+          format: byte
+        - name: chain_id
+          description: the eip155 chain id parsed from the requested block header.
+          in: query
+          required: false
+          type: string
+          format: int64
       tags:
         - Query
   /ethermint/evm/v1/validator_account/{cons_address}:
@@ -14111,11 +14174,14 @@ definitions:
         title: >-
           Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already
           activated)
-      merge_fork_block:
+      gray_glacier_block:
         type: string
         title: >-
-          EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in merge
-          proceedings)
+          EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
+          activated)
+      merge_netsplit_block:
+        type: string
+        title: Virtual fork after The Merge to use as a network splitter
     description: >-
       ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int
       values
@@ -14344,7 +14410,7 @@ definitions:
       size:
         type: number
         format: double
-        title: encoded storage size of the transaction
+        title: 'DEPRECATED: encoded storage size of the transaction'
       hash:
         type: string
         title: transaction hash in hex format
@@ -14515,11 +14581,14 @@ definitions:
             title: >-
               Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already
               activated)
-          merge_fork_block:
+          gray_glacier_block:
             type: string
             title: >-
-              EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in
-              merge proceedings)
+              EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
+              activated)
+          merge_netsplit_block:
+            type: string
+            title: Virtual fork after The Merge to use as a network splitter
         description: >-
           ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int
           values
@@ -14529,7 +14598,7 @@ definitions:
         type: boolean
         description: >-
           Allow unprotected transactions defines if replay-protected (i.e non
-          EIP155 
+          EIP155
 
           signed) transactions can be executed on the state machine.
     title: Params defines the EVM module parameters
@@ -14684,11 +14753,14 @@ definitions:
                 title: >-
                   Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already
                   activated)
-              merge_fork_block:
+              gray_glacier_block:
                 type: string
                 title: >-
-                  EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already
-                  in merge proceedings)
+                  EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
+                  activated)
+              merge_netsplit_block:
+                type: string
+                title: Virtual fork after The Merge to use as a network splitter
             description: >-
               ChainConfig defines the Ethereum ChainConfig parameters using
               *sdk.Int values
@@ -14698,7 +14770,7 @@ definitions:
             type: boolean
             description: >-
               Allow unprotected transactions defines if replay-protected (i.e
-              non EIP155 
+              non EIP155
 
               signed) transactions can be executed on the state machine.
         title: Params defines the EVM module parameters
@@ -14839,11 +14911,14 @@ definitions:
             title: >-
               Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already
               activated)
-          merge_fork_block:
+          gray_glacier_block:
             type: string
             title: >-
-              EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in
-              merge proceedings)
+              EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
+              activated)
+          merge_netsplit_block:
+            type: string
+            title: Virtual fork after The Merge to use as a network splitter
         description: >-
           ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int
           values

docs/api/proto-docs.md

@@ -563,6 +563,7 @@ EthCallRequest defines EthCall request
 | `args` | [bytes](#bytes) |  | same json format as the json rpc api. |
 | `gas_cap` | [uint64](#uint64) |  | the default gas cap to be used |
 | `proposer_address` | [bytes](#bytes) |  | the proposer of the requested block |
+| `chain_id` | [int64](#int64) |  | the eip155 chain id parsed from the requested block header |
 
 
 
@@ -793,6 +794,7 @@ QueryTraceBlockRequest defines TraceTx request
 | `block_hash` | [string](#string) |  | block hex hash |
 | `block_time` | [google.protobuf.Timestamp](#google.protobuf.Timestamp) |  | block time |
 | `proposer_address` | [bytes](#bytes) |  | the proposer of the requested block |
+| `chain_id` | [int64](#int64) |  | the eip155 chain id parsed from the requested block header |
 
 
 
@@ -829,6 +831,7 @@ QueryTraceTxRequest defines TraceTx request
 | `block_hash` | [string](#string) |  | block hex hash of requested transaction |
 | `block_time` | [google.protobuf.Timestamp](#google.protobuf.Timestamp) |  | block time of requested transaction |
 | `proposer_address` | [bytes](#bytes) |  | the proposer of the requested block |
+| `chain_id` | [int64](#int64) |  | the eip155 chain id parsed from the requested block header |
 
 
 

proto/ethermint/evm/v1/query.proto

@@ -223,6 +223,8 @@ message EthCallRequest {
   uint64 gas_cap = 2;
   // the proposer of the requested block
   bytes proposer_address = 3 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
+  // the eip155 chain id parsed from the requested block header
+  int64 chain_id = 4;
 }
 
 // EstimateGasResponse defines EstimateGas response
@@ -251,6 +253,8 @@ message QueryTraceTxRequest {
   google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
   // the proposer of the requested block
   bytes proposer_address = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
+  // the eip155 chain id parsed from the requested block header
+  int64 chain_id = 9;
 }
 
 // QueryTraceTxResponse defines TraceTx response
@@ -273,6 +277,8 @@ message QueryTraceBlockRequest {
   google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
   // the proposer of the requested block
   bytes proposer_address = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
+  // the eip155 chain id parsed from the requested block header
+  int64 chain_id = 9;
 }
 
 // QueryTraceBlockResponse defines TraceBlock response

rpc/backend/call_tx.go

@@ -305,10 +305,16 @@ func (b *Backend) EstimateGas(args evmtypes.TransactionArgs, blockNrOptional *rp
 		return 0, errors.New("header not found")
 	}
 
+	chainID, err := ethermint.ParseChainID(header.Block.ChainID)
+	if err != nil {
+		return 0, sdkerrors.Wrapf(err, "failed to parse chainID: %s", header.Block.ChainID)
+	}
+
 	req := evmtypes.EthCallRequest{
 		Args:            bz,
 		GasCap:          b.RPCGasCap(),
 		ProposerAddress: sdk.ConsAddress(header.Block.ProposerAddress),
+		ChainId:         chainID.Int64(),
 	}
 
 	// From ContextWithHeight: if the provided height is 0,
@@ -335,10 +341,17 @@ func (b *Backend) DoCall(
 		// the error message imitates geth behavior
 		return nil, errors.New("header not found")
 	}
+
+	chainID, err := ethermint.ParseChainID(header.Block.ChainID)
+	if err != nil {
+		return nil, sdkerrors.Wrapf(err, "failed to parse chainID: %s", header.Block.ChainID)
+	}
+
 	req := evmtypes.EthCallRequest{
 		Args:            bz,
 		GasCap:          b.RPCGasCap(),
 		ProposerAddress: sdk.ConsAddress(header.Block.ProposerAddress),
+		ChainId:         chainID.Int64(),
 	}
 
 	// From ContextWithHeight: if the provided height is 0,