@ardrive/turbo-sdk 2.1.0-alpha.1 → 2.1.0-alpha.3

package/lib/cjs/common/factory.js

@@ -126,7 +126,7 @@ class TurboBaseFactory {
         });
     }
     signerFromAdapter(walletAdapter, token) {
-        if (token === 'solana') {
+        if (types_js_1.supportedSolanaSignerTokens.has(token)) {
             if (!(0, types_js_1.isSolanaWalletAdapter)(walletAdapter)) {
                 throw new Error('Unsupported wallet adapter -- must implement publicKey and signMessage');
             }

package/lib/cjs/common/payment.js

@@ -28,6 +28,34 @@ const logger_js_1 = require("./logger.js");
 const index_js_1 = require("./token/index.js");
 exports.developmentPaymentServiceURL = 'https://payment.services.ar-io.dev';
 exports.defaultPaymentServiceURL = 'https://payment.ardrive.io';
+/**
+ * Translate a `/sign` failure into the error a caller can act on, matching
+ * the payment service's own response bodies.
+ *
+ * - 402 → {@link InsufficientCreditsError}, as `createArNSAction` maps it.
+ * - 409 → {@link ArNSActionExpiredError}: the chain confirmed the signed
+ *   bytes can never land. The body says whether the credits came back.
+ * - 400 `Action <nonce> expired …` → {@link ArNSActionExpiredError}. Matched
+ *   on THIS nonce, because the same status carries on-chain program
+ *   rejections ("Lease has expired", "Record is expired") that are not about
+ *   the action at all.
+ * - Anything else — including 503 "Blockhash not found", which the service
+ *   returns only when it cannot PROVE expiry — is returned unchanged.
+ */
+function arNSSignError(nonce, error) {
+    if (!(error instanceof errors_js_1.FailedRequestError))
+        return error;
+    const { status, message } = error;
+    if (status === 402)
+        return new errors_js_1.InsufficientCreditsError(message);
+    if (status === 409 && /expired/i.test(message)) {
+        return new errors_js_1.ArNSActionExpiredError(nonce, status, /credits have been returned/i.test(message), message);
+    }
+    if (status === 400 && message.includes(`Action ${nonce} expired`)) {
+        return new errors_js_1.ArNSActionExpiredError(nonce, status, /expired and was refunded/i.test(message), message);
+    }
+    return error;
+}
 class TurboUnauthenticatedPaymentService {
     constructor({ url = exports.defaultPaymentServiceURL, logger = logger_js_1.Logger.default, retryConfig = (0, http_js_1.defaultRetryConfig)(logger), token = 'arweave', }) {
         this.logger = logger;
@@ -607,17 +635,34 @@ class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentServic
      * the signature. Replaying a completed action returns `alreadyCompleted:
      * true` rather than buying twice, so this is safe to call again if a
      * response is lost.
+     *
+     * The route is authorised by the ANT owner's signature INSIDE the
+     * transaction, not by the payer: the credits were debited when the action
+     * was created. So no payer signature is sent by default — for a browser
+     * payer that would be a second wallet prompt inside the ~30 s blockhash
+     * window. Pass `headers` only for a service that requires them.
+     *
+     * Failures: {@link ArNSActionExpiredError} when the action or its
+     * transaction has provably expired (create a new action);
+     * {@link InsufficientCreditsError} on 402. A 503 "Blockhash not found"
+     * means expiry could not be proven — re-posting the SAME signed bytes is
+     * idempotent and may still succeed; do not re-create the action.
      */
-    async signArNSAction(nonce, signedTransaction) {
-        return this.httpService.post({
-            endpoint: `/arns/actions/${nonce}/sign`,
-            headers: {
-                ...(await this.signer.generateSignedRequestHeaders((0, uuid_js_1.uuidV4)())),
-                'content-type': 'application/json',
-            },
-            data: Buffer.from(JSON.stringify({ transaction: signedTransaction })),
-            retry: false,
-        });
+    async signArNSAction(nonce, signedTransaction, headers) {
+        try {
+            return await this.httpService.post({
+                endpoint: `/arns/actions/${nonce}/sign`,
+                headers: {
+                    ...(headers ?? {}),
+                    'content-type': 'application/json',
+                },
+                data: Buffer.from(JSON.stringify({ transaction: signedTransaction })),
+                retry: false,
+            });
+        }
+        catch (error) {
+            throw arNSSignError(nonce, error);
+        }
     }
     /**
      * Status of an action by nonce. Open — no signature required — so it works
@@ -644,7 +689,7 @@ class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentServic
             : undefined);
         // Fires before any wallet prompt: the action is already debited, so the
         // caller needs the nonce persisted even if the user walks away here.
-        await opts.onNonce?.(created.nonce);
+        await opts.onNonce?.(created.nonce, created);
         if (created.status === 'completed')
             return created;
         if (owner === undefined) {
@@ -653,6 +698,8 @@ class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentServic
                 `Nonce ${created.nonce} is already debited — poll it rather than re-creating.`);
         }
         const signed = await owner.signTransaction(created.transaction);
+        // The owner's signature is the only prompt between create and submit:
+        // `/sign` needs no payer signature (see `signArNSAction`).
         return this.signArNSAction(created.nonce, signed);
     }
     /**

package/lib/cjs/common/token/spl.js

@@ -23,6 +23,7 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const bignumber_js_1 = require("bignumber.js");
 const bs58_1 = __importDefault(require("bs58"));
+const types_js_1 = require("../../types.js");
 const common_js_1 = require("../../utils/common.js");
 const logger_js_1 = require("../logger.js");
 const solana_js_1 = require("./solana.js");
@@ -80,11 +81,12 @@ class SplToken {
                 data: Buffer.from('turboCreditDestinationAddress=' + turboCreditDestinationAddress),
             }));
         }
-        const serializedTx = tx.serializeMessage();
-        const signature = await signer.signData(Uint8Array.from(serializedTx));
-        tx.addSignature(ownerPublicKey, Buffer.from(signature));
+        const { signedTx, signature } = signer.walletAdapter !== undefined &&
+            (0, types_js_1.isSolanaWalletAdapter)(signer.walletAdapter)
+            ? await this.signWithWallet(tx, signer.walletAdapter)
+            : await this.signWithKey(tx, ownerPublicKey, signer);
         const txId = bs58_1.default.encode(signature);
-        await this.submitTx(tx, txId);
+        await this.submitTx(signedTx, txId);
         this.logger.debug(`Submitted ${this.tokenName} SPL transfer transaction...`, {
             id: txId,
             target,
@@ -95,6 +97,32 @@ class SplToken {
         });
         return { id: txId, target, reward: '0' };
     }
+    /** Sign the message bytes directly: a private-key signer holds the key. */
+    async signWithKey(tx, ownerPublicKey, signer) {
+        const signature = await signer.signData(Uint8Array.from(tx.serializeMessage()));
+        tx.addSignature(ownerPublicKey, Buffer.from(signature));
+        return { signedTx: tx, signature };
+    }
+    /**
+     * Have a browser wallet sign the transaction itself, as the SOL path does.
+     *
+     * A wallet signs through `signTransaction`, not `signMessage`: it refuses, or
+     * cannot display, a serialized transaction handed to it as a message. It may
+     * also add instructions of its own before signing (compute budget, guards),
+     * so the transaction submitted is the one it returns, never ours with its
+     * signature attached. Deserializing drops `lastValidBlockHeight`, so that is
+     * carried over for confirmation.
+     */
+    async signWithWallet(tx, walletAdapter) {
+        const signedTx = await walletAdapter.signTransaction(tx);
+        const signature = signedTx.signature;
+        if (signature === null) {
+            throw new Error(`Wallet returned an unsigned ${this.tokenName} transfer transaction`);
+        }
+        signedTx.recentBlockhash ??= tx.recentBlockhash;
+        signedTx.lastValidBlockHeight ??= tx.lastValidBlockHeight;
+        return { signedTx, signature: Uint8Array.from(signature) };
+    }
     async submitTx(tx, id) {
         this.logger.debug(`Submitting ${this.tokenName} fund transaction...`, {
             id,

package/lib/cjs/common/turbo.js

@@ -245,9 +245,13 @@ class TurboAuthenticatedClient extends TurboUnauthenticatedClient {
     createArNSAction(action, params, ownerProof) {
         return this.paymentService.createArNSAction(action, params, ownerProof);
     }
-    /** Submit the owner-signed transaction (FULL serialized tx, base64). */
-    signArNSAction(nonce, signedTransaction) {
-        return this.paymentService.signArNSAction(nonce, signedTransaction);
+    /**
+     * Submit the owner-signed transaction (FULL serialized tx, base64).
+     * Authorised by the owner's signature inside the transaction; payer
+     * `headers` are optional, for services that require them.
+     */
+    signArNSAction(nonce, signedTransaction, headers) {
+        return this.paymentService.signArNSAction(nonce, signedTransaction, headers);
     }
     /** Status by nonce — open, needs no signature. Use it to resume. */
     getArNSActionStatus(nonce) {

package/lib/cjs/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.arNSFiatPurchaseMethods = exports.arNSActions = exports.arNSPurchaseIntents = exports.validChunkingModes = exports.isJWK = exports.isWebUploadFolderParams = exports.isNodeUploadFolderParams = exports.multipartFinalizedStatus = exports.multipartFailedStatus = exports.multipartPendingStatus = exports.X402Funding = exports.OnDemandFunding = exports.ExistingBalanceFunding = exports.supportedEvmSignerTokens = exports.tokenTypes = exports.fiatCurrencyTypes = void 0;
+exports.arNSFiatPurchaseMethods = exports.arNSActions = exports.arNSPurchaseIntents = exports.validChunkingModes = exports.isJWK = exports.isWebUploadFolderParams = exports.isNodeUploadFolderParams = exports.multipartFinalizedStatus = exports.multipartFailedStatus = exports.multipartPendingStatus = exports.X402Funding = exports.OnDemandFunding = exports.ExistingBalanceFunding = exports.supportedEvmSignerTokens = exports.supportedSolanaSignerTokens = exports.tokenTypes = exports.fiatCurrencyTypes = void 0;
 exports.isCurrency = isCurrency;
 exports.isEthPrivateKey = isEthPrivateKey;
 exports.isSolanaWalletAdapter = isSolanaWalletAdapter;
@@ -35,6 +35,16 @@ exports.tokenTypes = [
     // USDC (SPL) on Solana — signed with the Solana signer, not an EVM one.
     'solana-usdc',
 ];
+/**
+ * Tokens paid from a Solana wallet: SOL natively, and ARIO and USDC as SPL
+ * transfers signed by the same ed25519 key. A private key for any of these
+ * builds a Solana signer, so a Solana wallet adapter must as well.
+ */
+exports.supportedSolanaSignerTokens = new Set([
+    'solana',
+    'ario',
+    'solana-usdc',
+]);
 exports.supportedEvmSignerTokens = new Set([
     'ethereum',
     'base-eth',

package/lib/cjs/utils/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbortError = exports.FiatPaymentsDisabledError = exports.InsufficientCreditsError = exports.ProvidedInputError = exports.FailedRequestError = exports.UnauthenticatedRequestError = exports.BaseError = void 0;
+exports.AbortError = exports.ArNSActionExpiredError = exports.FiatPaymentsDisabledError = exports.InsufficientCreditsError = exports.ProvidedInputError = exports.FailedRequestError = exports.UnauthenticatedRequestError = exports.BaseError = void 0;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -79,6 +79,33 @@ class FiatPaymentsDisabledError extends BaseError {
     }
 }
 exports.FiatPaymentsDisabledError = FiatPaymentsDisabledError;
+/**
+ * Raised when an ArNS action's owner-signed transaction reaches `/sign` too
+ * late. Solana accepts the transaction for only about 30 seconds after Turbo
+ * builds it; signing again cannot help, because that transaction is dead.
+ *
+ * `creditsReleased` says whether the credits debited at creation are back:
+ * - 409: the chain confirmed the bytes can never land. `true` when the
+ *   service says "Your credits have been returned"; `false` means its
+ *   immediate refund did not go through and the reconciler will refund.
+ * - 400 `Action <nonce> expired …`: `true` for "expired and was refunded";
+ *   `false` for the variant refused before submission, refunded
+ *   automatically once the reservation (`expiresAt`, ~15 min) lapses.
+ *
+ * Extends {@link FailedRequestError}, so existing `status` checks still work.
+ * Recovery: create a NEW action if the change is still wanted.
+ */
+class ArNSActionExpiredError extends FailedRequestError {
+    constructor(nonce, status, creditsReleased, 
+    /** The service's response body, or a `FailedRequestError` message. */
+    message) {
+        super(message?.replace(/^Failed request \(Status \d+\): /, '') ??
+            `ArNS action ${nonce} expired before its signed transaction was submitted.`, status);
+        this.nonce = nonce;
+        this.creditsReleased = creditsReleased;
+    }
+}
+exports.ArNSActionExpiredError = ArNSActionExpiredError;
 class AbortError extends BaseError {
     constructor(message = 'Request was aborted') {
         super(message);

package/lib/cjs/version.js

@@ -17,4 +17,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-exports.version = '2.1.0-alpha.1';
+exports.version = '2.1.0-alpha.3';

package/lib/esm/common/factory.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { HexInjectedSolanaSigner, InjectedEthereumSigner, SignatureConfig, } from '@dha-team/arbundles';
-import { isEthereumWalletAdapter, isSolanaWalletAdapter, supportedEvmSignerTokens, } from '../types.js';
+import { isEthereumWalletAdapter, isSolanaWalletAdapter, supportedEvmSignerTokens, supportedSolanaSignerTokens, } from '../types.js';
 import { Logger } from './logger.js';
 import { TurboAuthenticatedPaymentService, TurboUnauthenticatedPaymentService, } from './payment.js';
 import { defaultTokenMap } from './token/index.js';
@@ -123,7 +123,7 @@ export class TurboBaseFactory {
         });
     }
     signerFromAdapter(walletAdapter, token) {
-        if (token === 'solana') {
+        if (supportedSolanaSignerTokens.has(token)) {
             if (!isSolanaWalletAdapter(walletAdapter)) {
                 throw new Error('Unsupported wallet adapter -- must implement publicKey and signMessage');
             }

package/lib/esm/common/payment.js

@@ -16,7 +16,7 @@
 import { BigNumber } from 'bignumber.js';
 import { arNSPurchaseIntents, fiatCurrencyTypes, isCurrency, } from '../types.js';
 import { isAnyValidUserAddress, isValidArweaveBase64URL, isValidSolanaAddress, } from '../utils/common.js';
-import { FailedRequestError, FiatPaymentsDisabledError, InsufficientCreditsError, ProvidedInputError, } from '../utils/errors.js';
+import { ArNSActionExpiredError, FailedRequestError, FiatPaymentsDisabledError, InsufficientCreditsError, ProvidedInputError, } from '../utils/errors.js';
 import { uuidV4 } from '../utils/uuid.js';
 import { arNSKeywordsField, arNSMetadataField, arNSOwnerProofHeaders, buildArNSCustodyMessage, } from './arnsActions.js';
 import { defaultRetryConfig } from './http.js';
@@ -25,6 +25,34 @@ import { Logger } from './logger.js';
 import { exponentMap, tokenToBaseMap } from './token/index.js';
 export const developmentPaymentServiceURL = 'https://payment.services.ar-io.dev';
 export const defaultPaymentServiceURL = 'https://payment.ardrive.io';
+/**
+ * Translate a `/sign` failure into the error a caller can act on, matching
+ * the payment service's own response bodies.
+ *
+ * - 402 → {@link InsufficientCreditsError}, as `createArNSAction` maps it.
+ * - 409 → {@link ArNSActionExpiredError}: the chain confirmed the signed
+ *   bytes can never land. The body says whether the credits came back.
+ * - 400 `Action <nonce> expired …` → {@link ArNSActionExpiredError}. Matched
+ *   on THIS nonce, because the same status carries on-chain program
+ *   rejections ("Lease has expired", "Record is expired") that are not about
+ *   the action at all.
+ * - Anything else — including 503 "Blockhash not found", which the service
+ *   returns only when it cannot PROVE expiry — is returned unchanged.
+ */
+function arNSSignError(nonce, error) {
+    if (!(error instanceof FailedRequestError))
+        return error;
+    const { status, message } = error;
+    if (status === 402)
+        return new InsufficientCreditsError(message);
+    if (status === 409 && /expired/i.test(message)) {
+        return new ArNSActionExpiredError(nonce, status, /credits have been returned/i.test(message), message);
+    }
+    if (status === 400 && message.includes(`Action ${nonce} expired`)) {
+        return new ArNSActionExpiredError(nonce, status, /expired and was refunded/i.test(message), message);
+    }
+    return error;
+}
 export class TurboUnauthenticatedPaymentService {
     constructor({ url = defaultPaymentServiceURL, logger = Logger.default, retryConfig = defaultRetryConfig(logger), token = 'arweave', }) {
         this.logger = logger;
@@ -603,17 +631,34 @@ export class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymen
      * the signature. Replaying a completed action returns `alreadyCompleted:
      * true` rather than buying twice, so this is safe to call again if a
      * response is lost.
+     *
+     * The route is authorised by the ANT owner's signature INSIDE the
+     * transaction, not by the payer: the credits were debited when the action
+     * was created. So no payer signature is sent by default — for a browser
+     * payer that would be a second wallet prompt inside the ~30 s blockhash
+     * window. Pass `headers` only for a service that requires them.
+     *
+     * Failures: {@link ArNSActionExpiredError} when the action or its
+     * transaction has provably expired (create a new action);
+     * {@link InsufficientCreditsError} on 402. A 503 "Blockhash not found"
+     * means expiry could not be proven — re-posting the SAME signed bytes is
+     * idempotent and may still succeed; do not re-create the action.
      */
-    async signArNSAction(nonce, signedTransaction) {
-        return this.httpService.post({
-            endpoint: `/arns/actions/${nonce}/sign`,
-            headers: {
-                ...(await this.signer.generateSignedRequestHeaders(uuidV4())),
-                'content-type': 'application/json',
-            },
-            data: Buffer.from(JSON.stringify({ transaction: signedTransaction })),
-            retry: false,
-        });
+    async signArNSAction(nonce, signedTransaction, headers) {
+        try {
+            return await this.httpService.post({
+                endpoint: `/arns/actions/${nonce}/sign`,
+                headers: {
+                    ...(headers ?? {}),
+                    'content-type': 'application/json',
+                },
+                data: Buffer.from(JSON.stringify({ transaction: signedTransaction })),
+                retry: false,
+            });
+        }
+        catch (error) {
+            throw arNSSignError(nonce, error);
+        }
     }
     /**
      * Status of an action by nonce. Open — no signature required — so it works
@@ -640,7 +685,7 @@ export class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymen
             : undefined);
         // Fires before any wallet prompt: the action is already debited, so the
         // caller needs the nonce persisted even if the user walks away here.
-        await opts.onNonce?.(created.nonce);
+        await opts.onNonce?.(created.nonce, created);
         if (created.status === 'completed')
             return created;
         if (owner === undefined) {
@@ -649,6 +694,8 @@ export class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymen
                 `Nonce ${created.nonce} is already debited — poll it rather than re-creating.`);
         }
         const signed = await owner.signTransaction(created.transaction);
+        // The owner's signature is the only prompt between create and submit:
+        // `/sign` needs no payer signature (see `signArNSAction`).
         return this.signArNSAction(created.nonce, signed);
     }
     /**

package/lib/esm/common/token/spl.js

@@ -17,6 +17,7 @@ import { createAssociatedTokenAccountIdempotentInstruction, createTransferChecke
 import { Connection, PublicKey, Transaction, TransactionInstruction, } from '@solana/web3.js';
 import { BigNumber } from 'bignumber.js';
 import bs58 from 'bs58';
+import { isSolanaWalletAdapter, } from '../../types.js';
 import { defaultProdGatewayUrls, sleep } from '../../utils/common.js';
 import { Logger } from '../logger.js';
 import { memoProgramId } from './solana.js';
@@ -74,11 +75,12 @@ export class SplToken {
                 data: Buffer.from('turboCreditDestinationAddress=' + turboCreditDestinationAddress),
             }));
         }
-        const serializedTx = tx.serializeMessage();
-        const signature = await signer.signData(Uint8Array.from(serializedTx));
-        tx.addSignature(ownerPublicKey, Buffer.from(signature));
+        const { signedTx, signature } = signer.walletAdapter !== undefined &&
+            isSolanaWalletAdapter(signer.walletAdapter)
+            ? await this.signWithWallet(tx, signer.walletAdapter)
+            : await this.signWithKey(tx, ownerPublicKey, signer);
         const txId = bs58.encode(signature);
-        await this.submitTx(tx, txId);
+        await this.submitTx(signedTx, txId);
         this.logger.debug(`Submitted ${this.tokenName} SPL transfer transaction...`, {
             id: txId,
             target,
@@ -89,6 +91,32 @@ export class SplToken {
         });
         return { id: txId, target, reward: '0' };
     }
+    /** Sign the message bytes directly: a private-key signer holds the key. */
+    async signWithKey(tx, ownerPublicKey, signer) {
+        const signature = await signer.signData(Uint8Array.from(tx.serializeMessage()));
+        tx.addSignature(ownerPublicKey, Buffer.from(signature));
+        return { signedTx: tx, signature };
+    }
+    /**
+     * Have a browser wallet sign the transaction itself, as the SOL path does.
+     *
+     * A wallet signs through `signTransaction`, not `signMessage`: it refuses, or
+     * cannot display, a serialized transaction handed to it as a message. It may
+     * also add instructions of its own before signing (compute budget, guards),
+     * so the transaction submitted is the one it returns, never ours with its
+     * signature attached. Deserializing drops `lastValidBlockHeight`, so that is
+     * carried over for confirmation.
+     */
+    async signWithWallet(tx, walletAdapter) {
+        const signedTx = await walletAdapter.signTransaction(tx);
+        const signature = signedTx.signature;
+        if (signature === null) {
+            throw new Error(`Wallet returned an unsigned ${this.tokenName} transfer transaction`);
+        }
+        signedTx.recentBlockhash ??= tx.recentBlockhash;
+        signedTx.lastValidBlockHeight ??= tx.lastValidBlockHeight;
+        return { signedTx, signature: Uint8Array.from(signature) };
+    }
     async submitTx(tx, id) {
         this.logger.debug(`Submitting ${this.tokenName} fund transaction...`, {
             id,

package/lib/esm/common/turbo.js

@@ -241,9 +241,13 @@ export class TurboAuthenticatedClient extends TurboUnauthenticatedClient {
     createArNSAction(action, params, ownerProof) {
         return this.paymentService.createArNSAction(action, params, ownerProof);
     }
-    /** Submit the owner-signed transaction (FULL serialized tx, base64). */
-    signArNSAction(nonce, signedTransaction) {
-        return this.paymentService.signArNSAction(nonce, signedTransaction);
+    /**
+     * Submit the owner-signed transaction (FULL serialized tx, base64).
+     * Authorised by the owner's signature inside the transaction; payer
+     * `headers` are optional, for services that require them.
+     */
+    signArNSAction(nonce, signedTransaction, headers) {
+        return this.paymentService.signArNSAction(nonce, signedTransaction, headers);
     }
     /** Status by nonce — open, needs no signature. Use it to resume. */
     getArNSActionStatus(nonce) {

package/lib/esm/types.js

@@ -28,6 +28,16 @@ export const tokenTypes = [
     // USDC (SPL) on Solana — signed with the Solana signer, not an EVM one.
     'solana-usdc',
 ];
+/**
+ * Tokens paid from a Solana wallet: SOL natively, and ARIO and USDC as SPL
+ * transfers signed by the same ed25519 key. A private key for any of these
+ * builds a Solana signer, so a Solana wallet adapter must as well.
+ */
+export const supportedSolanaSignerTokens = new Set([
+    'solana',
+    'ario',
+    'solana-usdc',
+]);
 export const supportedEvmSignerTokens = new Set([
     'ethereum',
     'base-eth',

package/lib/esm/utils/errors.js

@@ -70,6 +70,32 @@ export class FiatPaymentsDisabledError extends BaseError {
         this.status = 503;
     }
 }
+/**
+ * Raised when an ArNS action's owner-signed transaction reaches `/sign` too
+ * late. Solana accepts the transaction for only about 30 seconds after Turbo
+ * builds it; signing again cannot help, because that transaction is dead.
+ *
+ * `creditsReleased` says whether the credits debited at creation are back:
+ * - 409: the chain confirmed the bytes can never land. `true` when the
+ *   service says "Your credits have been returned"; `false` means its
+ *   immediate refund did not go through and the reconciler will refund.
+ * - 400 `Action <nonce> expired …`: `true` for "expired and was refunded";
+ *   `false` for the variant refused before submission, refunded
+ *   automatically once the reservation (`expiresAt`, ~15 min) lapses.
+ *
+ * Extends {@link FailedRequestError}, so existing `status` checks still work.
+ * Recovery: create a NEW action if the change is still wanted.
+ */
+export class ArNSActionExpiredError extends FailedRequestError {
+    constructor(nonce, status, creditsReleased, 
+    /** The service's response body, or a `FailedRequestError` message. */
+    message) {
+        super(message?.replace(/^Failed request \(Status \d+\): /, '') ??
+            `ArNS action ${nonce} expired before its signed transaction was submitted.`, status);
+        this.nonce = nonce;
+        this.creditsReleased = creditsReleased;
+    }
+}
 export class AbortError extends BaseError {
     constructor(message = 'Request was aborted') {
         super(message);

package/lib/esm/version.js

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-export const version = '2.1.0-alpha.1';
+export const version = '2.1.0-alpha.3';

package/lib/types/common/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/common/factory.ts"],"names":[],"mappings":"AAqBA,OAAO,EACL,oBAAoB,EAEpB,+BAA+B,EAC/B,4CAA4C,EAC5C,wCAAwC,EACxC,iCAAiC,EAKlC,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EACL,gCAAgC,EAEjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AAGpB,8BAAsB,gBAAgB;IACpC,SAAS,CAAC,MAAM,CAAC,MAAM,SAAkB;IAGzC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ;IAIlC,MAAM,CAAC,eAAe,CAAC,EACrB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,GACN,GAAE,iCAAsC;IAqBzC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAC3B,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,KAAK,GACN,EAAE,oBAAoB,GAAG,2BAA2B;IAErD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,CAC9C,MAAM,EAAE,4CAA4C,GAAG;QACrD,cAAc,EAAE,gCAAgC,CAAC;KAClD,GACA,wCAAwC;IAE3C,SAAS,CAAC,qBAAqB,CAAC,EAC9B,UAAU,EACV,MAAM,EAAE,cAAc,EACtB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,UAAU,EACV,MAAM,EACN,aAAa,GACd,EAAE,+BAA+B,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE;IA0FvD,OAAO,CAAC,iBAAiB;CAuB1B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/common/factory.ts"],"names":[],"mappings":"AAqBA,OAAO,EACL,oBAAoB,EAEpB,+BAA+B,EAC/B,4CAA4C,EAC5C,wCAAwC,EACxC,iCAAiC,EAMlC,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EACL,gCAAgC,EAEjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AAGpB,8BAAsB,gBAAgB;IACpC,SAAS,CAAC,MAAM,CAAC,MAAM,SAAkB;IAGzC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ;IAIlC,MAAM,CAAC,eAAe,CAAC,EACrB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,GACN,GAAE,iCAAsC;IAqBzC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAC3B,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,KAAK,GACN,EAAE,oBAAoB,GAAG,2BAA2B;IAErD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,CAC9C,MAAM,EAAE,4CAA4C,GAAG;QACrD,cAAc,EAAE,gCAAgC,CAAC;KAClD,GACA,wCAAwC;IAE3C,SAAS,CAAC,qBAAqB,CAAC,EAC9B,UAAU,EACV,MAAM,EAAE,cAAc,EACtB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,UAAU,EACV,MAAM,EACN,aAAa,GACd,EAAE,+BAA+B,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE;IA0FvD,OAAO,CAAC,iBAAiB;CAuB1B"}