more logs

Author: ogtownsend

pkg/chainaccessor/default_accessor.go

@@ -125,6 +125,8 @@ func (l *DefaultAccessor) GetAllConfigsLegacy(
 		"destChainSelector", destChainSelector,
 		"sourceChainSelectors", sourceChainSelectors,
 		"numSourceChainConfigs", len(sourceChainConfigs),
+		"standardConfigs", standardConfigs,
+		"sourceChainConfigs", sourceChainConfigs,
 	)
 	return standardConfigs, sourceChainConfigs, nil
 }

pkg/reader/ccip.go

@@ -671,6 +671,7 @@ func (r *ccipChainReader) discoverOffRampContracts(
 	}
 
 	// Add static config contracts
+	lggr.Debugw("checking offramp static config contracts")
 	if len(config.Offramp.StaticConfig.RmnRemote) > 0 {
 		lggr.Infow("appending RMN remote contract address",
 			"address", hex.EncodeToString(config.Offramp.StaticConfig.RmnRemote),
@@ -679,6 +680,9 @@ func (r *ccipChainReader) discoverOffRampContracts(
 	}
 
 	if len(config.Offramp.StaticConfig.NonceManager) > 0 {
+		lggr.Infow("appending nonce manager contract address",
+			"address", hex.EncodeToString(config.Offramp.StaticConfig.NonceManager),
+			"chain", r.destChain)
 		resp = resp.Append(consts.ContractNameNonceManager, r.destChain, config.Offramp.StaticConfig.NonceManager)
 	}
 
@@ -690,6 +694,7 @@ func (r *ccipChainReader) discoverOffRampContracts(
 		resp = resp.Append(consts.ContractNameFeeQuoter, r.destChain, config.Offramp.DynamicConfig.FeeQuoter)
 	}
 
+	lggr.Debugw("returning discovered contracts", "contracts", resp)
 	return resp, nil
 }
 
@@ -699,14 +704,21 @@ func (r *ccipChainReader) DiscoverContracts(ctx context.Context,
 	var resp ContractAddresses
 	var err error
 	lggr := logutil.WithContextValues(ctx, r.lggr)
+	lggr = logger.With(lggr, "function", "DiscoverContracts",
+		"destChain", r.destChain, "offRamp", r.offrampAddress,
+		"supportedChains", supportedChains, "allChains", allChains)
 
 	if slices.Contains(supportedChains, r.destChain) {
+		lggr.Debugw("dest chain is supported, calling discoverOffRampContracts")
 		resp, err = r.discoverOffRampContracts(ctx, lggr, allChains)
 		// Can't continue with discovery if the destination chain is not available.
 		// We read source chains OnRamps from there, and onRamps are essential for feeQuoter and Router discovery.
 		if err != nil {
+			lggr.Debugw("failed to discover destination contracts", "err", err)
 			return nil, fmt.Errorf("discover destination contracts: %w", err)
 		}
+	} else {
+		lggr.Debugw("dest chain is not supported, skipping discoverOffRampContracts")
 	}
 
 	// The following calls are on dynamically configured chains which may not
@@ -744,32 +756,46 @@ func (r *ccipChainReader) DiscoverContracts(ctx context.Context,
 					"err", err)
 				return
 			}
+			lggr.Debugw("got chain config for chainSel", "chainSel", chainSel, "config", config)
 
 			// Use mutex to safely update the shared resp
 			mu.Lock()
 			defer mu.Unlock()
 
 			// Add FeeQuoter from dynamic config
 			if !cciptypes.UnknownAddress(config.OnRamp.DynamicConfig.DynamicConfig.FeeQuoter).IsZeroOrEmpty() {
+				lggr.Debugw("appending fee quoter contract address",
+					"address", hex.EncodeToString(config.OnRamp.DynamicConfig.DynamicConfig.FeeQuoter))
 				resp = resp.Append(
 					consts.ContractNameFeeQuoter,
 					chainSel,
 					config.OnRamp.DynamicConfig.DynamicConfig.FeeQuoter)
+			} else {
+				lggr.Warnw("FeeQuoter address is zero or empty. Ignore for disabled chains otherwise "+
+					"check for onRamp misconfiguration", "chain", chainSel,
+					"address", hex.EncodeToString(config.OnRamp.DynamicConfig.DynamicConfig.FeeQuoter))
 			}
 
 			// Add Router from dest chain config
 			if !cciptypes.UnknownAddress(config.OnRamp.DestChainConfig.Router).IsZeroOrEmpty() {
+				lggr.Debugw("appending router contract address",
+					"address", hex.EncodeToString(config.OnRamp.DestChainConfig.Router))
 				resp = resp.Append(
 					consts.ContractNameRouter,
 					chainSel,
 					config.OnRamp.DestChainConfig.Router)
+			} else {
+				lggr.Warnw("Router address is zero or empty. Ignore for disabled chains otherwise "+
+					"check for onRamp misconfiguration", "chain", chainSel,
+					"address", hex.EncodeToString(config.OnRamp.DestChainConfig.Router))
 			}
 		}(chainCopy)
 	}
 
 	// Wait for all goroutines to complete
 	wg.Wait()
 
