add basefee req

client/docs/swagger-ui/swagger.yaml

@@ -3730,12 +3730,19 @@ paths:
           format: byte
         - name: chain_id
           description: >-
-            chain_id is the the eip155 chain id parsed from the requested block
+            chain_id is the eip155 chain id parsed from the requested block
             header.
           in: query
           required: false
           type: string
           format: int64
+        - name: base_fee
+          description: >-
+            base_fee is the base fee based on the block_number of requested
+            transaction.
+          in: query
+          required: false
+          type: string
       tags:
         - Query
   /ethermint/evm/v1/validator_account/{cons_address}:

proto/ethermint/evm/v1/query.proto

@@ -267,8 +267,10 @@ message QueryTraceTxRequest {
   google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
   // proposer_address is the proposer of the requested block
   bytes proposer_address = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
-  // chain_id is the the eip155 chain id parsed from the requested block header
+  // chain_id is the eip155 chain id parsed from the requested block header
   int64 chain_id = 9;
+  // base_fee is the base fee based on the block_number of requested transaction
+  string base_fee = 10 [(gogoproto.customtype) = "cosmossdk.io/math.Int"];
 }
 
 // QueryTraceTxResponse defines TraceTx response

rpc/backend/evm_query_client_test.go

@@ -35,7 +35,7 @@ var _ evmtypes.QueryClient = &mocks.EVMQueryClient{}
 // TraceTransaction
 func RegisterTraceTransactionWithPredecessors(queryClient *mocks.EVMQueryClient, msgEthTx *evmtypes.MsgEthereumTx, predecessors []*evmtypes.MsgEthereumTx) {
 	data := []byte{0x7b, 0x22, 0x74, 0x65, 0x73, 0x74, 0x22, 0x3a, 0x20, 0x22, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x22, 0x7d}
-	queryClient.On("TraceTx", rpc.ContextWithBaseFee(rpc.ContextWithHeight(1), "1000000000"),
+	queryClient.On("TraceTx", rpc.ContextWithHeight(1),
 		mock.MatchedBy(func(req *evmtypes.QueryTraceTxRequest) bool {
 			if req.BlockNumber != 1 {
 				return false
@@ -63,7 +63,7 @@ func RegisterTraceTransactionWithPredecessors(queryClient *mocks.EVMQueryClient,
 
 func RegisterTraceTransaction(queryClient *mocks.EVMQueryClient, msgEthTx *evmtypes.MsgEthereumTx) {
 	data := []byte{0x7b, 0x22, 0x74, 0x65, 0x73, 0x74, 0x22, 0x3a, 0x20, 0x22, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x22, 0x7d}
-	queryClient.On("TraceTx", rpc.ContextWithBaseFee(rpc.ContextWithHeight(1), "1000000000"),
+	queryClient.On("TraceTx", rpc.ContextWithHeight(1),
 		mock.MatchedBy(func(req *evmtypes.QueryTraceTxRequest) bool {
 			if req.BlockNumber != 1 {
 				return false

rpc/backend/tracing.go

@@ -123,8 +123,8 @@ func (b *Backend) TraceTransaction(hash common.Hash, config *rpctypes.TraceConfi
 	if err != nil {
 		return nil, err
 	}
-	ctx := rpctypes.ContextWithBaseFee(rpctypes.ContextWithHeight(contextHeight), res.Params.BaseFee.String())
-	traceResult, err := b.queryClient.TraceTx(ctx, &traceTxRequest)
+	traceTxRequest.BaseFee = &res.Params.BaseFee
+	traceResult, err := b.queryClient.TraceTx(rpctypes.ContextWithHeight(contextHeight), &traceTxRequest)
 	if err != nil {
 		return nil, err
 	}

rpc/types/block.go

@@ -51,8 +51,6 @@ const (
 	BlockParamPending   = "pending"
 )
 
-const GRPCBaseFeeHeader = "x-cosmos-basefee"
-
 // NewBlockNumber creates a new BlockNumber instance.
 func NewBlockNumber(n *big.Int) BlockNumber {
 	if !n.IsInt64() {
@@ -74,11 +72,6 @@ func ContextWithHeight(height int64) context.Context {
 	return metadata.AppendToOutgoingContext(context.Background(), grpctypes.GRPCBlockHeightHeader, fmt.Sprintf("%d", height))
 }
 
-// ContextWithBaseFee wraps a context with a gRPC basefee header.
-func ContextWithBaseFee(c context.Context, fee string) context.Context {
-	return metadata.AppendToOutgoingContext(c, GRPCBaseFeeHeader, fee)
-}
-
 // UnmarshalJSON parses the given JSON fragment into a BlockNumber. It supports:
 // - "latest", "finalized", "earliest" or "pending" as string arguments
 // - the block number

x/evm/keeper/grpc_query.go

@@ -43,7 +43,6 @@ import (
 	ethermint "github.com/evmos/ethermint/types"
 	"github.com/evmos/ethermint/x/evm/statedb"
 	"github.com/evmos/ethermint/x/evm/types"
-	"google.golang.org/grpc/metadata"
 )
 
 var _ types.QueryServer = Keeper{}
@@ -423,6 +422,7 @@ func execTrace[T traceRequest](
 	c context.Context,
 	req T,
 	k Keeper,
+	baseFee *big.Int,
 	msgCb func(
 		ctx sdk.Context,
 		cfg *EVMConfig,
@@ -460,13 +460,8 @@ func execTrace[T traceRequest](
 		return nil, status.Errorf(codes.Internal, "failed to load evm config: %s", err.Error())
 	}
 
-	// Get basefee from the request context, if present.
-	if md, ok := metadata.FromIncomingContext(c); ok {
-		if headers := md.Get(rpctypes.GRPCBaseFeeHeader); len(headers) == 1 {
-			if basefee, ok := new(big.Int).SetString(headers[0], 10); ok {
-				cfg.BaseFee = basefee
-			}
-		}
+	if baseFee != nil {
+		cfg.BaseFee = baseFee
 	}
 
 	msg, err := msgCb(ctx, cfg, req.GetTraceConfig())
@@ -492,10 +487,15 @@ func execTrace[T traceRequest](
 // executes the given message in the provided environment. The return value will
 // be tracer dependent.
 func (k Keeper) TraceTx(c context.Context, req *types.QueryTraceTxRequest) (*types.QueryTraceTxResponse, error) {
+	var baseFee *big.Int
+	if req != nil && req.BaseFee != nil {
+		baseFee = big.NewInt(req.BaseFee.Int64())
+	}
 	resultData, err := execTrace(
 		c,
 		req,
 		k,
+		baseFee,
 		func(ctx sdk.Context, cfg *EVMConfig, traceConfig *types.TraceConfig) (*core.Message, error) {
 			signer := ethtypes.MakeSigner(cfg.ChainConfig, big.NewInt(ctx.BlockHeight()))
 			tracer, err := newTacer(&logger.Config{}, cfg.TxConfig, traceConfig)
@@ -618,6 +618,7 @@ func (k Keeper) TraceCall(c context.Context, req *types.QueryTraceCallRequest) (
 		c,
 		req,
 		k,
+		nil,
 		func(ctx sdk.Context, cfg *EVMConfig, _ *types.TraceConfig) (*core.Message, error) {
 			var args types.TransactionArgs
 			err := json.Unmarshal(req.Args, &args)

x/evm/types/interfaces.go

@@ -63,6 +63,7 @@ type StakingKeeper interface {
 // FeeMarketKeeper
 type FeeMarketKeeper interface {
 	GetBaseFee(ctx sdk.Context) *big.Int
+	CalculateBaseFee(ctx sdk.Context) *big.Int
 	GetParams(ctx sdk.Context) feemarkettypes.Params
 }