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.

Sign up for GitHub

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

(op-geth) Add extra error info when meet an unexpected el sync #132

Merged
merged 2 commits into from
Aug 27, 2024
Merged

(op-geth) Add extra error info when meet an unexpected el sync #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1be871
add extra error info when meet a unexpected el sync
krish-nr Jul 31, 2024
2828964
chore: add error define for forced head events
krish-nr Aug 6, 2024
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
3 changes: 3 additions & 0 deletions eth/catalyst/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,9 @@ func (api *ConsensusAPI) delayPayloadImport(block *types.Block) (engine.PayloadS
// that the parent state is missing and the syncer rejected extending the
// current cycle with the new payload.
log.Warn("Ignoring payload with missing parent", "number", block.NumberU64(), "hash", block.Hash(), "parent", block.ParentHash(), "reason", err)
if errors.Is(err, downloader.ErrForcedNeeded) {
return engine.PayloadStatusV1{Status: engine.SYNCING}, err
}
} else {
// In non-full sync mode (i.e. snap sync) all payloads are rejected until
// snap sync terminates as snap sync relies on direct database injections
Expand Down
12 changes: 7 additions & 5 deletions eth/catalyst/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"bytes"
"context"
crand "crypto/rand"
"errors"
"fmt"
"math/big"
"math/rand"
Expand All @@ -30,6 +31,8 @@ import (

"github.com/stretchr/testify/require"

"github.com/mattn/go-colorable"

"github.com/ethereum/go-ethereum/beacon/engine"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
Expand All @@ -50,7 +53,6 @@ import (
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/trie"
"github.com/mattn/go-colorable"
)

var (
Expand Down Expand Up @@ -717,7 +719,7 @@ func TestEmptyBlocks(t *testing.T) {
payload := getNewPayload(t, api, commonAncestor, nil)

status, err := api.NewPayloadV1(*payload)
if err != nil {
if err != nil && !errors.Is(err, downloader.ErrForcedNeeded) {
t.Fatal(err)
}
if status.Status != engine.VALID {
Expand All @@ -733,7 +735,7 @@ func TestEmptyBlocks(t *testing.T) {
payload = setBlockhash(payload)
// Now latestValidHash should be the common ancestor
status, err = api.NewPayloadV1(*payload)
if err != nil {
if err != nil && !errors.Is(err, downloader.ErrForcedNeeded) {
t.Fatal(err)
}
if status.Status != engine.INVALID {
Expand All @@ -751,7 +753,7 @@ func TestEmptyBlocks(t *testing.T) {
payload = setBlockhash(payload)
// Now latestValidHash should be the common ancestor
status, err = api.NewPayloadV1(*payload)
if err != nil {
if err != nil && !errors.Is(err, downloader.ErrForcedNeeded) {
t.Fatal(err)
}
if status.Status != engine.SYNCING {
Expand Down Expand Up @@ -863,7 +865,7 @@ func TestTrickRemoteBlockCache(t *testing.T) {
// feed the payloads to node B
for _, payload := range invalidChain {
status, err := apiB.NewPayloadV1(*payload)
if err != nil {
if err != nil && !errors.Is(err, downloader.ErrForcedNeeded) {
panic(err)
}
if status.Status == engine.VALID {
Expand Down
6 changes: 5 additions & 1 deletion eth/downloader/skeleton.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ var errChainGapped = errors.New("chain gapped")
// of the current sync cycle is forked with the one advertised by consensus client.
var errChainForked = errors.New("chain forked")

// ErrForcedNeeded is a public error to signal that the header chain
// of the current sync cycle needs a forced flag at startup.
var ErrForcedNeeded = errors.New("forced head needed for startup")

// maxBlockNumGapTolerance is the max gap tolerance by peer
var maxBlockNumGapTolerance = uint64(30)

Expand Down Expand Up @@ -269,7 +273,7 @@ func (s *skeleton) startup() {
// New head announced, start syncing to it, looping every time a current
// cycle is terminated due to a chain event (head reorg, old chain merge).
if !event.force {
event.errc <- errors.New("forced head needed for startup")
event.errc <- ErrForcedNeeded
continue
}
event.errc <- nil // forced head accepted for startup
Expand Down
Loading