fix: reset block number in chain iterator on rollback (#569)

agaffney · web-flow · commit d581746ca12f · 2025-03-29T09:54:34.000-05:00
Signed-off-by: Aurora Gaffney &lt;aurora@blinklabs.io&gt;
diff --git a/state/chain.go b/state/chain.go
@@ -94,6 +94,7 @@ func (ci *ChainIterator) Next(blocking bool) (*ChainIteratorResult, error) {
 	if ci.blockNumber > 0 && ci.blockNumber-1 > tip.BlockNumber {
 		ret.Point = tip.Point
 		ret.Rollback = true
+		ci.blockNumber = tip.BlockNumber + 1
 		ci.ls.RUnlock()
 		return ret, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ func (ci ChainIterator) Next(blocking bool) (ChainIteratorResult, error) {`
`94`	`94`	`if ci.blockNumber > 0 && ci.blockNumber-1 > tip.BlockNumber {`
`95`	`95`	`ret.Point = tip.Point`
`96`	`96`	`ret.Rollback = true`
	`97`	`+ ci.blockNumber = tip.BlockNumber + 1`
`97`	`98`	`ci.ls.RUnlock()`
`98`	`99`	`return ret, nil`
`99`	`100`	`}`