From 6d0d8ac38a0282c901b873e5f436594a6b432a1a Mon Sep 17 00:00:00 2001
From: jsvisa <delweng@gmail.com>
Date: Tue, 25 Jul 2023 17:18:05 +0800
Subject: [PATCH] eth/filters: check reorgBlock in idempotent

Signed-off-by: jsvisa <delweng@gmail.com>
---
 eth/filters/api.go | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/eth/filters/api.go b/eth/filters/api.go
index 3d93cf3cc5..6184927a99 100644
--- a/eth/filters/api.go
+++ b/eth/filters/api.go
@@ -380,13 +380,10 @@ func (api *FilterAPI) histLogs(notifier notifier, rpcSub *rpc.Subscription, from
 					}
 					continue
 				}
-				// TODO: if reorg occured in more than once?
-				if reorgBlock == 0 {
-					reorgBlock = logs[0].BlockNumber
-					if reorgBlock <= delivered {
-						logger.Info("Reorg detected", "reorgBlock", reorgBlock, "delivered", delivered)
-						reorged = true
-					}
+				reorgBlock = logs[0].BlockNumber
+				if reorgBlock <= delivered {
+					logger.Info("Reorg detected", "reorgBlock", reorgBlock, "delivered", delivered)
+					reorged = true
 				}
 				if !reorged {
 					continue