@ar.io/sdk 4.0.0-solana.9 → 4.0.0

package/lib/esm/cli/cli.js

@@ -16,18 +16,17 @@
  */
 // eslint-disable-next-line header/header -- This is a CLI file
 import { program } from 'commander';
-import { AOProcess, spawnANT } from '../node/index.js';
 import { mARIOToken } from '../types/token.js';
 import { version } from '../version.js';
-import { setAntBaseNameCLICommand, setAntRecordCLICommand, setAntUndernameCLICommand, transferRecordOwnershipCLICommand, upgradeAntCLICommand, } from './commands/antCommands.js';
+import { setAntBaseNameCLICommand, setAntRecordCLICommand, setAntUndernameCLICommand, transferRecordOwnershipCLICommand, } from './commands/antCommands.js';
 import { buyRecordCLICommand, extendLeaseCLICommand, increaseUndernameLimitCLICommand, requestPrimaryNameCLICommand, setPrimaryNameCLICommand, syncAttributesCLICommand, upgradeRecordCLICommand, } from './commands/arnsPurchaseCommands.js';
 import { escrowCancelCLICommand, escrowClaimArweaveCLICommand, escrowClaimEthereumCLICommand, escrowDepositCLICommand, escrowStatusCLICommand, escrowUpdateRecipientCLICommand, } from './commands/escrowCommands.js';
-import { cancelWithdrawal, decreaseDelegateStake, decreaseOperatorStake, delegateStake, increaseOperatorStake, instantWithdrawal, joinNetwork, leaveNetwork, redelegateStake, saveObservations, updateGatewaySettings, } from './commands/gatewayWriteCommands.js';
+import { cancelWithdrawal, claimWithdrawal, decreaseDelegateStake, decreaseOperatorStake, delegateStake, increaseOperatorStake, instantWithdrawal, joinNetwork, leaveNetwork, redelegateStake, saveObservations, updateGatewaySettings, } from './commands/gatewayWriteCommands.js';
 import { closeDrainedWithdrawalCLICommand, closeEmptyDelegationCLICommand, closeExpiredRequestCLICommand, closeObservationCLICommand, finalizeGoneCLICommand, pruneExpiredNamesCLICommand, pruneExpiredReservationCLICommand, pruneGatewayCLICommand, pruneNameToReturnedCLICommand, pruneReturnedNamesCLICommand, releaseVaultCLICommand, } from './commands/pruneCommands.js';
-import { getAllGatewayVaults, getAllowedDelegates, getArNSRecord, getArNSReservedName, getArNSReturnedName, getCostDetails, getDelegations, getEpoch, getGateway, getGatewayDelegates, getGatewayVaults, getPrescribedNames, getPrescribedObservers, getPrimaryName, getTokenCost, getVault, listAllDelegatesCLICommand, listAntsForAddress, listArNSRecords, listArNSRecordsForAddress, listArNSReservedNames, listArNSReturnedNames, listGateways, resolveArNSName, } from './commands/readCommands.js';
+import { getAllGatewayVaults, getAllowedDelegates, getArNSRecord, getArNSReservedName, getArNSReturnedName, getCostDetails, getDelegations, getEpoch, getGateway, getGatewayDelegates, getGatewayVaults, getPrescribedNames, getPrescribedObservers, getPrimaryName, getTokenCost, getVault, getWithdrawals, listAllDelegatesCLICommand, listAntsForAddress, listArNSRecords, listArNSRecordsForAddress, listArNSReservedNames, listArNSReturnedNames, listGateways, resolveArNSName, } from './commands/readCommands.js';
 import { createVaultCLICommand, extendVaultCLICommand, increaseVaultCLICommand, revokeVaultCLICommand, transferCLICommand, vaultedTransferCLICommand, } from './commands/transfer.js';