+	lggr.Debugw("returning discovered contracts", "contracts", resp)
 	return resp, nil
 }
 

pkg/reader/config_poller_v2.go

@@ -165,15 +165,18 @@ func (c *configPollerV2) GetChainConfig(
 	ctx context.Context,
 	chainSel cciptypes.ChainSelector,
 ) (cciptypes.ChainConfigSnapshot, error) {
+	lggr := logger.With(c.lggr, "function", "config_poller_v2 GetChainConfig", "chain", chainSel, "destChain", c.destChainSelector)
+
 	// Confirm we have an accessor for this chain
 	_, err := getChainAccessor(c.chainAccessors, chainSel)
 	if err != nil {
-		c.lggr.Errorw("No chain accessor for chain", "chain", chainSel, "error", err)
+		lggr.Errorw("No chain accessor for chain", "chain", chainSel, "error", err)
 		return cciptypes.ChainConfigSnapshot{}, fmt.Errorf("no chain accessor for %s: %w", chainSel, err)
 	}
 
 	cache := c.getOrCreateChainCache(chainSel)
 	if cache == nil {
+		lggr.Debugw("failed to get or create chain cache for chain")
 		return cciptypes.ChainConfigSnapshot{},
 			fmt.Errorf("failed to get or create chain cache for chain %s", chainSel)
 	}
@@ -182,23 +185,26 @@ func (c *configPollerV2) GetChainConfig(
 	cache.chainConfigMu.RLock()
 	if !cache.chainConfigRefresh.IsZero() {
 		defer cache.chainConfigMu.RUnlock()
-		c.lggr.Debugw("Returning cached chain config",
+		lggr.Debugw("Returning cached chain config",
 			"chain", chainSel,
-			"cacheAge", time.Since(cache.chainConfigRefresh))
+			"cacheAge", time.Since(cache.chainConfigRefresh),
+			"cachedChainConfigSnapshot", cache.chainConfigData)
 		return cache.chainConfigData, nil
 	}
 	cache.chainConfigMu.RUnlock()
 
 	// Cache miss: batch fetch all configs for this chain. Don't hold the lock while fetching.
 	// TODO: alternatively, if we want to prevent multiple goroutines from fetching the same chain config (especially
 	//     during node startup), we could block on this fetch if the cache is empty.
+	lggr.Debugw("Cache miss - fetching chain config via batch refresh")
 	if err := c.batchRefreshChainAndSourceConfigs(ctx, chainSel); err != nil {
 		return cciptypes.ChainConfigSnapshot{}, err
 	}
 
 	// Re-acquire read lock to return the data
 	cache.chainConfigMu.RLock()
 	defer cache.chainConfigMu.RUnlock()
+	lggr.Debugw("Returning freshly fetched chain config after cache miss", "freshlyFetchedChainConfigSnapshot", cache.chainConfigData)
 	return cache.chainConfigData, nil
 }