@across-protocol/sdk 4.3.70 → 4.3.72

package/src/arch/svm/SpokeUtils.ts

@@ -58,7 +58,6 @@ import {
   chainIsProd,
   chainIsSvm,
   chunk,
-  delay,
   getMessageHash,
   isDefined,
   isUnsafeDepositId,
@@ -87,7 +86,7 @@ import {
 } from "./";
 import { SvmCpiEventsClient } from "./eventsClient";
 import { SVM_LONG_TERM_STORAGE_SLOT_SKIPPED, SVM_SLOT_SKIPPED, isSolanaError } from "./provider";
-import { AttestedCCTPMessage, SVMEventNames, SVMProvider } from "./types";
+import { AttestedCCTPMessage, SVMEventNames, SVMProvider, LatestBlockhash } from "./types";
 import {
   getEmergencyDeleteRootBundleRootBundleId,
   getNearestSlotTime,
@@ -1261,21 +1260,18 @@ 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
+  latestBlockhash?: LatestBlockhash
 ): 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 +1282,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, latestBlockhash);
 };
 
 /**

package/src/arch/svm/types.ts

@@ -9,6 +9,7 @@ import {
   SlotNotificationsApi,
   SolanaRpcApiFromTransport,
   UnixTimestamp,
+  type Blockhash,
 } from "@solana/kit";
 
 export type EventData =
@@ -69,3 +70,8 @@ export type AttestedCCTPMessage = {
   attestation: string;
   type: "transfer" | "message";
 };
+
+export type LatestBlockhash = {
+  blockhash: Blockhash;
+  lastValidBlockHeight: bigint;
+};

package/src/arch/svm/utils.ts

@@ -26,7 +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 } from "./types";
+import { AttestedCCTPMessage, EventName, SVMEventNames, SVMProvider, LatestBlockhash } from "./types";
 import winston from "winston";
 
 export { isSolanaError } from "@solana/kit";
@@ -397,12 +397,16 @@ export function getRandomSvmAddress() {
  * @param signer - The signer of the transaction.
  * @returns The default transaction.
  */
-export const createDefaultTransaction = async (rpcClient: SVMProvider, signer: TransactionSigner) => {
-  const { value: latestBlockhash } = await rpcClient.getLatestBlockhash().send();
+export const createDefaultTransaction = async (
+  rpcClient: SVMProvider,
+  signer: TransactionSigner,
+  latestBlockhash?: LatestBlockhash
+) => {
+  latestBlockhash = isDefined(latestBlockhash) ? latestBlockhash : (await rpcClient.getLatestBlockhash().send()).value;
   return pipe(
     createTransactionMessage({ version: 0 }),
     (tx) => setTransactionMessageFeePayerSigner(signer, tx),
-    (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx)
+    (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash!, tx)
   );
 };
 
@@ -418,9 +422,13 @@ export const simulateAndDecode = async <P extends (buf: Buffer) => unknown>(
   solanaClient: SVMProvider,
   ix: IInstruction,
   signer: KeyPairSigner,
-  parser: P
+  parser: P,
+  latestBlockhash?: LatestBlockhash
 ): Promise<ReturnType<P>> => {
-  const simulationTx = appendTransactionMessageInstruction(ix, await createDefaultTransaction(solanaClient, signer));
+  const simulationTx = appendTransactionMessageInstruction(
+    ix,
+    await createDefaultTransaction(solanaClient, signer, latestBlockhash)
+  );
 
   const simulationResult = await solanaClient
     .simulateTransaction(getBase64EncodedWireTransaction(await signTransactionMessageWithSigners(simulationTx)), {
@@ -470,7 +478,8 @@ export const getCCTPNoncePda = async (
   solanaClient: SVMProvider,
   signer: KeyPairSigner,
   nonce: number,
-  sourceDomain: number
+  sourceDomain: number,
+  latestBlockhash?: LatestBlockhash
 ) => {
   const [messageTransmitterPda] = await getProgramDerivedAddress({
     programAddress: MessageTransmitterClient.MESSAGE_TRANSMITTER_PROGRAM_ADDRESS,
@@ -489,7 +498,7 @@ export const getCCTPNoncePda = async (
     throw new Error("Invalid buffer");
   };
 
-  return await simulateAndDecode(solanaClient, getNonceIx, signer, parserFunction);
+  return await simulateAndDecode(solanaClient, getNonceIx, signer, parserFunction, latestBlockhash);
 };
 
 /**

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,