Merge branch 'main' into jeremy/proposer-priority

Author: jewei1997

evmrpc/tests/tx_test.go

@@ -130,3 +130,23 @@ func TestEVMTransactionIndexResponseCorrectnessAndConsistency(t *testing.T) {
 		},
 	)
 }
+
+func TestGetTransactionGasPrice(t *testing.T) {
+	txData := send(0)
+	signedTx := signTxWithMnemonic(txData, mnemonic1)
+	tx := encodeEvmTx(txData, signedTx)
+	SetupTestServer([][][]byte{{tx}}, mnemonicInitializer(mnemonic1)).Run(
+		func(port int) {
+			res := sendRequestWithNamespace("eth", port, "getTransactionByHash", signedTx.Hash().Hex())
+			result := res["result"].(map[string]any)
+
+			// Verify gasPrice field exists and has the expected value
+			gasPrice, exists := result["gasPrice"]
+			require.True(t, exists, "gasPrice field should exist in response")
+
+			// The gasPrice should match the GasFeeCap from the DynamicFeeTx
+			expectedGasPrice := "0x3b9aca00" // 1000000000 in hex
+			require.Equal(t, expectedGasPrice, gasPrice, "gasPrice should match the transaction's GasFeeCap")
+		},
+	)
+}

evmrpc/tx.go

@@ -316,7 +316,12 @@ func (t *TransactionAPI) getTransactionWithBlock(block *coretypes.ResultBlock, i
 		return nil, errors.New("not found")
 	}
 	height := int64(receipt.BlockNumber)
-	baseFeePerGas := t.keeper.GetBaseFee(t.ctxProvider(height))
+	var baseFeePerGas *big.Int
+	if block.Block.Height > 1 {
+		baseFeePerGas = t.keeper.GetNextBaseFeePerGas(t.ctxProvider(height - 1)).TruncateInt().BigInt()
+	} else {
+		baseFeePerGas = types.DefaultMinFeePerGas.TruncateInt().BigInt()
+	}
 	chainConfig := types.DefaultChainConfig().EthereumConfig(t.keeper.ChainID(t.ctxProvider(height)))
 	blockHash := common.HexToHash(block.BlockID.Hash.String())
 	blockNumber := uint64(block.Block.Height)