roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

eth/catalyst: disallow importing blocks via newPayload during snap sync (#25210)

Browse Source 
* eth/catalyst: disallow importing blocks via newPayload during snap sync

* eth/catalyst: make tests pass by using full sync only

* eth/catalysts: make the import delay a bit cleaner

* eth/catalyst: fix typo

Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>

Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>
This commit is contained in:
Péter Szilágyi
2022-07-01 14:38:26 +03:00
committed by GitHub
co-authored by Marius van der Wijden
parent 692bfd1bf8
commit de1cecb22e
3 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eth/handler.go
+1 -1
View File
@@ -249,7 +249,7 @@ func newHandler(config *handlerConfig) (*handler, error) {
// out a way yet where nodes can decide unilaterally whether the network is new
// or not. This should be fixed if we figure out a solution.
if atomic.LoadUint32(&h.snapSync) == 1 {
log.Warn("Fast syncing, discarded propagated block", "number", blocks[0].Number(), "hash", blocks[0].Hash())
log.Warn("Snap syncing, discarded propagated block", "number", blocks[0].Number(), "hash", blocks[0].Hash())
return 0, nil
}
if h.merger.TDDReached() {