@across-protocol/sdk 4.2.9-alpha.0 → 4.2.9-alpha.1

package/src/clients/mocks/MockSvmSpokePoolClient.ts

@@ -2,15 +2,7 @@ import winston from "winston";
 import { SvmSpokeClient } from "@across-protocol/contracts";
 import { Address } from "@solana/kit";
 import { DepositWithBlock, RelayerRefundExecution, SortableEvent, SlowFillLeaf, Log } from "../../interfaces";
-import {
-  getCurrentTime,
-  bnZero,
-  MakeOptional,
-  EventSearchConfig,
-  Address as SDKAddress,
-  toAddressType,
-  isDefined,
-} from "../../utils";
+import { getCurrentTime, bnZero, MakeOptional, EventSearchConfig } from "../../utils";
 import { SpokePoolUpdate, SVMSpokePoolClient } from "../SpokePoolClient";
 import { HubPoolClient } from "../HubPoolClient";
 import { EventOverrides } from "./MockEvents";
@@ -54,9 +46,8 @@ export class MockSvmSpokePoolClient extends SVMSpokePoolClient {
     this.destinationTokenForChainOverride[chainId] = token;
   }
 
-  getDestinationTokenForDeposit(deposit: DepositWithBlock): SDKAddress {
-    const override = this.destinationTokenForChainOverride[deposit.originChainId];
-    return isDefined(override) ? toAddressType(override) : super.getDestinationTokenForDeposit(deposit);
+  getDestinationTokenForDeposit(deposit: DepositWithBlock): string {
+    return this.destinationTokenForChainOverride[deposit.originChainId] ?? super.getDestinationTokenForDeposit(deposit);
   }
 
   setLatestBlockNumber(blockNumber: number): void {

package/src/interfaces/HubPool.ts

@@ -1,4 +1,4 @@
-import { Address, BigNumber, EvmAddress } from "../utils";
+import { BigNumber } from "../utils";
 import { SortableEvent } from "./Common";
 
 export interface PoolRebalanceLeaf {
@@ -8,7 +8,7 @@ export interface PoolRebalanceLeaf {
   netSendAmounts: BigNumber[];
   runningBalances: BigNumber[];
   leafId: number;
-  l1Tokens: EvmAddress[];
+  l1Tokens: string[];
 }
 
 export interface RelayerRefundLeaf {
@@ -16,8 +16,8 @@ export interface RelayerRefundLeaf {
   chainId: number;
   refundAmounts: BigNumber[];
   leafId: number;
-  l2TokenAddress: Address;
-  refundAddresses: Address[];
+  l2TokenAddress: string;
+  refundAddresses: string[];
 }
 
 export interface ProposedRootBundle extends SortableEvent {
@@ -55,7 +55,7 @@ export interface ExecutedRootBundle extends SortableEvent {
   netSendAmounts: BigNumber[];
   runningBalances: BigNumber[];
   leafId: number;
-  l1Tokens: EvmAddress[];
+  l1Tokens: string[];
   proof: string[];
 }
 
@@ -76,14 +76,8 @@ export interface RelayerRefundLeafWithGroup extends RelayerRefundLeaf {
   groupIndex: number;
 }
 
-export interface L1TokenInfo {
-  address: EvmAddress;
-  symbol: string;
-  decimals: number;
-}
-
-export interface TokenInfo {
-  address: Address;
+export interface L1Token {
+  address: string;
   symbol: string;
   decimals: number;
 }
@@ -93,30 +87,27 @@ export interface LpToken {
   liquidReserves: BigNumber;
 }
 
-// TODO: I think I don't change string -> Address in the Events. I change right after the event is read
 export interface CrossChainContractsSet extends SortableEvent {
   l2ChainId: number;
-  spokePool: Address;
+  spokePool: string;
 }
 
-// TODO: I think I don't change string -> Address in the Events. I change right after the event is read
 export interface DestinationTokenWithBlock extends SortableEvent {
-  l2Token: Address;
-  l1Token: EvmAddress;
+  l2Token: string;
+  l1Token: string;
 }
 
-// TODO: I think I don't change string -> Address in the Events. I change right after the event is read
 export interface SetPoolRebalanceRoot extends SortableEvent {
   destinationChainId: number;
-  l1Token: EvmAddress;
-  destinationToken: Address;
+  l1Token: string;
+  destinationToken: string;
 }
 
 export interface PendingRootBundle {
   poolRebalanceRoot: string;
   relayerRefundRoot: string;
   slowRelayRoot: string;
-  proposer: EvmAddress;
+  proposer: string;
   unclaimedPoolRebalanceLeafCount: number;
   challengePeriodEndTimestamp: number;
   bundleEvaluationBlockNumbers: number[];

package/src/interfaces/SpokePool.ts

@@ -1,20 +1,23 @@
 import { SortableEvent } from "./Common";
+import { FilledV3RelayEvent, V3FundsDepositedEvent } from "../typechain";
 import { SpokePoolClient } from "../clients";
-import { BigNumber, Address, EvmAddress } from "../utils";
+import { BigNumber } from "../utils";
 import { RelayerRefundLeaf } from "./HubPool";
 
+export type { FilledV3RelayEvent, V3FundsDepositedEvent };
+
 export interface RelayData {
   originChainId: number;
-  depositor: Address;
-  recipient: Address;
+  depositor: string;
+  recipient: string;
   depositId: BigNumber;
-  inputToken: Address;
+  inputToken: string;
   inputAmount: BigNumber;
-  outputToken: Address;
+  outputToken: string;
   outputAmount: BigNumber;
   message: string;
   fillDeadline: number;
-  exclusiveRelayer: Address;
+  exclusiveRelayer: string;
   exclusivityDeadline: number;
 }
 
@@ -23,7 +26,7 @@ export interface Deposit extends RelayData {
   destinationChainId: number;
   quoteTimestamp: number;
   speedUpSignature?: string;
-  updatedRecipient?: Address;
+  updatedRecipient?: string;
   updatedOutputAmount?: BigNumber;
   updatedMessage?: string;
   fromLiteChain: boolean;
@@ -51,7 +54,7 @@ export enum FillType {
 }
 
 export interface RelayExecutionEventInfo {
-  updatedRecipient: Address;
+  updatedRecipient: string;
   updatedOutputAmount: BigNumber;
   updatedMessage?: string;
   updatedMessageHash: string;
@@ -61,7 +64,7 @@ export interface RelayExecutionEventInfo {
 export interface Fill extends Omit<RelayData, "message"> {
   messageHash: string;
   destinationChainId: number;
-  relayer: Address;
+  relayer: string;
   repaymentChainId: number;
   relayExecutionInfo: RelayExecutionEventInfo;
 }
@@ -72,25 +75,25 @@ export interface FillWithTime extends Fill, SortableEvent {
 }
 
 export interface EnabledDepositRoute {
-  originToken: Address;
+  originToken: string;
   destinationChainId: number;
   enabled: boolean;
 }
 
 export interface EnabledDepositRouteWithBlock extends EnabledDepositRoute, SortableEvent {}
 export interface SpeedUp {
-  depositor: EvmAddress;
+  depositor: string;
   depositorSignature: string;
   depositId: BigNumber;
   originChainId: number;
-  updatedRecipient: Address;
+  updatedRecipient: string;
   updatedOutputAmount: BigNumber;
   updatedMessage: string;
 }
 
 export interface SpeedUpWithBlock extends SpeedUp, SortableEvent {}
 
-export interface SlowFillRequest extends Omit<RelayData, "message"> {
+export interface SlowFillRequest extends RelayData {
   messageHash: string;
   destinationChainId: number;
 }
@@ -130,7 +133,7 @@ export interface TokensBridged extends SortableEvent {
   amountToReturn: BigNumber;
   chainId: number;
   leafId: number;
-  l2TokenAddress: Address;
+  l2TokenAddress: string;
 }
 
 export interface SpokePoolClientsByChain {

package/src/relayFeeCalculator/chain-queries/baseQuery.ts

@@ -15,8 +15,6 @@ import {
   bnZero,
   chainIsOPStack,
   fixedPointAdjustment,
-  toAddressType,
-  Address,
 } from "../../utils";
 import assert from "assert";
 import { Logger, QueryInterface, getDefaultSimulatedRelayerAddress } from "../relayFeeCalculator";
@@ -74,7 +72,7 @@ export class QueryBase implements QueryInterface {
    */
   async getGasCosts(
     deposit: Omit<Deposit, "messageHash">,
-    relayer = toAddressType(getDefaultSimulatedRelayerAddress(deposit.destinationChainId)),
+    relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId),
     options: Partial<{
       gasPrice: BigNumberish;
       gasUnits: BigNumberish;
@@ -124,7 +122,7 @@ export class QueryBase implements QueryInterface {
    */
   getUnsignedTxFromDeposit(
     deposit: Omit<Deposit, "messageHash">,
-    relayer = toAddressType(getDefaultSimulatedRelayerAddress(deposit.destinationChainId))
+    relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId)
   ): Promise<PopulatedTransaction> {
     return populateV3Relay(this.spokePool, deposit, relayer);
   }
@@ -137,10 +135,10 @@ export class QueryBase implements QueryInterface {
    */
   async getNativeGasCost(
     deposit: Omit<Deposit, "messageHash">,
-    relayer = toAddressType(getDefaultSimulatedRelayerAddress(deposit.destinationChainId))
+    relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId)
   ): Promise<BigNumber> {
     const unsignedTx = await this.getUnsignedTxFromDeposit(deposit, relayer);
-    const voidSigner = new VoidSigner(relayer.toEvmAddress(), this.provider);
+    const voidSigner = new VoidSigner(relayer, this.provider);
     return voidSigner.estimateGas(unsignedTx);
   }
 
@@ -154,7 +152,7 @@ export class QueryBase implements QueryInterface {
    */
   async getOpStackL1DataFee(
     unsignedTx: PopulatedTransaction,
-    relayer = toAddressType(getDefaultSimulatedRelayerAddress(unsignedTx.chainId)),
+    relayer = getDefaultSimulatedRelayerAddress(unsignedTx.chainId),
     options: Partial<{
       opStackL2GasUnits: BigNumberish;
       opStackL1DataFeeMultiplier: BigNumber;
@@ -163,7 +161,7 @@ export class QueryBase implements QueryInterface {
     const { opStackL2GasUnits, opStackL1DataFeeMultiplier = toBNWei("1") } = options || {};
     const { chainId } = await this.provider.getNetwork();
     assert(isOptimismL2Provider(this.provider), `Unexpected provider for chain ID ${chainId}.`);
-    const voidSigner = new VoidSigner(relayer.toEvmAddress(), this.provider);
+    const voidSigner = new VoidSigner(relayer, this.provider);
     const populatedTransaction = await voidSigner.populateTransaction({
       ...unsignedTx,
       gasLimit: opStackL2GasUnits, // prevents additional gas estimation call
@@ -185,7 +183,7 @@ export class QueryBase implements QueryInterface {
    */
   async estimateGas(
     unsignedTx: PopulatedTransaction,
-    senderAddress: Address,
+    senderAddress: string,
     provider: providers.Provider | L2Provider<providers.Provider>,
     options: Partial<{
       gasPrice: BigNumberish;
@@ -206,7 +204,7 @@ export class QueryBase implements QueryInterface {
     } = options || {};
 
     const { chainId } = await provider.getNetwork();
-    const voidSigner = new VoidSigner(senderAddress.toEvmAddress(), provider);
+    const voidSigner = new VoidSigner(senderAddress, provider);
 
     // Estimate the Gas units required to submit this transaction.
     const queries = [

package/src/relayFeeCalculator/chain-queries/svmQuery.ts

@@ -1,38 +1,33 @@
-import { pipe } from "@solana/functional";
+import { SvmSpokeClient } from "@across-protocol/contracts";
+import { intToU8Array32 } from "@across-protocol/contracts/dist/src/svm/web3-v1/conversionUtils";
+import { SYSTEM_PROGRAM_ADDRESS } from "@solana-program/system";
+import { ASSOCIATED_TOKEN_PROGRAM_ADDRESS, fetchMint } from "@solana-program/token";
+import { getComputeUnitEstimateForTransactionMessageFactory } from "@solana/kit";
+import {
+  SVMProvider,
+  SolanaVoidSigner,
+  createFillInstruction,
+  getAssociatedTokenAddress,
+  getEventAuthority,
+  getFillRelayDelegatePda,
+  getFillStatusPda,
+  getStatePda,
+} from "../../arch/svm";
 import { Coingecko } from "../../coingecko";
-import { SymbolMappingType } from "./";
 import { CHAIN_IDs } from "../../constants";
+import { SvmGasPriceEstimate, getGasPriceEstimate } from "../../gasPriceOracle";
 import { Deposit } from "../../interfaces";
-import { getGasPriceEstimate, SvmGasPriceEstimate } from "../../gasPriceOracle";
 import {
-  BigNumberish,
-  TransactionCostEstimate,
   BigNumber,
+  BigNumberish,
   SvmAddress,
-  toBN,
-  isDefined,
+  TransactionCostEstimate,
+  getRelayDataHash,
   toAddressType,
+  toBN,
 } from "../../utils";
-import { getDefaultSimulatedRelayerAddress, Logger, QueryInterface } from "../relayFeeCalculator";
-import {
-  fillRelayInstruction,
-  createApproveInstruction,
-  createTokenAccountsInstruction,
-  SVMProvider,
-  SolanaVoidSigner,
-  getAssociatedTokenAddress,
-} from "../../arch/svm";
-import {
-  createTransactionMessage,
-  setTransactionMessageFeePayer,
-  setTransactionMessageLifetimeUsingBlockhash,
-  appendTransactionMessageInstructions,
-  getComputeUnitEstimateForTransactionMessageFactory,
-  fetchEncodedAccount,
-  IInstruction,
-} from "@solana/kit";
-import { TOKEN_PROGRAM_ADDRESS, getMintSize, getInitializeMintInstruction, fetchMint } from "@solana-program/token";
-import { getCreateAccountInstruction } from "@solana-program/system";
+import { Logger, QueryInterface, getDefaultSimulatedRelayerAddress } from "../relayFeeCalculator";
+import { SymbolMappingType } from "./";
 
 /**
  * A special QueryBase implementation for SVM used for querying gas costs, token prices, and decimals of various tokens
@@ -70,7 +65,7 @@ export class SvmQuery implements QueryInterface {
   /**
    * Retrieves the current gas costs of performing a fillRelay contract at the referenced SpokePool.
    * @param deposit V3 deposit instance.
-   * @param relayerAddress Relayer address to simulate with.
+   * @param _relayer Relayer address to simulate with.
    * @param options
    * @param options.gasPrice Optional gas price to use for the simulation.
    * @param options.gasUnits Optional gas units to use for the simulation.
@@ -79,7 +74,7 @@ export class SvmQuery implements QueryInterface {
    */
   async getGasCosts(
     deposit: Omit<Deposit, "messageHash">,
-    _relayer = toAddressType(getDefaultSimulatedRelayerAddress(deposit.destinationChainId)),
+    _relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId),
     options: Partial<{
       gasPrice: BigNumberish;
       gasUnits: BigNumberish;
@@ -87,9 +82,8 @@ export class SvmQuery implements QueryInterface {
       priorityFeeMultiplier: BigNumber;
     }> = {}
   ): Promise<TransactionCostEstimate> {
-    const relayer = _relayer ? _relayer.forceSvmAddress() : this.simulatedRelayerAddress;
-
-    const fillRelayTx = await this.getFillRelayTx(deposit, relayer);
+    const relayer = _relayer ? toAddressType(_relayer).forceSvmAddress() : this.simulatedRelayerAddress;
+    const fillRelayTx = await this.getFillRelayTx(deposit, relayer.toBase58());
 
     const [computeUnitsConsumed, _gasPriceEstimate] = await Promise.all([
       toBN(await this.computeUnitEstimator(fillRelayTx)),
@@ -122,11 +116,10 @@ export class SvmQuery implements QueryInterface {
    */
   async getNativeGasCost(
     deposit: Omit<Deposit, "messageHash">,
-    _relayer = toAddressType(getDefaultSimulatedRelayerAddress(deposit.destinationChainId))
+    _relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId)
   ): Promise<BigNumber> {
     const fillRelayTx = await this.getFillRelayTx(deposit, _relayer);
-    const computeUnitsConsumed = toBN(await this.computeUnitEstimator(fillRelayTx));
-    return computeUnitsConsumed;
+    return toBN(await this.computeUnitEstimator(fillRelayTx));
   }
 
   /**
@@ -137,65 +130,73 @@ export class SvmQuery implements QueryInterface {
    */
   async getFillRelayTx(
     deposit: Omit<Deposit, "messageHash">,
-    _relayer = toAddressType(getDefaultSimulatedRelayerAddress(deposit.destinationChainId))
+    _relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId),
+    repaymentChainId = deposit.destinationChainId,
+    repaymentAddress = getDefaultSimulatedRelayerAddress(deposit.destinationChainId)
   ) {
-    const relayer = isDefined(_relayer) ? _relayer : this.simulatedRelayerAddress;
-    // If the user did not have a token account created on destination, then we need to include this as a gas cost.
-    const mint = deposit.outputToken.forceSvmAddress();
-    const owner = deposit.recipient.forceSvmAddress();
-    const associatedToken = await getAssociatedTokenAddress(owner, mint);
-    const simulatedSigner = SolanaVoidSigner(relayer.toBase58());
-
-    // If the recipient has an associated token account on destination, then skip generating the instruction for creating a new token account.
-    let recipientCreateTokenAccountInstructions: IInstruction[] | undefined = undefined;
-    const [associatedTokenAccountExists, mintInfo] = await Promise.all([
-      (await fetchEncodedAccount(this.provider, associatedToken)).exists,
-      fetchMint(this.provider, mint.toV2Address()),
-    ]);
-    if (!associatedTokenAccountExists) {
-      const space = BigInt(getMintSize());
-      const rent = await this.provider.getMinimumBalanceForRentExemption(space).send();
-      const createAccountIx = getCreateAccountInstruction({
-        payer: simulatedSigner,
-        newAccount: SolanaVoidSigner(mint.toBase58()),
-        lamports: rent,
-        space,
-        programAddress: TOKEN_PROGRAM_ADDRESS,
-      });
-
-      const initializeMintIx = getInitializeMintInstruction({
-        mint: mint.toV2Address(),
-        decimals: mintInfo.data.decimals,
-        mintAuthority: owner.toV2Address(),
-      });
-      recipientCreateTokenAccountInstructions = [createAccountIx, initializeMintIx];
-    }
+    const toSvmAddress = (address: string) => toAddressType(address).forceSvmAddress().toV2Address();
+    const relayer = _relayer ? toAddressType(_relayer).forceSvmAddress() : this.simulatedRelayerAddress;
+    const state = await getStatePda(this.spokePoolAddress.toV2Address());
+    const _relayDataHash = getRelayDataHash(deposit, deposit.destinationChainId);
+    const relayDataHash = new Uint8Array(Buffer.from(_relayDataHash.slice(2), "hex"));
+    const delegate = await getFillRelayDelegatePda(
+      relayDataHash,
+      BigInt(repaymentChainId),
+      toSvmAddress(repaymentAddress),
+      this.spokePoolAddress.toV2Address()
+    );
+    const mint = toAddressType(deposit.outputToken).forceSvmAddress();
+    const mintInfo = await fetchMint(this.provider, mint.toV2Address());
+    const recipientAta = await getAssociatedTokenAddress(
+      toAddressType(deposit.recipient).forceSvmAddress(),
+      mint,
+      mintInfo.programAddress
+    );
+    const relayerAta = await getAssociatedTokenAddress(
+      SvmAddress.from(relayer.toBase58()),
+      mint,
+      mintInfo.programAddress
+    );
+    const fillStatus = await getFillStatusPda(this.spokePoolAddress.toV2Address(), deposit, deposit.destinationChainId);
+    const eventAuthority = await getEventAuthority();
 
-    const [createTokenAccountsIx, approveIx, fillIx] = await Promise.all([
-      createTokenAccountsInstruction(mint, simulatedSigner),
-      createApproveInstruction(
-        mint.forceSvmAddress(),
-        deposit.outputAmount,
-        this.simulatedRelayerAddress,
-        this.spokePoolAddress,
-        mintInfo.data.decimals
-      ),
-      fillRelayInstruction(this.spokePoolAddress, deposit, simulatedSigner, associatedToken),
-    ]);
+    const relayData: SvmSpokeClient.FillRelayInput["relayData"] = {
+      depositor: toSvmAddress(deposit.depositor),
+      recipient: toSvmAddress(deposit.recipient),
+      exclusiveRelayer: toSvmAddress(deposit.exclusiveRelayer),
+      inputToken: toSvmAddress(deposit.inputToken),
+      outputToken: mint.toV2Address(),
+      inputAmount: deposit.inputAmount.toBigInt(),
+      outputAmount: deposit.outputAmount.toBigInt(),
+      originChainId: deposit.originChainId,
+      depositId: new Uint8Array(intToU8Array32(deposit.depositId.toNumber())),
+      fillDeadline: deposit.fillDeadline,
+      exclusivityDeadline: deposit.exclusivityDeadline,
+      message: new Uint8Array(Buffer.from(deposit.message, "hex")),
+    };
 
-    // Get the most recent confirmed blockhash.
-    const recentBlockhash = await this.provider.getLatestBlockhash().send();
-    const fillRelayTx = pipe(
-      createTransactionMessage({ version: 0 }),
-      (tx) => setTransactionMessageFeePayer(relayer.forceSvmAddress().toV2Address(), tx),
-      (tx) => setTransactionMessageLifetimeUsingBlockhash(recentBlockhash.value, tx),
-      (tx) =>
-        isDefined(recipientCreateTokenAccountInstructions)
-          ? appendTransactionMessageInstructions(recipientCreateTokenAccountInstructions, tx)
-          : tx,
-      (tx) => appendTransactionMessageInstructions([createTokenAccountsIx, approveIx, fillIx], tx)
-    );
-    return fillRelayTx;
+    const simulatedSigner = SolanaVoidSigner(relayer.toBase58());
+    const fillInput: SvmSpokeClient.FillRelayInput = {
+      signer: simulatedSigner,
+      state,
+      delegate,
+      mint: mint.toV2Address(),
+      relayerTokenAccount: relayerAta,
+      recipientTokenAccount: recipientAta,
+      fillStatus,
+      tokenProgram: mintInfo.programAddress,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
+      systemProgram: SYSTEM_PROGRAM_ADDRESS,
+      eventAuthority: eventAuthority,
+      program: this.spokePoolAddress.toV2Address(),
+      relayHash: relayDataHash,
+      relayData,
+      repaymentChainId: BigInt(repaymentChainId),
+      repaymentAddress: toSvmAddress(repaymentAddress),
+    };
+    // Pass createRecipientAtaIfNeeded =true to the createFillInstruction function to create the recipient token account
+    // if it doesn't exist.
+    return createFillInstruction(simulatedSigner, this.provider, fillInput, mintInfo.data.decimals, true);
   }
 
   /**

package/src/relayFeeCalculator/relayFeeCalculator.ts

@@ -1,4 +1,5 @@
 import assert from "assert";
+import { Transport } from "viem";
 import {
   DEFAULT_SIMULATED_RELAYER_ADDRESS,
   DEFAULT_SIMULATED_RELAYER_ADDRESS_SVM,
@@ -8,32 +9,29 @@ import { Deposit } from "../interfaces";
 import {
   BigNumber,
   BigNumberish,
+  ConvertDecimals,
   MAX_BIG_INT,
   TransactionCostEstimate,
   bnZero,
+  chainIsSvm,
+  compareAddressesSimple,
   fixedPointAdjustment,
   getTokenInfo,
   isDefined,
+  isZeroAddress,
   max,
   min,
   nativeToToken,
   percent,
   toBN,
   toBNWei,
-  isZeroAddress,
-  compareAddressesSimple,
-  ConvertDecimals,
-  chainIsSvm,
-  toAddressType,
-  Address,
 } from "../utils";
-import { Transport } from "viem";
 
 // This needs to be implemented for every chain and passed into RelayFeeCalculator
 export interface QueryInterface {
   getGasCosts: (
     deposit: Omit<Deposit, "messageHash">,
-    relayer: Address,
+    relayer: string,
     options?: Partial<{
       gasPrice: BigNumberish;
       gasUnits: BigNumberish;
@@ -44,7 +42,7 @@ export interface QueryInterface {
     }>
   ) => Promise<TransactionCostEstimate>;
   getTokenPrice: (tokenSymbol: string) => Promise<number>;
-  getNativeGasCost: (deposit: Omit<Deposit, "messageHash">, relayer: Address) => Promise<BigNumber>;
+  getNativeGasCost: (deposit: Omit<Deposit, "messageHash">, relayer: string) => Promise<BigNumber>;
 }
 
 export const expectedCapitalCostsKeys = ["lowerBound", "upperBound", "cutoff", "decimals"];
@@ -256,7 +254,7 @@ export class RelayFeeCalculator {
     deposit: Deposit,
     outputAmount: BigNumberish,
     simulateZeroFill = false,
-    relayerAddress = toAddressType(getDefaultSimulatedRelayerAddress(deposit.destinationChainId)),
+    relayerAddress = getDefaultSimulatedRelayerAddress(deposit.destinationChainId),
     _tokenPrice?: number,
     tokenMapping = TOKEN_SYMBOLS_MAP,
     gasPrice?: BigNumberish,
@@ -273,14 +271,14 @@ export class RelayFeeCalculator {
     // undefined address on destination.
     const destinationChainTokenDetails = Object.values(tokenMapping).find(
       (details) =>
-        compareAddressesSimple(details.addresses[originChainId], inputToken.toAddress()) &&
+        compareAddressesSimple(details.addresses[originChainId], inputToken) &&
         isDefined(details.addresses[destinationChainId])
     );
     const outputToken = isZeroAddress(deposit.outputToken)
       ? destinationChainTokenDetails!.addresses[destinationChainId]
-      : deposit.outputToken.toAddress();
+      : deposit.outputToken;
     const outputTokenInfo = getTokenInfo(outputToken, destinationChainId, tokenMapping);
-    const inputTokenInfo = getTokenInfo(inputToken.toAddress(), originChainId, tokenMapping);
+    const inputTokenInfo = getTokenInfo(inputToken, originChainId, tokenMapping);
     if (!isDefined(outputTokenInfo) || !isDefined(inputTokenInfo)) {
       throw new Error(`Could not find token information for ${inputToken} or ${outputToken}`);
     }
@@ -495,7 +493,7 @@ export class RelayFeeCalculator {
     deposit: Deposit,
     outputAmount?: BigNumberish,
     simulateZeroFill = false,
-    relayerAddress = toAddressType(getDefaultSimulatedRelayerAddress(deposit.destinationChainId)),
+    relayerAddress = getDefaultSimulatedRelayerAddress(deposit.destinationChainId),
     _tokenPrice?: number,
     gasPrice?: BigNumberish,
     gasUnits?: BigNumberish,
@@ -507,8 +505,8 @@ export class RelayFeeCalculator {
     const { inputToken, originChainId, outputToken, destinationChainId } = deposit;
     // We can perform a simple lookup with `getTokenInfo` here without resolving the exact token to resolve since we only need to
     // resolve the L1 token symbol and not the L2 token decimals.
-    const inputTokenInfo = getTokenInfo(inputToken.toAddress(), originChainId);
-    const outputTokenInfo = getTokenInfo(outputToken.toAddress(), destinationChainId);
+    const inputTokenInfo = getTokenInfo(inputToken, originChainId);
+    const outputTokenInfo = getTokenInfo(outputToken, destinationChainId);
     if (!isDefined(inputTokenInfo) || !isDefined(outputTokenInfo)) {
       throw new Error(`Could not find token information for ${inputToken} or ${outputToken}`);
     }