@across-protocol/sdk 4.3.106-beta.0 → 4.3.106

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

@@ -1 +1 @@
-{"version":3,"file":"Multicall.d.ts","sourceRoot":"","sources":["../../../src/utils/Multicall.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAI3E,OAAO,EAAE,UAAU,EAAuB,MAAM,iBAAiB,CAAC;AAElE,KAAK,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;AACnC,KAAK,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;AACnC,KAAK,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;AAEjC,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;CACd,CAAC;AAgCF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKvE;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,CAO1G;AAED,wBAAsB,SAAS,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAY5G;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,QAAQ,EACpB,KAAK,EAAE,KAAK,EAAE,EACd,QAAQ,CAAC,EAAE,QAAQ,GAClB,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAqBxD;AASD;;;;GAIG;AACH,wBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,oBAa1C"}
+{"version":3,"file":"Multicall.d.ts","sourceRoot":"","sources":["../../../src/utils/Multicall.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAI3E,OAAO,EAAE,UAAU,EAAuB,MAAM,iBAAiB,CAAC;AAElE,KAAK,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;AACnC,KAAK,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;AACnC,KAAK,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;AAEjC,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;CACd,CAAC;AA+BF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKvE;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,CAO1G;AAED,wBAAsB,SAAS,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAY5G;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,QAAQ,EACpB,KAAK,EAAE,KAAK,EAAE,EACd,QAAQ,CAAC,EAAE,QAAQ,GAClB,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAqBxD;AASD;;;;GAIG;AACH,wBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,oBAa1C"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.3.106-beta.0",
+  "version": "4.3.106",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "repository": {
@@ -111,7 +111,7 @@
   "dependencies": {
     "@across-protocol/across-token": "^1.0.0",
     "@across-protocol/constants": "^3.1.94",
-    "@across-protocol/contracts": "^4.1.14",
+    "@across-protocol/contracts": "4.1.16",
     "@coral-xyz/anchor": "^0.30.1",
     "@eth-optimism/sdk": "^3.3.1",
     "@ethersproject/bignumber": "^5.7.0",

package/src/arch/svm/SpokeUtils.ts

@@ -32,12 +32,10 @@ import {
   pipe,
   signTransactionMessageWithSigners,
   some,
-  compileTransaction,
   type TransactionSigner,
   type WritableAccount,
   type ReadonlyAccount,
   type Commitment,
-  type CompilableTransactionMessage,
 } from "@solana/kit";
 import assert from "assert";
 import winston from "winston";
@@ -102,8 +100,6 @@ import {
  */
 export const SLOT_DURATION_MS = 400;
 
-export const SOLANA_TX_SIZE_LIMIT = 1232;
-
 type ProtoFill = Omit<RelayData, "recipient" | "outputToken"> & {
   destinationChainId: number;
   recipient: SvmAddress;
@@ -697,8 +693,6 @@ 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)[] = [];
@@ -742,7 +736,7 @@ export async function getIPFillRelayTx(
     fillInput,
     { outputAmount: relayData.outputAmount.toBigInt(), recipient: toAddress(relayData.recipient) },
     mintInfo.data.decimals,
-    !recipientAtaEncodedAccount.exists,
+    true,
     remainingAccounts
   );
 }
@@ -1090,8 +1084,6 @@ async function fetchBatchFillStatusFromPdaAccounts(
  * 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.
  */
@@ -1421,47 +1413,6 @@ 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: CompilableTransactionMessage): {
-  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: CompilableTransactionMessage): 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.

package/src/arch/svm/encoders.ts

@@ -62,10 +62,6 @@ 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/eventsClient.ts

@@ -255,7 +255,7 @@ export class SvmCpiEventsClient {
       return;
     }
 
-    return events.map((event) => {
+    return depositEvents.map((event) => {
       const unwrappedEventArgs = unwrapEventData(event as Record<string, unknown>, [
         "depositId",
         "outputAmount",

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

@@ -161,9 +161,12 @@ function _getRepaymentChainId(
     return relayData.destinationChainId;
   }
 
-  // Repayment chain is valid if the input token and repayment chain are mapped to the same PoolRebalanceRoute.
+  // Repayment chain is valid if the input token and repayment chain are mapped to the same PoolRebalanceRoute and the repayment chain is not disabled in protocol.
   const repaymentTokenIsValid = _repaymentChainTokenIsValid(relayData, hubPoolClient, bundleEndBlockForMainnet);
-  if (repaymentTokenIsValid) {
+  const repaymentChainIsValid = !hubPoolClient.configStoreClient
+    .getDisabledChainsForBlock(bundleEndBlockForMainnet)
+    .includes(relayData.repaymentChainId);
+  if (repaymentTokenIsValid && repaymentChainIsValid) {
     return relayData.repaymentChainId;
   }
 

package/src/constants.ts

@@ -80,9 +80,6 @@ export const STABLE_COIN_SYMBOLS = [
   TOKEN_SYMBOLS_MAP["USDT-BNB"].symbol,
   TOKEN_SYMBOLS_MAP["USDT-SPOT"].symbol,
   TOKEN_SYMBOLS_MAP.DAI.symbol,
-  TOKEN_SYMBOLS_MAP["TATARA-USDC"].symbol,
-  TOKEN_SYMBOLS_MAP["TATARA-USDT"].symbol,
-  TOKEN_SYMBOLS_MAP["TATARA-USDS"].symbol,
   TOKEN_SYMBOLS_MAP.GHO.symbol,
   TOKEN_SYMBOLS_MAP.WGHO.symbol,
 ];

package/src/gasPriceOracle/oracle.ts

@@ -118,7 +118,6 @@ function _getEthersGasPriceEstimate(
     [CHAIN_IDs.ARBITRUM_SEPOLIA]: arbitrum.eip1559,
     [CHAIN_IDs.POLYGON_AMOY]: polygon.gasStation,
     [CHAIN_IDs.SEPOLIA]: ethereum.eip1559,
-    [CHAIN_IDs.TATARA]: ethereum.eip1559,
   } as const;
 
   let gasPriceFeed = gasPriceFeeds[chainId];

package/src/providers/solana/utils.ts

@@ -1,5 +1,4 @@
 import { RpcTransport } from "@solana/rpc-spec";
-import { CompilableTransactionMessage, SolanaRpcApi } from "@solana/kit";
 import { isSolanaError, SVM_SLOT_SKIPPED, SVM_LONG_TERM_STORAGE_SLOT_SKIPPED } from "../../arch/svm";
 
 /**
@@ -15,19 +14,6 @@ export interface SolanaRateLimitTask {
   reject: (err: unknown) => void;
 }
 
-// `simulateBundle` minimal response struct.
-export type SolanaBundleSimulation = {
-  result: {
-    unitsConsumed: number;
-    returnData: { programId: string; data: string };
-  };
-};
-
-// Minimal extension of a Solana RPC Api which also supports some JITO RPC endpoints.
-export interface JitoInterface extends SolanaRpcApi {
-  simulateBundle(transactions: CompilableTransactionMessage[]): SolanaBundleSimulation;
-}
-
 /**
  * Determine whether a Solana RPC error indicates an unrecoverable error that should not be retried.
  * @param method RPC method name.

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

@@ -4,27 +4,13 @@ import {
   TransactionSigner,
   fetchEncodedAccount,
   isSome,
-  Rpc,
-  pipe,
-  appendTransactionMessageInstruction,
 } from "@solana/kit";
-import {
-  SVMProvider,
-  SolanaVoidSigner,
-  getFillRelayTx,
-  getIPFillRelayTx,
-  getFillRelayViaInstructionParamsInstructions,
-  toAddress,
-  createDefaultTransaction,
-  getAssociatedTokenAddress,
-  isSVMFillTooLarge,
-} from "../../arch/svm";
-import { JitoInterface } from "../../providers/solana";
+import { SVMProvider, SolanaVoidSigner, getFillRelayTx, toAddress, getAssociatedTokenAddress } 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, toBN, mapAsync } from "../../utils";
+import { Address, BigNumber, BigNumberish, SvmAddress, TransactionCostEstimate, toBN } from "../../utils";
 import { Logger, QueryInterface, getDefaultRelayer } from "../relayFeeCalculator";
 import { SymbolMappingType } from "./";
 import { TOKEN_PROGRAM_ADDRESS } from "@solana-program/token";
@@ -91,35 +77,15 @@ export class SvmQuery implements QueryInterface {
     assert(relayer.isSVM());
 
     const [repaymentChainId, repaymentAddress] = [destinationChainId, relayer]; // These are not important for gas cost simulation.
-
-    // For solana, we algorithmically estimate gas based on the size of the message.
-    const _fillRelayTx = await this.getFillRelayTx(
+    const fillRelayTx = await this.getFillRelayTx(
       { ...relayData, recipient, outputToken, exclusiveRelayer },
       SolanaVoidSigner(relayer.toBase58()),
       repaymentChainId,
       repaymentAddress
     );
 
-    const fillTooLarge = isSVMFillTooLarge(_fillRelayTx);
-    // If the fill is too large, we need to construct a dummy fill relay transaction which estimates the priority fee of the fillRelay instruction call. To guarantee
-    // that the transaction won't be too large, we overwrite the message with empty bytes.
-    const fillRelayTx = fillTooLarge.tooLarge
-      ? await this.getFillRelayTx(
-          { ...relayData, recipient, outputToken, exclusiveRelayer, message: "0x" },
-          SolanaVoidSigner(relayer.toBase58()),
-          repaymentChainId,
-          repaymentAddress
-        )
-      : _fillRelayTx;
-    const [_computeUnitsConsumed, gasPriceEstimate, tokenAccountInfo] = await Promise.all([
-      fillTooLarge.tooLarge
-        ? this.estimateComputeUnits(
-            { ...relayData, recipient, outputToken, exclusiveRelayer },
-            relayer,
-            repaymentChainId,
-            repaymentAddress
-          )
-        : this.computeUnitEstimator(fillRelayTx),
+    const [computeUnitsConsumed, gasPriceEstimate, tokenAccountInfo] = await Promise.all([
+      toBN(await this.computeUnitEstimator(fillRelayTx)),
       getGasPriceEstimate(this.provider, {
         unsignedTx: fillRelayTx,
         baseFeeMultiplier: options.baseFeeMultiplier,
@@ -127,7 +93,6 @@ export class SvmQuery implements QueryInterface {
       }),
       this.provider.getAccountInfo(toAddress(outputToken), { encoding: "base58" }).send(),
     ]);
-    const computeUnitsConsumed = toBN(_computeUnitsConsumed);
 
     // If the owner of the token account is not the token program, then we can assume that it is the 2022 token program address, in which
     // case we need to determine the extensions the token has to properly calculate rent exemption.
@@ -246,44 +211,4 @@ export class SvmQuery implements QueryInterface {
     if (!this.symbolMapping[tokenSymbol]) throw new Error(`${tokenSymbol} does not exist in mapping`);
     return this.symbolMapping[tokenSymbol].decimals;
   }
-
-  // The fill is too large; we need to simulate the transaction in a bundle.
-  async estimateComputeUnits(
-    relayData: RelayData & {
-      destinationChainId: number;
-      recipient: SvmAddress;
-      outputToken: SvmAddress;
-      exclusiveRelayer: SvmAddress;
-    },
-    relayer: SvmAddress,
-    repaymentChainId: number,
-    repaymentAddress: SvmAddress
-  ): Promise<number> {
-    // @dev There is no way to tell if the RPC supports the JITO interface without querying the rpc directly.
-    // Cast the rpc type to support JITO and attempt to call `simulateBundle`. Throw and error if it fails, since
-    // the transaction message cannot be simulated otherwise.
-    const provider = this.provider as Rpc<JitoInterface>;
-
-    const spokePoolAddr = toAddress(this.spokePool);
-    const voidSigner = SolanaVoidSigner(relayer.toBase58());
-
-    const [instructionParamsIxs, fillRelayTx] = await Promise.all([
-      getFillRelayViaInstructionParamsInstructions(
-        spokePoolAddr,
-        relayData,
-        repaymentChainId,
-        repaymentAddress,
-        voidSigner
-      ),
-      getIPFillRelayTx(this.spokePool, provider, relayData, voidSigner, repaymentChainId, repaymentAddress),
-    ]);
-    const instructionParamsTxs = await mapAsync(instructionParamsIxs, async (ix) => {
-      return pipe(await createDefaultTransaction(provider, voidSigner), (tx) =>
-        appendTransactionMessageInstruction(ix, tx)
-      );
-    });
-
-    const simulateBundleResponse = await provider.simulateBundle([...instructionParamsTxs, fillRelayTx]).send();
-    return simulateBundleResponse.result.unitsConsumed;
-  }
 }

package/src/utils/Multicall.ts

@@ -42,7 +42,6 @@ const DETERMINISTIC_MULTICALL_CHAINS = [
   CHAIN_IDs.SEPOLIA,
   CHAIN_IDs.ARBITRUM_SEPOLIA,
   CHAIN_IDs.PLASMA_TESTNET,
-  CHAIN_IDs.TATARA,
   ...Object.keys(hreNetworks).map(Number), // See test/utils/multicall.ts
 ];