@across-protocol/sdk 4.3.3 → 4.3.4

package/dist/types/utils/DepositUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DepositUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,EAAE,yBAAyB,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAavH,oBAAY,WAAW;IACrB,gBAAgB,IAAI;IACpB,iBAAiB,IAAA;IACjB,YAAY,IAAA;IACZ,mBAAmB,IAAA;CACpB;AAED,MAAM,MAAM,mBAAmB,GAC3B;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,gBAAgB,CAAA;CAAE,GAC1C;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD;;;;;;;;;;;GAWG;AAEH,wBAAsB,6BAA6B,CACjD,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE,IAAI,GAAG,eAAe,EAC5B,KAAK,CAAC,EAAE,yBAAyB,GAChC,OAAO,CAAC,mBAAmB,CAAC,CAkF9B;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAA;CAAE,GACrF,MAAM,CAkBR;AAoBD,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAA;CAAE,EAC3F,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe,GAAG,aAAa,CAAC,GAC1E;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAkBpD;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,GAAG,SAAS,CAAC,GAAG,OAAO,CAE/F;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,OAAO,CAGnF;AAED,wBAAgB,gCAAgC,CAC9C,CAAC,EAAE,IAAI,CAAC,IAAI,GAAG,eAAe,EAAE,aAAa,GAAG,aAAa,CAAC,GAC7D,OAAO,CAET;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,SAAgB,GAAG,OAAO,CAE/D;AAED,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE5E;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAEzD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAI9D"}
+{"version":3,"file":"DepositUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/DepositUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,EACL,yBAAyB,EACzB,OAAO,EACP,gBAAgB,EAChB,IAAI,EACJ,SAAS,EACT,eAAe,EACf,kBAAkB,EAClB,aAAa,EACd,MAAM,eAAe,CAAC;AAavB,oBAAY,WAAW;IACrB,gBAAgB,IAAI;IACpB,iBAAiB,IAAA;IACjB,YAAY,IAAA;IACZ,mBAAmB,IAAA;CACpB;AAED,MAAM,MAAM,mBAAmB,GAC3B;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,gBAAgB,CAAA;CAAE,GAC1C;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD;;;;;;;;;;;GAWG;AAEH,wBAAsB,6BAA6B,CACjD,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE,IAAI,GAAG,eAAe,EAC5B,KAAK,CAAC,EAAE,yBAAyB,GAChC,OAAO,CAAC,mBAAmB,CAAC,CAkF9B;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAA;CAAE,GACrF,MAAM,CAkBR;AAoBD,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAA;CAAE,EAC3F,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe,GAAG,aAAa,CAAC,GAC1E;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAkBpD;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,GAAG,SAAS,CAAC,GAAG,OAAO,CAE/F;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,OAAO,CAGnF;AAED,wBAAgB,gCAAgC,CAC9C,CAAC,EAAE,IAAI,CAAC,IAAI,GAAG,eAAe,EAAE,aAAa,GAAG,aAAa,CAAC,GAC7D,OAAO,CAET;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,SAAgB,GAAG,OAAO,CAE/D;AAED,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE5E;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAEzD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAI9D;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB,CASxF;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,aAAa,CAcpE"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.3.3",
+  "version": "4.3.4",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [
@@ -106,7 +106,7 @@
   "dependencies": {
     "@across-protocol/across-token": "^1.0.0",
     "@across-protocol/constants": "^3.1.68",
-    "@across-protocol/contracts": "^4.0.12",
+    "@across-protocol/contracts": "^4.1.0",
     "@coral-xyz/anchor": "^0.30.1",
     "@eth-optimism/sdk": "^3.3.1",
     "@ethersproject/bignumber": "^5.7.0",

package/src/arch/svm/SpokeUtils.ts

@@ -1,5 +1,6 @@
 import { SvmSpokeClient } from "@across-protocol/contracts";
 import { decodeFillStatusAccount, fetchState } from "@across-protocol/contracts/dist/src/svm/clients/SvmSpoke";
+import { intToU8Array32 } from "@across-protocol/contracts/dist/src/svm/web3-v1/conversionUtils";
 import { hashNonEmptyMessage } from "@across-protocol/contracts/dist/src/svm/web3-v1";
 import {
   ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
@@ -18,6 +19,7 @@ import {
   getU32Encoder,
   getU64Encoder,
   pipe,
+  ReadonlyUint8Array,
   some,
   type TransactionSigner,
 } from "@solana/kit";
@@ -39,6 +41,7 @@ import {
 } from "../../utils";
 import {
   SvmCpiEventsClient,
+  bigToU8a32,
   createDefaultTransaction,
   getEventAuthority,
   getFillStatusPda,
@@ -447,7 +450,7 @@ export async function fillRelayInstruction(
       exclusiveRelayer,
       inputToken,
       outputToken,
-      inputAmount: relayData.inputAmount.toBigInt(),
+      inputAmount: bigToU8a32(relayData.inputAmount.toBigInt()),
       outputAmount: relayData.outputAmount.toBigInt(),
       originChainId: BigInt(relayData.originChainId),
       fillDeadline: relayData.fillDeadline,
@@ -475,6 +478,94 @@ export function createTokenAccountsInstruction(
   });
 }
 
+/**
+ * @notice Return the fillRelay transaction for a given deposit
+ * @param spokePoolAddr Address of the spoke pool we're trying to fill through
+ * @param solanaClient RPC client to interact with Solana chain
+ * @param relayData RelayData instance, supplemented with destinationChainId
+ * @param signer signer associated with the relayer creating a Fill. Can be VoidSigner for gas estimation
+ * @param repaymentChainId Chain id where relayer repayment is desired
+ * @param repaymentAddress Address to which repayment will go to on repaymentChainId
+ * @returns FillRelay transaction
+ */
+export async function getFillRelayTx(
+  spokePoolAddr: SvmAddress,
+  solanaClient: SVMProvider,
+  relayData: Omit<RelayData, "recipent" | "outputToken"> & {
+    destinationChainId: number;
+    recipient: SvmAddress;
+    outputToken: SvmAddress;
+  },
+  signer: TransactionSigner,
+  repaymentChainId: number,
+  repaymentAddress: SdkAddress
+) {
+  const { depositor, recipient, inputToken, outputToken, exclusiveRelayer, destinationChainId } = relayData;
+
+  // tsc appeasement...should be unnecessary, but isn't. @todo Identify why.
+  assert(recipient.isSVM(), `getFillRelayTx: recipient not an SVM address (${recipient})`);
+  assert(
+    repaymentAddress.isValidOn(repaymentChainId),
+    `getFillRelayTx: repayment address ${repaymentAddress} not valid on chain ${repaymentChainId})`
+  );
+
+  const program = toAddress(spokePoolAddr);
+  const _relayDataHash = getRelayDataHash(relayData, destinationChainId);
+  const relayDataHash = new Uint8Array(Buffer.from(_relayDataHash.slice(2), "hex"));
+
+  const [state, delegate] = await Promise.all([
+    getStatePda(program),
+    getFillRelayDelegatePda(relayDataHash, BigInt(repaymentChainId), toAddress(repaymentAddress), program),
+  ]);
+
+  const mint = toAddress(outputToken);
+  const mintInfo = await fetchMint(solanaClient, mint);
+
+  const [recipientAta, relayerAta, fillStatus, eventAuthority] = await Promise.all([
+    getAssociatedTokenAddress(recipient, outputToken, mintInfo.programAddress),
+    getAssociatedTokenAddress(SvmAddress.from(signer.address), outputToken, mintInfo.programAddress),
+    getFillStatusPda(program, relayData, destinationChainId),
+    getEventAuthority(program),
+  ]);
+
+  const svmRelayData: SvmSpokeClient.FillRelayInput["relayData"] = {
+    depositor: toAddress(depositor),
+    recipient: toAddress(recipient),
+    exclusiveRelayer: toAddress(exclusiveRelayer),
+    inputToken: toAddress(inputToken),
+    outputToken: mint,
+    inputAmount: bigToU8a32(relayData.inputAmount.toBigInt()),
+    outputAmount: relayData.outputAmount.toBigInt(),
+    originChainId: relayData.originChainId,
+    depositId: new Uint8Array(intToU8Array32(relayData.depositId.toNumber())),
+    fillDeadline: relayData.fillDeadline,
+    exclusivityDeadline: relayData.exclusivityDeadline,
+    message: new Uint8Array(Buffer.from(relayData.message, "hex")),
+  };
+
+  const fillInput: SvmSpokeClient.FillRelayInput = {
+    signer: signer,
+    state,
+    delegate,
+    mint,
+    relayerTokenAccount: relayerAta,
+    recipientTokenAccount: recipientAta,
+    fillStatus,
+    tokenProgram: mintInfo.programAddress,
+    associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
+    systemProgram: SYSTEM_PROGRAM_ADDRESS,
+    eventAuthority,
+    program,
+    relayHash: relayDataHash,
+    relayData: svmRelayData,
+    repaymentChainId: BigInt(repaymentChainId),
+    repaymentAddress: toAddress(repaymentAddress),
+  };
+  // Pass createRecipientAtaIfNeeded =true to the createFillInstruction function to create the recipient token account
+  // if it doesn't exist.
+  return createFillInstruction(signer, solanaClient, fillInput, mintInfo.data.decimals, true);
+}
+
 /**
  * Creates a fill instruction.
  * @param signer - The signer of the transaction.
@@ -643,7 +734,7 @@ export function getRelayDataHash(relayData: RelayData, destinationChainId: numbe
     encodeAddress(relayData.exclusiveRelayer),
     encodeAddress(relayData.inputToken),
     encodeAddress(relayData.outputToken),
-    Uint8Array.from(uint64Encoder.encode(BigInt(relayData.inputAmount.toString()))),
+    arrayify(hexZeroPad(hexlify(relayData.inputAmount), 32)),
     Uint8Array.from(uint64Encoder.encode(BigInt(relayData.outputAmount.toString()))),
     Uint8Array.from(uint64Encoder.encode(BigInt(relayData.originChainId.toString()))),
     arrayify(hexZeroPad(hexlify(relayData.depositId), 32)),
@@ -751,7 +842,7 @@ export async function getDepositDelegatePda(
     inputToken: Address<string>;
     outputToken: Address<string>;
     inputAmount: bigint;
-    outputAmount: bigint;
+    outputAmount: ReadonlyUint8Array;
     destinationChainId: bigint;
     exclusiveRelayer: Address<string>;
     quoteTimestamp: bigint;
@@ -771,7 +862,7 @@ export async function getDepositDelegatePda(
     Uint8Array.from(addrEnc.encode(depositData.inputToken)),
     Uint8Array.from(addrEnc.encode(depositData.outputToken)),
     Uint8Array.from(u64.encode(depositData.inputAmount)),
-    Uint8Array.from(u64.encode(depositData.outputAmount)),
+    Uint8Array.from(depositData.outputAmount),
     Uint8Array.from(u64.encode(depositData.destinationChainId)),
     Uint8Array.from(addrEnc.encode(depositData.exclusiveRelayer)),
     Uint8Array.from(u32.encode(depositData.quoteTimestamp)),
@@ -801,7 +892,7 @@ export async function getDepositNowDelegatePda(
     inputToken: Address<string>;
     outputToken: Address<string>;
     inputAmount: bigint;
-    outputAmount: bigint;
+    outputAmount: ReadonlyUint8Array;
     destinationChainId: bigint;
     exclusiveRelayer: Address<string>;
     fillDeadlineOffset: bigint;
@@ -820,7 +911,7 @@ export async function getDepositNowDelegatePda(
     Uint8Array.from(addrEnc.encode(depositData.inputToken)),
     Uint8Array.from(addrEnc.encode(depositData.outputToken)),
     Uint8Array.from(u64.encode(depositData.inputAmount)),
-    Uint8Array.from(u64.encode(depositData.outputAmount)),
+    Uint8Array.from(depositData.outputAmount),
     Uint8Array.from(u64.encode(depositData.destinationChainId)),
     Uint8Array.from(addrEnc.encode(depositData.exclusiveRelayer)),
     Uint8Array.from(u32.encode(depositData.fillDeadlineOffset)),

package/src/arch/svm/utils.ts

@@ -311,3 +311,19 @@ export const createDefaultTransaction = async (rpcClient: SVMProvider, signer: T
     (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx)
   );
 };
+
+/**
+ * Convert a bigint (0 ≤ n < 2^256) to a 32-byte Uint8Array (big-endian).
+ */
+export function bigintToU8a32(n: bigint): Uint8Array {
+  if (n < BigInt(0) || n > ethers.constants.MaxUint256.toBigInt()) {
+    throw new RangeError("Value must fit in 256 bits");
+  }
+  const hexPadded = ethers.utils.hexZeroPad("0x" + n.toString(16), 32);
+  return ethers.utils.arrayify(hexPadded);
+}
+
+export const bigToU8a32 = (bn: bigint | BigNumber) =>
+  bigintToU8a32(typeof bn === "bigint" ? bn : BigInt(bn.toString()));
+
+export const numberToU8a32 = (n: number) => bigintToU8a32(BigInt(n));

package/src/clients/BundleDataClient/BundleDataClient.ts

@@ -44,6 +44,8 @@ import {
   Address,
   getNetworkName,
   toBytes32,
+  convertRelayDataParamsToBytes32,
+  convertFillParamsToBytes32,
 } from "../../utils";
 import winston from "winston";
 import {
@@ -923,7 +925,7 @@ export class BundleDataClient {
               this.logger.debug({
                 at: "BundleDataClient#loadData",
                 message: "Duplicate deposit detected",
-                deposit,
+                deposit: convertRelayDataParamsToBytes32(deposit),
               });
               throw new Error("Duplicate deposit detected");
             }
@@ -1052,7 +1054,7 @@ export class BundleDataClient {
                 this.logger.debug({
                   at: "BundleDataClient#loadData",
                   message: "Duplicate fill detected",
-                  fill,
+                  fill: convertFillParamsToBytes32(fill),
                 });
                 throw new Error("Duplicate fill detected");
               }
@@ -1604,9 +1606,13 @@ export class BundleDataClient {
         at: "BundleDataClient#loadData",
         message: "Finished loading V3 spoke pool data and found some invalid fills in range",
         blockRangesForChains,
-        invalidFillsWithPartialMatchedDeposits,
-        preFillsForNextBundle,
-        unknownReasonInvalidFills,
+        invalidFillsWithPartialMatchedDeposits: invalidFillsWithPartialMatchedDeposits.map((invalidFill) =>
+          convertFillParamsToBytes32(invalidFill)
+        ),
+        preFillsForNextBundle: preFillsForNextBundle.map((preFill) => convertFillParamsToBytes32(preFill)),
+        unknownReasonInvalidFills: unknownReasonInvalidFills.map((invalidFill) =>
+          convertFillParamsToBytes32(invalidFill)
+        ),
       });
     }
 

package/src/clients/mocks/MockSvmCpiEventsClient.ts

@@ -17,6 +17,7 @@ import {
   SVMEventNames,
   SVMProvider,
   getRandomSvmAddress,
+  bigToU8a32,
 } from "../../arch/svm";
 import { bnZero, bnOne, bs58, getCurrentTime, randomAddress, EvmAddress, SvmAddress } from "../../utils";
 import { FillType } from "../../interfaces";
@@ -82,7 +83,7 @@ export class MockSvmCpiEventsClient extends SvmCpiEventsClient {
     const inputToken = deposit.inputToken ?? getRandomSvmAddress();
     const outputToken = deposit.outputToken ?? SvmAddress.from(randomBytes(32), "base16").toBase58();
     inputAmount ??= BigInt(random(1, 1000, false));
-    outputAmount ??= (inputAmount * BigInt(95)) / BigInt(100);
+    outputAmount ??= bigToU8a32((inputAmount * BigInt(95)) / BigInt(100));
     const message = deposit.message ?? new Uint8Array(32);
     const quoteTimestamp = deposit.quoteTimestamp ?? getCurrentTime();
 
@@ -114,8 +115,9 @@ export class MockSvmCpiEventsClient extends SvmCpiEventsClient {
     const { slot } = fill;
     let { depositId, inputAmount, outputAmount, fillDeadline } = fill;
     depositId ??= arrayify(hexZeroPad(hexlify(random(1, 100_000, false)), 32));
-    inputAmount ??= BigInt(random(1, 1000, false));
-    outputAmount ??= (inputAmount * BigInt(95)) / BigInt(100);
+    const inputAmountBigInt = BigInt(random(1, 1000, false));
+    inputAmount ??= bigToU8a32(inputAmountBigInt);
+    outputAmount ??= (inputAmountBigInt * BigInt(95)) / BigInt(100);
     fillDeadline ??= getCurrentTime() + 60;
 
     const depositor = fill.depositor ?? EvmAddress.from(randomAddress()).toBase58();

package/src/interfaces/SpokePool.ts

@@ -18,6 +18,15 @@ export interface RelayData {
   exclusivityDeadline: number;
 }
 
+export interface ConvertedRelayData
+  extends Omit<RelayData, "depositor" | "recipient" | "inputToken" | "outputToken" | "exclusiveRelayer"> {
+  depositor: string;
+  recipient: string;
+  inputToken: string;
+  outputToken: string;
+  exclusiveRelayer: string;
+}
+
 export interface SpeedUpCommon {
   updatedRecipient: Address;
   updatedOutputAmount: BigNumber;
@@ -69,6 +78,20 @@ export interface Fill extends Omit<RelayData, "message"> {
   relayExecutionInfo: RelayExecutionEventInfo;
 }
 
+export interface ConvertedFill
+  extends Omit<
+    Fill,
+    "depositor" | "recipient" | "inputToken" | "outputToken" | "exclusiveRelayer" | "relayer" | "relayExecutionInfo"
+  > {
+  depositor: string;
+  recipient: string;
+  inputToken: string;
+  outputToken: string;
+  exclusiveRelayer: string;
+  relayer: string;
+  relayExecutionInfo: Omit<RelayExecutionEventInfo, "updatedRecipient"> & { updatedRecipient: string };
+}
+
 export interface FillWithBlock extends Fill, SortableEvent {}
 export interface FillWithTime extends Fill, SortableEvent {
   fillTimestamp: number;

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

@@ -1,33 +1,11 @@
 import assert from "assert";
-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,
-  toAddress,
-} from "../../arch/svm";
+import { getComputeUnitEstimateForTransactionMessageFactory, TransactionSigner } from "@solana/kit";
+import { SVMProvider, SolanaVoidSigner, getFillRelayTx } from "../../arch/svm";
 import { Coingecko } from "../../coingecko";
 import { CHAIN_IDs } from "../../constants";
 import { getGasPriceEstimate } from "../../gasPriceOracle";
 import { RelayData } from "../../interfaces";
-import {
-  Address,
-  BigNumber,
-  BigNumberish,
-  SvmAddress,
-  TransactionCostEstimate,
-  getRelayDataHash,
-  toBN,
-} from "../../utils";
+import { Address, BigNumber, BigNumberish, SvmAddress, TransactionCostEstimate, toBN } from "../../utils";
 import { Logger, QueryInterface, getDefaultRelayer } from "../relayFeeCalculator";
 import { SymbolMappingType } from "./";
 
@@ -93,7 +71,7 @@ export class SvmQuery implements QueryInterface {
     const [repaymentChainId, repaymentAddress] = [destinationChainId, relayer]; // These are not important for gas cost simulation.
     const fillRelayTx = await this.getFillRelayTx(
       { ...relayData, recipient, outputToken, exclusiveRelayer },
-      relayer,
+      SolanaVoidSigner(relayer.toBase58()),
       repaymentChainId,
       repaymentAddress
     );
@@ -139,7 +117,7 @@ export class SvmQuery implements QueryInterface {
     const [repaymentChainId, repaymentAddress] = [destinationChainId, relayer]; // These are not important for gas cost simulation.
     const fillRelayTx = await this.getFillRelayTx(
       { ...deposit, recipient, outputToken, exclusiveRelayer },
-      relayer,
+      SolanaVoidSigner(relayer.toBase58()),
       repaymentChainId,
       repaymentAddress
     );
@@ -158,75 +136,11 @@ export class SvmQuery implements QueryInterface {
       recipient: SvmAddress;
       outputToken: SvmAddress;
     },
-    relayer: SvmAddress,
+    signer: TransactionSigner,
     repaymentChainId: number,
     repaymentAddress: Address
   ) {
-    const { depositor, recipient, inputToken, outputToken, exclusiveRelayer, destinationChainId } = relayData;
-
-    // tsc appeasement...should be unnecessary, but isn't. @todo Identify why.
-    assert(recipient.isSVM(), `getFillRelayTx: recipient not an SVM address (${recipient})`);
-    assert(
-      repaymentAddress.isValidOn(repaymentChainId),
-      `getFillRelayTx: repayment address ${repaymentAddress} not valid on chain ${repaymentChainId})`
-    );
-
-    const program = toAddress(this.spokePool);
-    const _relayDataHash = getRelayDataHash(relayData, destinationChainId);
-    const relayDataHash = new Uint8Array(Buffer.from(_relayDataHash.slice(2), "hex"));
-
-    const [state, delegate] = await Promise.all([
-      getStatePda(program),
-      getFillRelayDelegatePda(relayDataHash, BigInt(repaymentChainId), toAddress(repaymentAddress), program),
-    ]);
-
-    const mint = toAddress(outputToken);
-    const mintInfo = await fetchMint(this.provider, mint);
-
-    const [recipientAta, relayerAta, fillStatus, eventAuthority] = await Promise.all([
-      getAssociatedTokenAddress(recipient, outputToken, mintInfo.programAddress),
-      getAssociatedTokenAddress(SvmAddress.from(relayer.toBase58()), outputToken, mintInfo.programAddress),
-      getFillStatusPda(program, relayData, destinationChainId),
-      getEventAuthority(program),
-    ]);
-
-    const svmRelayData: SvmSpokeClient.FillRelayInput["relayData"] = {
-      depositor: toAddress(depositor),
-      recipient: toAddress(recipient),
-      exclusiveRelayer: toAddress(exclusiveRelayer),
-      inputToken: toAddress(inputToken),
-      outputToken: mint,
-      inputAmount: relayData.inputAmount.toBigInt(),
-      outputAmount: relayData.outputAmount.toBigInt(),
-      originChainId: relayData.originChainId,
-      depositId: new Uint8Array(intToU8Array32(relayData.depositId.toNumber())),
-      fillDeadline: relayData.fillDeadline,
-      exclusivityDeadline: relayData.exclusivityDeadline,
-      message: new Uint8Array(Buffer.from(relayData.message, "hex")),
-    };
-
-    const simulatedSigner = SolanaVoidSigner(relayer.toBase58());
-    const fillInput: SvmSpokeClient.FillRelayInput = {
-      signer: simulatedSigner,
-      state,
-      delegate,
-      mint,
-      relayerTokenAccount: relayerAta,
-      recipientTokenAccount: recipientAta,
-      fillStatus,
-      tokenProgram: mintInfo.programAddress,
-      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
-      systemProgram: SYSTEM_PROGRAM_ADDRESS,
-      eventAuthority,
-      program,
-      relayHash: relayDataHash,
-      relayData: svmRelayData,
-      repaymentChainId: BigInt(repaymentChainId),
-      repaymentAddress: toAddress(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);
+    return await getFillRelayTx(this.spokePool, this.provider, relayData, signer, repaymentChainId, repaymentAddress);
   }
 
   /**

package/src/utils/AddressUtils.ts

@@ -90,6 +90,7 @@ export function toAddressType(address: string, chainId: number): Address {
 // The Address class can contain any address type. It is up to the subclasses to determine how to format the address's internal representation,
 // which for this class, is a bytes32 hex string.
 export abstract class Address {
+  readonly __address_type_brand = true;
   readonly rawAddress: Uint8Array;
 
   // Keep all address types in cache so that we may lazily evaluate them when necessary.
@@ -109,6 +110,10 @@ export abstract class Address {
     this.rawAddress = utils.zeroPad(_rawAddress, 32);
   }
 
+  static isAddress(obj: unknown): obj is Address {
+    return "__address_type_brand" in (obj as { __address_type_brand: boolean });
+  }
+
   // Converts the address into a bytes32 string. Note that the output bytes will be lowercase so that it matches ethers event data. This function will never
   // throw since address length validation was done at construction time.
   toBytes32(): string {

package/src/utils/DepositUtils.ts

@@ -1,7 +1,16 @@
 import assert from "assert";
 import { SpokePoolClient } from "../clients";
 import { DEFAULT_CACHING_TTL, EMPTY_MESSAGE, UNDEFINED_MESSAGE_HASH, ZERO_BYTES } from "../constants";
-import { CachingMechanismInterface, Deposit, DepositWithBlock, Fill, RelayData, SlowFillRequest } from "../interfaces";
+import {
+  CachingMechanismInterface,
+  Deposit,
+  DepositWithBlock,
+  Fill,
+  RelayData,
+  SlowFillRequest,
+  ConvertedRelayData,
+  ConvertedFill,
+} from "../interfaces";
 import { getMessageHash, isUnsafeDepositId } from "./SpokeUtils";
 import { getNetworkName } from "./NetworkUtils";
 import { bnZero } from "./BigNumberUtils";
@@ -251,3 +260,42 @@ export function resolveDepositMessage(deposit: Deposit): string {
   assert(isDefined(message)); // Appease tsc about the updatedMessage being possibly undefined.
   return message;
 }
+
+/**
+ * Converts a RelayData object with `Address` types as address fields to a `RelayData`-like object with
+ * strings as address fields.
+ * @param relayData RelayData type.
+ * @returns a RelayData-like type which has strings as fields.
+ */
+export function convertRelayDataParamsToBytes32(relayData: RelayData): ConvertedRelayData {
+  return {
+    ...relayData,
+    depositor: relayData.depositor.toBytes32(),
+    recipient: relayData.recipient.toBytes32(),
+    inputToken: relayData.inputToken.toBytes32(),
+    outputToken: relayData.outputToken.toBytes32(),
+    exclusiveRelayer: relayData.exclusiveRelayer.toBytes32(),
+  };
+}
+
+/**
+ * Converts a Fill object with `Address` types as address fields to a `RelayData`-like object with
+ * strings as address fields.
+ * @param relayData RelayData type.
+ * @returns a RelayData-like type which has strings as fields.
+ */
+export function convertFillParamsToBytes32(fill: Fill): ConvertedFill {
+  return {
+    ...fill,
+    depositor: fill.depositor.toBytes32(),
+    recipient: fill.recipient.toBytes32(),
+    inputToken: fill.inputToken.toBytes32(),
+    outputToken: fill.outputToken.toBytes32(),
+    exclusiveRelayer: fill.exclusiveRelayer.toBytes32(),
+    relayer: fill.relayer.toBytes32(),
+    relayExecutionInfo: {
+      ...fill.relayExecutionInfo,
+      updatedRecipient: fill.relayExecutionInfo.updatedRecipient.toBytes32(),
+    },
+  };
+}