-import { addressAndVaultIdOptions, antStateOptions, arnsPurchaseOptions, buyRecordOptions, decreaseDelegateStakeOptions, delegateStakeOptions, epochOptions, getVaultOptions, globalOptions, joinNetworkOptions, operatorStakeOptions, optionMap, paginationAddressOptions, paginationOptions, redelegateStakeOptions, setAntBaseNameOptions, setAntUndernameOptions, tokenCostOptions, transferOptions, transferRecordOwnershipOptions, updateGatewaySettingsOptions, upgradeAntOptions, vaultedTransferOptions, writeActionOptions, } from './options.js';
-import { applyOptions, arioProcessIdFromOptions, assertConfirmationPrompt, customTagsFromOptions, epochInputFromOptions, formatARIOWithCommas, getANTStateFromOptions, getLoggerFromOptions, makeCommand, paginationParamsFromOptions, readANTFromOptions, readARIOFromOptions, requiredAddressFromOptions, requiredAoSignerFromOptions, requiredProcessIdFromOptions, requiredStringArrayFromOptions, requiredStringFromOptions, writeANTFromOptions, } from './utils.js';
+import { addressAndVaultIdOptions, antStateOptions, arnsPurchaseOptions, buyRecordOptions, decreaseDelegateStakeOptions, delegateStakeOptions, epochOptions, getVaultOptions, globalOptions, joinNetworkOptions, operatorStakeOptions, optionMap, paginationAddressOptions, paginationOptions, redelegateStakeOptions, setAntBaseNameOptions, setAntUndernameOptions, tokenCostOptions, transferOptions, transferRecordOwnershipOptions, updateGatewaySettingsOptions, vaultedTransferOptions, writeActionOptions, } from './options.js';
+import { applyOptions, assertConfirmationPrompt, customTagsFromOptions, epochInputFromOptions, formatARIOWithCommas, makeCommand, paginationParamsFromOptions, readANTFromOptions, readARIOFromOptions, requiredAddressFromOptions, requiredStringArrayFromOptions, requiredStringFromOptions, writeANTFromOptions, } from './utils.js';
 applyOptions(program
     .name('ar.io')
     .version(version)
@@ -244,11 +243,7 @@ makeCommand({
 makeCommand({
     name: 'list-arns-names-for-address',
     description: 'List all ArNS names for an address',
-    options: [
-        ...paginationOptions,
-        optionMap.address,
-        optionMap.antRegistryProcessId,
-    ],
+    options: [...paginationOptions, optionMap.address],
     action: listArNSRecordsForAddress,
 });
 makeCommand({
@@ -301,6 +296,12 @@ makeCommand({
     options: paginationAddressOptions,
     action: getAllGatewayVaults,
 });
+makeCommand({
+    name: 'get-withdrawals',
+    description: 'Get all pending stake withdrawals (operator + delegate) owned by an address (Solana-only)',
+    options: paginationAddressOptions,
+    action: getWithdrawals,
+});
 // # Actions
 makeCommand({
     name: 'transfer',
@@ -389,6 +390,12 @@ makeCommand({
     options: addressAndVaultIdOptions,
     action: cancelWithdrawal,
 });
+makeCommand({
+    name: 'claim-withdrawal',
+    description: 'Claim tokens from a matured withdrawal vault (after the lock period has elapsed)',
+    options: [...writeActionOptions, optionMap.vaultId],
+    action: claimWithdrawal,
+});
 makeCommand({
     name: 'delegate-stake',
     description: 'Delegate stake to a gateway',
@@ -532,7 +539,7 @@ makeCommand({
 makeCommand({
     name: 'get-ants-for-address',
     description: 'Get the list of ANTs owned by an address according to the ANT registry',
-    options: [optionMap.address, optionMap.antRegistryProcessId],
+    options: [optionMap.address],
     action: listAntsForAddress,
 });
 // # ANTS
@@ -608,35 +615,18 @@ makeCommand({
 // # Spawn
 makeCommand({
     name: 'spawn-ant',
-    description: 'Spawn an ANT process',
+    description: 'Spawn an ANT (mints a new MPL Core asset + ario-ant PDAs)',
     options: antStateOptions,
     action: async (options) => {
-        if (options.ao) {
-            const state = getANTStateFromOptions(options);
-            const antProcessId = await spawnANT({
-                state,
-                signer: requiredAoSignerFromOptions(options),
-                logger: getLoggerFromOptions(options),
-                ...(options.module !== undefined ? { module: options.module } : {}),
-            });
-            return {
-                processId: antProcessId,
-                signature: null,
-                state,
-                message: `Spawned ANT process with process ID ${antProcessId}`,
-            };
-        }
-        // Solana branch: the signer's pubkey IS the owner — no separate
-        // `--address` is needed (or possible, since the address would be the
-        // signer's pubkey anyway). We pass the raw CLI options through and let
-        // `spawnSolanaANTFromOptions` build the InitializeAntParams payload.
+        // The signer's pubkey IS the ANT owner on Solana — no separate
+        // `--address` flag is needed. Build the InitializeAntParams payload
+        // from CLI flags.
         const { spawnSolanaANTFromOptions } = await import('./utils.js');
         const result = await spawnSolanaANTFromOptions(options);
         return {
             processId: result.processId,
             signature: result.signature,
-            state: null,
-            message: `Spawned Solana ANT (mint=${result.processId})`,
+            message: `Spawned ANT (mint=${result.processId})`,
         };
     },
 });
@@ -668,23 +658,12 @@ makeCommand({
 // # Actions
 makeCommand({
     name: 'transfer-ant-ownership',
-    description: 'Transfer ownership of an ANT process',
-    options: [
-        optionMap.processId,
-        optionMap.target,
-        optionMap.removeControllers,
-        ...writeActionOptions,
-    ],
+    description: 'Transfer ownership of an ANT process. Ex-controllers are always cleared (Solana ACL semantics — see ANTWrite.transfer JSDoc).',
+    options: [optionMap.processId, optionMap.target, ...writeActionOptions],
     action: async (options) => {
         const target = requiredStringFromOptions(options, 'target');
-        const removeControllers = options.removeControllers !== undefined
-            ? options.removeControllers
-            : true;
-        await assertConfirmationPrompt(`Are you sure you want to transfer ANT ownership to ${target}${removeControllers ? ' (controllers will be removed)' : ' (controllers will be retained)'}?`, options);
-        return (await writeANTFromOptions(options)).transfer({
-            target,
-            removeControllers,
-        }, customTagsFromOptions(options));
+        await assertConfirmationPrompt(`Are you sure you want to transfer ANT ownership to ${target}? Existing controllers will be removed.`, options);
+        return (await writeANTFromOptions(options)).transfer({ target }, customTagsFromOptions(options));
     },
 });
 makeCommand({
@@ -745,12 +724,6 @@ makeCommand({
     options: transferRecordOwnershipOptions,
     action: transferRecordOwnershipCLICommand,
 });
-makeCommand({
-    name: 'upgrade-ant',
-    description: 'Upgrade an ANT by forking it to the latest version and reassigning names',
-    options: upgradeAntOptions,
-    action: upgradeAntCLICommand,
-});
 makeCommand({
     name: 'set-ant-ticker',
     description: 'Set the ticker of an ANT process',
@@ -815,103 +788,6 @@ makeCommand({
         }, customTagsFromOptions(options));
     },
 });
-// # ARIO Actions
-makeCommand({
-    name: 'release-name',
-    description: 'Release the name of an ANT process',
-    options: [optionMap.processId, optionMap.name, ...writeActionOptions],
-    action: async (options) => {
-        const name = requiredStringFromOptions(options, 'name');
-        await assertConfirmationPrompt(`Are you sure you want to release the name ${name} back to the protocol?`, options);
-        return (await writeANTFromOptions(options)).releaseName({
-            name,
-            arioProcessId: arioProcessIdFromOptions(options),
-        }, customTagsFromOptions(options));
-    },
-});
-makeCommand({
-    name: 'reassign-name',
-    description: 'Reassign the name of an ANT process to another ANT process',
-    options: [
-        optionMap.processId,
-        optionMap.name,
-        optionMap.target,
-        ...writeActionOptions,
-    ],
-    action: async (options) => {
-        const targetProcess = requiredStringFromOptions(options, 'target');
-        const name = requiredStringFromOptions(options, 'name');
-        await assertConfirmationPrompt(`Are you sure you want to reassign the name ${name} to ANT process ${targetProcess}?`, options);
-        return (await writeANTFromOptions(options)).reassignName({
-            name,
-            arioProcessId: arioProcessIdFromOptions(options),
-            antProcessId: targetProcess,
-        }, customTagsFromOptions(options));
-    },
-});
-makeCommand({
-    name: 'approve-primary-name-request',
-    description: 'Approve a primary name request',
-    options: [
-        optionMap.processId,
-        optionMap.name,
-        optionMap.address,
-        ...writeActionOptions,
-    ],
-    action: async (options) => {
-        const address = requiredAddressFromOptions(options);
-        const name = requiredStringFromOptions(options, 'name');
-        await assertConfirmationPrompt(`Are you sure you want to approve the primary name request ${name} to ${address}?`, options);
-        return (await writeANTFromOptions(options)).approvePrimaryNameRequest({
-            name,
-            address,
-            arioProcessId: arioProcessIdFromOptions(options),
-        }, customTagsFromOptions(options));
-    },
-});
-makeCommand({
-    name: 'remove-primary-names',
-    description: 'Remove primary names',
-    options: [optionMap.processId, optionMap.names, ...writeActionOptions],
-    action: async (options) => {
-        const names = requiredStringArrayFromOptions(options, 'names');
-        await assertConfirmationPrompt(`Are you sure you want to remove the primary names ${names}?`, options);
-        return (await writeANTFromOptions(options)).removePrimaryNames({
-            names,
-            arioProcessId: arioProcessIdFromOptions(options),
-        }, customTagsFromOptions(options));
-    },
-});
-// # Utilities
-makeCommand({
-    name: 'write-action',
-    description: 'Send a write action to an AO Process',
-    options: [...writeActionOptions, optionMap.processId],
-    action: async (options) => {
-        const process = new AOProcess({
-            processId: requiredProcessIdFromOptions(options),
-            logger: getLoggerFromOptions(options),
-        });
-        return process.send({
-            tags: customTagsFromOptions(options).tags ?? [],
-            signer: requiredAoSignerFromOptions(options),
-        });
-    },
-});
-makeCommand({
-    name: 'read-action',
-    description: 'Send a dry-run read action to an AO Process',
-    options: [optionMap.processId, optionMap.tags],
-    action: async (options) => {
-        const process = new AOProcess({
-            processId: requiredProcessIdFromOptions(options),
-            logger: getLoggerFromOptions(options),
-        });
-        return process.read({
-            tags: customTagsFromOptions(options).tags ?? [],
-        });
-    },
-});
 // =========================================
 // ANT Escrow commands (`ario-ant-escrow` program — Solana-only)
 // =========================================

package/lib/esm/cli/commands/antCommands.js

@@ -1,4 +1,4 @@
-import { antRecordMetadataFromOptions, arioProcessIdFromOptions, assertConfirmationPrompt, booleanFromOptions, customTagsFromOptions, defaultTtlSecondsCLI, readARIOFromOptions, requiredStringFromOptions, stringArrayFromOptions, writeANTFromOptions, } from '../utils.js';
+import { antRecordMetadataFromOptions, assertConfirmationPrompt, customTagsFromOptions, defaultTtlSecondsCLI, requiredStringFromOptions, writeANTFromOptions, } from '../utils.js';
 function targetProtocolFromOptions(o) {
     const raw = o.targetProtocol;
     if (!raw || raw === 'arweave')
@@ -24,7 +24,7 @@ export async function setAntRecordCLICommand(o) {
     if (!o.skipConfirmation) {
         await assertConfirmationPrompt(`Are you sure you want to set this record on the ANT process ${writeAnt.processId}?\n${JSON.stringify(recordParams, null, 2)}`, o);
     }
-    return (await writeANTFromOptions(o)).setRecord(recordParams, customTagsFromOptions(o));
+    return writeAnt.setRecord(recordParams, customTagsFromOptions(o));
 }
 export async function setAntBaseNameCLICommand(o) {
     const ttlSeconds = +(o.ttlSeconds ?? defaultTtlSecondsCLI);
@@ -40,7 +40,7 @@ export async function setAntBaseNameCLICommand(o) {
     if (!o.skipConfirmation) {
         await assertConfirmationPrompt(`Are you sure you want to set this base name on the ANT process ${writeAnt.processId}?\n${JSON.stringify(params, null, 2)}`, o);
     }
-    return (await writeANTFromOptions(o)).setBaseNameRecord(params, customTagsFromOptions(o));
+    return writeAnt.setBaseNameRecord(params, customTagsFromOptions(o));
 }
 export async function setAntUndernameCLICommand(o) {
     const ttlSeconds = +(o.ttlSeconds ?? defaultTtlSecondsCLI);
@@ -58,7 +58,7 @@ export async function setAntUndernameCLICommand(o) {
     if (!o.skipConfirmation) {
         await assertConfirmationPrompt(`Are you sure you want to set this undername on the ANT process ${writeAnt.processId}?\n${JSON.stringify(params, null, 2)}`, o);
     }
-    return (await writeANTFromOptions(o)).setUndernameRecord(params, customTagsFromOptions(o));
+    return writeAnt.setUndernameRecord(params, customTagsFromOptions(o));
 }
 export async function transferRecordOwnershipCLICommand(o) {
     const undername = requiredStringFromOptions(o, 'undername');
@@ -67,66 +67,5 @@ export async function transferRecordOwnershipCLICommand(o) {
     if (!o.skipConfirmation) {
         await assertConfirmationPrompt(`Are you sure you want to transfer ownership of "${undername}" to "${recipient}" on ANT process ${writeAnt.processId}?\n${JSON.stringify({ undername, recipient }, null, 2)}`, o);
     }
-    return (await writeANTFromOptions(o)).transferRecord({ undername, recipient }, customTagsFromOptions(o));
-}
-export async function upgradeAntCLICommand(o) {
-    // Solana: simple per-ANT schema migration (no forking, no name reassignment)
-    if (!o.ao) {
-        const writeAnt = await writeANTFromOptions(o);
-        if (!o.skipConfirmation) {
-            await assertConfirmationPrompt(`Migrate ANT to latest schema version?\n` +
-                `ANT: ${writeAnt.processId}`, o);
-        }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await writeAnt.upgrade();
-        if (!result.needsMigration) {
-            return { message: 'ANT is already at the latest version' };
-        }
-        return { message: 'ANT migrated successfully', txId: String(result.id) };
-    }
-    // AO: fork process and reassign names
-    const writeAnt = await writeANTFromOptions(o);
-    const arioProcessId = arioProcessIdFromOptions(o);
-    const ario = readARIOFromOptions(o);
-    const reassignAffiliatedNames = booleanFromOptions(o, 'reassignAffiliatedNames');
-    const names = stringArrayFromOptions(o, 'names') || [];
-    if (reassignAffiliatedNames) {
-        const allRecords = await ario.getArNSRecords({
-            filters: {
-                processId: writeAnt.processId,
-            },
-        });
-        const affiliatedNames = allRecords.items.map((record) => record.name);
-        names.push(...affiliatedNames);
-    }
-    if (names.length === 0) {
-        throw new Error('No names to reassign');
-    }
-    if (!o.skipConfirmation) {
-        await assertConfirmationPrompt(`Upgrade all names affiliated with this ANT on ARIO process?\n` +
-            `ARIO Process ID: ${arioProcessId}\n` +
-            `ANT Process ID: ${writeAnt.processId}\n` +
-            `Names that will be reassigned (${names.length}): ${names.join(', ')}`, o);
-    }
-    const result = reassignAffiliatedNames
-        ? await (await writeANTFromOptions(o)).upgrade({
-            reassignAffiliatedNames,
-            arioProcessId,
-        })
-        : await (await writeANTFromOptions(o)).upgrade({
-            names,
-            arioProcessId,
-        });
-    const serializedFailedReassignedNames = {};
-    for (const [name, failure] of Object.entries(result.failedReassignedNames)) {
-        serializedFailedReassignedNames[name] = {
-            id: failure.id,
-            error: failure.error.message,
-        };
-    }
-    return {
-        forkedProcessId: result.forkedProcessId,
-        reassignedNames: result.reassignedNames,
-        failedReassignedNames: serializedFailedReassignedNames,
-    };
+    return writeAnt.transferRecord({ undername, recipient }, customTagsFromOptions(o));
 }

package/lib/esm/cli/commands/arnsPurchaseCommands.js

@@ -1,19 +1,3 @@
-/**
- * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { ANT } from '../../common/ant.js';
 import { assertConfirmationPrompt, assertEnoughBalanceForArNSPurchase, customTagsFromOptions, fundFromFromOptions, fundingPlanFromOptions, positiveIntegerFromOptions, recordTypeFromOptions, referrerFromOptions, requiredPositiveIntegerFromOptions, requiredStringFromOptions, stringArrayFromOptions, withdrawalIdFromOptions, writeARIOFromOptions, } from '../utils.js';
 /** Coerce the JSON-parsed funding plan to the typed `FundingSourceSpec[]`. */
 function coerceFundingPlanSources(parsed) {
@@ -52,13 +36,9 @@ export async function buyRecordCLICommand(o) {
                 fromAddress: signerAddress,
             },
         });
-        // assert spawn new ant with module id
-        let antSpawnConfirmation = '';
-        if (processId === undefined) {
-            const { moduleId, version } = await ANT.versions.getLatestANTVersion();
-            antSpawnConfirmation = `Note: A new ANT process will be spawned with module ${moduleId} (v${version}) and assigned to this name.`;
-        }
-        await assertConfirmationPrompt(`Are you sure you want to ${type} the record ${name}? ${antSpawnConfirmation}`, o);
+        await assertConfirmationPrompt(`Are you sure you want to ${type} the record ${name}?${processId === undefined
+            ? ' Note: A new ANT (MPL Core asset) will be spawned and assigned to this name.'
+            : ''}`, o);
     }
     return ario.buyRecord({
         name: requiredStringFromOptions(o, 'name'),
@@ -226,12 +206,11 @@ export async function setPrimaryNameCLICommand(o) {
 }
 /**
  * Reconcile the on-chain ANT Attributes plugin (`ArNS Name`, `Type`,
- * `Undername Limit`) with the current `ArnsRecord` state. Permissionless,
- * Solana-only; AO backend will throw with a clear error.
+ * `Undername Limit`) with the current `ArnsRecord` state. Permissionless.
  *
- * Use after a `buy-record` / `reassign-name` where the buyer/recipient was
- * not the ANT NFT holder (the ANT-side trait CPI gets skipped at runtime
- * in that case so the plugin stays empty until the actual holder reconciles).
+ * Use after a `buy-record` where the buyer was not the ANT NFT holder
+ * (the ANT-side trait CPI gets skipped at runtime in that case so the
+ * plugin stays empty until the actual holder reconciles).
  */
 export async function syncAttributesCLICommand(o) {
     const name = requiredStringFromOptions(o, 'name');

package/lib/esm/cli/commands/escrowCommands.js

@@ -6,6 +6,12 @@
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 /**
  * CLI commands for `ario-ant-escrow` — trustless multi-protocol ANT custody.
@@ -21,10 +27,11 @@
  * - Ethereum: `--recipient-ethereum 0x...` parses the 20-byte hex address.
  */
 import { readFileSync } from 'node:fs';
-import { address, createKeyPairSignerFromBytes, createSolanaRpc, createSolanaRpcSubscriptions, } from '@solana/kit';
+import { address, createKeyPairSignerFromBytes, createSolanaRpcSubscriptions, } from '@solana/kit';
 import bs58 from 'bs58';
 import { ARIO_ANT_ESCROW_PROGRAM_ID } from '../../solana/constants.js';
 import { ANTEscrow } from '../../solana/escrow.js';
+import { createCircuitBreakerRpc, defaultFallbackUrl, } from '../../solana/rpc-circuit-breaker.js';
 // =========================================
 // Wiring helpers
 // =========================================
@@ -39,7 +46,10 @@ function escrowProgramIdFrom(options) {
 async function readEscrowReader(options) {
     const rpcUrl = options.rpcUrl ?? 'https://api.mainnet-beta.solana.com';
     return ANTEscrow.init({
-        rpc: createSolanaRpc(rpcUrl),
+        rpc: createCircuitBreakerRpc({
+            primaryUrl: rpcUrl,
+            fallbackUrl: defaultFallbackUrl(rpcUrl),
+        }),
         programId: escrowProgramIdFrom(options),
     });
 }
@@ -58,7 +68,10 @@ async function writeEscrowFromOptions(options) {
     const signer = await createKeyPairSignerFromBytes(secretKey);
     const rpcUrl = options.rpcUrl ?? 'https://api.mainnet-beta.solana.com';
     return ANTEscrow.init({
-        rpc: createSolanaRpc(rpcUrl),
+        rpc: createCircuitBreakerRpc({
+            primaryUrl: rpcUrl,
+            fallbackUrl: defaultFallbackUrl(rpcUrl),
+        }),
         rpcSubscriptions: createSolanaRpcSubscriptions(wsUrlFromRpcUrl(rpcUrl)),
         signer,
         programId: escrowProgramIdFrom(options),
@@ -179,12 +192,18 @@ export async function escrowClaimArweaveCLICommand(o) {
     if (sigBytes.length !== 512) {
         throw new Error(`signature file must be 512 bytes; got ${sigBytes.length}`);
     }
+    // RSA-PSS salt length: 0 is a valid value, so only reject NaN / negative /
+    // non-integer. An unset flag defaults to 32 (a full SHA-256 digest).
+    const saltLen = o.saltLen ? Number.parseInt(o.saltLen, 10) : 32;
+    if (!Number.isInteger(saltLen) || saltLen < 0) {
+        throw new Error(`--salt-len must be a non-negative integer (got '${o.saltLen}')`);
+    }
     const escrow = await writeEscrowFromOptions(o);
     const sig = await escrow.claimArweave({
         antMint: antFromOptions(o),
         claimant: address(o.claimant),
         signature: sigBytes,
-        saltLen: o.saltLen ? Number(o.saltLen) : 32,
+        saltLen,
     });
     return { signature: sig };
 }

package/lib/esm/cli/commands/gatewayWriteCommands.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import prompts from 'prompts';
-import { mARIOToken } from '../../node/index.js';
+import { mARIOToken } from '../../types/token.js';
 import { assertConfirmationPrompt, assertEnoughMARIOBalance, customTagsFromOptions, formatARIOWithCommas, gatewaySettingsFromOptions, redelegateParamsFromOptions, requiredAddressFromOptions, requiredMARIOFromOptions, requiredStringArrayFromOptions, requiredStringFromOptions, requiredTargetAndQuantityFromOptions, stringifyJsonForCLIDisplay, writeARIOFromOptions, } from '../utils.js';
 export async function joinNetwork(options) {
     const { ario, signerAddress } = await writeARIOFromOptions(options);
@@ -74,7 +74,7 @@ export async function leaveNetwork(options) {
             '\n\n' +
             'Are you sure you want to leave the AR.IO network?', options);
     }
-    return (await writeARIOFromOptions(options)).ario.leaveNetwork(customTagsFromOptions(options));
+    return ario.leaveNetwork(customTagsFromOptions(options));
 }
 export async function saveObservations(o) {
     const failedGateways = requiredStringArrayFromOptions(o, 'failedGateways');
@@ -115,6 +115,15 @@ export async function decreaseOperatorStake(o) {
         decreaseQty,
     }, customTagsFromOptions(o));
 }
+export async function claimWithdrawal(o) {
+    const vaultId = requiredStringFromOptions(o, 'vaultId');
+    await assertConfirmationPrompt(`You are about to claim matured withdrawal vault ${vaultId}. Tokens will be transferred to your wallet.\nAre you sure?`, o);
+    // claimWithdrawal is Solana-only — surface it through the SolanaARIOWriteable
+    // class rather than the shared ARIOWrite interface (see the comment in
+    // src/types/io.ts above syncAttributes).
+    const { ario } = await writeARIOFromOptions(o);
+    return ario.claimWithdrawal({ withdrawalId: vaultId }, customTagsFromOptions(o));
+}
 export async function instantWithdrawal(o) {
     const vaultId = requiredStringFromOptions(o, 'vaultId');
     const gatewayAddress = requiredAddressFromOptions(o);
@@ -223,18 +232,17 @@ export async function delegateStake(options) {
     return output;
 }
 export async function decreaseDelegateStake(options) {
-    const ario = await (await writeARIOFromOptions(options)).ario;
+    const { ario, signerAddress } = await writeARIOFromOptions(options);
     const { target, arioQuantity } = requiredTargetAndQuantityFromOptions(options);
     const instant = options.instant ?? false;
     if (!options.skipConfirmation) {
         // Verify the target gateway exists and look up delegation
-        const signerAddr = (await writeARIOFromOptions(options)).signerAddress;
         const targetGateway = await ario.getGateway({ address: target });
         if (targetGateway === undefined) {
             throw new Error(`Gateway not found: ${target}`);
         }
         // Find delegation to this gateway
-        const delegations = await ario.getDelegations({ address: signerAddr });
+        const delegations = await ario.getDelegations({ address: signerAddress });
         const delegation = delegations.items.find((d) => d.gatewayAddress === target && d.type === 'stake');
         if (!delegation) {
             throw new Error(`No active delegation found for you on gateway ${target}.`);
@@ -270,7 +278,7 @@ export async function decreaseDelegateStake(options) {
     return output;
 }
 export async function redelegateStake(options) {
-    const ario = await (await writeARIOFromOptions(options)).ario;
+    const { ario, signerAddress } = await writeARIOFromOptions(options);
     const params = redelegateParamsFromOptions(options);
     if (!options.skipConfirmation) {
         const targetGateway = await ario.getGateway({ address: params.target });
@@ -284,8 +292,7 @@ export async function redelegateStake(options) {
         if (sourceGateway === undefined) {
             throw new Error(`Source gateway not found: ${params.source}`);
         }
-        const signerAddr = (await writeARIOFromOptions(options)).signerAddress;
-        const delegations = await ario.getDelegations({ address: signerAddr });
+        const delegations = await ario.getDelegations({ address: signerAddress });
         const delegation = delegations.items.find((d) => d.gatewayAddress === params.source && d.type === 'stake');
         if (!delegation || delegation.balance < params.stakeQty.valueOf()) {
             const available = delegation?.balance ?? 0;