@across-protocol/sdk 4.3.69 → 4.3.71

package/src/arch/evm/index.ts

@@ -1,3 +1,4 @@
 export * from "./SpokeUtils";
 export * from "./BlockUtils";
 export * from "./utils";
+export * from "./MessageUtils";

package/src/arch/svm/MessageUtils.ts

@@ -0,0 +1,16 @@
+import { deserializeMessage } from ".";
+import { RelayData } from "../../interfaces";
+import { BigNumber, bnZero, isMessageEmpty } from "../../utils";
+
+/**
+ * @notice Return the native token cost of filling a deposit beyond gas cost. We're not using msg.value in our fills,
+ * so return zero for EVM side
+ * @param deposit RelayData associated with Deposit we're estimating for
+ * @returns Native token cost
+ */
+export function getAuxiliaryNativeTokenCost(deposit: RelayData): BigNumber {
+  // Notice. We return `message.value_amount` here instead of simulating the Transaction. The reason is, we choose to
+  // rely hard on Solana program to protect us from not taking more than `value_amount` rather than relying on
+  // simulation. Chain state may change between simulation and execution, so simulation alone is unreliable
+  return isMessageEmpty(deposit.message) ? bnZero : BigNumber.from(deserializeMessage(deposit.message).value_amount);
+}

package/src/arch/svm/SpokeUtils.ts

@@ -58,7 +58,6 @@ import {
   chainIsProd,
   chainIsSvm,
   chunk,
-  delay,
   getMessageHash,
   isDefined,
   isUnsafeDepositId,
@@ -1261,21 +1260,17 @@ export async function getFillRelayDelegatePda(
  * @param nonce The nonce to check.
  * @param sourceDomain The source domain.
  * @returns True if the message has been processed, false otherwise.
+ * @dev This function intentionally does not have error handling for `getCCTPNoncePda` nor `simulateAndDecode` since
+ * the error handling would have to account for the asynchronous opening/closing of PDAs, which is better handled downstream,
+ * where the caller of this function has more context.
  */
 export const hasCCTPV1MessageBeenProcessed = async (
   solanaClient: SVMProvider,
   signer: KeyPairSigner,
   nonce: number,
-  sourceDomain: number,
-  nRetries: number = 0,
-  maxRetries: number = 2
+  sourceDomain: number
 ): Promise<boolean> => {
-  let noncePda: Address;
-  try {
-    noncePda = await getCCTPNoncePda(solanaClient, signer, nonce, sourceDomain);
-  } catch (e) {
-    return false;
-  }
+  const noncePda = await getCCTPNoncePda(solanaClient, signer, nonce, sourceDomain);
   const isNonceUsedIx = MessageTransmitterClient.getIsNonceUsedInstruction({
     nonce: nonce,
     usedNonces: noncePda,
@@ -1286,19 +1281,7 @@ export const hasCCTPV1MessageBeenProcessed = async (
     }
     return Boolean(buf[0]);
   };
-  // If the nonce PDA was found, we should be able to query the isNonceUsed parameter. If we can't then assume it is a transient RPC error
-  // and retry, and throw if the error persists.
-  try {
-    return await simulateAndDecode(solanaClient, isNonceUsedIx, signer, parserFunction);
-  } catch (e) {
-    if (nRetries < maxRetries) {
-      const delaySeconds = 2 ** nRetries + Math.random();
-      await delay(delaySeconds);
-
-      return hasCCTPV1MessageBeenProcessed(solanaClient, signer, nonce, sourceDomain, ++nRetries);
-    }
-    throw e;
-  }
+  return await simulateAndDecode(solanaClient, isNonceUsedIx, signer, parserFunction);
 };
 
 /**

package/src/arch/svm/index.ts

@@ -6,3 +6,4 @@ export * from "./constants";
 export * from "./BlockUtils";
 export * from "./provider";
 export * from "./encoders";
+export * from "./MessageUtils";

package/src/gasPriceOracle/oracle.ts

@@ -108,7 +108,7 @@ function _getEthersGasPriceEstimate(
     [CHAIN_IDs.ARBITRUM]: arbitrum.eip1559,
     [CHAIN_IDs.BSC]: ethereum.legacy,
     [CHAIN_IDs.MAINNET]: ethereum.eip1559,
-    // [CHAIN_IDs.PLASMA]: ethereum.eip1559, @todo: Pending RPC support
+    [CHAIN_IDs.PLASMA]: ethereum.eip1559,
     [CHAIN_IDs.POLYGON]: polygon.gasStation,
     [CHAIN_IDs.SCROLL]: ethereum.legacy,
     [CHAIN_IDs.ZK_SYNC]: ethereum.legacy,

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

@@ -22,6 +22,7 @@ import { Logger, QueryInterface, getDefaultRelayer } from "../relayFeeCalculator
 import { Transport } from "viem";
 import { getGasPriceEstimate } from "../../gasPriceOracle";
 import { EvmProvider } from "../../arch/evm/types";
+import { arch } from "../..";
 
 export type SymbolMappingType = Record<
   string,
@@ -167,7 +168,7 @@ export class QueryBase implements QueryInterface {
    * @returns Native token cost
    */
   getAuxiliaryNativeTokenCost(_deposit: RelayData): BigNumber {
-    return bnZero;
+    return arch.evm.getAuxiliaryNativeTokenCost(_deposit);
   }
 
   /**

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

@@ -5,32 +5,17 @@ import {
   fetchEncodedAccount,
   isSome,
 } from "@solana/kit";
-import {
-  SVMProvider,
-  SolanaVoidSigner,
-  getFillRelayTx,
-  toAddress,
-  getAssociatedTokenAddress,
-  deserializeMessage,
-} from "../../arch/svm";
+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,
-  bnZero,
-  isMessageEmpty,
-  toBN,
-} 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";
 import { TOKEN_2022_PROGRAM_ADDRESS, getTokenSize, fetchMint, Extension } from "@solana-program/token-2022";
+import { arch } from "../..";
 
 /**
  * A special QueryBase implementation for SVM used for querying gas costs, token prices, and decimals of various tokens
@@ -180,10 +165,7 @@ export class SvmQuery implements QueryInterface {
    * @returns Native token cost
    */
   getAuxiliaryNativeTokenCost(deposit: RelayData): BigNumber {
-    // Notice. We return `message.value_amount` here instead of simulating the Transaction. The reason is, we choose to
-    // rely hard on Solana program to protect us from not taking more than `value_amount` rather than relying on
-    // simulation. Chain state may change between simulation and execution, so simulation alone is unreliable
-    return isMessageEmpty(deposit.message) ? bnZero : BigNumber.from(deserializeMessage(deposit.message).value_amount);
+    return arch.svm.getAuxiliaryNativeTokenCost(deposit);
   }
 
   /**