Merge pull request #154 from kaleido-io/handle-duplicate-block-number

Handle duplicate block number in the same getFilterChanges call
hyperledger · Sep 5, 2024 · 81ea8f3 · 81ea8f3
2 parents 102fac7 + 81c455f
commit 81ea8f3
Show file tree

Hide file tree

Showing 2 changed files with 388 additions and 1 deletion.
diff --git a/internal/ethereum/blocklistener.go b/internal/ethereum/blocklistener.go
@@ -200,6 +200,7 @@ func (bl *blockListener) listenLoop() {
 			failCount++
 			continue
 		}
+		log.L(bl.ctx).Debugf("Block filter received new block hashes: %+v", blockHashes)
 
 		update := &ffcapi.BlockHashEvent{GapPotential: gapPotential, Created: fftypes.Now()}
 		var notifyPos *list.Element
@@ -230,7 +231,7 @@ func (bl *blockListener) listenLoop() {
 			default:
 				candidate := bl.reconcileCanonicalChain(bi)
 				// Check this is the lowest position to notify from
-				if candidate != nil && (notifyPos == nil || candidate.Value.(*minimalBlockInfo).number < notifyPos.Value.(*minimalBlockInfo).number) {
+				if candidate != nil && (notifyPos == nil || candidate.Value.(*minimalBlockInfo).number <= notifyPos.Value.(*minimalBlockInfo).number) {
 					notifyPos = candidate
 				}
 			}