core/filtermaps: safe and simple SharedRange implementation

This commit is contained in:
zsfelfoldi 2025-08-06 06:41:01 +02:00
parent 8954cbf58f
commit 9e0008650d

View file

@ -124,25 +124,12 @@ func (cv *ChainView) RawReceipts(number uint64) types.Receipts {
// SharedRange returns the block range shared by two chain views. // SharedRange returns the block range shared by two chain views.
func (cv *ChainView) SharedRange(cv2 *ChainView) common.Range[uint64] { func (cv *ChainView) SharedRange(cv2 *ChainView) common.Range[uint64] {
if cv2 == nil { if cv == nil || cv2 == nil {
return common.Range[uint64]{} return common.Range[uint64]{}
} }
sharedLen := min(cv.headNumber, cv2.headNumber) + 1
cv.lock.Lock() for sharedLen > 0 && cv.BlockId(sharedLen-1) != cv2.BlockId(sharedLen-1) {
defer cv.lock.Unlock() sharedLen--
cv2.lock.Lock()
defer cv2.lock.Unlock()
if !cv.extendNonCanonical() || !cv2.extendNonCanonical() {
return common.Range[uint64]{}
}
var sharedLen uint64
for n := min(cv.headNumber+1-uint64(len(cv.hashes)), cv2.headNumber+1-uint64(len(cv2.hashes))); n <= cv.headNumber && n <= cv2.headNumber; n++ {
h1, h2 := cv.blockHash(n), cv2.blockHash(n)
if h1 != h2 || h1 == (common.Hash{}) {
break
}
sharedLen = n + 1
} }
return common.NewRange(0, sharedLen) return common.NewRange(0, sharedLen)
} }