Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(seq): latest block from execution for rpc #1473

Merged
merged 1 commit into from
Nov 14, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions turbo/rpchelper/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
borfinality "github.com/ledgerwatch/erigon/polygon/bor/finality"
"github.com/ledgerwatch/erigon/polygon/bor/finality/whitelist"
"github.com/ledgerwatch/erigon/rpc"
"github.com/ledgerwatch/erigon/zk/sequencer"
)

// unable to decode supplied params, or an invalid number of parameters
Expand All @@ -37,9 +38,18 @@ func GetCanonicalBlockNumber(blockNrOrHash rpc.BlockNumberOrHash, tx kv.Tx, filt
}

func _GetBlockNumber(requireCanonical bool, blockNrOrHash rpc.BlockNumberOrHash, tx kv.Tx, filters *Filters) (blockNumber uint64, hash libcommon.Hash, latest bool, err error) {
finishedBlockNumber, err := stages.GetStageProgress(tx, stages.Finish)
if err != nil {
return 0, libcommon.Hash{}, false, fmt.Errorf("getting finished block number: %w", err)
var finishedBlockNumber uint64

if !sequencer.IsSequencer() {
finishedBlockNumber, err = stages.GetStageProgress(tx, stages.Finish)
if err != nil {
return 0, libcommon.Hash{}, false, fmt.Errorf("getting finished block number: %w", err)
}
} else {
finishedBlockNumber, err = stages.GetStageProgress(tx, stages.Execution)
if err != nil {
return 0, libcommon.Hash{}, false, fmt.Errorf("getting finished block number: %w", err)
}
}

var ok bool
Expand Down
Loading