improve(relayer): Clear out token data explicitly and log token balances

src/clients/InventoryClient.ts

@@ -634,7 +634,9 @@ export class InventoryClient {
   }
 
   async wrapL2EthIfAboveThreshold(): Promise<void> {
-    if (!this.isInventoryManagementEnabled()) {
+    // If inventoryConfig is defined, there will be a default wrapEtherTarget and wrapEtherThreshold
+    // set by RelayerConfig.ts
+    if (!this?.inventoryConfig) {
       return;
     }
     this.log("Checking ETH->WETH Wrap status");

src/clients/TokenClient.ts

@@ -123,6 +123,10 @@ export class TokenClient {
     this.tokenShortfall = {};
   }
 
+  clearTokenData(): void {
+    this.tokenData = {};
+  }
+
   async setOriginTokenApprovals(): Promise<void> {
     const tokensToApprove: { chainId: number; token: string }[] = [];
     Object.entries(this.tokenData).forEach(([_chainId, tokenMap]) => {
@@ -191,7 +195,20 @@ export class TokenClient {
       }
     }
 
-    this.logger.debug({ at: "TokenBalanceClient", message: "TokenBalance client updated!" });
+    // Remove allowance from token data when logging.
+    const balanceData = Object.fromEntries(
+      Object.entries(this.tokenData).map(([chainId, tokenData]) => {
+        return [
+          chainId,
+          Object.fromEntries(
+            Object.entries(tokenData).map(([token, { balance }]) => {
+              return [token, balance];
+            })
+          ),
+        ];
+      })
+    );
+    this.logger.debug({ at: "TokenBalanceClient", message: "TokenBalance client updated!", balanceData });
   }
 
   async fetchTokenData(spokePoolClient: SpokePoolClient): Promise<{

src/clients/bridges/ArbitrumAdapter.ts

@@ -214,6 +214,13 @@ export class ArbitrumAdapter extends BaseAdapter {
       const value = ethBalance.sub(target);
       this.logger.debug({ at: this.getName(), message: "Wrapping ETH", threshold, target, value, ethBalance });
       return await this._wrapEthIfAboveThreshold(threshold, contract, value, simMode);
+    } else {
+      this.logger.debug({
+        at: this.getName(),
+        message: "ETH balance below threhsold",
+        threshold,
+        ethBalance,
+      });
     }
     return null;
   }

src/clients/bridges/ZKSyncAdapter.ts

@@ -246,6 +246,13 @@ export class ZKSyncAdapter extends BaseAdapter {
       const value = ethBalance.sub(target);
       this.logger.debug({ at: this.getName(), message: "Wrapping ETH", threshold, target, value, ethBalance });
       return await this._wrapEthIfAboveThreshold(threshold, contract, value, simMode);
+    } else {
+      this.logger.debug({
+        at: this.getName(),
+        message: "ETH balance below threhsold",
+        threshold,
+        ethBalance,
+      });
     }
     return null;
   }

src/clients/bridges/op-stack/OpStackAdapter.ts

@@ -154,6 +154,13 @@ export class OpStackAdapter extends BaseAdapter {
       const value = ethBalance.sub(target);
       this.logger.debug({ at: this.getName(), message: "Wrapping ETH", threshold, target, value, ethBalance });
       return await this._wrapEthIfAboveThreshold(threshold, contract, value, simMode);
+    } else {
+      this.logger.debug({
+        at: this.getName(),
+        message: "ETH balance below threhsold",
+        threshold,
+        ethBalance,
+      });
     }
     return null;
   }

src/relayer/RelayerClientHelper.ts

@@ -158,6 +158,7 @@ export async function updateRelayerClients(clients: RelayerClients, config: Rela
 
   // Update the token client after the inventory client has done its wrapping of L2 ETH to ensure latest WETH ballance.
   // The token client needs route data, so wait for update before checking approvals.
+  clients.tokenClient.clearTokenData();
   await clients.tokenClient.update();
   if (config.sendingRelaysEnabled) {
     await clients.tokenClient.setOriginTokenApprovals();

src/relayer/RelayerConfig.ts

@@ -108,7 +108,7 @@ export class RelayerConfig extends CommonConfig {
           );
         }
       });
-      Object.keys(this.inventoryConfig.tokenConfig).forEach((l1Token) => {
+      Object.keys(this.inventoryConfig?.tokenConfig ?? {}).forEach((l1Token) => {
         Object.keys(this.inventoryConfig.tokenConfig[l1Token]).forEach((chainId) => {
           const { targetPct, thresholdPct, unwrapWethThreshold, unwrapWethTarget } =
             this.inventoryConfig.tokenConfig[l1Token][chainId];