refactor: Simplify Monitor balance reporting and delete TokenTransferClient by nicholaspai · Pull Request #3111 · across-protocol/relayer

nicholaspai · 2026-03-25T15:53:24Z

Summary

Major simplification of the Monitor's balance reporting and spoke pool running balance logic:

Delete TokenTransferClient: Removed entirely — it was only used by Monitor and added complexity by querying ERC20 Transfer events per-chain. Balance reporting now uses direct on-chain balance queries instead.
Rewrite reportRelayerBalances(): Replaced the old multi-pass approach (initializeBalanceReports → updateCurrentRelayerBalances → updateLatestAndFutureRelayerRefunds → helpers for cross-chain transfers, L2 withdrawals, pending rebalances) with a single streamlined loop that:
- Uses getInventoryBalanceContributorTokens() to discover L2 tokens per (l1Token, chainId) pair
- Batches all balance requests into a single parallel fetch
- Fetches pending L2 withdrawals in parallel
- Rolls up cross-chain transfers, pending rebalances, and upcoming refunds inline
- Outputs an aligned ASCII table per token (instead of the old markdown format)
Rewrite checkSpokePoolRunningBalances() → reportSpokePoolRunningBalances(): Replaced the old approach that reconstructed pool rebalance roots and computed slow fill amounts from scratch with a call to the new getLatestRunningBalances() utility, producing a clean per-token table.
Remove L2_ONLY_TOKENS config: The L2Token interface, l2OnlyTokens config parsing, and related reporting are deleted — L2-only tokens are now handled naturally via getInventoryBalanceContributorTokens.
Remove stale interfaces: BalanceType, RelayerBalanceReport, RelayerBalanceTable, RelayerBalanceCell, TokenTransfer, TransfersByChain, TransfersByTokens — all deleted.
Fix BaseChainAdapter monitored addresses: Changed from Address[] to { [l1Token: string]: Address[] } so adapters only query bridge events for addresses relevant to each token's pool rebalance route. This prevents unnecessary queries for hub/spoke pool addresses on chains without a route for a given token.
Fix AdapterManager address filtering: Hub/spoke pool addresses are now excluded from monitored addresses for tokens that don't have a pool rebalance route on that chain.
Fix BinanceCEXBridge decimal handling: Finalization events now use L2 token decimals instead of L1 decimals, fixing incorrect amount conversions.
Fix outstanding transfer matching in BaseChainAdapter: Changed from per-event amount matching (which broke when L1/L2 decimals differed) to net-amount approach: sum all deposits, subtract all finalized amounts (with decimal conversion), then attribute the net outstanding amount to the newest unfinalized events.
Deduplicate spoke pool addresses in MonitorClientHelper: Prevents duplicate cross-chain transfer queries when multiple chains share the same spoke pool address.
Add monitored relayers to adapter manager: Monitored relayer addresses are now passed to the AdapterManager so cross-chain transfer queries include relayer bridges.

Test plan

Updated test/Monitor.ts — removed tests for deleted methods (initializeBalanceReports, updateCurrentRelayerBalances, updateLatestAndFutureRelayerRefunds), simplified test monitor class to MockMonitor that only overrides getTokenInfo for test tokens
Run full test suite
Deploy to staging monitor and verify balance reports render correctly
Verify spoke pool running balance reports against production data

🤖 Generated with Claude Code

…inance deposit matching, and floatToBN fix - TokenUtils: getInventoryEquivalentL1TokenAddress, getInventoryBalanceContributorTokens, isL2OnlyEquivalentToken - RunningBalanceUtils: getLatestRunningBalances extracted for shared use - BinanceUtils: getOutstandingBinanceDeposits for cross-L2 deposit matching, export BinanceDeposit type - BNUtils: Fix floatToBN MAX_SAFE_INTEGER overflow via string manipulation Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…t, InventoryClient, TokenClient - BundleDataApproxClient: returns values in L1 token decimals, groups deposits/refunds across inventory-equivalent L2 tokens, restores requireExecution param, fixes refund decimal conversion - InventoryClient: uses getInventoryEquivalentL1TokenAddress, getInventoryBalanceContributorTokens, getLatestRunningBalances; adds protected getTokenInfo for test mocking - TokenClient: uses getInventoryBalanceContributorTokens for L2 token discovery - Test updates: alias config for USDC, L1-decimal refunds, MockInventoryClient getTokenInfo override Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

