fix: gasPrice api to use PendingBlockAndReceipts

scroll-tech · Oct 29, 2024 · d13e8fd · d13e8fd
1 parent 7ea1d52
commit d13e8fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -68,13 +68,9 @@ func (s *PublicEthereumAPI) GasPrice(ctx context.Context) (*hexutil.Big, error)
 	if err != nil {
 		return nil, err
 	}
-	bNrOrHash := rpc.BlockNumberOrHashWithNumber(rpc.PendingBlockNumber)
-	block, err := s.b.BlockByNumberOrHash(ctx, bNrOrHash)
-	if err != nil {
-		return nil, err
-	}
-	if block.BaseFee() != nil {
-		tipcap.Add(tipcap, block.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)