@across-protocol/sdk 4.2.6-alpha.3 → 4.2.7

package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts

@@ -127,7 +127,7 @@ export declare class RelayFeeCalculator {
      *       a message & recipient contract is provided as this function may not simulate with
      *       the correct parameters to see a full fill.
      */
-    gasFeePercent(deposit: Deposit, amountToRelay: BigNumberish, simulateZeroFill?: boolean, relayerAddress?: string, _tokenPrice?: number, tokenMapping?: {
+    gasFeePercent(deposit: Deposit, outputAmount: BigNumberish, simulateZeroFill?: boolean, relayerAddress?: string, _tokenPrice?: number, tokenMapping?: {
         ACX: {
             name: string;
             symbol: string;
@@ -423,16 +423,7 @@ export declare class RelayFeeCalculator {
         VLR: {
             name: string;
             symbol: string;
-            decimals: number; /**
-             * Type guard to check if a config is a CapitalCostConfigOverride or a CapitalCostConfig.
-             * @param config CapitalCostConfig or CapitalCostConfigOverride
-             * @returns true if the config is a CapitalCostConfigOverride, false otherwise.
-             * @private
-             * @dev This is a type guard that is used to check if a config is a CapitalCostConfigOverride or a CapitalCostConfig.
-             * This is needed because the config can be either a CapitalCostConfig or a CapitalCostConfigOverride. If it's a
-             * CapitalCostConfig, then we need to convert it to a CapitalCostConfigOverride with the default config set with no route
-             * overrides.
-             */
+            decimals: number;
             addresses: {
                 [x: number]: string;
             };
@@ -530,7 +521,7 @@ export declare class RelayFeeCalculator {
             coingeckoId: string;
         };
     }, gasPrice?: BigNumberish, gasLimit?: BigNumberish, _tokenGasCost?: BigNumberish, transport?: Transport): Promise<BigNumber>;
-    capitalFeePercent(_amountToRelay: BigNumberish, _tokenSymbol: string, _originRoute?: ChainIdAsString, _destinationRoute?: ChainIdAsString): BigNumber;
+    capitalFeePercent(_outputAmount: BigNumberish, _tokenSymbol: string, _originRoute?: ChainIdAsString, _destinationRoute?: ChainIdAsString): BigNumber;
     /**
      * Checks for configuration conflicts across all token symbols and their associated chain configurations.
      * This method examines the capital costs configuration for each token and identifies any overlapping
@@ -558,7 +549,7 @@ export declare class RelayFeeCalculator {
      * @param gasUnits Optional gas units to use for the simulation
      * @returns A resulting `RelayerFeeDetails` object
      */
-    relayerFeeDetails(deposit: Deposit, amountToRelay?: BigNumberish, simulateZeroFill?: boolean, relayerAddress?: string, _tokenPrice?: number, gasPrice?: BigNumberish, gasUnits?: BigNumberish, tokenGasCost?: BigNumberish): Promise<RelayerFeeDetails>;
+    relayerFeeDetails(deposit: Deposit, outputAmount?: BigNumberish, simulateZeroFill?: boolean, relayerAddress?: string, _tokenPrice?: number, gasPrice?: BigNumberish, gasUnits?: BigNumberish, tokenGasCost?: BigNumberish): Promise<RelayerFeeDetails>;
 }
 export {};
 //# sourceMappingURL=relayFeeCalculator.d.ts.map

package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relayFeeCalculator.d.ts","sourceRoot":"","sources":["../../../src/relayFeeCalculator/relayFeeCalculator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"relayFeeCalculator.d.ts","sourceRoot":"","sources":["../../../src/relayFeeCalculator/relayFeeCalculator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EACL,SAAS,EACT,YAAY,EAEZ,uBAAuB,EAexB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAGjC,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,CACX,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,EACrC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,OAAO,CAAC;QAChB,QAAQ,EAAE,YAAY,CAAC;QACvB,QAAQ,EAAE,YAAY,CAAC;QACvB,iBAAiB,EAAE,SAAS,CAAC;QAC7B,qBAAqB,EAAE,SAAS,CAAC;QACjC,0BAA0B,EAAE,SAAS,CAAC;QACtC,SAAS,EAAE,SAAS,CAAC;KACtB,CAAC,KACC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACtC,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxD,gBAAgB,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;CAClG;AAED,eAAO,MAAM,wBAAwB,UAAqD,CAAC;AAC3F,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,KAAK,eAAe,GAAG,MAAM,CAAC;AAC9B,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACrF,yBAAyB,CAAC,EAAE,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;IACvE,oBAAoB,CAAC,EAAE,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;CACnE;AACD,MAAM,MAAM,sBAAsB,GAAG,yBAAyB,GAAG,iBAAiB,CAAC;AACnF,MAAM,WAAW,4BAA4B;IAC3C,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE;QAClB,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,GAAG,yBAAyB,CAAC;KAChE,CAAC;CACH;AACD,MAAM,WAAW,mCAAoC,SAAQ,4BAA4B;IACvF,OAAO,EAAE,cAAc,CAAC;CACzB;AACD,MAAM,WAAW,+BAAgC,SAAQ,4BAA4B;IACnF,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC5C;AACD,MAAM,MAAM,wBAAwB,GAAG,mCAAmC,GAAG,+BAA+B,CAAC;AAE7G,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,eAAe,CAAC;IACvB,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,eAAe,CAAC;CACxB;AAED,eAAO,MAAM,cAAc,EAAE,MAK5B,CAAC;AAEF,wBAAgB,iCAAiC,CAAC,OAAO,CAAC,EAAE,MAAM,iGAIjE;AAKD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,kBAAkB,CAA2D;IACrF,OAAO,CAAC,sBAAsB,CAA+D;IAC7F,OAAO,CAAC,eAAe,CAAwD;IAC/E,OAAO,CAAC,mBAAmB,CAA4D;IACvF,OAAO,CAAC,kBAAkB,CAAiD;IAI3E,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,mCAAmC,EAAE,MAAM,CAAC,EAAE,MAAM;gBAC5D,MAAM,EAAE,+BAA+B,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM;IAuCjG;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,CAAC,2BAA2B;IAM1C;;;;OAIG;IACH,MAAM,CAAC,8CAA8C,CACnD,YAAY,EAAE,yBAAyB,GAAG,iBAAiB,GAC1D,yBAAyB;IAsB5B;;;OAGG;IACH,MAAM,CAAC,0BAA0B,CAAC,YAAY,EAAE,iBAAiB,GAAG,IAAI;IAKxE,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAInD;;;;;;;;;;;;;;;;;;OAkBG;IACG,aAAa,CACjB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,gBAAgB,UAAQ,EACxB,cAAc,SAAgE,EAC9E,WAAW,CAAC,EAAE,MAAM,EACpB,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAAoB,EAChC,QAAQ,CAAC,EAAE,YAAY,EACvB,QAAQ,CAAC,EAAE,YAAY,EACvB,aAAa,CAAC,EAAE,YAAY,EAC5B,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,SAAS,CAAC;IA2DrB,iBAAiB,CACf,aAAa,EAAE,YAAY,EAC3B,YAAY,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,eAAe,EAC9B,iBAAiB,CAAC,EAAE,eAAe,GAClC,SAAS;IAmEZ;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IA0C/B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IA8B7B;;;;;;;;;;;;;;OAcG;IACG,iBAAiB,CACrB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,YAAY,EAC3B,gBAAgB,UAAQ,EACxB,cAAc,SAAgE,EAC9E,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,YAAY,EACvB,QAAQ,CAAC,EAAE,YAAY,EACvB,YAAY,CAAC,EAAE,YAAY,GAC1B,OAAO,CAAC,iBAAiB,CAAC;CAuE9B"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.2.6-alpha.3",
+  "version": "4.2.7",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [

package/src/arch/svm/utils.ts

@@ -7,6 +7,7 @@ import {
   getAddressEncoder,
   getProgramDerivedAddress,
   getU64Encoder,
+  getU32Encoder,
   isAddress,
   type TransactionSigner,
 } from "@solana/kit";
@@ -215,6 +216,50 @@ export async function getRoutePda(originToken: Address, seed: bigint, routeChain
   return pda;
 }
 
+/**
+ * Returns the PDA for the SVM Spoke's transfer liability account.
+ * @param programId the address of the spoke pool.
+ * @param originToken the address of the corresponding token.
+ */
+export async function getTransferLiabilityPda(programId: Address, originToken: Address): Promise<Address> {
+  const addressEncoder = getAddressEncoder();
+  const [pda] = await getProgramDerivedAddress({
+    programAddress: programId,
+    seeds: ["transfer_liability", addressEncoder.encode(originToken)],
+  });
+  return pda;
+}
+
+/**
+ * Returns the PDA for the SVM Spoke's root bundle account.
+ * @param programId the address of the spoke pool.
+ * @param statePda the spoke pool's state pda.
+ * @param rootBundleId the associated root bundle ID.
+ */
+export async function getRootBundlePda(programId: Address, state: Address, rootBundleId: number): Promise<Address> {
+  const intEncoder = getU32Encoder();
+  const addressEncoder = getAddressEncoder();
+  const [pda] = await getProgramDerivedAddress({
+    programAddress: programId,
+    seeds: ["root_bundle", addressEncoder.encode(state), intEncoder.encode(rootBundleId)],
+  });
+  return pda;
+}
+
+/**
+ * Returns the PDA for the SVM Spoke's instruction params account.
+ * @param programId the address of the spoke pool.
+ * @param signer the signer of the authenticated call.
+ */
+export async function getInstructionParamsPda(programId: Address, signer: Address): Promise<Address> {
+  const addressEncoder = getAddressEncoder();
+  const [pda] = await getProgramDerivedAddress({
+    programAddress: programId,
+    seeds: ["instruction_params", addressEncoder.encode(signer)],
+  });
+  return pda;
+}
+
 /**
  * Returns the PDA for the Event Authority.
  * @returns The PDA for the Event Authority.

package/src/clients/BundleDataClient/BundleDataClient.ts

@@ -94,10 +94,9 @@ function updateBundleFillsV3(
   repaymentAddress: string
 ): void {
   // We shouldn't pass any unrepayable fills into this function, so we perform an extra safety check.
-  assert(
-    chainIsEvm(repaymentChainId) && isValidEvmAddress(fill.relayer),
-    "validatedBundleV3Fills dictionary should only contain fills with valid repayment information"
-  );
+  if (chainIsEvm(repaymentChainId) && !isValidEvmAddress(fill.relayer)) {
+    return;
+  }
   if (!dict?.[repaymentChainId]?.[repaymentToken]) {
     assign(dict, [repaymentChainId, repaymentToken], {
       fills: [],
@@ -460,13 +459,15 @@ export class BundleDataClient {
         assert(isDefined(matchingDeposit), "Deposit not found for fill.");
 
         const spokeClient = this.spokePoolClients[_fill.destinationChainId];
-        if (!isEVMSpokePoolClient(spokeClient)) {
-          // FIXME: Handle non-EVM chains.
-          throw new Error("Destination chain is not an EVM chain.");
+        let provider;
+        if (isEVMSpokePoolClient(spokeClient)) {
+          provider = spokeClient.spokePool.provider;
+        } else if (isSVMSpokePoolClient(spokeClient)) {
+          provider = spokeClient.svmEventsClient.getRpc();
         }
         const fill = await verifyFillRepayment(
           _fill,
-          spokeClient.spokePool.provider,
+          provider!,
           matchingDeposit,
           this.clients.hubPoolClient,
           bundleEndBlockForMainnet
@@ -971,17 +972,20 @@ export class BundleDataClient {
                 assert(isDefined(deposits) && deposits.length > 0, "Deposit should exist in relay hash dictionary.");
                 v3RelayHashes[relayDataHash].fill = fill;
                 if (fill.blockNumber >= destinationChainBlockRange[0]) {
-                  if (!isEVMSpokePoolClient(destinationClient)) {
-                    // FIXME: Handle non-EVM chains.
-                    throw new Error("Destination chain is not an EVM chain.");
+                  let provider;
+                  if (isEVMSpokePoolClient(destinationClient)) {
+                    provider = destinationClient.spokePool.provider;
+                  } else if (isSVMSpokePoolClient(destinationClient)) {
+                    provider = destinationClient.svmEventsClient.getRpc();
                   }
                   const fillToRefund = await verifyFillRepayment(
                     fill,
-                    destinationClient.spokePool.provider,
+                    provider!,
                     deposits[0],
                     this.clients.hubPoolClient,
                     bundleEndBlockForMainnet
                   );
+
                   if (!isDefined(fillToRefund)) {
                     bundleUnrepayableFillsV3.push(fill);
                     // We don't return here yet because we still need to mark unexecutable slow fill leaves
@@ -1075,14 +1079,16 @@ export class BundleDataClient {
                 }
                 v3RelayHashes[relayDataHash].deposits = [matchedDeposit];
 
-                if (!isEVMSpokePoolClient(destinationClient)) {
-                  // FIXME: Handle non-EVM chains.
-                  throw new Error("Destination chain is not an EVM chain.");
+                let provider;
+                if (isEVMSpokePoolClient(destinationClient)) {
+                  provider = destinationClient.spokePool.provider;
+                } else if (isSVMSpokePoolClient(destinationClient)) {
+                  provider = destinationClient.svmEventsClient.getRpc();
                 }
 
                 const fillToRefund = await verifyFillRepayment(
                   fill,
-                  destinationClient.spokePool.provider,
+                  provider!,
                   matchedDeposit,
                   this.clients.hubPoolClient,
                   bundleEndBlockForMainnet
@@ -1257,13 +1263,15 @@ export class BundleDataClient {
           // include this pre fill if the fill is in an older bundle.
           if (fill) {
             if (fill.blockNumber < destinationChainBlockRange[0]) {
-              if (!isEVMSpokePoolClient(destinationClient)) {
-                // FIXME: Handle non-EVM chains.
-                throw new Error("Destination chain is not an EVM chain.");
+              let provider;
+              if (isEVMSpokePoolClient(destinationClient)) {
+                provider = destinationClient.spokePool.provider;
+              } else if (isSVMSpokePoolClient(destinationClient)) {
+                provider = destinationClient.svmEventsClient.getRpc();
               }
               const fillToRefund = await verifyFillRepayment(
                 fill,
-                destinationClient.spokePool.provider,
+                provider!,
                 deposits[0],
                 this.clients.hubPoolClient,
                 bundleEndBlockForMainnet
@@ -1314,13 +1322,15 @@ export class BundleDataClient {
             const prefill = await this.findMatchingFillEvent(deposit, destinationClient);
             assert(isDefined(prefill), `findFillEvent# Cannot find prefill: ${relayDataHash}`);
             assert(getRelayEventKey(prefill) === relayDataHash, "Relay hashes should match.");
-            if (!isEVMSpokePoolClient(destinationClient)) {
-              // FIXME: Handle non-EVM chains.
-              throw new Error("Destination chain is not an EVM chain.");
+            let provider;
+            if (isEVMSpokePoolClient(destinationClient)) {
+              provider = destinationClient.spokePool.provider;
+            } else if (isSVMSpokePoolClient(destinationClient)) {
+              provider = destinationClient.svmEventsClient.getRpc();
             }
             const verifiedFill = await verifyFillRepayment(
               prefill,
-              destinationClient.spokePool.provider,
+              provider!,
               deposit,
               this.clients.hubPoolClient,
               bundleEndBlockForMainnet

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

@@ -4,6 +4,7 @@ import { providers } from "ethers";
 import { DepositWithBlock, Fill, FillWithBlock } from "../../../interfaces";
 import { isSlowFill, isValidEvmAddress, isDefined, chainIsEvm } from "../../../utils";
 import { HubPoolClient } from "../../HubPoolClient";
+import { SVMProvider } from "../../../arch/svm";
 
 /**
  * @notice FillRepaymentInformation is a fill with additional properties required to determine where it can
@@ -65,7 +66,7 @@ export function getRefundInformationFromFill(
  */
 export async function verifyFillRepayment(
   _fill: FillWithBlock,
-  destinationChainProvider: providers.Provider,
+  destinationChainProvider: providers.Provider | SVMProvider,
   matchedDeposit: DepositWithBlock,
   hubPoolClient: HubPoolClient,
   bundleEndBlockForMainnet: number
@@ -91,32 +92,43 @@ export async function verifyFillRepayment(
   if (_repaymentAddressNeedsToBeOverwritten(fill)) {
     // TODO: Handle case where fill was sent on non-EVM chain, in which case the following call would fail
     // or return something unexpected. We'd want to return undefined here.
-    const fillTransaction = await destinationChainProvider.getTransaction(fill.txnRef);
-    const destinationRelayer = fillTransaction?.from;
-    // Repayment chain is still an EVM chain, but the msg.sender is a bytes32 address, so the fill is invalid.
-    if (!isDefined(destinationRelayer) || !isValidEvmAddress(destinationRelayer)) {
-      return undefined;
-    }
-    // If we can switch the repayment chain to the destination chain, then do so. We should only switch if the
-    // destination chain has a valid repayment token that is equivalent to the deposited input token. This would
-    // also be the same mapping as the repayment token on the repayment chain.
-    if (
-      !matchedDeposit.fromLiteChain &&
-      hubPoolClient.areTokensEquivalent(fill.inputToken, fill.originChainId, fill.outputToken, fill.destinationChainId)
-    ) {
-      repaymentChainId = fill.destinationChainId;
-    }
-    // If we can't switch the chain, then we need to verify that the msg.sender is a valid address on the repayment chain.
-    // Because we already checked that the `destinationRelayer` was a valid EVM address above, we only need to check
-    // that the repayment chain is an EVM chain.
-    else {
-      if (!chainIsEvm(repaymentChainId)) {
+    if (chainIsEvm(fill.destinationChainId)) {
+      assert(
+        destinationChainProvider instanceof providers.Provider,
+        `BundleDataClient#verifyFillRepayment: unexpected destination chain provider for chain ID ${fill.destinationChainId}`
+      );
+      const fillTransaction = await destinationChainProvider.getTransaction(fill.txnRef);
+      const destinationRelayer = fillTransaction?.from;
+      // Repayment chain is still an EVM chain, but the msg.sender is a bytes32 address, so the fill is invalid.
+      if (!isDefined(destinationRelayer) || !isValidEvmAddress(destinationRelayer)) {
         return undefined;
       }
+      // If we can switch the repayment chain to the destination chain, then do so. We should only switch if the
+      // destination chain has a valid repayment token that is equivalent to the deposited input token. This would
+      // also be the same mapping as the repayment token on the repayment chain.
+      if (
+        !matchedDeposit.fromLiteChain &&
+        hubPoolClient.areTokensEquivalent(
+          fill.inputToken,
+          fill.originChainId,
+          fill.outputToken,
+          fill.destinationChainId
+        )
+      ) {
+        repaymentChainId = fill.destinationChainId;
+      }
+      // If we can't switch the chain, then we need to verify that the msg.sender is a valid address on the repayment chain.
+      // Because we already checked that the `destinationRelayer` was a valid EVM address above, we only need to check
+      // that the repayment chain is an EVM chain.
+      else {
+        if (!chainIsEvm(repaymentChainId)) {
+          return undefined;
+        }
+      }
+      fill.relayer = destinationRelayer;
+    } else {
+      return undefined;
     }
-    fill.relayer = destinationRelayer;
-
-    // @todo: If chainIsSvm:
   }
 
   // Repayment address is now valid and repayment chain is either origin chain for lite chain or the destination

package/src/relayFeeCalculator/relayFeeCalculator.ts

@@ -22,6 +22,7 @@ import {
   toBNWei,
   isZeroAddress,
   compareAddressesSimple,
+  ConvertDecimals,
   chainIsSvm,
 } from "../utils";
 import { Transport } from "viem";
@@ -251,7 +252,7 @@ export class RelayFeeCalculator {
    */
   async gasFeePercent(
     deposit: Deposit,
-    amountToRelay: BigNumberish,
+    outputAmount: BigNumberish,
     simulateZeroFill = false,
     relayerAddress = getDefaultSimulatedRelayerAddress(deposit.destinationChainId),
     _tokenPrice?: number,
@@ -261,7 +262,7 @@ export class RelayFeeCalculator {
     _tokenGasCost?: BigNumberish,
     transport?: Transport
   ): Promise<BigNumber> {
-    if (toBN(amountToRelay).eq(bnZero)) return MAX_BIG_INT;
+    if (toBN(outputAmount).eq(bnZero)) return MAX_BIG_INT;
 
     const { inputToken, destinationChainId, originChainId } = deposit;
     // It's fine if we resolve a destination token which is not the "canonical" L1 token (e.g. USDB for DAI or USDC.e for USDC), since `getTokenInfo` will re-map
@@ -284,7 +285,7 @@ export class RelayFeeCalculator {
 
     // Reduce the output amount to simulate a full fill with a lower value to estimate
     // the fill cost accurately without risking a failure due to insufficient balance.
-    const simulatedAmount = simulateZeroFill ? safeOutputAmount : toBN(amountToRelay);
+    const simulatedAmount = simulateZeroFill ? safeOutputAmount : toBN(outputAmount);
     deposit = { ...deposit, outputAmount: simulatedAmount };
 
     const getGasCosts = this.queries
@@ -314,19 +315,19 @@ export class RelayFeeCalculator {
           throw error;
         }),
     ]);
-    const gasFeesInToken = nativeToToken(tokenGasCost, tokenPrice, inputTokenInfo.decimals, this.nativeTokenDecimals);
-    return percent(gasFeesInToken, amountToRelay.toString());
+    const gasFeesInToken = nativeToToken(tokenGasCost, tokenPrice, outputTokenInfo.decimals, this.nativeTokenDecimals);
+    return percent(gasFeesInToken, outputAmount.toString());
   }
 
   // Note: these variables are unused now, but may be needed in future versions of this function that are more complex.
   capitalFeePercent(
-    _amountToRelay: BigNumberish,
+    _outputAmount: BigNumberish,
     _tokenSymbol: string,
     _originRoute?: ChainIdAsString,
     _destinationRoute?: ChainIdAsString
   ): BigNumber {
     // If amount is 0, then the capital fee % should be the max 100%
-    if (toBN(_amountToRelay).eq(toBN(0))) return MAX_BIG_INT;
+    if (toBN(_outputAmount).eq(toBN(0))) return MAX_BIG_INT;
 
     // V0: Ensure that there is a capital fee available for the token.
     // If not, then we should throw an error because this is indicative
@@ -366,7 +367,7 @@ export class RelayFeeCalculator {
       );
 
       // Scale amount "y" to 18 decimals.
-      const y = toBN(_amountToRelay).mul(toBNWei("1", 18 - config.decimals));
+      const y = toBN(_outputAmount).mul(toBNWei("1", 18 - config.decimals));
       // At a minimum, the fee will be equal to lower bound fee * y
       const minCharge = toBN(config.lowerBound).mul(y).div(fixedPointAdjustment);
 
@@ -490,7 +491,7 @@ export class RelayFeeCalculator {
    */
   async relayerFeeDetails(
     deposit: Deposit,
-    amountToRelay?: BigNumberish,
+    outputAmount?: BigNumberish,
     simulateZeroFill = false,
     relayerAddress = getDefaultSimulatedRelayerAddress(deposit.destinationChainId),
     _tokenPrice?: number,
@@ -500,18 +501,19 @@ export class RelayFeeCalculator {
   ): Promise<RelayerFeeDetails> {
     // If the amount to relay is not provided, then we
     // should use the full deposit amount.
-    amountToRelay ??= deposit.outputAmount;
-    const { inputToken, originChainId } = deposit;
+    outputAmount ??= deposit.outputAmount;
+    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 token = getTokenInfo(inputToken, originChainId);
-    if (!isDefined(token)) {
-      throw new Error(`Could not find token information for ${inputToken}`);
+    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}`);
     }
 
     const gasFeePercent = await this.gasFeePercent(
       deposit,
-      amountToRelay,
+      outputAmount,
       simulateZeroFill,
       relayerAddress,
       _tokenPrice,
@@ -520,14 +522,15 @@ export class RelayFeeCalculator {
       gasUnits,
       tokenGasCost
     );
-    const gasFeeTotal = gasFeePercent.mul(amountToRelay).div(fixedPointAdjustment);
+    const outToInDecimals = ConvertDecimals(outputTokenInfo.decimals, inputTokenInfo.decimals);
+    const gasFeeTotal = gasFeePercent.mul(outToInDecimals(outputAmount.toString())).div(fixedPointAdjustment);
     const capitalFeePercent = this.capitalFeePercent(
-      amountToRelay,
-      token.symbol,
+      outputAmount,
+      inputTokenInfo.symbol,
       deposit.originChainId.toString(),
       deposit.destinationChainId.toString()
     );
-    const capitalFeeTotal = capitalFeePercent.mul(amountToRelay).div(fixedPointAdjustment);
+    const capitalFeeTotal = capitalFeePercent.mul(outToInDecimals(outputAmount.toString())).div(fixedPointAdjustment);
     const relayFeePercent = gasFeePercent.add(capitalFeePercent);
     const relayFeeTotal = gasFeeTotal.add(capitalFeeTotal);
 
@@ -546,12 +549,12 @@ export class RelayFeeCalculator {
       isAmountTooLow = true;
     } else {
       minDeposit = gasFeeTotal.mul(fixedPointAdjustment).div(maxGasFeePercent);
-      isAmountTooLow = toBN(amountToRelay).lt(minDeposit);
+      isAmountTooLow = toBN(outputAmount).lt(minDeposit);
     }
 
     return {
-      amountToRelay: amountToRelay.toString(),
-      tokenSymbol: token.symbol,
+      amountToRelay: outputAmount.toString(),
+      tokenSymbol: inputTokenInfo.symbol,
       gasFeePercent: gasFeePercent.toString(),
       gasFeeTotal: gasFeeTotal.toString(),
       gasDiscountPercent: this.gasDiscountPercent,