[alpha] Move header stuck fix from devel (#4226)

* allow --syncmode=snap for bor-mainnnet (#4206)

* save

* save

* allow --syncmode=snap for bor-mainnnet #4206

* allow snap sync for mumbai chain (#4208)

* save

* mumbai

* Bor: GetTransactionReceipt (#4209)

* fixed miner.sigfile option (#4210)

* Snap: reduced memory footprint on building huffman table (#4214)

* save

* save

* save

* save

* Remove dependency on leveldb (#4213)

* save

* save

* save

* save

* save

* save

* methods to read single txn by txnID (#4215)

* It's safe now to open snapshots at app start (#4216)

* removed obsolete trie variant (#4172)

* up gods lib version (#4217)

* Fix `rpc.BlockNumberOrHash` unmarshaling (#4218)

* add test

* fix unmarshaling bug

Co-authored-by: Igor Mandrigin <i@mandrigin.ru>

* return err on invalid syncmode (#4219)

* save

* save

* save

* fixed kiln bug (#4221)

* Clean headers pointers when removing links (#4222)

* Clean headers pointers when removing links

* Replace the lock

Co-authored-by: Alexey Sharp <alexeysharp@Alexeys-iMac.local>

* Makefile: pass docker build arguments (#4212)

Dockerfile requires some --build-arg options.
Fix "docker" target to pass them.
Fix GIT_TAG to reflect the most recent tag related to HEAD, instead of an unrelated most recent tag.
Use it as the image VERSION.

Image tags need to be passed explicitly if needed:

    DOCKER_FLAGS='-t erigon:latest' make docker

* More header download diagnostics (#4224)

Co-authored-by: Alexey Sharp <alexeysharp@Alexeys-iMac.local>

* Clean anchors, forward sort of headers (#4225)

Co-authored-by: Alexey Sharp <alexeysharp@Alexeys-iMac.local>

Co-authored-by: Alex Sharov <AskAlexSharov@gmail.com>
Co-authored-by: Giulio rebuffo <giulio.rebuffo@gmail.com>
Co-authored-by: Artem Tsebrovskiy <awskii@users.noreply.github.com>
Co-authored-by: Igor Mandrigin <mandrigin@users.noreply.github.com>
Co-authored-by: Igor Mandrigin <i@mandrigin.ru>
Co-authored-by: Alexey Sharp <alexeysharp@Alexeys-iMac.local>
Co-authored-by: battlmonstr <battlmonstr@users.noreply.github.com>

Author: 7 people

cmd/sentry/sentry/sentry_multy_client.go

@@ -488,7 +488,7 @@ func (cs *MultyClient) blockHeaders(ctx context.Context, pkt eth.BlockHeadersPac
 		})
 	}
 	if cs.Hd.POSSync() {
-		sort.Sort(headerdownload.HeadersByHeightAndHash(csHeaders)) // Sorting by reverse order of block heights
+		sort.Sort(headerdownload.HeadersReverseSort(csHeaders)) // Sorting by reverse order of block heights
 		tx, err := cs.db.BeginRo(ctx)
 		defer tx.Rollback()
 		if err != nil {
@@ -502,6 +502,7 @@ func (cs *MultyClient) blockHeaders(ctx context.Context, pkt eth.BlockHeadersPac
 			cs.Penalize(ctx, penalties)
 		}
 	} else {
+		sort.Sort(headerdownload.HeadersSort(csHeaders)) // Sorting by order of block heights
 		canRequestMore := cs.Hd.ProcessHeaders(csHeaders, false /* newBlock */, ConvertH512ToPeerID(peerID))
 
 		if canRequestMore {

eth/stagedsync/stage_headers.go

@@ -821,7 +821,7 @@ Loop:
 				log.Info("Req/resp stats", "req", reqCount, "reqMin", reqMin, "reqMax", reqMax,
 					"skel", skeletonReqCount, "skelMin", skeletonReqMin, "skelMax", skeletonReqMax,
 					"resp", respCount, "respMin", respMin, "respMax", respMax)
-
+				cfg.hd.LogAnchorState()
 				if noProgressCounter >= 5 && wasProgress {
 					log.Warn("Looks like chain is not progressing, moving to the next stage")
 					break Loop

turbo/stages/headerdownload/header_algos.go

@@ -56,21 +56,40 @@ const POSPandaBanner = `
 `
 
 // Implements sort.Interface so we can sort the incoming header in the message by block height
-type HeadersByHeightAndHash []ChainSegmentHeader
+type HeadersReverseSort []ChainSegmentHeader
 
-func (h HeadersByHeightAndHash) Len() int {
+func (h HeadersReverseSort) Len() int {
 	return len(h)
 }
 
-func (h HeadersByHeightAndHash) Less(i, j int) bool {
+func (h HeadersReverseSort) Less(i, j int) bool {
 	// Note - the ordering is the inverse ordering of the block heights
 	if h[i].Number != h[j].Number {
 		return h[i].Number > h[j].Number
 	}
 	return bytes.Compare(h[i].Hash[:], h[j].Hash[:]) > 0
 }
 
-func (h HeadersByHeightAndHash) Swap(i, j int) {
+func (h HeadersReverseSort) Swap(i, j int) {
+	h[i], h[j] = h[j], h[i]
+}
+
+// Implements sort.Interface so we can sort the incoming header in the message by block height
+type HeadersSort []ChainSegmentHeader
+
+func (h HeadersSort) Len() int {
+	return len(h)
+}
+
+func (h HeadersSort) Less(i, j int) bool {
+	// Note - the ordering is the inverse ordering of the block heights
+	if h[i].Number != h[j].Number {
+		return h[i].Number < h[j].Number
+	}
+	return bytes.Compare(h[i].Hash[:], h[j].Hash[:]) < 0
+}
+
+func (h HeadersSort) Swap(i, j int) {
 	h[i], h[j] = h[j], h[i]
 }
 
@@ -208,17 +227,20 @@ func (hd *HeaderDownload) pruneLinkQueue() {
 			} else {
 				prevChild.next = link.next
 			}
+			if anchor.fLink == nil {
+				hd.removeAnchor(anchor)
+			}
 		}
 	}
 }
 
-func (hd *HeaderDownload) AnchorState() string {
+func (hd *HeaderDownload) LogAnchorState() {
 	hd.lock.RLock()
 	defer hd.lock.RUnlock()
-	return hd.anchorState()
+	hd.logAnchorState()
 }
 
-func (hd *HeaderDownload) anchorState() string {
+func (hd *HeaderDownload) logAnchorState() {
 	//nolint:prealloc
 	var ss []string
 	for anchorParent, anchor := range hd.anchors {
@@ -276,7 +298,9 @@ func (hd *HeaderDownload) anchorState() string {
 		ss = append(ss, sb.String())
 	}
 	sort.Strings(ss)
-	return strings.Join(ss, "\n")
+	for _, s := range ss {
+		log.Info(s)
+	}
 }
 
 func (hd *HeaderDownload) RecoverFromDb(db kv.RoDB) error {
@@ -877,7 +901,7 @@ func (hd *HeaderDownload) ProcessHeader(sh ChainSegmentHeader, newBlock bool, pe
 			return false
 		}
 		if len(hd.anchors) >= hd.anchorLimit {
-			log.Debug(fmt.Sprintf("too many anchors: %d, limit %d, state: %s", len(hd.anchors), hd.anchorLimit, hd.anchorState()))
+			log.Debug(fmt.Sprintf("too many anchors: %d, limit %d", len(hd.anchors), hd.anchorLimit))
 			return false
 		}
 	}