handle context cancel

0xPolygon · Nov 12, 2024 · f2d99e1 · f2d99e1
1 parent 1a3109b
commit f2d99e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/crates/cdk/versions.json b/crates/cdk/versions.json
@@ -5,7 +5,7 @@
   "cdk_validium_node_image": "0xpolygon/cdk-validium-node:0.7.0-cdk",
   "zkevm_bridge_proxy_image": "haproxy:3.0-bookworm",
   "zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC1",
-  "zkevm_bridge_ui_image": "leovct/zkevm-bridge-ui:multi-network",
+  "zkevm_bridge_ui_image": "leovct/zkevm-bridge-ui:multi-network-2",
   "zkevm_contracts_image": "leovct/zkevm-contracts:v8.0.0-rc.4-fork.12",
   "zkevm_da_image": "0xpolygon/cdk-data-availability:0.0.10",
   "zkevm_node_image": "hermeznetwork/zkevm-node:v0.7.3",

diff --git a/sync/evmdownloader.go b/sync/evmdownloader.go
@@ -163,9 +163,13 @@ func (d *EVMDownloaderImplementation) WaitForNewBlocks(
 		case <-ticker.C:
 			header, err := d.ethClient.HeaderByNumber(ctx, d.blockFinality)
 			if err != nil {
-				attempts++
-				d.log.Error("error getting last block num from eth client: ", err)
-				d.rh.Handle("waitForNewBlocks", attempts)
+				if errors.Is(err, context.Canceled) {
+					attempts++
+					d.log.Error("error getting last block num from eth client: ", err)
+					d.rh.Handle("waitForNewBlocks", attempts)
+				} else {
+					d.log.Warn("context has been canceled while trying to get header by number")
+				}
 				continue
 			}
 			if header.Number.Uint64() > lastBlockSeen {