@across-protocol/sdk 4.3.113-alpha.4 → 4.3.114-alpha.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.3.113-alpha.4",
+  "version": "4.3.114-alpha.0",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "repository": {
@@ -56,14 +56,13 @@
     }
   ],
   "devDependencies": {
-    "@coral-xyz/borsh": "^0.30.1",
     "@defi-wonderland/smock": "^2.4.0",
-    "@eth-optimism/contracts": "^0.5.37",
+    "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
     "@nomiclabs/hardhat-ethers": "^2.2.1",
     "@nomiclabs/hardhat-etherscan": "^3.1.7",
-    "@nomiclabs/hardhat-waffle": "^2.0.3",
     "@openzeppelin/hardhat-upgrades": "^1.28.0",
     "@size-limit/preset-small-lib": "^7.0.8",
+    "@solana/web3.js": "^1.31.0",
     "@typechain/ethers-v5": "^11.1.1",
     "@typechain/hardhat": "^6.1.6",
     "@types/async": "^3.2.24",
@@ -71,6 +70,8 @@
     "@types/dotenv": "^8.2.0",
     "@types/lodash": "^4.14.199",
     "@types/lodash.get": "^4.4.7",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^24.3.0",
     "@typescript-eslint/eslint-plugin": "^6.6.0",
     "@typescript-eslint/parser": "^6.6.0",
     "arlocal": "^1.1.65",
@@ -89,7 +90,6 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-promise": "^6.1.1",
-    "ethereum-waffle": "^4.0.10",
     "hardhat": "^2.28.0",
     "hardhat-deploy": "^0.11.2",
     "hardhat-gas-reporter": "^1.0.8",
@@ -104,30 +104,26 @@
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
     "typechain": "^8.3.1",
-    "typescript": "^5.9",
-    "winston": "^3.17.0",
-    "winston-transport": "^4.9.0"
+    "typescript": "^5.9"
   },
   "dependencies": {
     "@across-protocol/across-token": "^1.0.0",
     "@across-protocol/constants": "^3.1.97",
-    "@across-protocol/contracts": "4.1.21-alpha.2",
+    "@across-protocol/contracts": "4.1.23-alpha.0",
     "@coral-xyz/anchor": "^0.30.1",
     "@eth-optimism/sdk": "^3.3.1",
     "@ethersproject/bignumber": "^5.7.0",
     "@nktkas/hyperliquid": "^0.25.9",
     "@pinata/sdk": "^2.1.0",
-    "@solana-program/system": "^0.7.0",
-    "@solana-program/token-2022": "^0.4.0",
-    "@solana/kit": "^2.3.0",
-    "@solana/web3.js": "^1.31.0",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^24.3.0",
-    "@uma/contracts-node": "^0.4.26",
+    "@solana-program/system": "^0.10.0",
+    "@solana-program/token": "^0.9.0",
+    "@solana-program/token-2022": "^0.6.1",
+    "@solana-program/compute-budget": "^0.11.0",
+    "@solana/kit": "^5.4.0",
+    "@solana/sysvars": "^5.4.0",
     "arweave": "^1.14.4",
     "async": "^3.2.5",
     "axios": "^0.27.2",
-    "big-number": "^2.0.0",
     "bs58": "^6.0.0",
     "decimal.js": "^10.3.1",
     "ethers": "^5.7.2",
@@ -136,7 +132,9 @@
     "node-gyp": "^11.0.0",
     "superstruct": "^0.15.4",
     "tslib": "^2.6.2",
-    "viem": "^2.21.15"
+    "viem": "^2.21.15",
+    "winston": "^3.17.0",
+    "winston-transport": "^4.9.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -146,20 +144,15 @@
     "preset": "ts-jest",
     "testEnvironment": "node"
   },
