@across-protocol/sdk 4.2.13 → 4.2.14-alpha.1

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

@@ -70,7 +70,7 @@ exports.updateRunningBalance = updateRunningBalance;
 function addLastRunningBalance(latestMainnetBlock, runningBalances, hubPoolClient) {
     Object.keys(runningBalances).forEach(function (repaymentChainId) {
         Object.keys(runningBalances[Number(repaymentChainId)]).forEach(function (l1TokenAddress) {
-            var runningBalance = hubPoolClient.getRunningBalanceBeforeBlockForChain(latestMainnetBlock, Number(repaymentChainId), l1TokenAddress).runningBalance;
+            var runningBalance = hubPoolClient.getRunningBalanceBeforeBlockForChain(latestMainnetBlock, Number(repaymentChainId), utils_1.EvmAddress.from(l1TokenAddress)).runningBalance;
             if (!runningBalance.eq(utils_1.bnZero)) {
                 updateRunningBalance(runningBalances, Number(repaymentChainId), l1TokenAddress, runningBalance);
             }
@@ -80,7 +80,7 @@ function addLastRunningBalance(latestMainnetBlock, runningBalances, hubPoolClien
 exports.addLastRunningBalance = addLastRunningBalance;
 function updateRunningBalanceForDeposit(runningBalances, hubPoolClient, deposit, updateAmount, mainnetBundleEndBlock) {
     var l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock);
-    updateRunningBalance(runningBalances, deposit.originChainId, l1TokenCounterpart, updateAmount);
+    updateRunningBalance(runningBalances, deposit.originChainId, l1TokenCounterpart.toEvmAddress(), updateAmount);
 }
 exports.updateRunningBalanceForDeposit = updateRunningBalanceForDeposit;
 function constructPoolRebalanceLeaves(latestMainnetBlock, runningBalances, realizedLpFees, chainsWithRefundsOnly, configStoreClient, maxL1TokenCount) {
@@ -133,7 +133,7 @@ function constructPoolRebalanceLeaves(latestMainnetBlock, runningBalances, reali
                 runningBalances: leafRunningBalances,
                 groupIndex: groupIndexForChainId++,
                 leafId: leaves.length,
-                l1Tokens: l1TokensToIncludeInThisLeaf,
+                l1Tokens: l1TokensToIncludeInThisLeaf.map(function (l1TokenAddr) { return utils_1.EvmAddress.from(l1TokenAddr); }),
             });
         };
         for (var i = 0; i < sortedL1Tokens.length; i += maxL1TokensPerLeaf) {

package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map

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

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

@@ -1,5 +1,5 @@
 import { Infer } from "superstruct";
-import { BigNumber } from "../../../utils";
+import { BigNumber, Address } from "../../../utils";
 export declare const SortableEventSS: {
     blockNumber: import("superstruct").Struct<number, null>;
     logIndex: import("superstruct").Struct<number, null>;
@@ -17,21 +17,21 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: Address;
+        recipient: Address;
+        inputToken: Address;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: Address;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: Address;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: Address | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
         txnIndex?: number | undefined;
@@ -48,22 +48,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
             repaymentChainId: number;
             messageHash: string;
             quoteTimestamp: number;
-            depositor: string;
-            recipient: string;
-            inputToken: string;
+            depositor: Address;
+            recipient: Address;
+            inputToken: Address;
             inputAmount: BigNumber;
-            outputToken: string;
+            outputToken: Address;
             outputAmount: BigNumber;
             fillDeadline: number;
-            exclusiveRelayer: string;
+            exclusiveRelayer: Address;
             exclusivityDeadline: number;
             blockNumber: number;
             logIndex: number;
-            relayer: string;
+            relayer: Address;
             lpFeePct: BigNumber;
             relayExecutionInfo: {
                 fillType: number;
-                updatedRecipient: string;
+                updatedRecipient: Address;
                 updatedOutputAmount: BigNumber;
                 updatedMessageHash: string;
                 updatedMessage?: string | undefined;
@@ -86,22 +86,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: Address;
+        recipient: Address;
+        inputToken: Address;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: Address;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: Address;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
         speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: Address | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
         txnIndex?: number | undefined;
@@ -118,21 +118,21 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: Address;
+        recipient: Address;
+        inputToken: Address;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: Address;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: Address;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: Address | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
         txnIndex?: number | undefined;
@@ -149,22 +149,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: Address;
+        recipient: Address;
+        inputToken: Address;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: Address;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: Address;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
         speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: Address | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
         txnIndex?: number | undefined;
@@ -182,21 +182,21 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: Address;
+        recipient: Address;
+        inputToken: Address;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: Address;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: Address;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: Address | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
         txnIndex?: number | undefined;
@@ -213,21 +213,21 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: Address;
+        recipient: Address;
+        inputToken: Address;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: Address;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: Address;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: Address | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
         txnIndex?: number | undefined;
@@ -244,22 +244,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: Address;
+        recipient: Address;
+        inputToken: Address;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: Address;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: Address;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
         speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: Address | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
         txnIndex?: number | undefined;
@@ -276,22 +276,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: Address;
+        recipient: Address;
+        inputToken: Address;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: Address;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: Address;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
         speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: Address | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
         txnIndex?: number | undefined;
@@ -308,22 +308,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
             repaymentChainId: number;
             messageHash: string;
             quoteTimestamp: number;
-            depositor: string;
-            recipient: string;
-            inputToken: string;
+            depositor: Address;
+            recipient: Address;
+            inputToken: Address;
             inputAmount: BigNumber;
-            outputToken: string;
+            outputToken: Address;
             outputAmount: BigNumber;
             fillDeadline: number;
-            exclusiveRelayer: string;
+            exclusiveRelayer: Address;
             exclusivityDeadline: number;
             blockNumber: number;
             logIndex: number;
-            relayer: string;
+            relayer: Address;
             lpFeePct: BigNumber;
             relayExecutionInfo: {
                 fillType: number;
-                updatedRecipient: string;
+                updatedRecipient: Address;
                 updatedOutputAmount: BigNumber;
                 updatedMessageHash: string;
                 updatedMessage?: string | undefined;

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

@@ -15,18 +15,21 @@ var BigNumberType = (0, superstruct_1.coerce)((0, superstruct_1.instance)(utils_
         return value;
     }
 });
+var AddressType = (0, superstruct_1.coerce)((0, superstruct_1.instance)(utils_1.Address), (0, superstruct_1.string)(), function (value) {
+    return (0, utils_1.toAddressType)(value);
+});
 var FillTypeSS = (0, superstruct_1.number)();
 var V3RelayDataSS = {
-    inputToken: (0, superstruct_1.string)(),
+    inputToken: AddressType,
     inputAmount: BigNumberType,
-    outputToken: (0, superstruct_1.string)(),
+    outputToken: AddressType,
     outputAmount: BigNumberType,
     fillDeadline: (0, superstruct_1.number)(),
-    exclusiveRelayer: (0, superstruct_1.string)(),
+    exclusiveRelayer: AddressType,
     exclusivityDeadline: (0, superstruct_1.number)(),
     originChainId: (0, superstruct_1.number)(),
-    depositor: (0, superstruct_1.string)(),
-    recipient: (0, superstruct_1.string)(),
+    depositor: AddressType,
+    recipient: AddressType,
     depositId: BigNumberType,
     message: (0, superstruct_1.string)(),
 };
@@ -46,7 +49,7 @@ var V3DepositSS = {
     quoteTimestamp: (0, superstruct_1.number)(),
     relayerFeePct: (0, superstruct_1.optional)(BigNumberType),
     speedUpSignature: (0, superstruct_1.optional)((0, superstruct_1.string)()),
-    updatedRecipient: (0, superstruct_1.optional)((0, superstruct_1.string)()),
+    updatedRecipient: (0, superstruct_1.optional)(AddressType),
     updatedOutputAmount: (0, superstruct_1.optional)(BigNumberType),
     updatedMessage: (0, superstruct_1.optional)((0, superstruct_1.string)()),
 };
@@ -56,11 +59,11 @@ var V3DepositWithBlockLpFeeSS = (0, superstruct_1.object)(tslib_1.__assign(tslib
 var V3RelayExecutionEventInfoSS = (0, superstruct_1.object)({
     updatedOutputAmount: BigNumberType,
     fillType: FillTypeSS,
-    updatedRecipient: (0, superstruct_1.string)(),
+    updatedRecipient: AddressType,
     updatedMessage: (0, superstruct_1.optional)((0, superstruct_1.string)()),
     updatedMessageHash: (0, superstruct_1.defaulted)((0, superstruct_1.string)(), constants_1.UNDEFINED_MESSAGE_HASH),
 });
-var V3FillSS = tslib_1.__assign(tslib_1.__assign({}, V3RelayDataSS), { message: (0, superstruct_1.optional)((0, superstruct_1.string)()), messageHash: (0, superstruct_1.defaulted)((0, superstruct_1.string)(), constants_1.UNDEFINED_MESSAGE_HASH), destinationChainId: (0, superstruct_1.number)(), relayer: (0, superstruct_1.string)(), repaymentChainId: (0, superstruct_1.number)(), relayExecutionInfo: V3RelayExecutionEventInfoSS, quoteTimestamp: (0, superstruct_1.number)() });
+var V3FillSS = tslib_1.__assign(tslib_1.__assign({}, V3RelayDataSS), { message: (0, superstruct_1.optional)((0, superstruct_1.string)()), messageHash: (0, superstruct_1.defaulted)((0, superstruct_1.string)(), constants_1.UNDEFINED_MESSAGE_HASH), destinationChainId: (0, superstruct_1.number)(), relayer: AddressType, repaymentChainId: (0, superstruct_1.number)(), relayExecutionInfo: V3RelayExecutionEventInfoSS, quoteTimestamp: (0, superstruct_1.number)() });
 var V3FillWithBlockSS = tslib_1.__assign(tslib_1.__assign({}, exports.SortableEventSS), V3FillSS);
 var BundleFillV3SS = (0, superstruct_1.object)(tslib_1.__assign(tslib_1.__assign({}, V3FillWithBlockSS), { lpFeePct: BigNumberType }));
 var nestedV3DepositRecordSS = (0, superstruct_1.record)(PositiveIntegerStringSS, (0, superstruct_1.record)(Web3AddressSS, (0, superstruct_1.array)(V3DepositWithBlockSS)));

package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map

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

package/dist/cjs/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,27 +69,27 @@ 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;
-    getTokenInfoForAddress(tokenAddress: string, chain: number): L1Token;
+    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;
+    getTokenInfoForAddress(tokenAddress: string, chainId: number): TokenInfo;
     getBlockNumber(timestamp: number): Promise<number>;
     getBlockNumbers(timestamps: number[]): Promise<{
         [quoteTimestamp: number]: number;
     }>;
-    getCurrentPoolUtilization(l1Token: string): Promise<BigNumber>;
-    protected getUtilization(hubPoolToken: string, blockNumber: number, depositAmount: BigNumber, timestamp: number, timeToCache: number): Promise<BigNumber>;
+    getCurrentPoolUtilization(l1Token: EvmAddress): 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;
@@ -108,9 +108,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;