fix(api): change gas_price to use pending block (#1082)

* fix(api): change gas_price to use pending block
scroll-tech · Oct 30, 2024 · 3747296 · 3747296
1 parent 69ce8d9
commit 3747296
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -67,8 +67,9 @@ func (s *EthereumAPI) GasPrice(ctx context.Context) (*hexutil.Big, error) {
 	if err != nil {
 		return nil, err
 	}
-	if head := s.b.CurrentHeader(); head.BaseFee != nil {
-		tipcap.Add(tipcap, head.BaseFee)
+	pendingBlock, _ := s.b.PendingBlockAndReceipts()
+	if pendingBlock != nil && pendingBlock.BaseFee() != nil {
+		tipcap.Add(tipcap, pendingBlock.BaseFee())
 	}
 	return (*hexutil.Big)(tipcap), err
 }

diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go
@@ -63,6 +63,7 @@ type Backend interface {
 	BlockByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Block, error)
 	BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error)
 	BlockByNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (*types.Block, error)
+	PendingBlockAndReceipts() (*types.Block, types.Receipts)
 	StateAndHeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*state.StateDB, *types.Header, error)
 	StateAndHeaderByNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (*state.StateDB, *types.Header, error)
 	StateAt(root common.Hash) (*state.StateDB, error)