Merge pull request #27 from Crossbell-Box/fix/nil-block-caused-panic

fix: nil block caused panic
Crossbell-Box · May 23, 2023 · e743987 · e743987
2 parents 2bcb920 + 782d86e
commit e743987
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/listener/ethereum.go b/listener/ethereum.go
@@ -254,13 +254,15 @@ func (e *EthereumListener) GetSubscriptions() map[string]*bridgeCore.Subscribe {
 }
 
 func (e *EthereumListener) UpdateCurrentBlock(block bridgeCore.Block) error {
-	if block != nil && e.GetCurrentBlock().GetHeight() < block.GetHeight() {
-		log.Info(fmt.Sprintf("[%sListener] UpdateCurrentBlock", e.name), "new block", block.GetHeight(), "current block", e.GetCurrentBlock().GetHeight())
-		e.currentBlock.Store(block)
-		return e.SaveCurrentBlockToDB()
-	} else if e.GetCurrentBlock().GetHeight() >= block.GetHeight() {
-		log.Info(fmt.Sprintf("[%sListener] UpdateCurrentBlock: block <= current block. Check the RPC if needed", e.name), "new block", block.GetHeight(), "current block", e.GetCurrentBlock().GetHeight())
-	}
+	if block != nil {
+		if e.GetCurrentBlock().GetHeight() < block.GetHeight() {
+			log.Info(fmt.Sprintf("[%sListener] UpdateCurrentBlock", e.name), "new block", block.GetHeight(), "current block", e.GetCurrentBlock().GetHeight())
+			e.currentBlock.Store(block)
+			return e.SaveCurrentBlockToDB()
+		} else if e.GetCurrentBlock().GetHeight() >= block.GetHeight() {
+			log.Info(fmt.Sprintf("[%sListener] UpdateCurrentBlock: block <= current block. Check the RPC if needed", e.name), "new block", block.GetHeight(), "current block", e.GetCurrentBlock().GetHeight())
+		}
+	} // else just skip this block
 	return nil
 }