-  "main": "./dist/cjs/src/index.js",
-  "module": "./dist/esm/src/index.js",
-  "types": "./dist/types/src/index.d.ts",
-  "typings": "./dist/types/src/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/types/index.d.ts",
+  "typings": "./dist/types/index.d.ts",
   "exports": {
     ".": {
-      "require": "./dist/cjs/src/index.js",
-      "import": "./dist/esm/src/index.js",
-      "types": "./dist/types/src/index.d.ts"
-    },
-    "./test-utils": {
-      "require": "./dist/cjs/test-utils.js",
-      "import": "./dist/esm/test-utils.js",
-      "types": "./dist/types/test-utils.d.ts"
+      "require": "./dist/cjs/index.js",
+      "import": "./dist/esm/index.js",
+      "types": "./dist/types/index.d.ts"
     },
     "./dist/cjs/*": {
       "require": "./dist/cjs/*.js",
@@ -177,7 +170,15 @@
     "**/ethereum-cryptography/secp256k1": "4.0.4",
     "**/arbundles/secp256k1": "4.0.4",
     "**/ganache/secp256k1": "4.0.4",
-    "**/ethereumjs-util/secp256k1": "3.8.1"
+    "**/ethereumjs-util/secp256k1": "3.8.1",
+    "**/@solana/codecs": "5.4.0",
+    "**/@solana/codecs-core": "5.4.0",
+    "**/@solana/codecs-data-structures": "5.4.0",
+    "**/@solana/codecs-numbers": "5.4.0",
+    "**/@solana/codecs-strings": "5.4.0",
+    "**/@solana/addresses": "5.4.0",
+    "**/@solana/options": "5.4.0",
+    "**/@solana/errors": "5.4.0"
   },
   "overrides": {
     "secp256k1@3.7.1": "3.8.1",

package/src/arch/svm/SpokeUtils.ts

@@ -13,11 +13,11 @@ import {
 } from "@solana-program/token";
 import {
   Account,
+  AccountMeta,
   AccountRole,
   Address,
   FetchAccountConfig,
-  IAccountMeta,
-  IInstruction,
+  Instruction,
   KeyPairSigner,
   ReadonlyUint8Array,
   appendTransactionMessageInstruction,
@@ -32,12 +32,14 @@ import {
   pipe,
   signTransactionMessageWithSigners,
   some,
+  compileTransaction,
   type TransactionSigner,
   type WritableAccount,
   type ReadonlyAccount,
   type Commitment,
-  type CompilableTransactionMessage,
+  type TransactionMessage,
   type TransactionMessageWithBlockhashLifetime,
+  type TransactionMessageWithFeePayer,
 } from "@solana/kit";
 import assert from "assert";
 import winston from "winston";
@@ -102,6 +104,8 @@ import {
  */
 export const SLOT_DURATION_MS = 400;
 
+export const SOLANA_TX_SIZE_LIMIT = 1232;
+
 type ProtoFill = Omit<RelayData, "recipient" | "outputToken"> & {
   destinationChainId: number;
   recipient: SvmAddress;
@@ -501,7 +505,7 @@ export async function fillRelayInstruction(
   recipientTokenAccount: Address<string>,
   repaymentAddress: EvmAddress | SvmAddress,
   repaymentChainId: number
-): Promise<IInstruction> {
+): Promise<Instruction> {
   const program = toAddress(spokePool);
   assert(
     repaymentAddress.isValidOn(repaymentChainId),
@@ -526,7 +530,7 @@ export async function fillRelayInstruction(
   return SvmSpokeClient.getFillRelayInstruction({
     signer,
     state: statePda,
-    delegate: toAddress(SvmAddress.from(delegatePda.toString())),
+    delegate: delegatePda,
     mint: svmRelayData.outputToken,
     relayerTokenAccount: relayerTokenAccount,
     recipientTokenAccount: recipientTokenAccount,
@@ -576,7 +580,7 @@ export async function getFillRelayTx(
   signer: TransactionSigner,
   repaymentChainId: number,
   repaymentAddress: SdkAddress
-): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> {
+): Promise<TransactionMessage & TransactionMessageWithBlockhashLifetime & TransactionMessageWithFeePayer> {
   const svmRelayData = toSvmRelayData(relayData);
 
   assert(
@@ -671,7 +675,7 @@ export async function getIPFillRelayTx(
   signer: TransactionSigner,
   repaymentChainId: number,
   repaymentAddress: SdkAddress
-): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> {
+): Promise<TransactionMessage & TransactionMessageWithBlockhashLifetime & TransactionMessageWithFeePayer> {
   const program = toAddress(spokePoolAddr);
   const _relayDataHash = getRelayDataHash(
     { ...relayData, messageHash: getMessageHash(relayData.message) },
@@ -695,6 +699,8 @@ export async function getIPFillRelayTx(
     getEventAuthority(program),
   ]);
 
+  const recipientAtaEncodedAccount = await fetchEncodedAccount(solanaClient, recipientAta);
+
   // Add remaining accounts if the relayData has a non-empty message.
   // @dev ! since in the context of creating a `fillRelayTx`, `relayData` must be defined.
   const remainingAccounts: (WritableAccount | ReadonlyAccount)[] = [];
@@ -738,7 +744,7 @@ export async function getIPFillRelayTx(
     fillInput,
     { outputAmount: relayData.outputAmount.toBigInt(), recipient: toAddress(relayData.recipient) },
     mintInfo.data.decimals,
-    true,
+    !recipientAtaEncodedAccount.exists,
     remainingAccounts
   );
 }
@@ -760,7 +766,7 @@ export const createFillInstruction = async (
   tokenDecimals: number,
   createRecipientAta: boolean = false,
   remainingAccounts: (WritableAccount | ReadonlyAccount)[] = []
-): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> => {
+): Promise<TransactionMessage & TransactionMessageWithBlockhashLifetime & TransactionMessageWithFeePayer> => {
   const mintInfo = await getMintInfo(solanaClient, fillInput.mint);
   const approveIx = getApproveCheckedInstruction(
     {
@@ -828,7 +834,7 @@ export const createDepositInstruction = async (
   depositInput: SvmSpokeClient.DepositInput,
   tokenDecimals: number,
   createVaultAtaIfNeeded: boolean = true
-): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> => {
+): Promise<TransactionMessage & TransactionMessageWithBlockhashLifetime> => {
   const getCreateAssociatedTokenIdempotentIx = () =>
     getCreateAssociatedTokenIdempotentInstruction({
       payer: signer,
@@ -873,7 +879,7 @@ export const createRequestSlowFillInstruction = async (
   signer: TransactionSigner,
   solanaClient: SVMProvider,
   requestSlowFillInput: SvmSpokeClient.RequestSlowFillInput
-): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> => {
+): Promise<TransactionMessage & TransactionMessageWithBlockhashLifetime> => {
   const requestSlowFillIx = SvmSpokeClient.getRequestSlowFillInstruction(requestSlowFillInput);
 
   return pipe(await createDefaultTransaction(solanaClient, signer), (tx) =>
@@ -898,7 +904,7 @@ export async function getSlowFillRequestTx(
     outputToken: SvmAddress;
   },
   signer: TransactionSigner
-): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> {
+): Promise<TransactionMessage & TransactionMessageWithBlockhashLifetime> {
   const program = toAddress(spokePoolAddr);
   const messageHash = getMessageHash(relayData.message);
   const relayDataHash = getRelayDataHash({ ...relayData, messageHash }, relayData.destinationChainId);
@@ -935,7 +941,7 @@ export const createCloseFillPdaInstruction = async (
   signer: TransactionSigner,
   solanaClient: SVMProvider,
   fillStatusPda: Address
-): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> => {
+): Promise<TransactionMessage & TransactionMessageWithBlockhashLifetime> => {
   const closeFillPdaIx = SvmSpokeClient.getCloseFillPdaInstruction({
     signer,
     state: await getStatePda(SvmSpokeClient.SVM_SPOKE_PROGRAM_ADDRESS),
@@ -950,10 +956,10 @@ export const createReceiveMessageInstruction = async (
   signer: TransactionSigner,
   solanaClient: SVMProvider,
   input: MessageTransmitterClient.ReceiveMessageInput,
-  remainingAccounts: IAccountMeta<string>[]
-): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> => {
+  remainingAccounts: AccountMeta<string>[]
+): Promise<TransactionMessage & TransactionMessageWithBlockhashLifetime & TransactionMessageWithFeePayer> => {
   const receiveMessageIx = MessageTransmitterClient.getReceiveMessageInstruction(input);
-  (receiveMessageIx.accounts as IAccountMeta<string>[]).push(...remainingAccounts);
+  (receiveMessageIx.accounts as AccountMeta<string>[]).push(...remainingAccounts);
   return pipe(await createDefaultTransaction(solanaClient, signer), (tx) =>
     appendTransactionMessageInstruction(receiveMessageIx, tx)
   );
@@ -1082,10 +1088,34 @@ async function fetchBatchFillStatusFromPdaAccounts(
   return fillStatuses;
 }
 
+export async function getIPForFillRelayTxs(
+  spokePool: SvmAddress,
+  relayData: RelayData,
+  repaymentChainId: number,
+  repaymentAddress: SdkAddress,
+  signer: TransactionSigner<string>,
+  provider: SVMProvider
+): Promise<Array<TransactionMessage & TransactionMessageWithBlockhashLifetime & TransactionMessageWithFeePayer>> {
+  const ixs = await getFillRelayViaInstructionParamsInstructions(
+    toAddress(spokePool),
+    relayData,
+    repaymentChainId,
+    repaymentAddress,
+    signer,
+    provider
+  );
+  const txns = await mapAsync(ixs, async (ix) => {
+    return pipe(await createDefaultTransaction(provider, signer), (tx) => appendTransactionMessageInstruction(ix, tx));
+  });
+  return txns;
+}
+
 /**
  * Returns a set of instructions to execute to fill a relay via instruction params.
  * @param spokePool The program ID of the Solana spoke pool.
  * @param relayData The relay data to write to the instruction params PDA.
+ * @param repaymentChainId: The chain ID to take repayment.
+ * @param repaymentAddress: The address to receive repayment on the specified repayment chain.
  * @param signer The transaction signer and authority of the instruction params PDA.
  * @param maxWriteSize The maximum fragment size to write to instruction params.
  */
@@ -1095,9 +1125,11 @@ export async function getFillRelayViaInstructionParamsInstructions(
   repaymentChainId: number,
   repaymentAddress: SdkAddress,
   signer: TransactionSigner<string>,
+  provider: SVMProvider,
   maxWriteSize = 450
-): Promise<IInstruction[]> {
+): Promise<Instruction[]> {
   const instructionParams = await getInstructionParamsPda(spokePool, signer.address);
+  const encodedInstructionParams = await fetchEncodedAccount(provider, instructionParams);
 
   const relayDataEncoder = SvmSpokeClient.getFillRelayParamsEncoder();
   const svmRelayData = toSvmRelayData(relayData);
@@ -1112,7 +1144,7 @@ export async function getFillRelayViaInstructionParamsInstructions(
     instructionParams,
     totalSize: encodedRelayData.length,
   });
-  const instructions: IInstruction[] = [initInstructionParamsIx];
+  const instructions: Instruction[] = [initInstructionParamsIx];
 
   for (let i = 0; i <= encodedRelayData.length / maxWriteSize; ++i) {
     const offset = i * maxWriteSize;
@@ -1126,7 +1158,9 @@ export async function getFillRelayViaInstructionParamsInstructions(
     });
     instructions.push(writeInstructionParamsIx);
   }
-  return instructions;
+  return encodedInstructionParams.exists
+    ? [SvmSpokeClient.getCloseInstructionParamsInstruction({ signer, instructionParams }), ...instructions]
+    : instructions;
 }
 
 /**
@@ -1295,7 +1329,7 @@ export async function getAccountMetasForTokenlessMessage(
   solanaClient: SVMProvider,
   signer: KeyPairSigner,
   messageBytes: string
-): Promise<IAccountMeta<string>[]> {
+): Promise<AccountMeta<string>[]> {
   const messageHex = messageBytes.slice(2);
   const messageHeader = decodeMessageHeader(Buffer.from(messageHex, "hex"));
   const programAddress = SvmSpokeClient.SVM_SPOKE_PROGRAM_ADDRESS;
@@ -1303,7 +1337,7 @@ export async function getAccountMetasForTokenlessMessage(
   const selfAuthority = await getSelfAuthority();
   const eventAuthority = await getEventAuthority(programAddress);
 
-  const base: IAccountMeta<string>[] = [
+  const base: AccountMeta<string>[] = [
     { address: statePda, role: AccountRole.READONLY },
     { address: selfAuthority, role: AccountRole.READONLY },
     { address: programAddress, role: AccountRole.READONLY },
@@ -1415,6 +1449,47 @@ export async function getCCTPDepositAccounts(
   };
 }
 
+/**
+ * Returns true if the input deposit's corresponding relay data would result in a transaction size
+ * that is larger than the Solana transaction size limit.
+ * @param fillRelayTx The compilable fill relay transaction to check.
+ * @returns Object containing a boolean if the input deposit requires a multipart fill, false otherwise and
+ * the number of bytes in the serialized transaction.
+ */
+export function isSVMFillTooLarge(fillRelayTx: TransactionMessage & TransactionMessageWithFeePayer): {
+  tooLarge: boolean;
+  sizeBytes: number;
+} {
+  const sizeBytes = calculateFillSizeBytes(fillRelayTx);
+  return {
+    tooLarge: sizeBytes > SOLANA_TX_SIZE_LIMIT,
+    sizeBytes,
+  };
+}
+
+/**
+ * Returns the byte size of a base64 transaction.
+ * @param base64TxString base64 serialized Solana transaction.
+ * @returns The number of bytes in the transaction.
+ */
+export function base64StrToByteSize(base64TxString: string): number {
+  // base64 string has 6 bits per character, so every 4 symbols represent 3 bytes
+  // However, we also need to account for padding: https://en.wikipedia.org/wiki/Base64#Padding
+  const paddingLen = base64TxString.endsWith("==") ? 2 : base64TxString.endsWith("=") ? 1 : 0;
+  return (base64TxString.length * 3) / 4 - paddingLen;
+}
+
+/**
+ * Returns the size of the fill relay transaction using the input relayData.
+ * @param fillTx The compilable fill relay transaction.
+ * @returns The number of bytes in the serialized fillRelay transaction.
+ */
+export function calculateFillSizeBytes(fillTx: TransactionMessage & TransactionMessageWithFeePayer): number {
+  const signedTransaction = compileTransaction(fillTx);
+  const serializedTx = getBase64EncodedWireTransaction(signedTransaction);
+  return base64StrToByteSize(serializedTx);
+}
+
 /**
  * Returns the account metas for a deposit message.
  * @param message The CCTP message.
@@ -1428,7 +1503,7 @@ async function getAccountMetasForDepositMessage(
   hubChainId: number,
   tokenMessengerMinter: Address,
   recipientAta: SvmAddress
-): Promise<IAccountMeta<string>[]> {
+): Promise<AccountMeta<string>[]> {
   const l1Usdc = EvmAddress.from(TOKEN_SYMBOLS_MAP.USDC.addresses[hubChainId]);
   const l2Usdc = SvmAddress.from(
     TOKEN_SYMBOLS_MAP.USDC.addresses[chainIsProd(hubChainId) ? CHAIN_IDs.SOLANA : CHAIN_IDs.SOLANA_DEVNET]
@@ -1503,7 +1578,7 @@ export async function getCCTPV1ReceiveMessageTx(
   message: AttestedCCTPMessage,
   hubChainId: number,
   recipientAta: SvmAddress
-): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> {
+): Promise<TransactionMessage & TransactionMessageWithBlockhashLifetime & TransactionMessageWithFeePayer> {
   const [messageTransmitterPda] = await getProgramDerivedAddress({
     programAddress: MessageTransmitterClient.MESSAGE_TRANSMITTER_PROGRAM_ADDRESS,
     seeds: ["message_transmitter"],
@@ -1527,7 +1602,7 @@ export async function getCCTPV1ReceiveMessageTx(
   const usedNonces = await getCCTPNoncePda(solanaClient, signer, message.nonce, message.sourceDomain);
 
   // Notice: for Svm tokenless messages, we currently only support very specific finalizations: Hub -> Spoke relayRootBundle calls
-  const accountMetas: IAccountMeta<string>[] = isDepositForBurnEvent(message)
+  const accountMetas: AccountMeta<string>[] = isDepositForBurnEvent(message)
     ? await getAccountMetasForDepositMessage(
         message,
         hubChainId,

package/src/arch/svm/encoders.ts

@@ -62,6 +62,10 @@ export function getHandlerMessageEncoder(): Encoder<Array<CompiledIx>> {
   return getArrayEncoder(getCompiledIxEncoder());
 }
 
+export function getHandlerMessageDecoder(): Decoder<Array<CompiledIx>> {
+  return getArrayDecoder(getCompiledIxDecoder());
+}
+
 export function getCompiledIxEncoder(): Encoder<CompiledIx> {
   return getStructEncoder([
     ["program_id_index", getU8Encoder()],

package/src/arch/svm/utils.ts

@@ -2,7 +2,7 @@ import { MessageTransmitterClient, SpokePool__factory, SvmSpokeClient } from "@a
 import { BN, BorshEventCoder, Idl } from "@coral-xyz/anchor";
 import {
   Address,
-  IInstruction,
+  Instruction,
   KeyPairSigner,
   address,
   appendTransactionMessageInstruction,
@@ -18,6 +18,9 @@ import {
   setTransactionMessageLifetimeUsingBlockhash,
   signTransactionMessageWithSigners,
   type Commitment,
+  type TransactionMessage,
+  type TransactionMessageWithBlockhashLifetime,
+  type TransactionMessageWithFeePayer,
   type TransactionSigner,
 } from "@solana/kit";
 import assert from "assert";
@@ -367,6 +370,19 @@ export async function getEventAuthority(programId: Address): Promise<Address> {
   return eventAuthority;
 }
 
+/**
+ * Returns the PDA for the handler signer.
+ * @param programId The multicall handler program ID.
+ * @returns The PDA for the State account.
+ */
+export async function getHandlerSignerPda(programId: Address): Promise<Address> {
+  const [handlerSignerPda] = await getProgramDerivedAddress({
+    programAddress: programId,
+    seeds: ["handler_signer"],
+  });
+  return handlerSignerPda;
+}
+
 /**
  * Returns the PDA for the Self Authority.
  * @returns The PDA for the Self Authority.
@@ -398,7 +414,7 @@ export const createDefaultTransaction = async (
   rpcClient: SVMProvider,
   signer: TransactionSigner,
   latestBlockhash?: LatestBlockhash
-) => {
+): Promise<TransactionMessage & TransactionMessageWithBlockhashLifetime & TransactionMessageWithFeePayer> => {
   latestBlockhash = isDefined(latestBlockhash) ? latestBlockhash : (await rpcClient.getLatestBlockhash().send()).value;
   return pipe(
     createTransactionMessage({ version: 0 }),
@@ -417,7 +433,7 @@ export const createDefaultTransaction = async (
  */
 export const simulateAndDecode = async <P extends (buf: Buffer) => unknown>(
   solanaClient: SVMProvider,
-  ix: IInstruction,
+  ix: Instruction,
   signer: KeyPairSigner,
   parser: P,
   latestBlockhash?: LatestBlockhash

package/src/constants.ts

@@ -82,7 +82,6 @@ export const STABLE_COIN_SYMBOLS = [
   TOKEN_SYMBOLS_MAP.DAI.symbol,
   TOKEN_SYMBOLS_MAP.GHO.symbol,
   TOKEN_SYMBOLS_MAP.WGHO.symbol,
-  TOKEN_SYMBOLS_MAP.USDM.symbol,
 ];
 
 const resolveCustomGasTokens = (): { [chainId: number]: string } => {

package/src/gasPriceOracle/adapters/solana.ts

@@ -2,7 +2,12 @@ import { SVMProvider } from "../../arch/svm";
 import { toBN, dedupArray } from "../../utils";
 import { SvmGasPriceEstimate } from "../types";
 import { GasPriceEstimateOptions } from "../oracle";
-import { CompilableTransactionMessage, TransactionMessageBytesBase64, compileTransaction } from "@solana/kit";
+import {
+  TransactionMessage,
+  TransactionMessageBytesBase64,
+  TransactionMessageWithFeePayer,
+  compileTransaction,
+} from "@solana/kit";
 
 /**
  * @notice Returns result of getFeeForMessage and getRecentPrioritizationFees RPC calls.
@@ -11,8 +16,8 @@ import { CompilableTransactionMessage, TransactionMessageBytesBase64, compileTra
 export async function messageFee(provider: SVMProvider, opts: GasPriceEstimateOptions): Promise<SvmGasPriceEstimate> {
   const { unsignedTx: _unsignedTx } = opts;
 
-  // Cast the opaque unsignedTx type to a solana-kit CompilableTransactionMessage.
-  const unsignedTx = _unsignedTx as CompilableTransactionMessage;
+  // Cast the opaque unsignedTx type to a solana-kit TransactionMessage with fee payer.
+  const unsignedTx = _unsignedTx as TransactionMessage & TransactionMessageWithFeePayer;
   const compiledTransaction = compileTransaction(unsignedTx);
 
   // Get this base fee. This should result in LAMPORTS_PER_SIGNATURE * nSignatures.

package/src/index.ts

@@ -1,7 +1,6 @@
 export * as arch from "./arch";
 export * as addressAggregator from "./addressAggregator";
 export * as lpFeeCalculator from "./lpFeeCalculator";
-export * as pool from "./pool";
 export * as relayFeeCalculator from "./relayFeeCalculator";
 export * as utils from "./utils";
 export * as contracts from "./contracts";

package/src/providers/solana/utils.ts

@@ -1,4 +1,5 @@
 import { RpcTransport } from "@solana/rpc-spec";
+import { SolanaRpcApi } from "@solana/kit";
 import { isSolanaError, SVM_SLOT_SKIPPED, SVM_LONG_TERM_STORAGE_SLOT_SKIPPED } from "../../arch/svm";
 
 /**
@@ -14,6 +15,49 @@ export interface SolanaRateLimitTask {
   reject: (err: unknown) => void;
 }
 
+export type TransactionResult = {
+  err: string | undefined;
+  logs: Array<string>;
+  postExecutionAccounts: ExecutionAccounts[];
+  preExecutionAccounts: ExecutionAccounts[];
+  returnData: string | undefined;
+  unitsConsumed: bigint;
+};
+
+export type ExecutionAccounts = {
+  data: [string, string];
+  executable: boolean;
+  lamports: bigint;
+  owner: string;
+  rentEpoch: bigint;
+  space: bigint;
+};
+
+// `simulateBundle` minimal response struct.
+export type SolanaBundleSimulation = {
+  context: { apiVersion: string; slot: bigint };
+  value: {
+    summary: "succeeded" | { failed: { error: { TransactionFailure: [Array<bigint>, string] }; tx_signature: string } };
+    transactionResults: Array<TransactionResult>;
+  };
+};
+
+export type SimulationOpts = {
+  simulationBank?: string;
+  skipSigVerify?: boolean;
+  replaceRecentBlockhash?: boolean;
+  accounts?: { addresses: string[]; encoding: string };
+  // pre/post Execution accounts must be defined if any other opt is defined.
+  preExecutionAccountsConfigs: Array<{ accountIndex: number; addresses: string[] } | undefined>;
+  postExecutionAccountsConfigs: Array<{ accountIndex: number; addresses: string[] } | undefined>;
+};
+
+// Minimal extension of a Solana RPC Api which also supports some JITO RPC endpoints.
+export interface JitoInterface extends SolanaRpcApi {
+  // Simulate an array of base64 encoded transactions
+  simulateBundle(transactions: { encodedTransactions: string[] }, opts?: SimulationOpts): SolanaBundleSimulation;
+}
+
 /**
  * Determine whether a Solana RPC error indicates an unrecoverable error that should not be retried.
  * @param method RPC method name.