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

package/src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts

@@ -5,7 +5,6 @@ import winston from "winston";
 import { isError } from "../../typeguards";
 import {
   EventSearchConfig,
-  EvmAddress,
   MakeOptional,
   isArrayOf,
   isDefined,
@@ -108,7 +107,7 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
   }
 
   getRateModelForBlockNumber(
-    l1Token: EvmAddress,
+    l1Token: string,
     originChainId: number | string,
     destinationChainId: number | string,
     blockNumber: number | undefined = undefined
@@ -122,9 +121,7 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
 
     const defaultRateModelUpdate = sortEventsDescending(this.cumulativeRateModelUpdates).find(
       (config) =>
-        config.blockNumber <= (blockNumber ?? 0) &&
-        config.l1Token === l1Token.toEvmAddress() &&
-        config.rateModel !== undefined
+        config.blockNumber <= (blockNumber ?? 0) && config.l1Token === l1Token && config.rateModel !== undefined
     );
     if (!defaultRateModelUpdate) {
       throw new Error(`Could not find TokenConfig update for ${l1Token} at block ${blockNumber}`);
@@ -133,12 +130,12 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
   }
 
   getRouteRateModelForBlockNumber(
-    l1Token: EvmAddress,
+    l1Token: string,
     route: string,
     blockNumber: number | undefined = undefined
   ): RateModel | undefined {
     const config = (sortEventsDescending(this.cumulativeRouteRateModelUpdates) as RouteRateModelUpdate[]).find(
-      (config) => config.blockNumber <= (blockNumber ?? 0) && config.l1Token === l1Token.toEvmAddress()
+      (config) => config.blockNumber <= (blockNumber ?? 0) && config.l1Token === l1Token
     );
     if (config?.routeRateModel[route] === undefined) {
       return undefined;

package/src/clients/BundleDataClient/BundleDataClient.ts

@@ -39,9 +39,11 @@ import {
   bnUint32Max,
   isZeroValueDeposit,
   isZeroValueFillOrSlowFillRequest,
+  chainIsEvm,
+  isValidEvmAddress,
   duplicateEvent,
   invalidOutputToken,
-  Address,
+  getNetworkName,
 } from "../../utils";
 import winston from "winston";
 import {
@@ -57,6 +59,7 @@ import {
   verifyFillRepayment,
 } from "./utils";
 import { isEVMSpokePoolClient, isSVMSpokePoolClient } from "../SpokePoolClient";
+import { SpokePoolManager } from "../SpokePoolClient/SpokePoolClientManager";
 
 // max(uint256) - 1
 export const INFINITE_FILL_DEADLINE = bnUint32Max;
@@ -66,21 +69,22 @@ type DataCache = Record<string, Promise<LoadDataReturnValue>>;
 // V3 dictionary helper functions
 function updateExpiredDepositsV3(dict: ExpiredDepositsToRefundV3, deposit: V3DepositWithBlock): void {
   // A deposit refund for a deposit is invalid if the depositor has a bytes32 address input for an EVM chain. It is valid otherwise.
-  if (!deposit.depositor.isValidOn(deposit.originChainId)) {
+  if (chainIsEvm(deposit.originChainId) && !isValidEvmAddress(deposit.depositor)) {
     return;
   }
-
   const { originChainId, inputToken } = deposit;
-  dict[originChainId] ??= {};
-  dict[originChainId][inputToken.toBytes32()] ??= [];
-  dict[originChainId][inputToken.toBytes32()].push(deposit);
+  if (!dict?.[originChainId]?.[inputToken]) {
+    assign(dict, [originChainId, inputToken], []);
+  }
+  dict[originChainId][inputToken].push(deposit);
 }
 
 function updateBundleDepositsV3(dict: BundleDepositsV3, deposit: V3DepositWithBlock): void {
   const { originChainId, inputToken } = deposit;
-  dict[originChainId] ??= {};
-  dict[originChainId][inputToken.toBytes32()] ??= [];
-  dict[originChainId][inputToken.toBytes32()].push(deposit);
+  if (!dict?.[originChainId]?.[inputToken]) {
+    assign(dict, [originChainId, inputToken], []);
+  }
+  dict[originChainId][inputToken].push(deposit);
 }
 
 function updateBundleFillsV3(
@@ -88,29 +92,29 @@ function updateBundleFillsV3(
   fill: V3FillWithBlock,
   lpFeePct: BigNumber,
   repaymentChainId: number,
-  repaymentToken: Address,
-  repaymentAddress: Address
+  repaymentToken: string,
+  repaymentAddress: string
 ): void {
   // We shouldn't pass any unrepayable fills into this function, so we perform an extra safety check.
-  if (!fill.relayer.isValidOn(repaymentChainId)) {
+  if (chainIsEvm(repaymentChainId) && !isValidEvmAddress(fill.relayer)) {
     return;
   }
-
-  dict[repaymentChainId] ??= {};
-  dict[repaymentChainId][repaymentToken.toBytes32()] ??= {
-    fills: [],
-    totalRefundAmount: bnZero,
-    realizedLpFees: bnZero,
-    refunds: {},
-  };
+  if (!dict?.[repaymentChainId]?.[repaymentToken]) {
+    assign(dict, [repaymentChainId, repaymentToken], {
+      fills: [],
+      totalRefundAmount: bnZero,
+      realizedLpFees: bnZero,
+      refunds: {},
+    });
+  }
 
   const bundleFill: BundleFillV3 = { ...fill, lpFeePct, relayer: repaymentAddress };
 
   // Add all fills, slow and fast, to dictionary.
-  assign(dict, [repaymentChainId, repaymentToken.toBytes32(), "fills"], [bundleFill]);
+  assign(dict, [repaymentChainId, repaymentToken, "fills"], [bundleFill]);
 
   // All fills update the bundle LP fees.
-  const refundObj = dict[repaymentChainId][repaymentToken.toBytes32()];
+  const refundObj = dict[repaymentChainId][repaymentToken];
   const realizedLpFee = bundleFill.inputAmount.mul(bundleFill.lpFeePct).div(fixedPointAdjustment);
   refundObj.realizedLpFees = refundObj.realizedLpFees ? refundObj.realizedLpFees.add(realizedLpFee) : realizedLpFee;
 
@@ -124,11 +128,10 @@ function updateBundleFillsV3(
     // Instantiate dictionary if it doesn't exist.
     refundObj.refunds ??= {};
 
-    if (refundObj.refunds[bundleFill.relayer.toBytes32()]) {
-      refundObj.refunds[bundleFill.relayer.toBytes32()] =
-        refundObj.refunds[bundleFill.relayer.toBytes32()].add(refundAmount);
+    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;
     }
   }
 }
@@ -138,20 +141,21 @@ function updateBundleExcessSlowFills(
   deposit: V3DepositWithBlock & { lpFeePct: BigNumber }
 ): void {
   const { destinationChainId, outputToken } = deposit;
-  dict[destinationChainId] ??= {};
-  dict[destinationChainId][outputToken.toBytes32()] ??= [];
-  dict[destinationChainId][outputToken.toBytes32()].push(deposit);
+  if (!dict?.[destinationChainId]?.[outputToken]) {
+    assign(dict, [destinationChainId, outputToken], []);
+  }
+  dict[destinationChainId][outputToken].push(deposit);
 }
 
 function updateBundleSlowFills(dict: BundleSlowFills, deposit: V3DepositWithBlock & { lpFeePct: BigNumber }): void {
-  if (!deposit.recipient.isValidOn(deposit.destinationChainId)) {
+  if (chainIsEvm(deposit.destinationChainId) && !isValidEvmAddress(deposit.recipient)) {
     return;
   }
-
   const { destinationChainId, outputToken } = deposit;
-  dict[destinationChainId] ??= {};
-  dict[destinationChainId][outputToken.toBytes32()] ??= [];
-  dict[destinationChainId][outputToken.toBytes32()].push(deposit);
+  if (!dict?.[destinationChainId]?.[outputToken]) {
+    assign(dict, [destinationChainId, outputToken], []);
+  }
+  dict[destinationChainId][outputToken].push(deposit);
 }
 
 // @notice Shared client for computing data needed to construct or validate a bundle.
@@ -160,15 +164,18 @@ export class BundleDataClient {
   private arweaveDataCache: Record<string, Promise<LoadDataReturnValue | undefined>> = {};
 
   private bundleTimestampCache: Record<string, { [chainId: number]: number[] }> = {};
+  readonly spokePoolClientManager: SpokePoolManager;
 
   // eslint-disable-next-line no-useless-constructor
   constructor(
     readonly logger: winston.Logger,
     readonly clients: Clients,
-    readonly spokePoolClients: { [chainId: number]: SpokePoolClient },
+    spokePoolClients: { [chainId: number]: SpokePoolClient },
     readonly chainIdListForBundleEvaluationBlockNumbers: number[],
     readonly blockRangeEndBlockBuffer: { [chainId: number]: number } = {}
-  ) {}
+  ) {
+    this.spokePoolClientManager = new SpokePoolManager(logger, spokePoolClients);
+  }
 
   // This should be called whenever it's possible that the loadData information for a block range could have changed.
   // For instance, if the spoke or hub clients have been updated, it probably makes sense to clear this to be safe.
@@ -398,7 +405,7 @@ export class BundleDataClient {
     // expiries here so we can skip some steps. We also don't need to compute LP fees as they should be small enough
     // so as not to affect this approximate refund count.
     const arweaveData = await this.loadArweaveData(bundleEvaluationBlockRanges);
-    if (arweaveData === undefined) {
+    if (!isDefined(arweaveData)) {
       combinedRefunds = await this.getApproximateRefundsForBlockRange(chainIds, bundleEvaluationBlockRanges);
     } else {
       const { bundleFillsV3, expiredDepositsToRefundV3 } = arweaveData;
@@ -408,7 +415,7 @@ export class BundleDataClient {
       // a reasonable assumption. This empty refund chain also matches what the alternative
       // `getApproximateRefundsForBlockRange` would return.
       Object.keys(combinedRefunds).forEach((chainId) => {
-        if (this.spokePoolClients[Number(chainId)] === undefined) {
+        if (!this.spokePoolClientManager.getClient(Number(chainId))) {
           delete combinedRefunds[Number(chainId)];
         }
       });
@@ -424,7 +431,8 @@ export class BundleDataClient {
     const refundsForChain: CombinedRefunds = {};
     const bundleEndBlockForMainnet = blockRanges[0][1];
     for (const chainId of chainIds) {
-      if (this.spokePoolClients[chainId] === undefined) {
+      const spokePoolClient = this.spokePoolClientManager.getClient(chainId);
+      if (!isDefined(spokePoolClient)) {
         continue;
       }
       const chainIndex = chainIds.indexOf(chainId);
@@ -433,7 +441,7 @@ export class BundleDataClient {
       // and then query the FillStatus on-chain, but that might slow this function down too much. For now, we
       // will live with this expected inaccuracy as it should be small. The pre-fill would have to precede the deposit
       // by more than the caller's event lookback window which is expected to be unlikely.
-      const fillsToCount = this.spokePoolClients[chainId].getFills().filter((fill) => {
+      const fillsToCount = spokePoolClient.getFills().filter((fill) => {
         if (
           fill.blockNumber < blockRanges[chainIndex][0] ||
           fill.blockNumber > blockRanges[chainIndex][1] ||
@@ -443,20 +451,32 @@ export class BundleDataClient {
           return false;
         }
 
+        const originSpokePoolClient = this.spokePoolClientManager.getClient(fill.originChainId);
         // If origin spoke pool client isn't defined, we can't validate it.
-        if (this.spokePoolClients[fill.originChainId] === undefined) {
+        if (!isDefined(originSpokePoolClient)) {
           return false;
         }
-        const matchingDeposit = this.spokePoolClients[fill.originChainId].getDeposit(fill.depositId);
+        const matchingDeposit = originSpokePoolClient.getDeposit(fill.depositId);
         const hasMatchingDeposit =
           matchingDeposit !== undefined && getRelayEventKey(fill) === getRelayEventKey(matchingDeposit);
         return hasMatchingDeposit;
       });
       await forEachAsync(fillsToCount, async (_fill) => {
-        const matchingDeposit = this.spokePoolClients[_fill.originChainId].getDeposit(_fill.depositId);
-        assert(isDefined(matchingDeposit), "Deposit not found for fill.");
+        const originChain = getNetworkName(_fill.originChainId);
+        const originSpokePoolClient = this.spokePoolClientManager.getClient(_fill.originChainId);
+        assert(isDefined(originSpokePoolClient), `No SpokePoolClient for chain ${originChain}`);
+        const matchingDeposit = originSpokePoolClient.getDeposit(_fill.depositId);
+        assert(
+          isDefined(matchingDeposit),
+          `No ${originChain} deposit found for ${getNetworkName(_fill.destinationChainId)} fill ${_fill.depositId}`
+        );
+
+        const spokeClient = this.spokePoolClientManager.getClient(_fill.destinationChainId);
+        assert(
+          isDefined(spokeClient),
+          `SpokePoolClient for ${getNetworkName(_fill.destinationChainId)} not found for fill.`
+        );
 
-        const spokeClient = this.spokePoolClients[_fill.destinationChainId];
         let provider;
         if (isEVMSpokePoolClient(spokeClient)) {
           provider = spokeClient.spokePool.provider;
@@ -487,23 +507,22 @@ export class BundleDataClient {
         // worst from the relayer's perspective.
         const { relayer, inputAmount: refundAmount } = fill;
         refundsForChain[chainToSendRefundTo] ??= {};
-        refundsForChain[chainToSendRefundTo][repaymentToken.toBytes32()] ??= {};
-        const existingRefundAmount =
-          refundsForChain[chainToSendRefundTo][repaymentToken.toBytes32()][relayer.toBytes32()] ?? bnZero;
-        refundsForChain[chainToSendRefundTo][repaymentToken.toBytes32()][relayer.toBytes32()] =
-          existingRefundAmount.add(refundAmount);
+        refundsForChain[chainToSendRefundTo][repaymentToken] ??= {};
+        const existingRefundAmount = refundsForChain[chainToSendRefundTo][repaymentToken][relayer] ?? bnZero;
+        refundsForChain[chainToSendRefundTo][repaymentToken][relayer] = existingRefundAmount.add(refundAmount);
       });
     }
     return refundsForChain;
   }
 
-  getUpcomingDepositAmount(chainId: number, l2Token: Address, latestBlockToSearch: number): BigNumber {
-    if (this.spokePoolClients[chainId] === undefined) {
+  getUpcomingDepositAmount(chainId: number, l2Token: string, latestBlockToSearch: number): BigNumber {
+    const spokePoolClient = this.spokePoolClientManager.getClient(chainId);
+    if (!isDefined(spokePoolClient)) {
       return toBN(0);
     }
-    return this.spokePoolClients[chainId]
+    return spokePoolClient
       .getDeposits()
-      .filter((deposit) => deposit.blockNumber > latestBlockToSearch && deposit.inputToken.eq(l2Token))
+      .filter((deposit) => deposit.blockNumber > latestBlockToSearch && deposit.inputToken === l2Token)
       .reduce((acc, deposit) => {
         return acc.add(deposit.inputAmount);
       }, toBN(0));
@@ -529,7 +548,7 @@ export class BundleDataClient {
     // should be handled gracefully and effectively cause this function to ignore refunds for the chain.
     let widestBundleBlockRanges = getWidestPossibleExpectedBlockRange(
       chainIds,
-      this.spokePoolClients,
+      this.spokePoolClientManager.getSpokePoolClients(),
       getEndBlockBuffers(chainIds, this.blockRangeEndBlockBuffer),
       this.clients,
       this.clients.hubPoolClient.latestHeightSearched,
@@ -572,7 +591,7 @@ export class BundleDataClient {
       // data is undefined and use the much faster approximation method which doesn't consider LP fees which is
       // ok for this use case.
       const arweaveData = await this.loadArweaveData(pendingBundleBlockRanges);
-      if (arweaveData === undefined) {
+      if (!isDefined(arweaveData)) {
         combinedRefunds.push(await this.getApproximateRefundsForBlockRange(chainIds, pendingBundleBlockRanges));
       } else {
         const { bundleFillsV3, expiredDepositsToRefundV3 } = arweaveData;
@@ -626,18 +645,18 @@ export class BundleDataClient {
     const executedRefunds: { [tokenAddress: string]: { [relayer: string]: BigNumber } } = {};
     for (const refundLeaf of executedRefundLeaves) {
       const tokenAddress = refundLeaf.l2TokenAddress;
-      if (executedRefunds[tokenAddress.toBytes32()] === undefined) {
-        executedRefunds[tokenAddress.toBytes32()] = {};
+      if (executedRefunds[tokenAddress] === undefined) {
+        executedRefunds[tokenAddress] = {};
       }
-      const executedTokenRefunds = executedRefunds[tokenAddress.toBytes32()];
+      const executedTokenRefunds = executedRefunds[tokenAddress];
 
       for (let i = 0; i < refundLeaf.refundAddresses.length; i++) {
         const relayer = refundLeaf.refundAddresses[i];
         const refundAmount = refundLeaf.refundAmounts[i];
-        if (executedTokenRefunds[relayer.toBytes32()] === undefined) {
-          executedTokenRefunds[relayer.toBytes32()] = bnZero;
+        if (executedTokenRefunds[relayer] === undefined) {
+          executedTokenRefunds[relayer] = bnZero;
         }
-        executedTokenRefunds[relayer.toBytes32()] = executedTokenRefunds[relayer.toBytes32()].add(refundAmount);
+        executedTokenRefunds[relayer] = executedTokenRefunds[relayer].add(refundAmount);
       }
     }
     return executedRefunds;
@@ -650,13 +669,11 @@ export class BundleDataClient {
   ): CombinedRefunds {
     for (const chainIdStr of Object.keys(allRefunds)) {
       const chainId = Number(chainIdStr);
-      if (!isDefined(this.spokePoolClients[chainId])) {
+      const spokePoolClient = this.spokePoolClientManager.getClient(chainId);
+      if (!isDefined(spokePoolClient)) {
         continue;
       }
-      const executedRefunds = this.getExecutedRefunds(
-        this.spokePoolClients[chainId],
-        bundleContainingRefunds.relayerRefundRoot
-      );
+      const executedRefunds = this.getExecutedRefunds(spokePoolClient, bundleContainingRefunds.relayerRefundRoot);
 
       for (const tokenAddress of Object.keys(allRefunds[chainId])) {
         const refunds = allRefunds[chainId][tokenAddress];
@@ -678,15 +695,15 @@ export class BundleDataClient {
     return allRefunds;
   }
 
-  getRefundsFor(bundleRefunds: CombinedRefunds, relayer: Address, chainId: number, token: Address): BigNumber {
-    if (!bundleRefunds[chainId] || !bundleRefunds[chainId][token.toBytes32()]) {
+  getRefundsFor(bundleRefunds: CombinedRefunds, relayer: string, chainId: number, token: string): BigNumber {
+    if (!bundleRefunds[chainId] || !bundleRefunds[chainId][token]) {
       return BigNumber.from(0);
     }
-    const allRefunds = bundleRefunds[chainId][token.toBytes32()];
-    return allRefunds && allRefunds[relayer.toBytes32()] ? allRefunds[relayer.toBytes32()] : BigNumber.from(0);
+    const allRefunds = bundleRefunds[chainId][token];
+    return allRefunds && allRefunds[relayer] ? allRefunds[relayer] : BigNumber.from(0);
   }
 
-  getTotalRefund(refunds: CombinedRefunds[], relayer: Address, chainId: number, refundToken: Address): BigNumber {
+  getTotalRefund(refunds: CombinedRefunds[], relayer: string, chainId: number, refundToken: string): BigNumber {
     return refunds.reduce((totalRefund, refunds) => {
       return totalRefund.add(this.getRefundsFor(refunds, relayer, chainId, refundToken));
     }, bnZero);
@@ -899,11 +916,7 @@ export class BundleDataClient {
             "Not using correct bundle deposit hash key"
           );
           if (deposit.blockNumber >= originChainBlockRange[0]) {
-            if (
-              bundleDepositsV3?.[originChainId]?.[deposit.inputToken.toBytes32()]?.find((d) =>
-                duplicateEvent(deposit, d)
-              )
-            ) {
+            if (bundleDepositsV3?.[originChainId]?.[deposit.inputToken]?.find((d) => duplicateEvent(deposit, d))) {
               this.logger.debug({
                 at: "BundleDataClient#loadData",
                 message: "Duplicate deposit detected",

package/src/clients/BundleDataClient/utils/DataworkerUtils.ts

@@ -17,7 +17,6 @@ import {
   fixedPointAdjustment,
   count2DDictionaryValues,
   count3DDictionaryValues,
-  toAddressType,
 } from "../../../utils";
 import {
   addLastRunningBalance,
@@ -66,10 +65,10 @@ export function getRefundsFromBundle(
     Object.entries(depositsForChain).forEach(([l2TokenAddress, deposits]) => {
       deposits.forEach((deposit) => {
         if (combinedRefunds[originChainId][l2TokenAddress] === undefined) {
-          combinedRefunds[originChainId][l2TokenAddress] = { [deposit.depositor.toBytes32()]: deposit.inputAmount };
+          combinedRefunds[originChainId][l2TokenAddress] = { [deposit.depositor]: deposit.inputAmount };
         } else {
-          const existingRefundAmount = combinedRefunds[originChainId][l2TokenAddress][deposit.depositor.toBytes32()];
-          combinedRefunds[originChainId][l2TokenAddress][deposit.depositor.toBytes32()] = deposit.inputAmount.add(
+          const existingRefundAmount = combinedRefunds[originChainId][l2TokenAddress][deposit.depositor];
+          combinedRefunds[originChainId][l2TokenAddress][deposit.depositor] = deposit.inputAmount.add(
             existingRefundAmount ?? bnZero
           );
         }
@@ -154,23 +153,19 @@ export function _buildPoolRebalanceRoot(
         // If the repayment token and repayment chain ID do not map to a PoolRebalanceRoute graph, then
         // there are no relevant L1 running balances.
         if (
-          !clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(
-            toAddressType(l2TokenAddress, repaymentChainId),
-            repaymentChainId,
-            mainnetBundleEndBlock
-          )
+          !clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(l2TokenAddress, repaymentChainId, mainnetBundleEndBlock)
         ) {
           chainWithRefundsOnly.add(repaymentChainId);
           return;
         }
         const l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(
-          toAddressType(l2TokenAddress, repaymentChainId),
+          l2TokenAddress,
           repaymentChainId,
           mainnetBundleEndBlock
         );
 
-        updateRunningBalance(runningBalances, repaymentChainId, l1TokenCounterpart.toEvmAddress(), totalRefundAmount);
-        updateRunningBalance(realizedLpFees, repaymentChainId, l1TokenCounterpart.toEvmAddress(), totalRealizedLpFee);
+        updateRunningBalance(runningBalances, repaymentChainId, l1TokenCounterpart, totalRefundAmount);
+        updateRunningBalance(realizedLpFees, repaymentChainId, l1TokenCounterpart, totalRealizedLpFee);
       }
     );
   });
@@ -187,17 +182,12 @@ export function _buildPoolRebalanceRoot(
     Object.entries(depositsForChain).forEach(([outputToken, deposits]) => {
       deposits.forEach((deposit) => {
         const l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(
-          toAddressType(outputToken, destinationChainId),
+          outputToken,
           destinationChainId,
           mainnetBundleEndBlock
         );
         const lpFee = deposit.lpFeePct.mul(deposit.inputAmount).div(fixedPointAdjustment);
-        updateRunningBalance(
-          runningBalances,
-          destinationChainId,
-          l1TokenCounterpart.toEvmAddress(),
-          deposit.inputAmount.sub(lpFee)
-        );
+        updateRunningBalance(runningBalances, destinationChainId, l1TokenCounterpart, deposit.inputAmount.sub(lpFee));
         // Slow fill LP fees are accounted for when the slow fill executes and a V3FilledRelay is emitted. i.e. when
         // the slow fill execution is included in bundleFillsV3.
       });
@@ -216,17 +206,12 @@ export function _buildPoolRebalanceRoot(
     Object.entries(slowFilledDepositsForChain).forEach(([outputToken, slowFilledDeposits]) => {
       slowFilledDeposits.forEach((deposit) => {
         const l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(
-          toAddressType(outputToken, destinationChainId),
+          outputToken,
           destinationChainId,
           mainnetBundleEndBlock
         );
         const lpFee = deposit.lpFeePct.mul(deposit.inputAmount).div(fixedPointAdjustment);
-        updateRunningBalance(
-          runningBalances,
-          destinationChainId,
-          l1TokenCounterpart.toEvmAddress(),
-          lpFee.sub(deposit.inputAmount)
-        );
+        updateRunningBalance(runningBalances, destinationChainId, l1TokenCounterpart, lpFee.sub(deposit.inputAmount));
         // Slow fills don't add to lpFees, only when the slow fill is executed and a V3FilledRelay is emitted, so
         // we don't need to subtract it here. Moreover, the HubPoole expects bundleLpFees to be > 0.
       });
@@ -286,11 +271,11 @@ export function _buildPoolRebalanceRoot(
           return;
         }
         const l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(
-          toAddressType(inputToken, originChainId),
+          inputToken,
           originChainId,
           mainnetBundleEndBlock
         );
-        updateRunningBalance(runningBalances, originChainId, l1TokenCounterpart.toEvmAddress(), deposit.inputAmount);
+        updateRunningBalance(runningBalances, originChainId, l1TokenCounterpart, deposit.inputAmount);
       });
     });
   });

package/src/clients/BundleDataClient/utils/FillUtils.ts

@@ -2,7 +2,7 @@ import _ from "lodash";
 import assert from "assert";
 import { providers } from "ethers";
 import { DepositWithBlock, Fill, FillWithBlock } from "../../../interfaces";
-import { isSlowFill, isValidEvmAddress, isDefined, chainIsEvm, Address, toAddressType } from "../../../utils";
+import { isSlowFill, isValidEvmAddress, isDefined, chainIsEvm } from "../../../utils";
 import { HubPoolClient } from "../../HubPoolClient";
 import { SVMProvider } from "../../../arch/svm";
 
@@ -25,7 +25,7 @@ export function getRefundInformationFromFill(
   bundleEndBlockForMainnet: number
 ): {
   chainToSendRefundTo: number;
-  repaymentToken: Address;
+  repaymentToken: string;
 } {
   const chainToSendRefundTo = _getRepaymentChainId(relayData, hubPoolClient, bundleEndBlockForMainnet);
   if (chainToSendRefundTo === relayData.originChainId) {
@@ -49,7 +49,6 @@ export function getRefundInformationFromFill(
     chainToSendRefundTo,
     bundleEndBlockForMainnet
   );
-
   return {
     chainToSendRefundTo,
     repaymentToken,
@@ -126,11 +125,7 @@ export async function verifyFillRepayment(
           return undefined;
         }
       }
-      fill.relayer = toAddressType(destinationRelayer, fill.destinationChainId);
-      assert(
-        fill.relayer.isValidOn(fill.destinationChainId),
-        `Cannot re-assign fill to msg.sender: ${destinationRelayer}`
-      );
+      fill.relayer = destinationRelayer;
     } else {
       return undefined;
     }
@@ -205,6 +200,5 @@ function _repaymentAddressNeedsToBeOverwritten(fill: Fill): boolean {
   // - i.e. If chainIsSvm && !isValidSvmAddress(fill.relayer) then return false
   //        If chainIsEvm && !isValidEvmAddress(fill.relayer) then return false
   //        If chainIsEvm && isValidEvmAddress(fill.relayer) then return true
-  // @todo: UMIP might require upper 12 bytes non-zero for SVM repayment
-  return !fill.relayer.isValidOn(fill.repaymentChainId);
+  return !isValidEvmAddress(fill.relayer);
 }

package/src/clients/BundleDataClient/utils/MerkleTreeUtils.ts

@@ -21,12 +21,6 @@ export function buildPoolRebalanceLeafTree(poolRebalanceLeaves: PoolRebalanceLea
   }
 
   const paramType = getParamType("MerkleLibTest", "verifyPoolRebalance", "rebalance");
-  const hashFn = (input: PoolRebalanceLeaf) => {
-    const ethersLeaf = {
-      ...input,
-      l1Tokens: input.l1Tokens.map((l1Token) => l1Token.toEvmAddress()),
-    };
-    return utils.keccak256(utils.defaultAbiCoder.encode([paramType], [ethersLeaf]));
-  };
+  const hashFn = (input: PoolRebalanceLeaf) => utils.keccak256(utils.defaultAbiCoder.encode([paramType], [input]));
   return new MerkleTree<PoolRebalanceLeaf>(poolRebalanceLeaves, hashFn);
 }

package/src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts

@@ -1,7 +1,7 @@
 import { MerkleTree } from "@across-protocol/contracts/dist/utils/MerkleTree";
 import { RunningBalances, PoolRebalanceLeaf, Clients, SpokePoolTargetBalance } from "../../../interfaces";
 import { SpokePoolClient } from "../../SpokePoolClient";
-import { BigNumber, bnZero, compareAddresses, EvmAddress } from "../../../utils";
+import { BigNumber, bnZero, compareAddresses } from "../../../utils";
 import { HubPoolClient } from "../../HubPoolClient";
 import { V3DepositWithBlock } from "./shims";
 import { AcrossConfigStoreClient } from "../../AcrossConfigStoreClient";
@@ -151,7 +151,7 @@ export function addLastRunningBalance(
       const { runningBalance } = hubPoolClient.getRunningBalanceBeforeBlockForChain(
         latestMainnetBlock,
         Number(repaymentChainId),
-        EvmAddress.from(l1TokenAddress)
+        l1TokenAddress
       );
       if (!runningBalance.eq(bnZero)) {
         updateRunningBalance(runningBalances, Number(repaymentChainId), l1TokenAddress, runningBalance);
@@ -172,7 +172,7 @@ export function updateRunningBalanceForDeposit(
     deposit.originChainId,
     mainnetBundleEndBlock
   );
-  updateRunningBalance(runningBalances, deposit.originChainId, l1TokenCounterpart.toEvmAddress(), updateAmount);
+  updateRunningBalance(runningBalances, deposit.originChainId, l1TokenCounterpart, updateAmount);
 }
 
 export function constructPoolRebalanceLeaves(
@@ -253,7 +253,7 @@ export function constructPoolRebalanceLeaves(
           runningBalances: leafRunningBalances,
           groupIndex: groupIndexForChainId++,
           leafId: leaves.length,
-          l1Tokens: l1TokensToIncludeInThisLeaf.map((l1TokenAddr: string) => EvmAddress.from(l1TokenAddr)),
+          l1Tokens: l1TokensToIncludeInThisLeaf,
         });
       }
     });