From f5b8420f9580cd405d985536c8f21db6e3a18c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Wed, 5 Mar 2025 09:26:12 +0100 Subject: [PATCH] use latest instead of pending --- rollup/internal/controller/sender/sender.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rollup/internal/controller/sender/sender.go b/rollup/internal/controller/sender/sender.go index 657e02238c..60dea367a0 100644 --- a/rollup/internal/controller/sender/sender.go +++ b/rollup/internal/controller/sender/sender.go @@ -663,7 +663,7 @@ func (s *Sender) getSenderMeta() *orm.SenderMeta { } func (s *Sender) getBlockNumberAndBaseFeeAndBlobFee(ctx context.Context) (uint64, uint64, uint64, error) { - header, err := s.client.HeaderByNumber(ctx, big.NewInt(rpc.PendingBlockNumber.Int64())) + header, err := s.client.HeaderByNumber(ctx, big.NewInt(rpc.LatestBlockNumber.Int64())) if err != nil { return 0, 0, 0, fmt.Errorf("failed to get header by number, err: %w", err) } @@ -677,8 +677,8 @@ func (s *Sender) getBlockNumberAndBaseFeeAndBlobFee(ctx context.Context) (uint64 if excess := header.ExcessBlobGas; excess != nil { blobBaseFee = misc.CalcBlobFee(*excess).Uint64() } - // header.Number.Uint64() returns the pendingBlockNumber, so we minus 1 to get the latestBlockNumber. - return header.Number.Uint64() - 1, baseFee, blobBaseFee, nil + + return header.Number.Uint64(), baseFee, blobBaseFee, nil } func makeSidecar(blob *kzg4844.Blob) (*gethTypes.BlobTxSidecar, error) {