forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/downloader: return nil from cleanStales if the latest filled hashnis non-existent or different than the corresponding skeleton header. add test case that beacon syncs a chain, beacon syncs to a separate fork

Browse source 
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
This commit is contained in:
Jared Wasinger 2024-04-12 07:54:49 -07:00
parent ee00779a79
commit 9f6de6d68a
3 changed files with 17 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
eth/downloader/downloader.go
View file

@ -235,7 +235,7 @@ func New(stateDb ethdb.Database, mux *event.TypeMux, chain BlockChain, lightchai
syncStartBlock: chain.CurrentSnapBlock().Number.Uint64(),
}
// Create the post-merge skeleton syncer and start the process
dl.skeleton = newSkeleton(chain, stateDb, dl.peers, dropPeer, newBeaconBackfiller(dl, success))
dl.skeleton = newSkeleton(stateDb, dl.peers, dropPeer, newBeaconBackfiller(dl, success))
go dl.stateFetcher()
return dl
@ -498,7 +498,6 @@ func (d *Downloader) syncWithPeer(p *peerConnection, hash common.Hash, td, ttd *
if number < oldest.Number.Uint64() {
count := int(oldest.Number.Uint64() - number) // it's capped by fsMinFullBlocks
headers := d.readHeaderRange(oldest, count)
fmt.Printf("readHeaderRange, oldest=%x, oldest num=%d, count=%d\n", oldest.Hash(), oldest.Number, count)
if len(headers) == count {
pivot = headers[len(headers)-1]
log.Warn("Retrieved pivot header from local", "number", pivot.Number, "hash", pivot.Hash(), "latest", latest.Number, "oldest", oldest.Number)

56
eth/downloader/skeleton.go
View file

@ -142,7 +142,6 @@ type headerRequest struct {
stale chan struct{} // Channel to signal the request was dropped
head uint64 // Head number of the requested batch of headers
chain BlockChain
}
// headerResponse is an already verified remote response to a header request.
@ -202,7 +201,6 @@ type backfiller interface {
type skeleton struct {
db ethdb.Database // Database backing the skeleton
filler backfiller // Chain syncer suspended/resumed by head events
chain BlockChain
peers *peerSet // Set of peers we can sync from
idles map[string]*peerConnection // Set of idle peers in the current sync cycle
@ -229,7 +227,7 @@ type skeleton struct {
// newSkeleton creates a new sync skeleton that tracks a potentially dangling
// header chain until it's linked into an existing set of blocks.
func newSkeleton(chain BlockChain, db ethdb.Database, peers *peerSet, drop peerDropFn, filler backfiller) *skeleton {
func newSkeleton(db ethdb.Database, peers *peerSet, drop peerDropFn, filler backfiller) *skeleton {
sk := &skeleton{
db: db,
filler: filler,
@ -239,7 +237,6 @@ func newSkeleton(chain BlockChain, db ethdb.Database, peers *peerSet, drop peerD
headEvents: make(chan *headUpdate),
terminate: make(chan chan error),
terminated: make(chan struct{}),
chain: chain,
}
go sk.startup()
return sk
@ -349,7 +346,7 @@ func (s *skeleton) Sync(head *types.Header, final *types.Header, force bool) err
// sync is the internal version of Sync that executes a single sync cycle, either
// until some termination condition is reached, or until the current cycle merges
// with a previously aborted run.
func (s *skeleton) sync(head *types.Header) (header *types.Header, err error) {
func (s *skeleton) sync(head *types.Header) (*types.Header, error) {
// If we're continuing a previous merge interrupt, just access the existing
// old state without initing from disk.
if head == nil {
@ -390,27 +387,6 @@ func (s *skeleton) sync(head *types.Header) (header *types.Header, err error) {
log.Error("Latest filled block is not available")
return
}
// if the skeleton just linked up and the current snap/full block is within
// the range of the skeleton, the skeleton forked
newlyLinked :=
rawdb.HasHeader(s.db, s.progress.Subchains[0].Next, s.progress.Subchains[0].Tail-1) &&
rawdb.HasBody(s.db, s.progress.Subchains[0].Next, s.progress.Subchains[0].Tail-1) &&
rawdb.HasReceipts(s.db, s.progress.Subchains[0].Next, s.progress.Subchains[0].Tail-1) && !linked
if newlyLinked && filled.Number.Uint64() >= s.progress.Subchains[0].Tail {
// TODO: this could also happen if the skeleton was reverted back to a block already in the filled history?
// ^probably/definitely not but need to verify
// revert the chain to the shared ancestor
ancestor, err := s.findSkeletonAncestor(filled)
if err != nil {
log.Crit("Failed to find skeleton ancestor", "err", err)
}
if err = s.chain.SetHead(ancestor); err != nil {
log.Crit("Failed to rewind chain", "err", err)
}
filled = s.chain.CurrentSnapBlock()
}
// If something was filled, try to delete stale sync helpers. If
// unsuccessful, warn the user, but not much else we can do (it's
// a programming error, just let users report an issue and don't
@ -1156,6 +1132,16 @@ func (s *skeleton) cleanStales(filled *types.Header) error {
if number+1 == s.progress.Subchains[0].Tail {
return nil
}
// If the latest fill was on a different subchain, it means the backfiller
// was interrupted before it got to do any meaningful work, no cleanup
header := rawdb.ReadSkeletonHeader(s.db, filled.Number.Uint64())
if header == nil {
log.Debug("Filled header outside of skeleton range", "number", number, "head", s.progress.Subchains[0].Head, "tail", s.progress.Subchains[0].Tail)
return nil
} else if header.Hash() != filled.Hash() {
log.Debug("Filled header on different sidechain", "number", number, "filled", filled.Hash(), "skeleton", header.Hash())
return nil
}
var (
start uint64
end uint64
@ -1270,21 +1256,3 @@ func (s *skeleton) Bounds() (head *types.Header, tail *types.Header, final *type
func (s *skeleton) Header(number uint64) *types.Header {
return rawdb.ReadSkeletonHeader(s.db, number)
}
// find the common ancestor header of the skeleton chain and the snap block
func (s *skeleton) findSkeletonAncestor(filledHeader *types.Header) (uint64, error) {
for {
if filledHeader.Hash() == s.Header(filledHeader.Number.Uint64()).Hash() {
return filledHeader.Number.Uint64(), nil
}
if filledHeader.Number.Uint64() == s.progress.Subchains[0].Tail-1 {
if filledHeader.Hash() == s.progress.Subchains[0].Next {
return filledHeader.Number.Uint64(), nil
}
break
}
filledHeader = s.chain.GetHeaderByHash(filledHeader.ParentHash)
}
log.Crit("absolutely should not happen: the chain of the filled header and the skeleton chain must have a common ancestor")
return 0, nil
}

6
eth/downloader/skeleton_test.go
View file

@ -368,7 +368,7 @@ func TestSkeletonSyncInit(t *testing.T) {
// Create a skeleton sync and run a cycle
wait := make(chan struct{})
skeleton := newSkeleton(nil, db, newPeerSet(), nil, newHookedBackfiller())
skeleton := newSkeleton(db, newPeerSet(), nil, newHookedBackfiller())
skeleton.syncStarting = func() { close(wait) }
skeleton.Sync(tt.head, nil, true)
@ -482,7 +482,7 @@ func TestSkeletonSyncExtend(t *testing.T) {
// Create a skeleton sync and run a cycle
wait := make(chan struct{})
skeleton := newSkeleton(nil, db, newPeerSet(), nil, newHookedBackfiller())
skeleton := newSkeleton(db, newPeerSet(), nil, newHookedBackfiller())
skeleton.syncStarting = func() { close(wait) }
skeleton.Sync(tt.head, nil, true)
@ -858,7 +858,7 @@ func TestSkeletonSyncRetrievals(t *testing.T) {
}
}
// Create a skeleton sync and run a cycle
skeleton := newSkeleton(nil, db, peerset, drop, filler)
skeleton := newSkeleton(db, peerset, drop, filler)
skeleton.Sync(tt.head, nil, true)
var progress skeletonProgress