@across-protocol/sdk 4.2.16-alpha.6 → 4.2.16

package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts

@@ -1,6 +1,6 @@
 import { Contract } from "ethers";
 import winston from "winston";
-import { EventSearchConfig, EvmAddress, MakeOptional } from "../../utils";
+import { EventSearchConfig, MakeOptional } from "../../utils";
 import { ConfigStoreVersionUpdate, DisabledChainsUpdate, GlobalConfigUpdate, LiteChainsIdListUpdate, RateModelUpdate, RouteRateModelUpdate, SortableEvent, SpokePoolTargetBalance, SpokeTargetBalanceUpdate, TokenConfig } from "../../interfaces";
 import { BaseAbstractClient, UpdateFailureReason } from "../BaseAbstractClient";
 import { RateModel } from "../../lpFeeCalculator";
@@ -44,8 +44,8 @@ export declare class AcrossConfigStoreClient extends BaseAbstractClient {
     hasLatestConfigStoreVersion: boolean;
     chainId: number | undefined;
     constructor(logger: winston.Logger, configStore: Contract, eventSearchConfig: MakeOptional<EventSearchConfig, "to"> | undefined, configStoreVersion: number);
-    getRateModelForBlockNumber(l1Token: EvmAddress, originChainId: number | string, destinationChainId: number | string, blockNumber?: number | undefined): RateModel;
-    getRouteRateModelForBlockNumber(l1Token: EvmAddress, route: string, blockNumber?: number | undefined): RateModel | undefined;
+    getRateModelForBlockNumber(l1Token: string, originChainId: number | string, destinationChainId: number | string, blockNumber?: number | undefined): RateModel;
+    getRouteRateModelForBlockNumber(l1Token: string, route: string, blockNumber?: number | undefined): RateModel | undefined;
     protected implicitChainIdIndices(chainId?: number): number[];
     getChainIdIndicesForBlock(blockNumber?: number): number[];
     getLiteChainIdIndicesForBlock(blockNumber?: number): number[];

package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js

@@ -66,9 +66,7 @@ var AcrossConfigStoreClient = (function (_super) {
             return routeRateModel;
         }
         var defaultRateModelUpdate = (0, utils_1.sortEventsDescending)(this.cumulativeRateModelUpdates).find(function (config) {
-            return config.blockNumber <= (blockNumber !== null && blockNumber !== void 0 ? blockNumber : 0) &&
-                config.l1Token === l1Token.toEvmAddress() &&
-                config.rateModel !== undefined;
+            return config.blockNumber <= (blockNumber !== null && blockNumber !== void 0 ? blockNumber : 0) && config.l1Token === l1Token && config.rateModel !== undefined;
         });
         if (!defaultRateModelUpdate) {
             throw new Error("Could not find TokenConfig update for ".concat(l1Token, " at block ").concat(blockNumber));
@@ -77,7 +75,7 @@ var AcrossConfigStoreClient = (function (_super) {
     };
     AcrossConfigStoreClient.prototype.getRouteRateModelForBlockNumber = function (l1Token, route, blockNumber) {
         if (blockNumber === void 0) { blockNumber = undefined; }
-        var config = (0, utils_1.sortEventsDescending)(this.cumulativeRouteRateModelUpdates).find(function (config) { return config.blockNumber <= (blockNumber !== null && blockNumber !== void 0 ? blockNumber : 0) && config.l1Token === l1Token.toEvmAddress(); });
+        var config = (0, utils_1.sortEventsDescending)(this.cumulativeRouteRateModelUpdates).find(function (config) { return config.blockNumber <= (blockNumber !== null && blockNumber !== void 0 ? blockNumber : 0) && config.l1Token === l1Token; });
         if ((config === null || config === void 0 ? void 0 : config.routeRateModel[route]) === undefined) {
             return undefined;
         }

package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcrossConfigStoreClient.js","sourceRoot":"","sources":["../../../../src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcrossConfigStoreClient.js","sourceRoot":"","sources":["../../../../src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts"],"names":[],"mappings":"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"}

package/dist/cjs/clients/BundleDataClient/BundleDataClient.d.ts

@@ -1,14 +1,12 @@
 import { ProposedRootBundle, SpokePoolClientsByChain, LoadDataReturnValue, Clients, CombinedRefunds, FillWithBlock, DepositWithBlock } from "../../interfaces";
 import { SpokePoolClient } from "..";
-import { BigNumber, Address } from "../../utils";
+import { BigNumber } from "../../utils";
 import winston from "winston";
+import { SpokePoolManager } from "../SpokePoolClient/SpokePoolClientManager";
 export declare const INFINITE_FILL_DEADLINE: BigNumber;
 export declare class BundleDataClient {
     readonly logger: winston.Logger;
     readonly clients: Clients;
-    readonly spokePoolClients: {
-        [chainId: number]: SpokePoolClient;
-    };
     readonly chainIdListForBundleEvaluationBlockNumbers: number[];
     readonly blockRangeEndBlockBuffer: {
         [chainId: number]: number;
@@ -16,6 +14,7 @@ export declare class BundleDataClient {
     private loadDataCache;
     private arweaveDataCache;
     private bundleTimestampCache;
+    readonly spokePoolClientManager: SpokePoolManager;
     constructor(logger: winston.Logger, clients: Clients, spokePoolClients: {
         [chainId: number]: SpokePoolClient;
     }, chainIdListForBundleEvaluationBlockNumbers: number[], blockRangeEndBlockBuffer?: {
@@ -35,7 +34,7 @@ export declare class BundleDataClient {
     getPendingRefundsFromValidBundles(): Promise<CombinedRefunds[]>;
     getPendingRefundsFromBundle(bundle: ProposedRootBundle): Promise<CombinedRefunds>;
     getApproximateRefundsForBlockRange(chainIds: number[], blockRanges: number[][]): Promise<CombinedRefunds>;
-    getUpcomingDepositAmount(chainId: number, l2Token: Address, latestBlockToSearch: number): BigNumber;
+    getUpcomingDepositAmount(chainId: number, l2Token: string, latestBlockToSearch: number): BigNumber;
     getNextBundleRefunds(): Promise<CombinedRefunds[]>;
     getExecutedRefunds(spokePoolClient: SpokePoolClient, relayerRefundRoot: string): {
         [tokenAddress: string]: {
@@ -43,8 +42,8 @@ export declare class BundleDataClient {
         };
     };
     private deductExecutedRefunds;
-    getRefundsFor(bundleRefunds: CombinedRefunds, relayer: Address, chainId: number, token: Address): BigNumber;
-    getTotalRefund(refunds: CombinedRefunds[], relayer: Address, chainId: number, refundToken: Address): BigNumber;
+    getRefundsFor(bundleRefunds: CombinedRefunds, relayer: string, chainId: number, token: string): BigNumber;
+    getTotalRefund(refunds: CombinedRefunds[], relayer: string, chainId: number, refundToken: string): BigNumber;
     private loadArweaveData;
     loadData(blockRangesForChains: number[][], spokePoolClients: SpokePoolClientsByChain, attemptArweaveLoad?: boolean): Promise<LoadDataReturnValue>;
     private loadDataFromScratch;

package/dist/cjs/clients/BundleDataClient/BundleDataClient.js

@@ -10,42 +10,43 @@ var svm_1 = require("../../arch/svm");
 var utils_1 = require("../../utils");
 var utils_2 = require("./utils");
 var SpokePoolClient_1 = require("../SpokePoolClient");
+var SpokePoolClientManager_1 = require("../SpokePoolClient/SpokePoolClientManager");
 exports.INFINITE_FILL_DEADLINE = utils_1.bnUint32Max;
 function updateExpiredDepositsV3(dict, deposit) {
-    var _a, _b;
-    var _c, _d;
-    if (!deposit.depositor.isValidOn(deposit.originChainId)) {
+    var _a;
+    if ((0, utils_1.chainIsEvm)(deposit.originChainId) && !(0, utils_1.isValidEvmAddress)(deposit.depositor)) {
         return;
     }
     var originChainId = deposit.originChainId, inputToken = deposit.inputToken;
-    (_a = dict[originChainId]) !== null && _a !== void 0 ? _a : (dict[originChainId] = {});
-    (_b = (_c = dict[originChainId])[_d = inputToken.toBytes32()]) !== null && _b !== void 0 ? _b : (_c[_d] = []);
-    dict[originChainId][inputToken.toBytes32()].push(deposit);
+    if (!((_a = dict === null || dict === void 0 ? void 0 : dict[originChainId]) === null || _a === void 0 ? void 0 : _a[inputToken])) {
+        (0, utils_1.assign)(dict, [originChainId, inputToken], []);
+    }
+    dict[originChainId][inputToken].push(deposit);
 }
 function updateBundleDepositsV3(dict, deposit) {
-    var _a, _b;
-    var _c, _d;
+    var _a;
     var originChainId = deposit.originChainId, inputToken = deposit.inputToken;
-    (_a = dict[originChainId]) !== null && _a !== void 0 ? _a : (dict[originChainId] = {});
-    (_b = (_c = dict[originChainId])[_d = inputToken.toBytes32()]) !== null && _b !== void 0 ? _b : (_c[_d] = []);
-    dict[originChainId][inputToken.toBytes32()].push(deposit);
+    if (!((_a = dict === null || dict === void 0 ? void 0 : dict[originChainId]) === null || _a === void 0 ? void 0 : _a[inputToken])) {
+        (0, utils_1.assign)(dict, [originChainId, inputToken], []);
+    }
+    dict[originChainId][inputToken].push(deposit);
 }
 function updateBundleFillsV3(dict, fill, lpFeePct, repaymentChainId, repaymentToken, repaymentAddress) {
-    var _a, _b, _c;
-    var _d, _e;
-    if (!fill.relayer.isValidOn(repaymentChainId)) {
+    var _a, _b;
+    if ((0, utils_1.chainIsEvm)(repaymentChainId) && !(0, utils_1.isValidEvmAddress)(fill.relayer)) {
         return;
     }
-    (_a = dict[repaymentChainId]) !== null && _a !== void 0 ? _a : (dict[repaymentChainId] = {});
-    (_b = (_d = dict[repaymentChainId])[_e = repaymentToken.toBytes32()]) !== null && _b !== void 0 ? _b : (_d[_e] = {
-        fills: [],
-        totalRefundAmount: utils_1.bnZero,
-        realizedLpFees: utils_1.bnZero,
-        refunds: {},
-    });
+    if (!((_a = dict === null || dict === void 0 ? void 0 : dict[repaymentChainId]) === null || _a === void 0 ? void 0 : _a[repaymentToken])) {
+        (0, utils_1.assign)(dict, [repaymentChainId, repaymentToken], {
+            fills: [],
+            totalRefundAmount: utils_1.bnZero,
+            realizedLpFees: utils_1.bnZero,
+            refunds: {},
+        });
+    }
     var bundleFill = tslib_1.__assign(tslib_1.__assign({}, fill), { lpFeePct: lpFeePct, relayer: repaymentAddress });
-    (0, utils_1.assign)(dict, [repaymentChainId, repaymentToken.toBytes32(), "fills"], [bundleFill]);
-    var refundObj = dict[repaymentChainId][repaymentToken.toBytes32()];
+    (0, utils_1.assign)(dict, [repaymentChainId, repaymentToken, "fills"], [bundleFill]);
+    var refundObj = dict[repaymentChainId][repaymentToken];
     var realizedLpFee = bundleFill.inputAmount.mul(bundleFill.lpFeePct).div(utils_1.fixedPointAdjustment);
     refundObj.realizedLpFees = refundObj.realizedLpFees ? refundObj.realizedLpFees.add(realizedLpFee) : realizedLpFee;
     if (!(0, utils_1.isSlowFill)(bundleFill)) {
@@ -53,46 +54,45 @@ function updateBundleFillsV3(dict, fill, lpFeePct, repaymentChainId, repaymentTo
         refundObj.totalRefundAmount = refundObj.totalRefundAmount
             ? refundObj.totalRefundAmount.add(refundAmount)
             : refundAmount;
-        (_c = refundObj.refunds) !== null && _c !== void 0 ? _c : (refundObj.refunds = {});
-        if (refundObj.refunds[bundleFill.relayer.toBytes32()]) {
-            refundObj.refunds[bundleFill.relayer.toBytes32()] =
-                refundObj.refunds[bundleFill.relayer.toBytes32()].add(refundAmount);
+        (_b = refundObj.refunds) !== null && _b !== void 0 ? _b : (refundObj.refunds = {});
+        if (refundObj.refunds[bundleFill.relayer]) {
+            refundObj.refunds[bundleFill.relayer] = refundObj.refunds[bundleFill.relayer].add(refundAmount);
         }
         else {
-            refundObj.refunds[bundleFill.relayer.toBytes32()] = refundAmount;
+            refundObj.refunds[bundleFill.relayer] = refundAmount;
         }
     }
 }
 function updateBundleExcessSlowFills(dict, deposit) {
-    var _a, _b;
-    var _c, _d;
+    var _a;
     var destinationChainId = deposit.destinationChainId, outputToken = deposit.outputToken;
-    (_a = dict[destinationChainId]) !== null && _a !== void 0 ? _a : (dict[destinationChainId] = {});
-    (_b = (_c = dict[destinationChainId])[_d = outputToken.toBytes32()]) !== null && _b !== void 0 ? _b : (_c[_d] = []);
-    dict[destinationChainId][outputToken.toBytes32()].push(deposit);
+    if (!((_a = dict === null || dict === void 0 ? void 0 : dict[destinationChainId]) === null || _a === void 0 ? void 0 : _a[outputToken])) {
+        (0, utils_1.assign)(dict, [destinationChainId, outputToken], []);
+    }
+    dict[destinationChainId][outputToken].push(deposit);
 }
 function updateBundleSlowFills(dict, deposit) {
-    var _a, _b;
-    var _c, _d;
-    if (!deposit.recipient.isValidOn(deposit.destinationChainId)) {
+    var _a;
+    if ((0, utils_1.chainIsEvm)(deposit.destinationChainId) && !(0, utils_1.isValidEvmAddress)(deposit.recipient)) {
         return;
     }
     var destinationChainId = deposit.destinationChainId, outputToken = deposit.outputToken;
-    (_a = dict[destinationChainId]) !== null && _a !== void 0 ? _a : (dict[destinationChainId] = {});
-    (_b = (_c = dict[destinationChainId])[_d = outputToken.toBytes32()]) !== null && _b !== void 0 ? _b : (_c[_d] = []);
-    dict[destinationChainId][outputToken.toBytes32()].push(deposit);
+    if (!((_a = dict === null || dict === void 0 ? void 0 : dict[destinationChainId]) === null || _a === void 0 ? void 0 : _a[outputToken])) {
+        (0, utils_1.assign)(dict, [destinationChainId, outputToken], []);
+    }
+    dict[destinationChainId][outputToken].push(deposit);
 }
 var BundleDataClient = (function () {
     function BundleDataClient(logger, clients, spokePoolClients, chainIdListForBundleEvaluationBlockNumbers, blockRangeEndBlockBuffer) {
         if (blockRangeEndBlockBuffer === void 0) { blockRangeEndBlockBuffer = {}; }
         this.logger = logger;
         this.clients = clients;
-        this.spokePoolClients = spokePoolClients;
         this.chainIdListForBundleEvaluationBlockNumbers = chainIdListForBundleEvaluationBlockNumbers;
         this.blockRangeEndBlockBuffer = blockRangeEndBlockBuffer;
         this.loadDataCache = {};
         this.arweaveDataCache = {};
         this.bundleTimestampCache = {};
+        this.spokePoolClientManager = new SpokePoolClientManager_1.SpokePoolManager(logger, spokePoolClients);
     }
     BundleDataClient.prototype.clearCache = function () {
         this.loadDataCache = {};
@@ -248,7 +248,7 @@ var BundleDataClient = (function () {
                         return [4, this.loadArweaveData(bundleEvaluationBlockRanges)];
                     case 1:
                         arweaveData = _a.sent();
-                        if (!(arweaveData === undefined)) return [3, 3];
+                        if (!!(0, utils_1.isDefined)(arweaveData)) return [3, 3];
                         return [4, this.getApproximateRefundsForBlockRange(chainIds, bundleEvaluationBlockRanges)];
                     case 2:
                         combinedRefunds = _a.sent();
@@ -257,7 +257,7 @@ var BundleDataClient = (function () {
                         bundleFillsV3 = arweaveData.bundleFillsV3, expiredDepositsToRefundV3 = arweaveData.expiredDepositsToRefundV3;
                         combinedRefunds = (0, utils_2.getRefundsFromBundle)(bundleFillsV3, expiredDepositsToRefundV3);
                         Object.keys(combinedRefunds).forEach(function (chainId) {
-                            if (_this.spokePoolClients[Number(chainId)] === undefined) {
+                            if (!_this.spokePoolClientManager.getClient(Number(chainId))) {
                                 delete combinedRefunds[Number(chainId)];
                             }
                         });
@@ -277,38 +277,44 @@ var BundleDataClient = (function () {
                         refundsForChain = {};
                         bundleEndBlockForMainnet = blockRanges[0][1];
                         _loop_1 = function (chainId) {
-                            var chainIndex, fillsToCount;
+                            var spokePoolClient, chainIndex, fillsToCount;
                             return tslib_1.__generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0:
-                                        if (this_1.spokePoolClients[chainId] === undefined) {
+                                        spokePoolClient = this_1.spokePoolClientManager.getClient(chainId);
+                                        if (!(0, utils_1.isDefined)(spokePoolClient)) {
                                             return [2, "continue"];
                                         }
                                         chainIndex = chainIds.indexOf(chainId);
-                                        fillsToCount = this_1.spokePoolClients[chainId].getFills().filter(function (fill) {
+                                        fillsToCount = spokePoolClient.getFills().filter(function (fill) {
                                             if (fill.blockNumber < blockRanges[chainIndex][0] ||
                                                 fill.blockNumber > blockRanges[chainIndex][1] ||
                                                 (0, utils_1.isZeroValueFillOrSlowFillRequest)(fill) ||
                                                 (0, utils_1.invalidOutputToken)(fill)) {
                                                 return false;
                                             }
-                                            if (_this.spokePoolClients[fill.originChainId] === undefined) {
+                                            var originSpokePoolClient = _this.spokePoolClientManager.getClient(fill.originChainId);
+                                            if (!(0, utils_1.isDefined)(originSpokePoolClient)) {
                                                 return false;
                                             }
-                                            var matchingDeposit = _this.spokePoolClients[fill.originChainId].getDeposit(fill.depositId);
+                                            var matchingDeposit = originSpokePoolClient.getDeposit(fill.depositId);
                                             var hasMatchingDeposit = matchingDeposit !== undefined && (0, utils_1.getRelayEventKey)(fill) === (0, utils_1.getRelayEventKey)(matchingDeposit);
                                             return hasMatchingDeposit;
                                         });
                                         return [4, (0, utils_1.forEachAsync)(fillsToCount, function (_fill) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                                var matchingDeposit, spokeClient, provider, fill, _a, chainToSendRefundTo, repaymentToken, relayer, refundAmount, existingRefundAmount;
+                                                var originChain, originSpokePoolClient, matchingDeposit, spokeClient, provider, fill, _a, chainToSendRefundTo, repaymentToken, relayer, refundAmount, existingRefundAmount;
                                                 var _b, _c, _d;
-                                                var _e, _f;
-                                                return tslib_1.__generator(this, function (_g) {
-                                                    switch (_g.label) {
+                                                var _e;
+                                                return tslib_1.__generator(this, function (_f) {
+                                                    switch (_f.label) {
                                                         case 0:
-                                                            matchingDeposit = this.spokePoolClients[_fill.originChainId].getDeposit(_fill.depositId);
-                                                            (0, assert_1.default)((0, utils_1.isDefined)(matchingDeposit), "Deposit not found for fill.");
-                                                            spokeClient = this.spokePoolClients[_fill.destinationChainId];
+                                                            originChain = (0, utils_1.getNetworkName)(_fill.originChainId);
+                                                            originSpokePoolClient = this.spokePoolClientManager.getClient(_fill.originChainId);
+                                                            (0, assert_1.default)((0, utils_1.isDefined)(originSpokePoolClient), "No SpokePoolClient for chain ".concat(originChain));
+                                                            matchingDeposit = originSpokePoolClient.getDeposit(_fill.depositId);
+                                                            (0, assert_1.default)((0, utils_1.isDefined)(matchingDeposit), "No ".concat(originChain, " deposit found for ").concat((0, utils_1.getNetworkName)(_fill.destinationChainId), " fill ").concat(_fill.depositId));
+                                                            spokeClient = this.spokePoolClientManager.getClient(_fill.destinationChainId);
+                                                            (0, assert_1.default)((0, utils_1.isDefined)(spokeClient), "SpokePoolClient for ".concat((0, utils_1.getNetworkName)(_fill.destinationChainId), " not found for fill."));
                                                             if ((0, SpokePoolClient_1.isEVMSpokePoolClient)(spokeClient)) {
                                                                 provider = spokeClient.spokePool.provider;
                                                             }
@@ -317,17 +323,16 @@ var BundleDataClient = (function () {
                                                             }
                                                             return [4, (0, utils_2.verifyFillRepayment)(_fill, provider, matchingDeposit, this.clients.hubPoolClient, bundleEndBlockForMainnet)];
                                                         case 1:
-                                                            fill = _g.sent();
+                                                            fill = _f.sent();
                                                             if (!(0, utils_1.isDefined)(fill)) {
                                                                 return [2];
                                                             }
                                                             _a = (0, utils_2.getRefundInformationFromFill)(tslib_1.__assign(tslib_1.__assign({}, fill), { fromLiteChain: matchingDeposit.fromLiteChain }), this.clients.hubPoolClient, bundleEndBlockForMainnet), chainToSendRefundTo = _a.chainToSendRefundTo, repaymentToken = _a.repaymentToken;
                                                             relayer = fill.relayer, refundAmount = fill.inputAmount;
                                                             (_b = refundsForChain[chainToSendRefundTo]) !== null && _b !== void 0 ? _b : (refundsForChain[chainToSendRefundTo] = {});
-                                                            (_c = (_e = refundsForChain[chainToSendRefundTo])[_f = repaymentToken.toBytes32()]) !== null && _c !== void 0 ? _c : (_e[_f] = {});
-                                                            existingRefundAmount = (_d = refundsForChain[chainToSendRefundTo][repaymentToken.toBytes32()][relayer.toBytes32()]) !== null && _d !== void 0 ? _d : utils_1.bnZero;
-                                                            refundsForChain[chainToSendRefundTo][repaymentToken.toBytes32()][relayer.toBytes32()] =
-                                                                existingRefundAmount.add(refundAmount);
+                                                            (_c = (_e = refundsForChain[chainToSendRefundTo])[repaymentToken]) !== null && _c !== void 0 ? _c : (_e[repaymentToken] = {});
+                                                            existingRefundAmount = (_d = refundsForChain[chainToSendRefundTo][repaymentToken][relayer]) !== null && _d !== void 0 ? _d : utils_1.bnZero;
+                                                            refundsForChain[chainToSendRefundTo][repaymentToken][relayer] = existingRefundAmount.add(refundAmount);
                                                             return [2];
                                                     }
                                                 });
@@ -357,12 +362,13 @@ var BundleDataClient = (function () {
         });
     };
     BundleDataClient.prototype.getUpcomingDepositAmount = function (chainId, l2Token, latestBlockToSearch) {
-        if (this.spokePoolClients[chainId] === undefined) {
+        var spokePoolClient = this.spokePoolClientManager.getClient(chainId);
+        if (!(0, utils_1.isDefined)(spokePoolClient)) {
             return (0, utils_1.toBN)(0);
         }
-        return this.spokePoolClients[chainId]
+        return spokePoolClient
             .getDeposits()
-            .filter(function (deposit) { return deposit.blockNumber > latestBlockToSearch && deposit.inputToken.eq(l2Token); })
+            .filter(function (deposit) { return deposit.blockNumber > latestBlockToSearch && deposit.inputToken === l2Token; })
             .reduce(function (acc, deposit) {
             return acc.add(deposit.inputAmount);
         }, (0, utils_1.toBN)(0));
@@ -390,13 +396,13 @@ var BundleDataClient = (function () {
                         nextBundleMainnetStartBlock = hubPoolClient.getNextBundleStartBlockNumber(this.chainIdListForBundleEvaluationBlockNumbers, hubPoolClient.latestHeightSearched, hubPoolClient.chainId);
                         chainIds = this.clients.configStoreClient.getChainIdIndicesForBlock(nextBundleMainnetStartBlock);
                         combinedRefunds = [];
-                        widestBundleBlockRanges = (0, utils_2.getWidestPossibleExpectedBlockRange)(chainIds, this.spokePoolClients, (0, utils_2.getEndBlockBuffers)(chainIds, this.blockRangeEndBlockBuffer), this.clients, this.clients.hubPoolClient.latestHeightSearched, this.clients.configStoreClient.getEnabledChains(this.clients.hubPoolClient.latestHeightSearched));
+                        widestBundleBlockRanges = (0, utils_2.getWidestPossibleExpectedBlockRange)(chainIds, this.spokePoolClientManager.getSpokePoolClients(), (0, utils_2.getEndBlockBuffers)(chainIds, this.blockRangeEndBlockBuffer), this.clients, this.clients.hubPoolClient.latestHeightSearched, this.clients.configStoreClient.getEnabledChains(this.clients.hubPoolClient.latestHeightSearched));
                         if (!hubPoolClient.hasPendingProposal()) return [3, 5];
                         pendingBundleBlockRanges = (0, utils_1.getImpliedBundleBlockRanges)(hubPoolClient, this.clients.configStoreClient, hubPoolClient.getLatestProposedRootBundle());
                         return [4, this.loadArweaveData(pendingBundleBlockRanges)];
                     case 1:
                         arweaveData = _e.sent();
-                        if (!(arweaveData === undefined)) return [3, 3];
+                        if (!!(0, utils_1.isDefined)(arweaveData)) return [3, 3];
                         _b = (_a = combinedRefunds).push;
                         return [4, this.getApproximateRefundsForBlockRange(chainIds, pendingBundleBlockRanges)];
                     case 2:
@@ -440,17 +446,17 @@ var BundleDataClient = (function () {
         for (var _i = 0, executedRefundLeaves_1 = executedRefundLeaves; _i < executedRefundLeaves_1.length; _i++) {
             var refundLeaf = executedRefundLeaves_1[_i];
             var tokenAddress = refundLeaf.l2TokenAddress;
-            if (executedRefunds[tokenAddress.toBytes32()] === undefined) {
-                executedRefunds[tokenAddress.toBytes32()] = {};
+            if (executedRefunds[tokenAddress] === undefined) {
+                executedRefunds[tokenAddress] = {};
             }
-            var executedTokenRefunds = executedRefunds[tokenAddress.toBytes32()];
+            var executedTokenRefunds = executedRefunds[tokenAddress];
             for (var i = 0; i < refundLeaf.refundAddresses.length; i++) {
                 var relayer = refundLeaf.refundAddresses[i];
                 var refundAmount = refundLeaf.refundAmounts[i];
-                if (executedTokenRefunds[relayer.toBytes32()] === undefined) {
-                    executedTokenRefunds[relayer.toBytes32()] = utils_1.bnZero;
+                if (executedTokenRefunds[relayer] === undefined) {
+                    executedTokenRefunds[relayer] = utils_1.bnZero;
                 }
-                executedTokenRefunds[relayer.toBytes32()] = executedTokenRefunds[relayer.toBytes32()].add(refundAmount);
+                executedTokenRefunds[relayer] = executedTokenRefunds[relayer].add(refundAmount);
             }
         }
         return executedRefunds;
@@ -459,10 +465,11 @@ var BundleDataClient = (function () {
         for (var _i = 0, _a = Object.keys(allRefunds); _i < _a.length; _i++) {
             var chainIdStr = _a[_i];
             var chainId = Number(chainIdStr);
-            if (!(0, utils_1.isDefined)(this.spokePoolClients[chainId])) {
+            var spokePoolClient = this.spokePoolClientManager.getClient(chainId);
+            if (!(0, utils_1.isDefined)(spokePoolClient)) {
                 continue;
             }
-            var executedRefunds = this.getExecutedRefunds(this.spokePoolClients[chainId], bundleContainingRefunds.relayerRefundRoot);
+            var executedRefunds = this.getExecutedRefunds(spokePoolClient, bundleContainingRefunds.relayerRefundRoot);
             for (var _b = 0, _c = Object.keys(allRefunds[chainId]); _b < _c.length; _b++) {
                 var tokenAddress = _c[_b];
                 var refunds = allRefunds[chainId][tokenAddress];
@@ -482,11 +489,11 @@ var BundleDataClient = (function () {
         return allRefunds;
     };
     BundleDataClient.prototype.getRefundsFor = function (bundleRefunds, relayer, chainId, token) {
-        if (!bundleRefunds[chainId] || !bundleRefunds[chainId][token.toBytes32()]) {
+        if (!bundleRefunds[chainId] || !bundleRefunds[chainId][token]) {
             return utils_1.BigNumber.from(0);
         }
-        var allRefunds = bundleRefunds[chainId][token.toBytes32()];
-        return allRefunds && allRefunds[relayer.toBytes32()] ? allRefunds[relayer.toBytes32()] : utils_1.BigNumber.from(0);
+        var allRefunds = bundleRefunds[chainId][token];
+        return allRefunds && allRefunds[relayer] ? allRefunds[relayer] : utils_1.BigNumber.from(0);
     };
     BundleDataClient.prototype.getTotalRefund = function (refunds, relayer, chainId, refundToken) {
         var _this = this;
@@ -653,9 +660,7 @@ var BundleDataClient = (function () {
                                     (0, assert_1.default)(decodedBundleDepositHash.relayDataHash === relayDataHash &&
                                         decodedBundleDepositHash.index === deposits.length - 1, "Not using correct bundle deposit hash key");
                                     if (deposit.blockNumber >= originChainBlockRange[0]) {
-                                        if ((_b = (_a = bundleDepositsV3 === null || bundleDepositsV3 === void 0 ? void 0 : bundleDepositsV3[originChainId]) === null || _a === void 0 ? void 0 : _a[deposit.inputToken.toBytes32()]) === null || _b === void 0 ? void 0 : _b.find(function (d) {
-                                            return (0, utils_1.duplicateEvent)(deposit, d);
-                                        })) {
+                                        if ((_b = (_a = bundleDepositsV3 === null || bundleDepositsV3 === void 0 ? void 0 : bundleDepositsV3[originChainId]) === null || _a === void 0 ? void 0 : _a[deposit.inputToken]) === null || _b === void 0 ? void 0 : _b.find(function (d) { return (0, utils_1.duplicateEvent)(deposit, d); })) {
                                             _this.logger.debug({
                                                 at: "BundleDataClient#loadData",
                                                 message: "Duplicate deposit detected",