@across-protocol/sdk 4.3.25 → 4.3.27

package/dist/types/arch/svm/provider.d.ts

@@ -3,5 +3,6 @@ export { isSolanaError } from "@solana/kit";
  * SVM RPC provider error codes
  * See https://www.quicknode.com/docs/solana/error-references
  */
+export declare const SVM_BLOCK_NOT_AVAILABLE = -32004;
 export declare const SVM_NO_BLOCK_AT_SLOT = -32007;
 //# sourceMappingURL=provider.d.ts.map

package/dist/types/arch/svm/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../../src/arch/svm/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C;;;GAGG;AACH,eAAO,MAAM,oBAAoB,SAAS,CAAC"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../../src/arch/svm/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C;;;GAGG;AAGH,eAAO,MAAM,uBAAuB,SAAS,CAAC;AAG9C,eAAO,MAAM,oBAAoB,SAAS,CAAC"}

package/dist/types/providers/solana/retryRpcFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"retryRpcFactory.d.ts","sourceRoot":"","sources":["../../../../src/providers/solana/retryRpcFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAGtE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIjC,qBAAa,qBAAsB,SAAQ,uBAAuB;IAO9D,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,iBAAiB,EAAE,MAAM;IANpC,SAAS,CAAC,oBAAoB,EAAE,YAAY,CAAC;IAE7C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gBAGd,OAAO,EAAE,MAAM,EACf,iBAAiB,EAAE,MAAM,EAClC,GAAG,4BAA4B,EAAE,qBAAqB,CAAC,OAAO,2BAA2B,CAAC;IAuBrF,eAAe,IAAI,YAAY;IAMtC;;;;;OAKG;YACW,QAAQ;IAoCtB;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;CAK5B"}
+{"version":3,"file":"retryRpcFactory.d.ts","sourceRoot":"","sources":["../../../../src/providers/solana/retryRpcFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAItE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIjC,qBAAa,qBAAsB,SAAQ,uBAAuB;IAO9D,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,iBAAiB,EAAE,MAAM;IANpC,SAAS,CAAC,oBAAoB,EAAE,YAAY,CAAC;IAE7C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gBAGd,OAAO,EAAE,MAAM,EACf,iBAAiB,EAAE,MAAM,EAClC,GAAG,4BAA4B,EAAE,qBAAqB,CAAC,OAAO,2BAA2B,CAAC;IAuBrF,eAAe,IAAI,YAAY;IAMtC;;;;;OAKG;YACW,QAAQ;IAoCtB;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;CAc5B"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.3.25",
+  "version": "4.3.27",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [
@@ -106,8 +106,8 @@
   },
   "dependencies": {
     "@across-protocol/across-token": "^1.0.0",
-    "@across-protocol/constants": "^3.1.68",
-    "@across-protocol/contracts": "^4.1.0",
+    "@across-protocol/constants": "^3.1.71",
+    "@across-protocol/contracts": "^4.1.1",
     "@coral-xyz/anchor": "^0.30.1",
     "@eth-optimism/sdk": "^3.3.1",
     "@ethersproject/bignumber": "^5.7.0",

package/src/arch/svm/SpokeUtils.ts

@@ -103,11 +103,14 @@ export async function getTimestampForSlot(provider: SVMProvider, slotNumber: big
     }
 
     const { __code: code } = err.context;
-    if ([SVM_NO_BLOCK_AT_SLOT].includes(code)) {
-      return undefined;
-    }
+    const slot = slotNumber.toString();
+    switch (err.context.__code) {
+      case SVM_NO_BLOCK_AT_SLOT:
+        return undefined;
 
-    throw err; // Unhandled Solana error.
+      default:
+        throw new Error(`Unhandled SVM getBlockTime() error for slot ${slot}: ${code}`, { cause: err });
+    }
   }
 
   const timestamp = Number(_timestamp);
@@ -1183,12 +1186,14 @@ export async function getAccountMetasForTokenlessMessage(
  * @param message The CCTP message.
  * @param hubChainId The chain ID of the hub.
  * @param tokenMessengerMinter The token messenger minter address.
+ * @param recipientAta The ATA of the recipient address.
  * @returns The account metas for a deposit message.
  */
 async function getAccountMetasForDepositMessage(
   message: AttestedCCTPMessage,
   hubChainId: number,
-  tokenMessengerMinter: Address
+  tokenMessengerMinter: Address,
+  recipientAta: SvmAddress
 ): Promise<IAccountMeta<string>[]> {
   const l1Usdc = EvmAddress.from(TOKEN_SYMBOLS_MAP.USDC.addresses[hubChainId]);
   const l2Usdc = SvmAddress.from(
@@ -1220,14 +1225,6 @@ async function getAccountMetasForDepositMessage(
     seeds: ["custody", bs58.decode(l2Usdc.toBase58())],
   });
 
-  const state = await getStatePda(SvmSpokeClient.SVM_SPOKE_PROGRAM_ADDRESS);
-  const tokenProgram = TOKEN_PROGRAM_ADDRESS;
-  const vault = await getAssociatedTokenAddress(
-    SvmAddress.from(state),
-    SvmAddress.from(l2Usdc.toBase58()),
-    tokenProgram
-  );
-
   // Define accounts dependent on deposit information.
   const [tokenPairPda] = await getProgramDerivedAddress({
     programAddress: tokenMessengerMinter,
@@ -1249,7 +1246,7 @@ async function getAccountMetasForDepositMessage(
     { address: tokenMinterPda, role: AccountRole.WRITABLE },
     { address: localTokenPda, role: AccountRole.WRITABLE },
     { address: tokenPairPda, role: AccountRole.READONLY },
-    { address: vault, role: AccountRole.WRITABLE },
+    { address: toAddress(recipientAta), role: AccountRole.WRITABLE },
     { address: custodyTokenAccountPda, role: AccountRole.WRITABLE },
     { address: TOKEN_PROGRAM_ADDRESS, role: AccountRole.READONLY },
     { address: tokenMessengerEventAuthorityPda, role: AccountRole.READONLY },
@@ -1263,13 +1260,15 @@ async function getAccountMetasForDepositMessage(
  * @param signer The signer of the transaction.
  * @param message The CCTP message.
  * @param hubChainId The chain ID of the hub.
+ * @param recipientAta The ATA of the recipient address (used for token finalizations only).
  * @returns The CCTP v1 receive message transaction.
  */
 export async function getCCTPV1ReceiveMessageTx(
   solanaClient: SVMProvider,
   signer: KeyPairSigner,
   message: AttestedCCTPMessage,
-  hubChainId: number
+  hubChainId: number,
+  recipientAta: SvmAddress
 ) {
   const [messageTransmitterPda] = await getProgramDerivedAddress({
     programAddress: MessageTransmitterClient.MESSAGE_TRANSMITTER_PROGRAM_ADDRESS,
@@ -1298,7 +1297,8 @@ export async function getCCTPV1ReceiveMessageTx(
     ? await getAccountMetasForDepositMessage(
         message,
         hubChainId,
-        TokenMessengerMinterClient.TOKEN_MESSENGER_MINTER_PROGRAM_ADDRESS
+        TokenMessengerMinterClient.TOKEN_MESSENGER_MINTER_PROGRAM_ADDRESS,
+        recipientAta
       )
     : await getAccountMetasForTokenlessMessage(solanaClient, signer, message.messageBytes);
 
@@ -1329,6 +1329,7 @@ export async function getCCTPV1ReceiveMessageTx(
  * @param solanaClient The Solana client.
  * @param attestedMessages The CCTP messages to Solana.
  * @param signer A base signer to be converted into a Solana signer.
+ * @param recipientAta The ATA of the recipient address (used for token finalizations only).
  * @param simulate Whether to simulate the transaction.
  * @param hubChainId The chain ID of the hub.
  * @returns A list of executed transaction signatures.
@@ -1338,11 +1339,12 @@ export function finalizeCCTPV1Messages(
   solanaClient: SVMProvider,
   attestedMessages: AttestedCCTPMessage[],
   signer: KeyPairSigner,
+  recipientAta: SvmAddress,
   simulate = false,
   hubChainId = 1
 ): Promise<string[]> {
   return mapAsync(attestedMessages, async (message) => {
-    const receiveMessageIx = await getCCTPV1ReceiveMessageTx(solanaClient, signer, message, hubChainId);
+    const receiveMessageIx = await getCCTPV1ReceiveMessageTx(solanaClient, signer, message, hubChainId, recipientAta);
 
     if (simulate) {
       const result = await solanaClient

package/src/arch/svm/index.ts

@@ -4,3 +4,4 @@ export * from "./types";
 export * from "./utils";
 export * from "./constants";
 export * from "./BlockUtils";
+export * from "./provider";

package/src/arch/svm/provider.ts

@@ -4,4 +4,9 @@ export { isSolanaError } from "@solana/kit";
  * SVM RPC provider error codes
  * See https://www.quicknode.com/docs/solana/error-references
  */
+
+// Timeout; recommended to retry.
+export const SVM_BLOCK_NOT_AVAILABLE = -32004;
+
+// No block produced for slot.
 export const SVM_NO_BLOCK_AT_SLOT = -32007;

package/src/clients/HubPoolClient.ts

@@ -1157,7 +1157,7 @@ export class HubPoolClient extends BaseAbstractClient {
     this.eventSearchConfig.to = undefined; // Caller can re-set on subsequent updates if necessary.
 
     this.isUpdated = true;
-    this.logger.debug({ at: "HubPoolClient::update", message: "HubPool client updated!", searchEndBlock });
+    this.logger.debug({ at: "HubPoolClient::update", message: "HubPool client updated!", searchEndBlock, currentTime });
   }
 
   // Returns end block for `chainId` in ProposedRootBundle.bundleBlockEvalNumbers. Looks up chainId

package/src/providers/solana/retryRpcFactory.ts

@@ -1,6 +1,7 @@
 import { RpcTransport } from "@solana/kit";
 import { SolanaClusterRpcFactory } from "./baseRpcFactories";
 import { RateLimitedSolanaRpcFactory } from "./rateLimitedRpcFactory";
+import { isSolanaError, SVM_NO_BLOCK_AT_SLOT } from "../../arch/svm";
 import { delay } from "../../utils";
 import { getOriginFromURL } from "../../utils/NetworkUtils";
 import { Logger } from "winston";
@@ -93,9 +94,18 @@ export class RetrySolanaRpcFactory extends SolanaClusterRpcFactory {
    * @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 {
-    // TODO: Decide which Solana RPC errors should be considered non-transitory and should not be retried.
-    // For now, retry all errors.
-    return false;
+  private shouldFailImmediate(method: string, error: unknown): boolean {
+    if (!isSolanaError(error)) {
+      return false;
+    }
+
+    const { __code: code } = error.context;
+    switch (method) {
+      case "getBlockTime":
+        return code === SVM_NO_BLOCK_AT_SLOT;
+
+      default:
+        return false;
+    }
   }
 }