@across-protocol/sdk 4.3.114-alpha.2 → 4.3.114

package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svmQuery.d.ts","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/svmQuery.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EASlB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,WAAW,EASX,iBAAiB,EAClB,MAAM,gBAAgB,CAAC;AAKxB,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,uBAAuB,EAAkB,MAAM,aAAa,CAAC;AACpH,OAAO,EAAE,MAAM,EAAE,cAAc,EAAqB,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAMvC;;;GAGG;AACH,qBAAa,QAAS,YAAW,cAAc;IAe3C,QAAQ,CAAC,QAAQ,EAAE,WAAW;IAC9B,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IACzC,QAAQ,CAAC,SAAS,EAAE,UAAU;IAC9B,QAAQ,CAAC,uBAAuB,EAAE,UAAU;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM;IACpC,QAAQ,CAAC,aAAa,CAAC,EAAE,YAAY;IACrC,QAAQ,CAAC,qBAAqB,EAAE,MAAM;IArBxC,SAAS,CAAC,oBAAoB,2HAAC;IAE/B;;;;;;;;;;OAUG;gBAEQ,QAAQ,EAAE,WAAW,EACrB,aAAa,EAAE,iBAAiB,EAChC,SAAS,EAAE,UAAU,EACrB,uBAAuB,EAAE,UAAU,EACnC,MAAM,EAAE,MAAM,EACd,kBAAkB,CAAC,EAAE,MAAM,YAAA,EAC3B,aAAa,CAAC,EAAE,YAAY,YAAA,EAC5B,qBAAqB,GAAE,MAAc;IAOhD;;;;;;;;;OASG;IACG,WAAW,CACf,SAAS,EAAE,SAAS,GAAG;QAAE,kBAAkB,EAAE,MAAM,CAAA;KAAE,EACrD,OAAO,UAAkD,EACzD,OAAO,GAAE,OAAO,CAAC;QACf,QAAQ,EAAE,YAAY,CAAC;QACvB,QAAQ,EAAE,YAAY,CAAC;QACvB,iBAAiB,EAAE,SAAS,CAAC;QAC7B,qBAAqB,EAAE,SAAS,CAAC;KAClC,CAAM,GACN,OAAO,CAAC,uBAAuB,CAAC;IAoFnC;;;;;OAKG;IACG,gBAAgB,CACpB,OAAO,EAAE,SAAS,GAAG;QAAE,kBAAkB,EAAE,MAAM,CAAA;KAAE,EACnD,OAAO,UAAgD,GACtD,OAAO,CAAC,SAAS,CAAC;IAiBrB;;;;;;OAMG;IACH,2BAA2B,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS;IAI1D;;;;;OAKG;cACa,cAAc,CAC5B,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,WAAW,GAAG,aAAa,CAAC,GAAG;QACxD,kBAAkB,EAAE,MAAM,CAAC;QAC3B,SAAS,EAAE,UAAU,CAAC;QACtB,WAAW,EAAE,UAAU,CAAC;KACzB,EACD,MAAM,EAAE,iBAAiB,EACzB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,iBAAiB,CAAC;IAI7B;;;;OAIG;IACG,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUzD;;;;OAIG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAMvC,oBAAoB,CACxB,SAAS,EAAE,SAAS,GAAG;QACrB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,SAAS,EAAE,UAAU,CAAC;QACtB,WAAW,EAAE,UAAU,CAAC;QACxB,gBAAgB,EAAE,UAAU,CAAC;KAC9B,EACD,OAAO,EAAE,UAAU,EACnB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,UAAU,GAC3B,OAAO,CAAC,MAAM,CAAC;CAiEnB"}
+{"version":3,"file":"svmQuery.d.ts","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/svmQuery.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.3.114-alpha.2",
+  "version": "4.3.114",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "repository": {
@@ -109,18 +109,16 @@
   "dependencies": {
     "@across-protocol/across-token": "^1.0.0",
     "@across-protocol/constants": "^3.1.97",
-    "@across-protocol/contracts": "4.1.23-alpha.0",
+    "@across-protocol/contracts": "4.1.20",
     "@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.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",
+    "@solana-program/system": "^0.7.0",
+    "@solana-program/token-2022": "^0.4.0",
+    "@solana-program/compute-budget": "^0.8.0",
+    "@solana/kit": "^2.3.0",
     "arweave": "^1.14.4",
     "async": "^3.2.5",
     "axios": "^0.27.2",
@@ -170,15 +168,7 @@
     "**/ethereum-cryptography/secp256k1": "4.0.4",
     "**/arbundles/secp256k1": "4.0.4",
     "**/ganache/secp256k1": "4.0.4",
-    "**/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"
+    "**/ethereumjs-util/secp256k1": "3.8.1"
   },
   "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,
-  Instruction,
+  IAccountMeta,
+  IInstruction,
   KeyPairSigner,
   ReadonlyUint8Array,
   appendTransactionMessageInstruction,
@@ -37,6 +37,8 @@ import {
   type WritableAccount,
   type ReadonlyAccount,
   type Commitment,
+  type CompilableTransactionMessage,
+  type TransactionMessageWithBlockhashLifetime,
 } from "@solana/kit";
 import assert from "assert";
 import winston from "winston";
@@ -87,7 +89,7 @@ import {
 } from "./";
 import { SvmCpiEventsClient } from "./eventsClient";
 import { SVM_LONG_TERM_STORAGE_SLOT_SKIPPED, SVM_SLOT_SKIPPED, isSolanaError } from "./provider";
-import { AttestedCCTPMessage, SVMEventNames, SVMProvider, LatestBlockhash, SolanaTransaction } from "./types";
+import { AttestedCCTPMessage, SVMEventNames, SVMProvider, LatestBlockhash } from "./types";
 import {
   getEmergencyDeleteRootBundleRootBundleId,
   getNearestSlotTime,
@@ -502,7 +504,7 @@ export async function fillRelayInstruction(
   recipientTokenAccount: Address<string>,
   repaymentAddress: EvmAddress | SvmAddress,
   repaymentChainId: number
-): Promise<Instruction> {
+): Promise<IInstruction> {
   const program = toAddress(spokePool);
   assert(
     repaymentAddress.isValidOn(repaymentChainId),
@@ -577,7 +579,7 @@ export async function getFillRelayTx(
   signer: TransactionSigner,
   repaymentChainId: number,
   repaymentAddress: SdkAddress
-): Promise<SolanaTransaction> {
+): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> {
   const svmRelayData = toSvmRelayData(relayData);
 
   assert(
@@ -672,7 +674,7 @@ export async function getIPFillRelayTx(
   signer: TransactionSigner,
   repaymentChainId: number,
   repaymentAddress: SdkAddress
-): Promise<SolanaTransaction> {
+): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> {
   const program = toAddress(spokePoolAddr);
   const _relayDataHash = getRelayDataHash(
     { ...relayData, messageHash: getMessageHash(relayData.message) },
@@ -763,7 +765,7 @@ export const createFillInstruction = async (
   tokenDecimals: number,
   createRecipientAta: boolean = false,
   remainingAccounts: (WritableAccount | ReadonlyAccount)[] = []
-): Promise<SolanaTransaction> => {
+): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> => {
   const mintInfo = await getMintInfo(solanaClient, fillInput.mint);
   const approveIx = getApproveCheckedInstruction(
     {
@@ -831,7 +833,7 @@ export const createDepositInstruction = async (
   depositInput: SvmSpokeClient.DepositInput,
   tokenDecimals: number,
   createVaultAtaIfNeeded: boolean = true
-): Promise<SolanaTransaction> => {
+): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> => {
   const getCreateAssociatedTokenIdempotentIx = () =>
     getCreateAssociatedTokenIdempotentInstruction({
       payer: signer,
@@ -876,7 +878,7 @@ export const createRequestSlowFillInstruction = async (
   signer: TransactionSigner,
   solanaClient: SVMProvider,
   requestSlowFillInput: SvmSpokeClient.RequestSlowFillInput
-): Promise<SolanaTransaction> => {
+): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> => {
   const requestSlowFillIx = SvmSpokeClient.getRequestSlowFillInstruction(requestSlowFillInput);
 
   return pipe(await createDefaultTransaction(solanaClient, signer), (tx) =>
@@ -901,7 +903,7 @@ export async function getSlowFillRequestTx(
     outputToken: SvmAddress;
   },
   signer: TransactionSigner
-): Promise<SolanaTransaction> {
+): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> {
   const program = toAddress(spokePoolAddr);
   const messageHash = getMessageHash(relayData.message);
   const relayDataHash = getRelayDataHash({ ...relayData, messageHash }, relayData.destinationChainId);
@@ -938,7 +940,7 @@ export const createCloseFillPdaInstruction = async (
   signer: TransactionSigner,
   solanaClient: SVMProvider,
   fillStatusPda: Address
-): Promise<SolanaTransaction> => {
+): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> => {
   const closeFillPdaIx = SvmSpokeClient.getCloseFillPdaInstruction({
     signer,
     state: await getStatePda(SvmSpokeClient.SVM_SPOKE_PROGRAM_ADDRESS),
@@ -953,10 +955,10 @@ export const createReceiveMessageInstruction = async (
   signer: TransactionSigner,
   solanaClient: SVMProvider,
   input: MessageTransmitterClient.ReceiveMessageInput,
-  remainingAccounts: AccountMeta<string>[]
-): Promise<SolanaTransaction> => {
+  remainingAccounts: IAccountMeta<string>[]
+): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> => {
   const receiveMessageIx = MessageTransmitterClient.getReceiveMessageInstruction(input);
-  (receiveMessageIx.accounts as AccountMeta<string>[]).push(...remainingAccounts);
+  (receiveMessageIx.accounts as IAccountMeta<string>[]).push(...remainingAccounts);
   return pipe(await createDefaultTransaction(solanaClient, signer), (tx) =>
     appendTransactionMessageInstruction(receiveMessageIx, tx)
   );
@@ -1092,7 +1094,7 @@ export async function getIPForFillRelayTxs(
   repaymentAddress: SdkAddress,
   signer: TransactionSigner<string>,
   provider: SVMProvider
-): Promise<Array<SolanaTransaction>> {
+) {
   const ixs = await getFillRelayViaInstructionParamsInstructions(
     toAddress(spokePool),
     relayData,
@@ -1124,7 +1126,7 @@ export async function getFillRelayViaInstructionParamsInstructions(
   signer: TransactionSigner<string>,
   provider: SVMProvider,
   maxWriteSize = 450
-): Promise<Instruction[]> {
+): Promise<IInstruction[]> {
   const instructionParams = await getInstructionParamsPda(spokePool, signer.address);
   const encodedInstructionParams = await fetchEncodedAccount(provider, instructionParams);
 
@@ -1141,7 +1143,7 @@ export async function getFillRelayViaInstructionParamsInstructions(
     instructionParams,
     totalSize: encodedRelayData.length,
   });
-  const instructions: Instruction[] = [initInstructionParamsIx];
+  const instructions: IInstruction[] = [initInstructionParamsIx];
 
   for (let i = 0; i <= encodedRelayData.length / maxWriteSize; ++i) {
     const offset = i * maxWriteSize;
@@ -1326,7 +1328,7 @@ export async function getAccountMetasForTokenlessMessage(
   solanaClient: SVMProvider,
   signer: KeyPairSigner,
   messageBytes: string
-): Promise<AccountMeta<string>[]> {
+): Promise<IAccountMeta<string>[]> {
   const messageHex = messageBytes.slice(2);
   const messageHeader = decodeMessageHeader(Buffer.from(messageHex, "hex"));
   const programAddress = SvmSpokeClient.SVM_SPOKE_PROGRAM_ADDRESS;
@@ -1334,7 +1336,7 @@ export async function getAccountMetasForTokenlessMessage(
   const selfAuthority = await getSelfAuthority();
   const eventAuthority = await getEventAuthority(programAddress);
 
-  const base: AccountMeta<string>[] = [
+  const base: IAccountMeta<string>[] = [
     { address: statePda, role: AccountRole.READONLY },
     { address: selfAuthority, role: AccountRole.READONLY },
     { address: programAddress, role: AccountRole.READONLY },
@@ -1453,7 +1455,7 @@ export async function getCCTPDepositAccounts(
  * @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: SolanaTransaction): {
+export function isSVMFillTooLarge(fillRelayTx: CompilableTransactionMessage): {
   tooLarge: boolean;
   sizeBytes: number;
 } {
@@ -1481,7 +1483,7 @@ export function base64StrToByteSize(base64TxString: string): number {
  * @param fillTx The compilable fill relay transaction.
  * @returns The number of bytes in the serialized fillRelay transaction.
  */
-export function calculateFillSizeBytes(fillTx: SolanaTransaction): number {
+export function calculateFillSizeBytes(fillTx: CompilableTransactionMessage): number {
   const signedTransaction = compileTransaction(fillTx);
   const serializedTx = getBase64EncodedWireTransaction(signedTransaction);
   return base64StrToByteSize(serializedTx);
@@ -1500,7 +1502,7 @@ async function getAccountMetasForDepositMessage(
   hubChainId: number,
   tokenMessengerMinter: Address,
   recipientAta: SvmAddress
-): Promise<AccountMeta<string>[]> {
+): Promise<IAccountMeta<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]
@@ -1575,7 +1577,7 @@ export async function getCCTPV1ReceiveMessageTx(
   message: AttestedCCTPMessage,
   hubChainId: number,
   recipientAta: SvmAddress
-): Promise<SolanaTransaction> {
+): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> {
   const [messageTransmitterPda] = await getProgramDerivedAddress({
     programAddress: MessageTransmitterClient.MESSAGE_TRANSMITTER_PROGRAM_ADDRESS,
     seeds: ["message_transmitter"],
@@ -1599,7 +1601,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: AccountMeta<string>[] = isDepositForBurnEvent(message)
+  const accountMetas: IAccountMeta<string>[] = isDepositForBurnEvent(message)
     ? await getAccountMetasForDepositMessage(
         message,
         hubChainId,

package/src/arch/svm/types.ts

@@ -10,19 +10,8 @@ import {
   SolanaRpcApiFromTransport,
   UnixTimestamp,
   type Blockhash,
-  type TransactionMessage,
-  type TransactionMessageWithBlockhashLifetime,
-  type TransactionMessageWithFeePayer,
 } from "@solana/kit";
 
-/**
- * A Solana transaction message ready to be signed and sent.
- * Includes fee payer and blockhash lifetime information.
- */
-export type SolanaTransaction = TransactionMessage &
-  TransactionMessageWithBlockhashLifetime &
-  TransactionMessageWithFeePayer;
-
 export type EventData =
   | SvmSpokeClient.BridgedToHubPool
   | SvmSpokeClient.TokensBridged

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,
-  Instruction,
+  IInstruction,
   KeyPairSigner,
   address,
   appendTransactionMessageInstruction,
@@ -26,14 +26,7 @@ import { ethers } from "ethers";
 import { FillType, RelayData, RelayDataWithMessageHash } from "../../interfaces";
 import { BigNumber, Address as SdkAddress, biMin, getMessageHash, isDefined, isUint8Array } from "../../utils";
 import { getTimestampForSlot, getSlot, getRelayDataHash } from "./SpokeUtils";
-import {
-  AttestedCCTPMessage,
-  EventName,
-  SVMEventNames,
-  SVMProvider,
-  LatestBlockhash,
-  SolanaTransaction,
-} from "./types";
+import { AttestedCCTPMessage, EventName, SVMEventNames, SVMProvider, LatestBlockhash } from "./types";
 import winston from "winston";
 /**
  * Basic void TransactionSigner type
@@ -418,7 +411,7 @@ export const createDefaultTransaction = async (
   rpcClient: SVMProvider,
   signer: TransactionSigner,
   latestBlockhash?: LatestBlockhash
-): Promise<SolanaTransaction> => {
+) => {
   latestBlockhash = isDefined(latestBlockhash) ? latestBlockhash : (await rpcClient.getLatestBlockhash().send()).value;
   return pipe(
     createTransactionMessage({ version: 0 }),
@@ -437,7 +430,7 @@ export const createDefaultTransaction = async (
  */
 export const simulateAndDecode = async <P extends (buf: Buffer) => unknown>(
   solanaClient: SVMProvider,
-  ix: Instruction,
+  ix: IInstruction,
   signer: KeyPairSigner,
   parser: P,
   latestBlockhash?: LatestBlockhash

package/src/clients/BundleDataClient/BundleDataClient.ts

@@ -455,7 +455,7 @@ export class BundleDataClient {
     };
 
     const _depositIsExpired = (deposit: DepositWithBlock): boolean => {
-      return deposit.fillDeadline < bundleBlockTimestamps[deposit.destinationChainId][1];
+      return deposit.fillDeadline <= bundleBlockTimestamps[deposit.destinationChainId][1];
     };
 
     const _getFillStatusForDeposit = (deposit: Deposit, queryBlock: number): Promise<FillStatus> => {

package/src/gasPriceOracle/adapters/solana.ts

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

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

@@ -1,5 +1,6 @@
 import assert from "assert";
 import {
+  getComputeUnitEstimateForTransactionMessageFactory,
   TransactionSigner,
   fetchEncodedAccount,
   isSome,
@@ -8,7 +9,8 @@ import {
   appendTransactionMessageInstruction,
   compileTransaction,
   getBase64EncodedWireTransaction,
-  type Instruction,
+  type CompilableTransactionMessage,
+  type TransactionMessageWithBlockhashLifetime,
 } from "@solana/kit";
 import {
   SVMProvider,
@@ -20,7 +22,6 @@ import {
   createDefaultTransaction,
   getAssociatedTokenAddress,
   isSVMFillTooLarge,
-  SolanaTransaction,
 } from "../../arch/svm";
 import { JitoInterface } from "../../providers/solana";
 import { Coingecko } from "../../coingecko";
@@ -32,7 +33,7 @@ import { Logger, QueryInterface, getDefaultRelayer } from "../relayFeeCalculator
 import { SymbolMappingType } from "./";
 import { TOKEN_PROGRAM_ADDRESS } from "@solana-program/token";
 import { TOKEN_2022_PROGRAM_ADDRESS, getTokenSize, fetchMint, Extension } from "@solana-program/token-2022";
-import { getSetComputeUnitLimitInstruction, estimateComputeUnitLimitFactory } from "@solana-program/compute-budget";
+import { getSetComputeUnitLimitInstruction } from "@solana-program/compute-budget";
 import { arch } from "../..";
 
 /**
@@ -63,7 +64,7 @@ export class SvmQuery implements QueryInterface {
     readonly fixedGasPrice?: BigNumberish,
     readonly coingeckoBaseCurrency: string = "eth"
   ) {
-    this.computeUnitEstimator = estimateComputeUnitLimitFactory({
+    this.computeUnitEstimator = getComputeUnitEstimateForTransactionMessageFactory({
       rpc: provider,
     });
   }
@@ -223,7 +224,7 @@ export class SvmQuery implements QueryInterface {
     signer: TransactionSigner,
     repaymentChainId: number,
     repaymentAddress: Address
-  ): Promise<SolanaTransaction> {
+  ): Promise<CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime> {
     return await getFillRelayTx(this.spokePool, this.provider, relayData, signer, repaymentChainId, repaymentAddress);
   }
 
@@ -289,7 +290,7 @@ export class SvmQuery implements QueryInterface {
     const computeUnitLimitIx = getSetComputeUnitLimitInstruction({ units: 10_000_000 });
     const fillRelayTx = pipe(_fillRelayTx, (tx) => appendTransactionMessageInstruction(computeUnitLimitIx, tx));
 
-    const instructionParamsTxs = await mapAsync(instructionParamsIxs, async (ix: Instruction) => {
+    const instructionParamsTxs = await mapAsync(instructionParamsIxs, async (ix) => {
       return pipe(await createDefaultTransaction(provider, voidSigner), (tx) =>
         appendTransactionMessageInstruction(ix, tx)
       );