@across-protocol/sdk 4.2.16 → 4.3.0

package/dist/esm/clients/HubPoolClient.d.ts

@@ -1,8 +1,8 @@
 import { Contract, EventFilter } from "ethers";
 import winston from "winston";
-import { CachingMechanismInterface, CancelledRootBundle, CrossChainContractsSet, Deposit, DepositWithBlock, DestinationTokenWithBlock, DisputedRootBundle, ExecutedRootBundle, L1Token, Log, LpToken, PendingRootBundle, ProposedRootBundle, RealizedLpFee, TokenRunningBalance } from "../interfaces";
+import { CachingMechanismInterface, CancelledRootBundle, CrossChainContractsSet, Deposit, DepositWithBlock, DestinationTokenWithBlock, DisputedRootBundle, ExecutedRootBundle, TokenInfo, Log, LpToken, PendingRootBundle, ProposedRootBundle, RealizedLpFee, TokenRunningBalance, L1TokenInfo } from "../interfaces";
 import { EVMBlockFinder } from "../arch/evm";
-import { BigNumber, EventSearchConfig, MakeOptional } from "../utils";
+import { BigNumber, EventSearchConfig, MakeOptional, EvmAddress, Address } from "../utils";
 import { AcrossConfigStoreClient as ConfigStoreClient } from "./AcrossConfigStoreClient/AcrossConfigStoreClient";
 import { BaseAbstractClient, UpdateFailureReason } from "./BaseAbstractClient";
 type HubPoolUpdateSuccess = {
@@ -38,7 +38,7 @@ export declare class HubPoolClient extends BaseAbstractClient {
         timeToCache?: number;
     };
     protected l1TokensToDestinationTokens: L1TokensToDestinationTokens;
-    protected l1Tokens: L1Token[];
+    protected l1Tokens: L1TokenInfo[];
     protected lpTokens: {
         [token: string]: LpToken;
     };
@@ -69,21 +69,21 @@ export declare class HubPoolClient extends BaseAbstractClient {
     getCancelledRootBundles(): CancelledRootBundle[];
     getDisputedRootBundles(): DisputedRootBundle[];
     getExecutedRootBundles(): ExecutedRootBundle[];
-    getSpokePoolForBlock(chain: number, block?: number): string;
-    getSpokePoolActivationBlock(chain: number, spokePool: string): number | undefined;
-    getL2TokenForL1TokenAtBlock(l1Token: string, destinationChainId: number, latestHubBlock?: number): string;
-    getL1TokenForL2TokenAtBlock(l2Token: string, destinationChainId: number, latestHubBlock?: number): string;
-    protected getL1TokenForDeposit(deposit: Pick<DepositWithBlock, "originChainId" | "inputToken" | "quoteBlockNumber">): string;
-    l2TokenEnabledForL1Token(l1Token: string, destinationChainId: number): boolean;
-    l2TokenEnabledForL1TokenAtBlock(l1Token: string, destinationChainId: number, hubBlockNumber: number): boolean;
-    l2TokenHasPoolRebalanceRoute(l2Token: string, l2ChainId: number, hubPoolBlock?: number): boolean;
+    getSpokePoolForBlock(chain: number, block?: number): Address;
+    getSpokePoolActivationBlock(chain: number, spokePool: Address): number | undefined;
+    getL2TokenForL1TokenAtBlock(l1Token: EvmAddress, destinationChainId: number, latestHubBlock?: number): Address;
+    getL1TokenForL2TokenAtBlock(l2Token: Address, destinationChainId: number, latestHubBlock?: number): EvmAddress;
+    protected getL1TokenForDeposit(deposit: Pick<DepositWithBlock, "originChainId" | "inputToken" | "quoteBlockNumber">): EvmAddress;
+    l2TokenEnabledForL1Token(l1Token: EvmAddress, destinationChainId: number): boolean;
+    l2TokenEnabledForL1TokenAtBlock(l1Token: EvmAddress, destinationChainId: number, hubBlockNumber: number): boolean;
+    l2TokenHasPoolRebalanceRoute(l2Token: Address, l2ChainId: number, hubPoolBlock?: number): boolean;
     /**
      * @dev If tokenAddress + chain do not exist in TOKEN_SYMBOLS_MAP then this will throw.
      * @param tokenAddress Token address on `chain`
-     * @param chain Chain where the `tokenAddress` exists in TOKEN_SYMBOLS_MAP.
+     * @param chainId Chain where the `tokenAddress` exists in TOKEN_SYMBOLS_MAP.
      * @returns Token info for the given token address on the L2 chain including symbol and decimal.
      */
-    getTokenInfoForAddress(tokenAddress: string, chain: number): L1Token;
+    getTokenInfoForAddress(tokenAddress: string, chainId: number): TokenInfo;
     /**
      * Resolve a given timestamp to a block number on the HubPool chain.
      * @param timestamp A single timestamp to be resolved to a block number on the HubPool chain.
@@ -100,7 +100,7 @@ export declare class HubPoolClient extends BaseAbstractClient {
     getBlockNumbers(timestamps: number[]): Promise<{
         [quoteTimestamp: number]: number;
     }>;
-    getCurrentPoolUtilization(l1Token: string): Promise<BigNumber>;
+    getCurrentPoolUtilization(l1Token: EvmAddress): Promise<BigNumber>;
     /**
      * For a HubPool token at a specific block number, compute the relevant utilization.
      * @param hubPoolToken HubPool token to query utilization for.
@@ -110,13 +110,13 @@ export declare class HubPoolClient extends BaseAbstractClient {
      * @param timeToCache Age at which the response is able to be cached.
      * @returns HubPool utilization at `blockNumber` after optional `amount` increase in utilization.
      */
-    protected getUtilization(hubPoolToken: string, blockNumber: number, depositAmount: BigNumber, timestamp: number, timeToCache: number): Promise<BigNumber>;
+    protected getUtilization(hubPoolToken: EvmAddress, blockNumber: number, depositAmount: BigNumber, timestamp: number, timeToCache: number): Promise<BigNumber>;
     computeRealizedLpFeePct(deposit: LpFeeRequest): Promise<RealizedLpFee>;
     batchComputeRealizedLpFeePct(deposits: LpFeeRequest[]): Promise<RealizedLpFee[]>;
-    getL1Tokens(): L1Token[];
-    getTokenInfoForL1Token(l1Token: string): L1Token | undefined;
-    getLpTokenInfoForL1Token(l1Token: string): LpToken | undefined;
-    areTokensEquivalent(tokenA: string, chainIdA: number, tokenB: string, chainIdB: number, hubPoolBlock?: number): boolean;
+    getL1Tokens(): L1TokenInfo[];
+    getTokenInfoForL1Token(l1Token: EvmAddress): L1TokenInfo | undefined;
+    getLpTokenInfoForL1Token(l1Token: EvmAddress): LpToken | undefined;
+    areTokensEquivalent(tokenA: Address, chainIdA: number, tokenB: Address, chainIdB: number, hubPoolBlock?: number): boolean;
     getSpokeActivationBlockForChain(chainId: number): number;
     isRootBundleValid(rootBundle: ProposedRootBundle, latestMainnetBlock: number): boolean;
     getRootBundleEvalBlockNumberContainingBlock(latestMainnetBlock: number, block: number, chain: number, chainIdListOverride?: number[]): number | undefined;
@@ -142,9 +142,9 @@ export declare class HubPoolClient extends BaseAbstractClient {
     getNthFullyExecutedRootBundle(n: number, startBlock?: number): ProposedRootBundle | undefined;
     getLatestBundleEndBlockForChain(chainIdList: number[], latestMainnetBlock: number, chainId: number): number;
     getNextBundleStartBlockNumber(chainIdList: number[], latestMainnetBlock: number, chainId: number): number;
-    getLatestExecutedRootBundleContainingL1Token(block: number, chain: number, l1Token: string): ExecutedRootBundle | undefined;
-    getRunningBalanceBeforeBlockForChain(block: number, chain: number, l1Token: string): TokenRunningBalance;
-    getRunningBalanceForToken(l1Token: string, executedRootBundle: ExecutedRootBundle | undefined): TokenRunningBalance;
+    getLatestExecutedRootBundleContainingL1Token(block: number, chain: number, l1Token: EvmAddress): ExecutedRootBundle | undefined;
+    getRunningBalanceBeforeBlockForChain(block: number, chain: number, l1Token: EvmAddress): TokenRunningBalance;
+    getRunningBalanceForToken(l1Token: EvmAddress, executedRootBundle: ExecutedRootBundle | undefined): TokenRunningBalance;
     _update(eventNames: HubPoolEvent[]): Promise<HubPoolUpdate>;
     update(eventsToQuery?: HubPoolEvent[]): Promise<void>;
     protected getBundleEndBlockForChain(proposeRootBundleEvent: ProposedRootBundle, chainId: number, chainIdList: number[]): number;

package/dist/esm/clients/HubPoolClient.js

@@ -1,10 +1,10 @@
 import { __assign, __awaiter, __extends, __generator, __spreadArray } from "tslib";
 import assert from "assert";
 import _ from "lodash";
-import { DEFAULT_CACHING_SAFE_LAG, DEFAULT_CACHING_TTL, TOKEN_SYMBOLS_MAP, ZERO_ADDRESS } from "../constants";
+import { DEFAULT_CACHING_SAFE_LAG, DEFAULT_CACHING_TTL, TOKEN_SYMBOLS_MAP } from "../constants";
 import * as lpFeeCalculator from "../lpFeeCalculator";
 import { EVMBlockFinder } from "../arch/evm";
-import { BigNumber, bnZero, dedupArray, assign, fetchTokenInfo, getCachedBlockForTimestamp, getCurrentTime, getNetworkName, isDefined, mapAsync, paginatedEventQuery, shouldCache, sortEventsDescending, spreadEventWithBlockNumber, toBN, getTokenInfo, getUsdcSymbol, compareAddressesSimple, chainIsSvm, getDeployedAddress, SvmAddress, } from "../utils";
+import { BigNumber, bnZero, dedupArray, assign, fetchTokenInfo, getCachedBlockForTimestamp, getCurrentTime, getNetworkName, isDefined, mapAsync, paginatedEventQuery, shouldCache, sortEventsDescending, spreadEventWithBlockNumber, toBN, getTokenInfo, getUsdcSymbol, chainIsSvm, getDeployedAddress, SvmAddress, EvmAddress, toAddressType, } from "../utils";
 import { BaseAbstractClient, isUpdateFailureReason, UpdateFailureReason } from "./BaseAbstractClient";
 var HubPoolClient = /** @class */ (function (_super) {
     __extends(HubPoolClient, _super);
@@ -26,6 +26,7 @@ var HubPoolClient = /** @class */ (function (_super) {
         // L1Token -> destinationChainId -> destinationToken
         _this.l1TokensToDestinationTokens = {};
         _this.l1Tokens = []; // L1Tokens and their associated info.
+        // @dev `token` here is a 20-byte hex sting
         _this.lpTokens = {};
         _this.proposedRootBundles = [];
         _this.canceledRootBundles = [];
@@ -84,29 +85,31 @@ var HubPoolClient = /** @class */ (function (_super) {
     HubPoolClient.prototype.getSpokePoolActivationBlock = function (chain, spokePool) {
         // Return first time that this spoke pool was registered in the HubPool as a cross chain contract. We can use
         // this block as the oldest block that we should query for SpokePoolClient purposes.
-        var mostRecentSpokePoolUpdateBeforeBlock = this.crossChainContracts[chain].find(function (crossChainContract) { return crossChainContract.spokePool === spokePool; });
+        var mostRecentSpokePoolUpdateBeforeBlock = this.crossChainContracts[chain].find(function (crossChainContract) {
+            return crossChainContract.spokePool.eq(spokePool);
+        });
         return mostRecentSpokePoolUpdateBeforeBlock === null || mostRecentSpokePoolUpdateBeforeBlock === void 0 ? void 0 : mostRecentSpokePoolUpdateBeforeBlock.blockNumber;
     };
     // Returns the latest L2 token to use for an L1 token as of the input hub block.
     HubPoolClient.prototype.getL2TokenForL1TokenAtBlock = function (l1Token, destinationChainId, latestHubBlock) {
         var _a, _b, _c, _d;
         if (latestHubBlock === void 0) { latestHubBlock = Number.MAX_SAFE_INTEGER; }
-        if (!((_b = (_a = this.l1TokensToDestinationTokensWithBlock) === null || _a === void 0 ? void 0 : _a[l1Token]) === null || _b === void 0 ? void 0 : _b[destinationChainId])) {
+        if (!((_b = (_a = this.l1TokensToDestinationTokensWithBlock) === null || _a === void 0 ? void 0 : _a[l1Token.toEvmAddress()]) === null || _b === void 0 ? void 0 : _b[destinationChainId])) {
             var chain = getNetworkName(destinationChainId);
             var symbol = ((_c = this.l1Tokens.find(function (_a) {
                 var address = _a.address;
-                return address === l1Token;
-            })) !== null && _c !== void 0 ? _c : { symbol: l1Token }).symbol;
+                return address.eq(l1Token);
+            })) !== null && _c !== void 0 ? _c : { symbol: l1Token.toString() }).symbol;
             throw new Error("Could not find SpokePool mapping for ".concat(symbol, " on ").concat(chain, " and L1 token ").concat(l1Token));
         }
         // Find the last mapping published before the target block.
-        var l2Token = sortEventsDescending(this.l1TokensToDestinationTokensWithBlock[l1Token][destinationChainId]).find(function (mapping) { return mapping.blockNumber <= latestHubBlock; });
+        var l2Token = sortEventsDescending(this.l1TokensToDestinationTokensWithBlock[l1Token.toEvmAddress()][destinationChainId]).find(function (mapping) { return mapping.blockNumber <= latestHubBlock; });
         if (!l2Token) {
             var chain = getNetworkName(destinationChainId);
             var symbol = ((_d = this.l1Tokens.find(function (_a) {
                 var address = _a.address;
-                return address === l1Token;
-            })) !== null && _d !== void 0 ? _d : { symbol: l1Token }).symbol;
+                return address.eq(l1Token);
+            })) !== null && _d !== void 0 ? _d : { symbol: l1Token.toString() }).symbol;
             throw new Error("Could not find SpokePool mapping for ".concat(symbol, " on ").concat(chain, " at or before HubPool block ").concat(latestHubBlock, "!"));
         }
         return l2Token.l2Token;
@@ -116,10 +119,14 @@ var HubPoolClient = /** @class */ (function (_super) {
         var _this = this;
         if (latestHubBlock === void 0) { latestHubBlock = Number.MAX_SAFE_INTEGER; }
         var l2Tokens = Object.keys(this.l1TokensToDestinationTokensWithBlock)
-            .filter(function (l1Token) { return _this.l2TokenEnabledForL1Token(l1Token, destinationChainId); })
+            .filter(function (l1Token) { return _this.l2TokenEnabledForL1Token(EvmAddress.from(l1Token), destinationChainId); })
             .map(function (l1Token) {
             // Return all matching L2 token mappings that are equal to or earlier than the target block.
-            return _this.l1TokensToDestinationTokensWithBlock[l1Token][destinationChainId].filter(function (mapping) { return mapping.l2Token === l2Token && mapping.blockNumber <= latestHubBlock; });
+            // @dev Since tokens on L2s (like Solana) can have 32 byte addresses, filter on the lower 20 bytes of the token only.
+            return _this.l1TokensToDestinationTokensWithBlock[l1Token][destinationChainId].filter(function (dstTokenWithBlock) {
+                return dstTokenWithBlock.l2Token.truncateToBytes20() === l2Token.truncateToBytes20() &&
+                    dstTokenWithBlock.blockNumber <= latestHubBlock;
+            });
         })
             .flat();
         if (l2Tokens.length === 0) {
@@ -137,12 +144,12 @@ var HubPoolClient = /** @class */ (function (_super) {
     };
     HubPoolClient.prototype.l2TokenEnabledForL1Token = function (l1Token, destinationChainId) {
         var _a, _b;
-        return ((_b = (_a = this.l1TokensToDestinationTokens) === null || _a === void 0 ? void 0 : _a[l1Token]) === null || _b === void 0 ? void 0 : _b[destinationChainId]) != undefined;
+        return ((_b = (_a = this.l1TokensToDestinationTokens) === null || _a === void 0 ? void 0 : _a[l1Token.toEvmAddress()]) === null || _b === void 0 ? void 0 : _b[destinationChainId]) != undefined;
     };
     HubPoolClient.prototype.l2TokenEnabledForL1TokenAtBlock = function (l1Token, destinationChainId, hubBlockNumber) {
         var _a, _b, _c;
         // Find the last mapping published before the target block.
-        var l2Token = sortEventsDescending((_c = (_b = (_a = this.l1TokensToDestinationTokensWithBlock) === null || _a === void 0 ? void 0 : _a[l1Token]) === null || _b === void 0 ? void 0 : _b[destinationChainId]) !== null && _c !== void 0 ? _c : []).find(function (mapping) { return mapping.blockNumber <= hubBlockNumber; });
+        var l2Token = sortEventsDescending((_c = (_b = (_a = this.l1TokensToDestinationTokensWithBlock) === null || _a === void 0 ? void 0 : _a[l1Token.toEvmAddress()]) === null || _b === void 0 ? void 0 : _b[destinationChainId]) !== null && _c !== void 0 ? _c : []).find(function (mapping) { return mapping.blockNumber <= hubBlockNumber; });
         return l2Token !== undefined;
     };
     HubPoolClient.prototype.l2TokenHasPoolRebalanceRoute = function (l2Token, l2ChainId, hubPoolBlock) {
@@ -152,7 +159,7 @@ var HubPoolClient = /** @class */ (function (_super) {
                 var _l2ChainId = _a[0], setPoolRebalanceRouteEvents = _a[1];
                 return setPoolRebalanceRouteEvents.some(function (e) {
                     return (e.blockNumber <= hubPoolBlock &&
-                        compareAddressesSimple(e.l2Token, l2Token) &&
+                        e.l2Token.truncateToBytes20() === l2Token.truncateToBytes20() &&
                         Number(_l2ChainId) === l2ChainId);
                 });
             });
@@ -161,16 +168,17 @@ var HubPoolClient = /** @class */ (function (_super) {
     /**
      * @dev If tokenAddress + chain do not exist in TOKEN_SYMBOLS_MAP then this will throw.
      * @param tokenAddress Token address on `chain`
-     * @param chain Chain where the `tokenAddress` exists in TOKEN_SYMBOLS_MAP.
+     * @param chainId Chain where the `tokenAddress` exists in TOKEN_SYMBOLS_MAP.
      * @returns Token info for the given token address on the L2 chain including symbol and decimal.
      */
-    HubPoolClient.prototype.getTokenInfoForAddress = function (tokenAddress, chain) {
+    // TODO: didn't change `tokenAddress` here to Address because of downstream getTokenInfo impl
+    HubPoolClient.prototype.getTokenInfoForAddress = function (tokenAddress, chainId) {
         var _a;
-        var tokenInfo = getTokenInfo(tokenAddress, chain);
+        var tokenInfo = getTokenInfo(tokenAddress, chainId);
         // @dev Temporarily handle case where an L2 token for chain ID can map to more than one TOKEN_SYMBOLS_MAP
         // entry. For example, L2 Bridged USDC maps to both the USDC and USDC.e/USDbC entries in TOKEN_SYMBOLS_MAP.
-        if (tokenInfo.symbol.toLowerCase() === "usdc" && chain !== this.chainId) {
-            tokenInfo.symbol = (_a = getUsdcSymbol(tokenAddress, chain)) !== null && _a !== void 0 ? _a : "UNKNOWN";
+        if (tokenInfo.symbol.toLowerCase() === "usdc" && chainId !== this.chainId) {
+            tokenInfo.symbol = (_a = getUsdcSymbol(tokenAddress, chainId)) !== null && _a !== void 0 ? _a : "UNKNOWN";
         }
         return tokenInfo;
     };
@@ -262,11 +270,11 @@ var HubPoolClient = /** @class */ (function (_super) {
                                     case 0:
                                         overrides = { blockTag: blockNumber };
                                         if (!depositAmount.eq(0)) return [3 /*break*/, 2];
-                                        return [4 /*yield*/, this.hubPool.callStatic.liquidityUtilizationCurrent(hubPoolToken, overrides)];
+                                        return [4 /*yield*/, this.hubPool.callStatic.liquidityUtilizationCurrent(hubPoolToken.toEvmAddress(), overrides)];
                                     case 1: 
                                     // For zero amount, just get the utilisation at `blockNumber`.
                                     return [2 /*return*/, _a.sent()];
-                                    case 2: return [4 /*yield*/, this.hubPool.callStatic.liquidityUtilizationPostRelay(hubPoolToken, depositAmount, overrides)];
+                                    case 2: return [4 /*yield*/, this.hubPool.callStatic.liquidityUtilizationPostRelay(hubPoolToken.toEvmAddress(), depositAmount, overrides)];
                                     case 3: return [2 /*return*/, _a.sent()];
                                 }
                             });
@@ -277,8 +285,8 @@ var HubPoolClient = /** @class */ (function (_super) {
                             return [2 /*return*/, resolver()];
                         }
                         key = depositAmount.eq(0)
-                            ? "utilization_".concat(hubPoolToken, "_").concat(blockNumber)
-                            : "utilization_".concat(hubPoolToken, "_").concat(blockNumber, "_").concat(depositAmount.toString(), "_");
+                            ? "utilization_".concat(hubPoolToken.toEvmAddress(), "_").concat(blockNumber)
+                            : "utilization_".concat(hubPoolToken.toEvmAddress(), "_").concat(blockNumber, "_").concat(depositAmount.toString(), "_");
                         return [4 /*yield*/, cache.get(key)];
                     case 1:
                         result = _a.sent();
@@ -341,6 +349,7 @@ var HubPoolClient = /** @class */ (function (_super) {
                         getHubPoolTokens = function () { return dedupArray(Object.values(hubPoolTokens).filter(isDefined)); };
                         resolveUniqueQuoteTimestamps = function (deposit) {
                             var _a;
+                            var _b;
                             var quoteTimestamp = deposit.quoteTimestamp;
                             // Resolve the HubPool token address for this origin chainId/token pair, if it isn't already known.
                             var quoteBlockNumber = quoteBlocks[quoteTimestamp];
@@ -349,9 +358,9 @@ var HubPoolClient = /** @class */ (function (_super) {
                                 return;
                             }
                             // Append the quoteTimestamp for this HubPool token, if it isn't already enqueued.
-                            (_a = utilizationTimestamps[hubPoolToken]) !== null && _a !== void 0 ? _a : (utilizationTimestamps[hubPoolToken] = []);
-                            if (!utilizationTimestamps[hubPoolToken].includes(quoteTimestamp)) {
-                                utilizationTimestamps[hubPoolToken].push(quoteTimestamp);
+                            (_a = utilizationTimestamps[_b = hubPoolToken.toEvmAddress()]) !== null && _a !== void 0 ? _a : (utilizationTimestamps[_b] = []);
+                            if (!utilizationTimestamps[hubPoolToken.toEvmAddress()].includes(quoteTimestamp)) {
+                                utilizationTimestamps[hubPoolToken.toEvmAddress()].push(quoteTimestamp);
                             }
                         };
                         resolveUtilization = function (hubPoolToken) { return __awaiter(_this, void 0, void 0, function () {
@@ -361,7 +370,7 @@ var HubPoolClient = /** @class */ (function (_super) {
                                 switch (_c.label) {
                                     case 0:
                                         _b = (_a = Object).fromEntries;
-                                        return [4 /*yield*/, mapAsync(utilizationTimestamps[hubPoolToken], function (quoteTimestamp) { return __awaiter(_this, void 0, void 0, function () {
+                                        return [4 /*yield*/, mapAsync(utilizationTimestamps[hubPoolToken.toEvmAddress()], function (quoteTimestamp) { return __awaiter(_this, void 0, void 0, function () {
                                                 var blockNumber, utilization;
                                                 return __generator(this, function (_a) {
                                                     switch (_a.label) {
@@ -394,7 +403,7 @@ var HubPoolClient = /** @class */ (function (_super) {
                                             throw new Error("Cannot computeRealizedLpFeePct for deposit with no pool rebalance route for input token ".concat(deposit.inputToken, " on ").concat(originChainId));
                                         }
                                         rateModel = this.configStoreClient.getRateModelForBlockNumber(hubPoolToken, originChainId, paymentChainId, quoteBlock);
-                                        preUtilization = utilization[hubPoolToken][quoteBlock];
+                                        preUtilization = utilization[hubPoolToken.toEvmAddress()][quoteBlock];
                                         return [4 /*yield*/, this.getUtilization(hubPoolToken, quoteBlock, inputAmount, quoteTimestamp, timeToCache)];
                                     case 1:
                                         postUtilization = _a.sent();
@@ -414,14 +423,19 @@ var HubPoolClient = /** @class */ (function (_super) {
                         // Identify the unique hubPoolToken & quoteTimestamp mappings. This is used to optimise subsequent HubPool queries.
                         deposits.forEach(function (deposit) { return resolveUniqueQuoteTimestamps(deposit); });
                         _c = (_b = Object).fromEntries;
-                        return [4 /*yield*/, mapAsync(getHubPoolTokens(), function (hubPoolToken) { return __awaiter(_this, void 0, void 0, function () { var _a; return __generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0:
-                                        _a = [hubPoolToken];
-                                        return [4 /*yield*/, resolveUtilization(hubPoolToken)];
-                                    case 1: return [2 /*return*/, _a.concat([_b.sent()])];
-                                }
-                            }); }); })];
+                        return [4 /*yield*/, mapAsync(getHubPoolTokens(), function (hubPoolToken) { return __awaiter(_this, void 0, void 0, function () {
+                                var _a;
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
+                                        case 0:
+                                            _a = [hubPoolToken.toEvmAddress()];
+                                            return [4 /*yield*/, resolveUtilization(hubPoolToken)];
+                                        case 1: return [2 /*return*/, _a.concat([
+                                                _b.sent()
+                                            ])];
+                                    }
+                                });
+                            }); })];
                     case 2:
                         // For each token / quoteBlock pair, resolve the utilisation for each quoted block.
                         // This can be reused for each deposit with the same HubPool token and quoteTimestamp pair.
@@ -454,10 +468,10 @@ var HubPoolClient = /** @class */ (function (_super) {
         return this.l1Tokens;
     };
     HubPoolClient.prototype.getTokenInfoForL1Token = function (l1Token) {
-        return this.l1Tokens.find(function (token) { return token.address === l1Token; });
+        return this.l1Tokens.find(function (token) { return token.address.eq(l1Token); });
     };
     HubPoolClient.prototype.getLpTokenInfoForL1Token = function (l1Token) {
-        return this.lpTokens[l1Token];
+        return this.lpTokens[l1Token.toEvmAddress()];
     };
     HubPoolClient.prototype.areTokensEquivalent = function (tokenA, chainIdA, tokenB, chainIdB, hubPoolBlock) {
         if (hubPoolBlock === void 0) { hubPoolBlock = this.latestHeightSearched; }
@@ -468,13 +482,13 @@ var HubPoolClient = /** @class */ (function (_super) {
         // Resolve both SpokePool tokens back to their respective HubPool tokens and verify that they match.
         var l1TokenA = this.getL1TokenForL2TokenAtBlock(tokenA, chainIdA, hubPoolBlock);
         var l1TokenB = this.getL1TokenForL2TokenAtBlock(tokenB, chainIdB, hubPoolBlock);
-        if (l1TokenA !== l1TokenB) {
+        if (!l1TokenA.eq(l1TokenB)) {
             return false;
         }
         // Resolve both HubPool tokens back to a current SpokePool token and verify that they match.
         var _tokenA = this.getL2TokenForL1TokenAtBlock(l1TokenA, chainIdA, hubPoolBlock);
         var _tokenB = this.getL2TokenForL1TokenAtBlock(l1TokenB, chainIdB, hubPoolBlock);
-        return tokenA === _tokenA && tokenB === _tokenB;
+        return tokenA.eq(_tokenA) && tokenB.eq(_tokenB);
     };
     HubPoolClient.prototype.getSpokeActivationBlockForChain = function (chainId) {
         var _a;
@@ -661,7 +675,7 @@ var HubPoolClient = /** @class */ (function (_super) {
         return sortEventsDescending(this.executedRootBundles).find(function (executedLeaf) {
             return (executedLeaf.blockNumber <= block &&
                 executedLeaf.chainId === chain &&
-                executedLeaf.l1Tokens.some(function (token) { return token.toLowerCase() === l1Token.toLowerCase(); }));
+                executedLeaf.l1Tokens.some(function (token) { return token.eq(l1Token); }));
         });
     };
     HubPoolClient.prototype.getRunningBalanceBeforeBlockForChain = function (block, chain, l1Token) {
@@ -671,10 +685,10 @@ var HubPoolClient = /** @class */ (function (_super) {
     HubPoolClient.prototype.getRunningBalanceForToken = function (l1Token, executedRootBundle) {
         var runningBalance = toBN(0);
         if (executedRootBundle) {
-            var indexOfL1Token = executedRootBundle.l1Tokens
-                .map(function (l1Token) { return l1Token.toLowerCase(); })
-                .indexOf(l1Token.toLowerCase());
-            runningBalance = executedRootBundle.runningBalances[indexOfL1Token];
+            var indexOfL1Token = executedRootBundle.l1Tokens.findIndex(function (tokenInBundle) { return tokenInBundle.eq(l1Token); });
+            if (indexOfL1Token !== -1) {
+                runningBalance = executedRootBundle.runningBalances[indexOfL1Token];
+            }
         }
         return { runningBalance: runningBalance };
     };
@@ -738,7 +752,7 @@ var HubPoolClient = /** @class */ (function (_super) {
                         return [2 /*return*/, {
                                 success: true,
                                 currentTime: currentTime,
-                                pendingRootBundleProposal: pendingRootBundleProposal,
+                                pendingRootBundleProposal: __assign(__assign({}, pendingRootBundleProposal), { proposer: toAddressType(pendingRootBundleProposal.proposer, this.chainId) }),
                                 searchEndBlock: searchConfig.to,
                                 events: _events,
                             }];
@@ -749,7 +763,7 @@ var HubPoolClient = /** @class */ (function (_super) {
     HubPoolClient.prototype.update = function (eventsToQuery) {
         if (eventsToQuery === void 0) { eventsToQuery = Object.keys(this.hubPoolEventFilters()); }
         return __awaiter(this, void 0, void 0, function () {
-            var update, events, currentTime, pendingRootBundleProposal, searchEndBlock, _i, _a, event_1, args, dataToAdd, solanaSpokePool, truncatedAddress, _b, _c, event_2, args, destinationToken, usdcTokenSol, truncatedAddress, uniqueL1Tokens, _d, tokenInfo, lpTokenInfo_1, _loop_1, this_1, _e, tokenInfo_1, info, _f, _g, event_3, executedRootBundle, l1Tokens, runningBalances, nTokens, mostRecentProposedRootBundle;
+            var update, events, currentTime, pendingRootBundleProposal, searchEndBlock, _i, _a, event_1, args, dataToAdd, solanaSpokePool, svmSpoke, truncatedAddress, _b, _c, event_2, args, destinationToken, usdcTokenSol, svmUsdc, uniqueL1Tokens, _d, tokenInfo, lpTokenInfo_1, _loop_1, this_1, _e, tokenInfo_1, info, _f, _g, event_3, executedRootBundle, l1Tokens, runningBalances, nTokens, mostRecentProposedRootBundle;
             var _h, _j, _k;
             var _this = this;
             return __generator(this, function (_l) {
@@ -774,7 +788,7 @@ var HubPoolClient = /** @class */ (function (_super) {
                                 event_1 = _a[_i];
                                 args = spreadEventWithBlockNumber(event_1);
                                 dataToAdd = {
-                                    spokePool: args.spokePool,
+                                    spokePool: toAddressType(args.spokePool, this.chainId),
                                     blockNumber: args.blockNumber,
                                     txnRef: args.txnRef,
                                     logIndex: args.logIndex,
@@ -790,14 +804,14 @@ var HubPoolClient = /** @class */ (function (_super) {
                                     if (!solanaSpokePool) {
                                         throw new Error("SVM spoke pool not found for chain ".concat(args.l2ChainId));
                                     }
-                                    truncatedAddress = SvmAddress.from(solanaSpokePool).truncateToBytes20();
+                                    svmSpoke = SvmAddress.from(solanaSpokePool);
+                                    truncatedAddress = svmSpoke.truncateToBytes20();
                                     // Verify the event address matches our expected truncated address
                                     if (args.spokePool.toLowerCase() !== truncatedAddress.toLowerCase()) {
                                         throw new Error("SVM spoke pool address mismatch for chain ".concat(args.l2ChainId, ". ") +
                                             "Expected ".concat(truncatedAddress, ", got ").concat(args.spokePool));
                                     }
-                                    // Store the full Solana address
-                                    dataToAdd.spokePool = SvmAddress.from(solanaSpokePool).toBytes32();
+                                    dataToAdd.spokePool = svmSpoke;
                                 }
                                 assign(this.crossChainContracts, [args.l2ChainId], [dataToAdd]);
                             }
@@ -806,23 +820,23 @@ var HubPoolClient = /** @class */ (function (_super) {
                             for (_b = 0, _c = events["SetPoolRebalanceRoute"]; _b < _c.length; _b++) {
                                 event_2 = _c[_b];
                                 args = spreadEventWithBlockNumber(event_2);
-                                destinationToken = args.destinationToken;
+                                destinationToken = toAddressType(args.destinationToken, this.chainId);
                                 if (chainIsSvm(args.destinationChainId)) {
                                     usdcTokenSol = TOKEN_SYMBOLS_MAP.USDC.addresses[args.destinationChainId];
-                                    truncatedAddress = SvmAddress.from(usdcTokenSol).truncateToBytes20();
-                                    if (destinationToken.toLowerCase() !== truncatedAddress.toLowerCase()) {
+                                    svmUsdc = SvmAddress.from(usdcTokenSol);
+                                    if (destinationToken.truncateToBytes20() !== svmUsdc.truncateToBytes20()) {
                                         throw new Error("SVM USDC address mismatch for chain ".concat(args.destinationChainId, ". ") +
-                                            "Expected ".concat(truncatedAddress, ", got ").concat(destinationToken));
+                                            "Expected ".concat(svmUsdc.truncateToBytes20(), ", got ").concat(destinationToken));
                                     }
-                                    destinationToken = SvmAddress.from(usdcTokenSol).toBytes32();
+                                    destinationToken = svmUsdc;
                                 }
                                 // If the destination token is set to the zero address in an event, then this means Across should no longer
                                 // rebalance to this chain.
-                                if (destinationToken !== ZERO_ADDRESS) {
+                                if (!destinationToken.isZeroAddress()) {
                                     assign(this.l1TokensToDestinationTokens, [args.l1Token, args.destinationChainId], destinationToken);
                                     assign(this.l1TokensToDestinationTokensWithBlock, [args.l1Token, args.destinationChainId], [
                                         {
-                                            l1Token: args.l1Token,
+                                            l1Token: toAddressType(args.l1Token, this.chainId),
                                             l2Token: destinationToken,
                                             blockNumber: args.blockNumber,
                                             txnIndex: args.txnIndex,
@@ -836,7 +850,17 @@ var HubPoolClient = /** @class */ (function (_super) {
                         if (!eventsToQuery.includes("L1TokenEnabledForLiquidityProvision")) return [3 /*break*/, 3];
                         uniqueL1Tokens = dedupArray(events["L1TokenEnabledForLiquidityProvision"].map(function (event) { return String(event.args["l1Token"]); }));
                         return [4 /*yield*/, Promise.all([
-                                Promise.all(uniqueL1Tokens.map(function (l1Token) { return fetchTokenInfo(l1Token, _this.hubPool.provider); })),
+                                Promise.all(uniqueL1Tokens.map(function (l1Token) { return __awaiter(_this, void 0, void 0, function () {
+                                    var tokenInfo;
+                                    return __generator(this, function (_a) {
+                                        switch (_a.label) {
+                                            case 0: return [4 /*yield*/, fetchTokenInfo(l1Token, this.hubPool.provider)];
+                                            case 1:
+                                                tokenInfo = _a.sent();
+                                                return [2 /*return*/, __assign(__assign({}, tokenInfo), { address: EvmAddress.from(l1Token) })];
+                                        }
+                                    });
+                                }); })),
                                 Promise.all(uniqueL1Tokens.map(function (l1Token) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.hubPool.pooledTokens(l1Token, { blockTag: update.searchEndBlock })];
@@ -847,7 +871,7 @@ var HubPoolClient = /** @class */ (function (_super) {
                     case 2:
                         _d = _l.sent(), tokenInfo = _d[0], lpTokenInfo_1 = _d[1];
                         _loop_1 = function (info) {
-                            if (!this_1.l1Tokens.find(function (token) { return compareAddressesSimple(token.address, info.address); })) {
+                            if (!this_1.l1Tokens.find(function (token) { return token.address.eq(info.address); })) {
                                 if (info.decimals > 0 && info.decimals <= 18) {
                                     this_1.l1Tokens.push(info);
                                 }
@@ -872,7 +896,10 @@ var HubPoolClient = /** @class */ (function (_super) {
                         if (eventsToQuery.includes("ProposeRootBundle")) {
                             (_h = this.proposedRootBundles).push.apply(_h, events["ProposeRootBundle"]
                                 .filter(function (event) { return !_this.configOverride.ignoredHubProposedBundles.includes(event.blockNumber); })
-                                .map(function (event) { return spreadEventWithBlockNumber(event); }));
+                                .map(function (_event) {
+                                var args = spreadEventWithBlockNumber(_event);
+                                return __assign(__assign({}, args), { proposer: EvmAddress.from(args.proposer) });
+                            }));
                         }
                         if (eventsToQuery.includes("RootBundleCanceled")) {
                             (_j = this.canceledRootBundles).push.apply(_j, events["RootBundleCanceled"].map(function (event) { return spreadEventWithBlockNumber(event); }));
@@ -895,7 +922,9 @@ var HubPoolClient = /** @class */ (function (_super) {
                                         " Expected ".concat(nTokens, " or ").concat(nTokens * 2, " for chain ").concat(this.chainId, " transaction ").concat(event_3.transactionHash));
                                 }
                                 executedRootBundle.runningBalances = runningBalances.slice(0, nTokens);
-                                this.executedRootBundles.push(executedRootBundle);
+                                this.executedRootBundles.push(__assign(__assign({}, executedRootBundle), { l1Tokens: l1Tokens.map(function (token) {
+                                        return EvmAddress.from(token, "base16");
+                                    }) }));
                             }
                         }
                         // If the contract's current rootBundleProposal() value has an unclaimedPoolRebalanceLeafCount > 0, then