@across-protocol/sdk 4.3.71 → 4.3.73

package/src/arch/svm/utils.ts

@@ -26,11 +26,8 @@ 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";
-
 /**
  * Basic void TransactionSigner type
  */
@@ -397,12 +394,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 +419,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 +475,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 +495,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/providers/solana/quorumFallbackRpcFactory.ts

@@ -1,9 +1,10 @@
+import { Logger } from "winston";
 import { RpcFromTransport, RpcResponse, RpcTransport, SolanaRpcApiFromTransport } from "@solana/kit";
-import { CachedSolanaRpcFactory } from "./cachedRpcFactory";
-import { SolanaBaseRpcFactory, SolanaClusterRpcFactory } from "./baseRpcFactories";
 import { isPromiseFulfilled, isPromiseRejected } from "../../utils/TypeGuards";
 import { compareSvmRpcResults, createSendErrorWithMessage } from "../utils";
-import { Logger } from "winston";
+import { CachedSolanaRpcFactory } from "./cachedRpcFactory";
+import { SolanaBaseRpcFactory, SolanaClusterRpcFactory } from "./baseRpcFactories";
+import { shouldFailImmediate } from "./utils";
 
 // This factory stores multiple Cached RPC factories so that users of this factory can specify multiple RPC providers
 // and the factory will fallback through them if any RPC calls fail. This factory also implements quorum logic amongst
@@ -64,13 +65,18 @@ export class QuorumFallbackSolanaRpcFactory extends SolanaBaseRpcFactory {
               throw error;
             }
 
+            // If one RPC provider reverted, others likely will too. Skip them.
+            if (quorumThreshold === 1 && shouldFailImmediate(method, error)) {
+              throw error;
+            }
+
             const currentFactory = factory.rpcFactory.clusterUrl;
             const nextFactory = fallbackFactories.shift()!;
             this.logger.debug({
               at: "FallbackSolanaRpcFactory#createTransport::tryWithFallback",
               message: `[${method}] ${currentFactory} failed, falling back to ${nextFactory.rpcFactory.clusterUrl}, new fallback providers length: ${fallbackFactories.length}`,
               method,
-              error,
+              jsonError: error,
             });
             return tryWithFallback(nextFactory, ...args);
           });

package/src/providers/solana/retryRpcFactory.ts

@@ -1,10 +1,11 @@
+import { Logger } from "winston";
 import { RpcTransport, SOLANA_ERROR__RPC__TRANSPORT_HTTP_ERROR } from "@solana/kit";
 import { getThrowSolanaErrorResponseTransformer } from "@solana/rpc-transformers";
+import { isSolanaError } from "../../arch/svm";
+import { delay } from "../../utils";
 import { SolanaClusterRpcFactory } from "./baseRpcFactories";
 import { RateLimitedSolanaRpcFactory } from "./rateLimitedRpcFactory";
-import { isSolanaError, SVM_SLOT_SKIPPED, SVM_LONG_TERM_STORAGE_SLOT_SKIPPED } from "../../arch/svm";
-import { delay } from "../../utils";
-import { Logger } from "winston";
+import { shouldFailImmediate } from "./utils";
 
 // This factory adds retry logic on top of the RateLimitedSolanaRpcFactory.
 // It follows the same composition pattern as other factories in this module.
@@ -67,7 +68,7 @@ export class RetrySolanaRpcFactory extends SolanaClusterRpcFactory {
         getThrowSolanaErrorResponseTransformer()(response, { methodName: method, params });
         return response;
       } catch (error) {
-        if (retryAttempt++ >= this.retries || this.shouldFailImmediate(method, error)) {
+        if (retryAttempt++ >= this.retries || shouldFailImmediate(method, error)) {
           throw error;
         }
 
@@ -82,29 +83,6 @@ export class RetrySolanaRpcFactory extends SolanaClusterRpcFactory {
     }
   }
 
-  /**
-   * Determine whether a Solana RPC error indicates an unrecoverable error that should not be retried.
-   * @param method RPC method name
-   * @param error Error object from the RPC call
-   * @returns True if the request should be aborted immediately, otherwise false
-   */
-  private shouldFailImmediate(method: string, error: unknown): boolean {
-    if (!isSolanaError(error)) {
-      return false;
-    }
-
-    // JSON-RPC errors: https://www.quicknode.com/docs/solana/error-references
-    const { __code: code } = error.context;
-    switch (method) {
-      case "getBlock":
-      case "getBlockTime":
-        // No block at the requested slot. This may not be correct for blocks > 1 year old.
-        return [SVM_SLOT_SKIPPED, SVM_LONG_TERM_STORAGE_SLOT_SKIPPED].includes(code);
-      default:
-        return false;
-    }
-  }
-
   /**
    * Identify whether an error thrown was the result of an RPC provider 429 response.
    * @param error Error object from the RPC query.

package/src/providers/solana/utils.ts

@@ -1,4 +1,5 @@
 import { RpcTransport } from "@solana/rpc-spec";
+import { isSolanaError, SVM_SLOT_SKIPPED, SVM_LONG_TERM_STORAGE_SLOT_SKIPPED } from "../../arch/svm";
 
 /**
  * This is the type we pass to define a Solana RPC request "task".
@@ -12,3 +13,26 @@ export interface SolanaRateLimitTask {
   resolve: (result: unknown) => void;
   reject: (err: unknown) => void;
 }
+
+/**
+ * Determine whether a Solana RPC error indicates an unrecoverable error that should not be retried.
+ * @param method RPC method name.
+ * @param error Error object from the RPC call.
+ * @returns True if the request should be aborted immediately, otherwise false.
+ */
+export function shouldFailImmediate(method: string, error: unknown): boolean {
+  if (!isSolanaError(error)) {
+    return false;
+  }
+
+  // JSON-RPC errors: https://www.quicknode.com/docs/solana/error-references
+  const { __code: code } = error.context;
+  switch (method) {
+    case "getBlock":
+    case "getBlockTime":
+      // No block at the requested slot. This may not be correct for blocks > 1 year old.
+      return [SVM_SLOT_SKIPPED, SVM_LONG_TERM_STORAGE_SLOT_SKIPPED].includes(code);
+    default:
+      return false;
+  }
+}