- BinanceCEXBridge: rewrite getL2PendingWithdrawalAmount to correctly compute outstanding deposits when finalizer batches deposits from multiple L2s into single L1 withdrawal. Uses getOutstandingBinanceDeposits with Redis-cached deposit sender lookups. - BaseChainAdapter: use getInventoryEquivalentL1TokenAddress, skip zero-amount outstanding transfers in getOutstandingCrossChainTransfers - AdapterManager: minor cleanup - MockLineaEvents: accept amount parameter for BridgingInitiatedV2/BridgingFinalizedV2 - Generic adapter tests: updated for zero-amount skip behavior Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…ication

…Client - Monitor.reportRelayerBalances: rewritten to use getInventoryBalanceContributorTokens for per-chain L2 token discovery, batch-fetch all balances in parallel, produce aligned table per token. Adds protected getTokenInfo for test mocking. Fixes pending rebalance double-count by only applying to canonical L2 token. - MonitorConfig: removes L2Token interface, l2OnlyTokens, L2_ONLY_TOKENS env var - MonitorClientHelper: removes TokenTransferClient construction - Delete TokenTransferClient (no longer needed) - Delete unused BalanceType/RelayerBalanceReport/TokenTransfer interfaces Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1227d02411

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-03-25T15:58:58Z

src/monitor/Monitor.ts

