forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-24 00:39:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/filtermaps: fixed indexer checkpoint initialization (#31419)

Browse source 
This PR fixes a bug in the `lastMapBoundaryBefore` logic that resulted
in incorrect checkpoint initialization (started rendering from the
previous epoch boundary which caused the `needTailEpoch` check to fail).
Apparently the bug was present before but went unnoticed because
`needTailEpoch` behaved differently.
Fixes https://github.com/ethereum/go-ethereum/issues/31413
This commit is contained in:
Felföldi Zsolt 2025-03-18 13:46:23 +01:00 committed by GitHub
parent e5f4b274b3
commit fe640f8f57
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/filtermaps/indexer.go
View file

@ -346,6 +346,9 @@ func (f *FilterMaps) needTailEpoch(epoch uint32) bool {
if epoch > firstEpoch { if epoch > firstEpoch {
return true return true
} }
if (epoch+1)<<f.logMapsPerEpoch >= f.indexedRange.maps.AfterLast() {
return true
}
if epoch+1 < firstEpoch { if epoch+1 < firstEpoch {
return false return false
} }

29
core/filtermaps/map_renderer.go
View file

@ -185,27 +185,30 @@ func (f *FilterMaps) lastCanonicalMapBoundaryBefore(renderBefore uint32) (nextMa
// lastMapBoundaryBefore returns the latest map boundary before the specified // lastMapBoundaryBefore returns the latest map boundary before the specified
// map index. // map index.
func (f *FilterMaps) lastMapBoundaryBefore(mapIndex uint32) (uint32, bool) { func (f *FilterMaps) lastMapBoundaryBefore(renderBefore uint32) (uint32, bool) {
if !f.indexedRange.initialized || f.indexedRange.maps.AfterLast() == 0 { if !f.indexedRange.initialized || f.indexedRange.maps.AfterLast() == 0 || renderBefore == 0 {
return 0, false return 0, false
} }
if mapIndex > f.indexedRange.maps.AfterLast() { afterLastFullMap := f.indexedRange.maps.AfterLast()
mapIndex = f.indexedRange.maps.AfterLast() if afterLastFullMap > 0 && f.indexedRange.headIndexed {
afterLastFullMap-- // last map is not full
} }
if mapIndex > f.indexedRange.maps.First() { firstRendered := min(renderBefore-1, afterLastFullMap)
return mapIndex - 1, true if firstRendered == 0 {
return 0, false
} }
if mapIndex+f.mapsPerEpoch > f.indexedRange.maps.First() { if firstRendered >= f.indexedRange.maps.First() {
if mapIndex > f.indexedRange.maps.First()-f.mapsPerEpoch+f.indexedRange.tailPartialEpoch { return firstRendered - 1, true
mapIndex = f.indexedRange.maps.First() - f.mapsPerEpoch + f.indexedRange.tailPartialEpoch }
} if firstRendered+f.mapsPerEpoch > f.indexedRange.maps.First() {
firstRendered = min(firstRendered, f.indexedRange.maps.First()-f.mapsPerEpoch+f.indexedRange.tailPartialEpoch)
} else { } else {
mapIndex = (mapIndex >> f.logMapsPerEpoch) << f.logMapsPerEpoch firstRendered = (firstRendered >> f.logMapsPerEpoch) << f.logMapsPerEpoch
} }
if mapIndex == 0 { if firstRendered == 0 {
return 0, false return 0, false
} }
return mapIndex - 1, true return firstRendered - 1, true
} }
// emptyFilterMap returns an empty filter map. // emptyFilterMap returns an empty filter map.