If initial get chain id fails retry

0xsequence · Aug 15, 2023 · 5da30cf · 5da30cf
1 parent f39ee54
commit 5da30cf
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/ethmonitor/ethmonitor.go b/ethmonitor/ethmonitor.go
@@ -137,7 +137,7 @@ func NewMonitor(provider ethrpc.Interface, options ...Options) (*Monitor, error)
 	chainID := ethkit.NewLazy(func() *big.Int {
 		chainId, err := getChainID(provider)
 		if err != nil {
-			return big.NewInt(-1)
+			return nil
 		}
 		return chainId
 	})
@@ -473,7 +473,7 @@ func (m *Monitor) filterLogs(ctx context.Context, blockHash common.Hash, topics
 		topicsDigest.Write([]byte{'\n'})
 	}
 
-	key := fmt.Sprintf("ethmonitor:%s:Logs:hash=%s;topics=%d", m.chainID.Get().String(), blockHash.String(), topicsDigest.Sum64())
+	key := fmt.Sprintf("ethmonitor:%s:Logs:hash=%s;topics=%d", m.getChainID().String(), blockHash.String(), topicsDigest.Sum64())
 	return m.logCache.GetOrSetWithLockEx(ctx, key, getter, m.options.CacheExpiry)
 }
 
@@ -536,7 +536,7 @@ func (m *Monitor) fetchNextBlock(ctx context.Context) (*types.Block, bool, error
 	}
 
 	if m.blockCache != nil {
-		key := fmt.Sprintf("ethmonitor:%s:BlockNum:%s", m.chainID.Get().String(), m.nextBlockNumber.String())
+		key := fmt.Sprintf("ethmonitor:%s:BlockNum:%s", m.getChainID().String(), m.nextBlockNumber.String())
 		nextBlock, err := m.blockCache.GetOrSetWithLockEx(ctx, key, getter, m.options.CacheExpiry)
 		return nextBlock, miss, err
 	}
@@ -625,7 +625,7 @@ func (m *Monitor) fetchBlockByHash(ctx context.Context, hash common.Hash) (*type
 	}
 
 	if m.blockCache != nil {
-		key := fmt.Sprintf("ethmonitor:%s:BlockHash:%s", m.chainID.Get().String(), hash.String())
+		key := fmt.Sprintf("ethmonitor:%s:BlockHash:%s", m.getChainID().String(), hash.String())
 		return m.blockCache.GetOrSetWithLockEx(ctx, key, getter, m.options.CacheExpiry)
 	}
 	return getter(ctx, "")
@@ -775,6 +775,14 @@ func (m *Monitor) PurgeHistory() {
 	}
 }
 
+func (m *Monitor) getChainID() *big.Int {
+	if val := m.chainID.Get(); val == nil {
+		return big.NewInt(-1)
+	} else {
+		return val
+	}
+}
+
 func getChainID(provider ethrpc.Interface) (*big.Int, error) {
 	var chainID *big.Int
 	err := breaker.Do(context.Background(), func() error {