+    if (isDefined(this.clients.rebalancerClient)) {
+      pendingRebalances = await this.clients.rebalancerClient.getPendingRebalances();


Guard pending rebalance fetch to keep monitor loop alive

This call now runs without any error handling, so a transient failure inside rebalancerClient.getPendingRebalances() (for example from an external bridge/CEX adapter) will throw out of reportRelayerBalances and abort the entire monitor iteration. The previous flow handled this path defensively and continued with zero pending rebalances, so this is a resilience regression that can suppress unrelated monitoring checks.

Useful? React with 👍 / 👎.

This shouldn't error and if it does we want to know

src/monitor/Monitor.ts

src/adapter/l2Bridges/BinanceCEXBridge.ts

nicholaspai · 2026-03-26T16:01:11Z

@codex re review

chatgpt-codex-connector · 2026-03-26T16:03:36Z

Summary

Added a defensive try/catch around rebalancerClient.getPendingRebalances() inside Monitor.reportRelayerBalances(), so transient failures no longer abort the monitor iteration. The code now logs an error and continues with empty pending rebalance data. src/monitor/Monitor.tsL410-L422
Kept pending rebalance behavior unchanged when fetch succeeds; this is strictly a resilience guard around the fetch path. src/monitor/Monitor.tsL411-L415
Documentation updates were not needed for this targeted runtime hardening change (no config/interface/runtime-flow contract changed beyond error tolerance in one call path). src/monitor/Monitor.tsL405-L424

Testing

⚠️ yarn test test/Monitor.ts (fails in this environment: Yarn workspace/lockfile mismatch — package not present in lockfile).

View task →

- MonitorClientHelper: Should filter out duplicate spoke pool address strings passed into AdapterManager - AdapterManager: should filter out hub/spoke pool addresses from monitored addresses passed to BaseChainAdapter if the token doesn't have a pool rebalance route to that chain. - BaseChainAdapter: computes outstanding l1->l2 transfer amount using net amount approach rather than marking off events one by one, which better supports adapters with Binance which don't have this 1:1 relationship assumption

nicholaspai · 2026-03-26T19:29:55Z

@codex

@bmzig I fixed various issues here can you PTAL: fe5e120 (details in commit message)

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fe5e120254

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

src/monitor/Monitor.ts

chatgpt-codex-connector · 2026-03-26T19:36:08Z

src/adapter/BaseChainAdapter.ts

+          const totalAmount = totalDepositedAmount.sub(totalFinalizedAmount);
+          let remainingUnfinalizedAmount = totalAmount;
+          if (remainingUnfinalizedAmount.gt(0)) {
+            for (const depositEvent of depositInitiatedEvents) {


Exclude ignored bridge tx refs when attributing outstanding hashes

The net outstanding amount is computed from deposits filtered by ignoredPendingBridgeTxnRefs, but the tx-hash attribution loop still iterates the unfiltered depositInitiatedEvents. In cases where ignored bridge txs are present, those ignored refs can be recorded as outstanding (and consume remainingUnfinalizedAmount) while real outstanding txs are omitted, which breaks diagnostics and any alerting that relies on depositTxHashes.

Useful? React with 👍 / 👎.

Valid, fixed this here 474a382

…in adapter codex suggestion

nicholaspai · 2026-03-26T19:51:44Z

@codex @claude

chatgpt-codex-connector · 2026-03-26T19:53:59Z

Summary

Added defensive error handling around rebalancerClient.getPendingRebalances() in Monitor.reportRelayerBalances() so transient fetch failures no longer abort the monitor reporting cycle; on failure, the monitor now logs and continues with an empty pending-rebalance map. src/monitor/Monitor.tsL410-L422
Documentation updates were not needed for this targeted resilience fix because no config/interface/runtime contract changed beyond fallback behavior on one read path. src/monitor/Monitor.tsL405-L424
Committed on the current branch as fc59457 and created a follow-up PR via the make_pr tool titled “[Follow-up] Guard Monitor pending rebalance fetch failures”.

Testing

⚠️ yarn test test/Monitor.ts (fails in this environment due to Yarn workspace/lockfile mismatch: package missing from lockfile).

View task →

nicholaspai and others added 6 commits March 25, 2026 11:36

Update InventoryClient.InventoryRebalance.ts

1fecd57

Merge branch 'npai/adapter-binance-cex-fix' into npai/monitor-simplif…

583641f

…ication

nicholaspai requested review from bmzig, dohaki, mrice32 and pxrl as code owners March 25, 2026 15:53

chatgpt-codex-connector bot reviewed Mar 25, 2026

View reviewed changes

nicholaspai added 2 commits March 25, 2026 12:08

Update Monitor.ts

4e8448d

Update Monitor.ts

84ebe4c

nicholaspai mentioned this pull request Mar 25, 2026

fix: Binance CEX pending withdrawal logic and adapter zero-amount cleanup #3110

Merged

2 tasks

Base automatically changed from npai/client-bundle-inventory to master March 26, 2026 15:51

merge

6f79f74

Update Monitor.ts

dfa7ac1

bmzig previously approved these changes Mar 26, 2026

View reviewed changes

nicholaspai dismissed bmzig’s stale review via fe5e120 March 26, 2026 19:26

chatgpt-codex-connector bot reviewed Mar 26, 2026

View reviewed changes

nicholaspai added 3 commits March 26, 2026 15:43

Fix tests, change monitor logging to be mobile-friendly, fix base cha…

474a382

…in adapter codex suggestion

Fix tests

28edb66

lint

ab427cf

bmzig approved these changes Mar 26, 2026

View reviewed changes

nicholaspai merged commit 4feb9dd into master Mar 26, 2026
4 checks passed

nicholaspai deleted the npai/monitor-simplification branch March 26, 2026 20:16

mrice32 mentioned this pull request Apr 7, 2026

fix(monitor): Fix TypeError in spokePoolAddress dedup #3167

Merged

2 tasks

		if (isDefined(this.clients.rebalancerClient)) {
		pendingRebalances = await this.clients.rebalancerClient.getPendingRebalances();

Conversation

nicholaspai commented Mar 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

nicholaspai Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

nicholaspai commented Mar 26, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 26, 2026

Summary

Uh oh!

nicholaspai commented Mar 26, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector bot Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

nicholaspai Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

nicholaspai commented Mar 26, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 26, 2026

Summary

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

nicholaspai commented Mar 25, 2026 •

edited

Loading