@ar.io/sdk 3.24.0 → 4.0.0-solana.3

package/lib/esm/cli/cli.js

@@ -20,7 +20,8 @@ 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 { buyRecordCLICommand, extendLeaseCLICommand, increaseUndernameLimitCLICommand, requestPrimaryNameCLICommand, setPrimaryNameCLICommand, upgradeRecordCLICommand, } from './commands/arnsPurchaseCommands.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 { 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 { createVaultCLICommand, extendVaultCLICommand, increaseVaultCLICommand, revokeVaultCLICommand, transferCLICommand, vaultedTransferCLICommand, } from './commands/transfer.js';
@@ -411,7 +412,12 @@ makeCommand({
     options: buyRecordOptions,
     action: buyRecordCLICommand,
 });
-// TODO alias buy-record with buy-name
+makeCommand({
+    name: 'buy-name',
+    description: 'Buy a name (alias for buy-record)',
+    options: buyRecordOptions,
+    action: buyRecordCLICommand,
+});
 makeCommand({
     name: 'upgrade-record',
     description: 'Upgrade the lease of a record to a permabuy',
@@ -430,6 +436,14 @@ makeCommand({
     options: [...arnsPurchaseOptions, optionMap.increaseCount],
     action: increaseUndernameLimitCLICommand,
 });
+makeCommand({
+    name: 'sync-attributes',
+    description: 'Sync the on-chain ANT Attributes plugin (ArNS Name / Type / Undername Limit) ' +
+        'with the current ArnsRecord. Solana-only; permissionless reconciliation. ' +
+        'Use after a buy/reassign where the buyer was not the ANT NFT holder.',
+    options: arnsPurchaseOptions,
+    action: syncAttributesCLICommand,
+});
 makeCommand({
     name: 'request-primary-name',
     description: 'Request a primary name',
@@ -456,7 +470,7 @@ makeCommand({
     description: 'Get the state of an ANT process',
     options: [optionMap.processId],
     action: async (options) => {
-        return readANTFromOptions(options).getState();
+        return (await readANTFromOptions(options)).getState();
     },
 });
 makeCommand({
@@ -464,7 +478,7 @@ makeCommand({
     description: 'Get the info of an ANT process',
     options: [optionMap.processId],
     action: async (options) => {
-        return readANTFromOptions(options).getInfo();
+        return (await readANTFromOptions(options)).getInfo();
     },
 });
 makeCommand({
@@ -472,7 +486,7 @@ makeCommand({
     description: 'Get a record of an ANT process',
     options: [optionMap.processId, optionMap.undername],
     action: async (options) => {
-        return ((await readANTFromOptions(options).getRecord({
+        return ((await (await readANTFromOptions(options)).getRecord({
             undername: requiredStringFromOptions(options, 'undername'),
         })) ?? { message: 'No record found' });
     },
@@ -482,7 +496,7 @@ makeCommand({
     description: 'Get the owner of an ANT process',
     options: [optionMap.processId],
     action: async (options) => {
-        return readANTFromOptions(options).getOwner();
+        return (await readANTFromOptions(options)).getOwner();
     },
 });
 makeCommand({
@@ -490,7 +504,7 @@ makeCommand({
     description: 'Get the name of an ANT process',
     options: [optionMap.processId],
     action: async (options) => {
-        return readANTFromOptions(options).getName();
+        return (await readANTFromOptions(options)).getName();
     },
 });
 makeCommand({
@@ -498,7 +512,7 @@ makeCommand({
     description: 'Get the ticker of an ANT process',
     options: [optionMap.processId],
     action: async (options) => {
-        return readANTFromOptions(options).getTicker();
+        return (await readANTFromOptions(options)).getTicker();
     },
 });
 makeCommand({
@@ -506,7 +520,7 @@ makeCommand({
     description: 'Get the logo of an ANT process',
     options: [optionMap.processId],
     action: async (options) => {
-        return readANTFromOptions(options).getLogo();
+        return (await readANTFromOptions(options)).getLogo();
     },
 });
 makeCommand({
@@ -514,7 +528,7 @@ makeCommand({
     description: 'Get the balance of an ANT process',
     options: [optionMap.processId, optionMap.address],
     action: async (options) => {
-        return readANTFromOptions(options).getBalance({
+        return (await readANTFromOptions(options)).getBalance({
             address: requiredAddressFromOptions(options),
         });
     },
@@ -525,17 +539,32 @@ makeCommand({
     description: 'Spawn an ANT process',
     options: antStateOptions,
     action: async (options) => {
-        const state = getANTStateFromOptions(options);
-        const antProcessId = await spawnANT({
-            state,
-            signer: requiredAoSignerFromOptions(options),
-            logger: getLoggerFromOptions(options),
-            ...(options.module !== undefined ? { module: options.module } : {}),
-        });
+        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.
+        const { spawnSolanaANTFromOptions } = await import('./utils.js');
+        const result = await spawnSolanaANTFromOptions(options);
         return {
-            processId: antProcessId,
-            state,
-            message: `Spawned ANT process with process ID ${antProcessId}`,
+            processId: result.processId,
+            signature: result.signature,
+            state: null,
+            message: `Spawned Solana ANT (mint=${result.processId})`,
         };
     },
 });
@@ -545,7 +574,7 @@ makeCommand({
     description: 'Get the records of an ANT process',
     options: [optionMap.processId],
     action: async (options) => {
-        return readANTFromOptions(options).getRecords();
+        return (await readANTFromOptions(options)).getRecords();
     },
 });
 makeCommand({
@@ -553,7 +582,7 @@ makeCommand({
     description: 'List the controllers of an ANT process',
     options: [optionMap.processId],
     action: async (options) => {
-        return readANTFromOptions(options).getControllers();
+        return (await readANTFromOptions(options)).getControllers();
     },
 });
 makeCommand({
@@ -561,7 +590,7 @@ makeCommand({
     description: 'Get the balances of an ANT process',
     options: [optionMap.processId],
     action: async (options) => {
-        return readANTFromOptions(options).getBalances();
+        return (await readANTFromOptions(options)).getBalances();
     },
 });
 // # Actions
@@ -580,7 +609,7 @@ makeCommand({
             ? 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 writeANTFromOptions(options).transfer({
+        return (await writeANTFromOptions(options)).transfer({
             target,
             removeControllers,
         }, customTagsFromOptions(options));
@@ -593,7 +622,7 @@ makeCommand({
     action: async (options) => {
         const controller = requiredStringFromOptions(options, 'controller');
         await assertConfirmationPrompt(`Are you sure you want to add ${controller} as a controller?`, options);
-        return writeANTFromOptions(options).addController({
+        return (await writeANTFromOptions(options)).addController({
             controller: requiredStringFromOptions(options, 'controller'),
         }, customTagsFromOptions(options));
     },
@@ -603,7 +632,7 @@ makeCommand({
     description: 'Remove a controller from an ANT process',
     options: [optionMap.processId, optionMap.controller, ...writeActionOptions],
     action: async (options) => {
-        return writeANTFromOptions(options).removeController({
+        return (await writeANTFromOptions(options)).removeController({
             controller: requiredStringFromOptions(options, 'controller'),
         }, customTagsFromOptions(options));
     },
@@ -615,7 +644,7 @@ makeCommand({
     action: async (options) => {
         const undername = requiredStringFromOptions(options, 'undername');
         await assertConfirmationPrompt(`Are you sure you want to remove the record with undername ${undername}?`, options);
-        return writeANTFromOptions(options).removeRecord({
+        return (await writeANTFromOptions(options)).removeRecord({
             undername,
         }, customTagsFromOptions(options));
     },
@@ -657,7 +686,7 @@ makeCommand({
     action: async (options) => {
         const ticker = requiredStringFromOptions(options, 'ticker');
         await assertConfirmationPrompt(`Are you sure you want to set the ticker to ${ticker}?`, options);
-        return writeANTFromOptions(options).setTicker({
+        return (await writeANTFromOptions(options)).setTicker({
             ticker,
         }, customTagsFromOptions(options));
     },
@@ -669,7 +698,7 @@ makeCommand({
     action: async (options) => {
         const name = requiredStringFromOptions(options, 'name');
         await assertConfirmationPrompt(`Are you sure you want to set the name to ${requiredStringFromOptions(options, 'name')}?`, options);
-        return writeANTFromOptions(options).setName({
+        return (await writeANTFromOptions(options)).setName({
             name,
         }, customTagsFromOptions(options));
     },
@@ -681,7 +710,7 @@ makeCommand({
     action: async (options) => {
         const description = requiredStringFromOptions(options, 'description');
         await assertConfirmationPrompt(`Are you sure you want to set the ANT description to ${description}?`, options);
-        return writeANTFromOptions(options).setDescription({
+        return (await writeANTFromOptions(options)).setDescription({
             description,
         }, customTagsFromOptions(options));
     },
@@ -693,7 +722,7 @@ makeCommand({
     action: async (options) => {
         const keywords = requiredStringArrayFromOptions(options, 'keywords');
         await assertConfirmationPrompt(`Are you sure you want to set the ANT keywords to ${keywords}?`, options);
-        return writeANTFromOptions(options).setKeywords({
+        return (await writeANTFromOptions(options)).setKeywords({
             keywords,
         }, customTagsFromOptions(options));
     },
@@ -709,7 +738,7 @@ makeCommand({
     action: async (options) => {
         const txId = requiredStringFromOptions(options, 'transactionId');
         await assertConfirmationPrompt(`Are you sure you want to set the ANT logo to target Arweave TxID ${txId}?`, options);
-        return writeANTFromOptions(options).setLogo({
+        return (await writeANTFromOptions(options)).setLogo({
             txId,
         }, customTagsFromOptions(options));
     },
@@ -722,7 +751,7 @@ makeCommand({
     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 writeANTFromOptions(options).releaseName({
+        return (await writeANTFromOptions(options)).releaseName({
             name,
             arioProcessId: arioProcessIdFromOptions(options),
         }, customTagsFromOptions(options));
@@ -741,7 +770,7 @@ makeCommand({
         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 writeANTFromOptions(options).reassignName({
+        return (await writeANTFromOptions(options)).reassignName({
             name,
             arioProcessId: arioProcessIdFromOptions(options),
             antProcessId: targetProcess,
@@ -761,7 +790,7 @@ makeCommand({
         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 writeANTFromOptions(options).approvePrimaryNameRequest({
+        return (await writeANTFromOptions(options)).approvePrimaryNameRequest({
             name,
             address,
             arioProcessId: arioProcessIdFromOptions(options),
@@ -775,7 +804,7 @@ makeCommand({
     action: async (options) => {
         const names = requiredStringArrayFromOptions(options, 'names');
         await assertConfirmationPrompt(`Are you sure you want to remove the primary names ${names}?`, options);
-        return writeANTFromOptions(options).removePrimaryNames({
+        return (await writeANTFromOptions(options)).removePrimaryNames({
             names,
             arioProcessId: arioProcessIdFromOptions(options),
         }, customTagsFromOptions(options));
@@ -811,10 +840,69 @@ makeCommand({
         });
     },
 });
-// Normalize separators so includes() works on Windows (argv uses backslashes).
-const argvScript = process.argv[1].replace(/\\/g, '/');
-if (argvScript.includes('bin/ar.io') || // Running from global .bin
-    argvScript.includes('cli/cli') // Running from source
+// =========================================
+// ANT Escrow commands (`ario-ant-escrow` program — Solana-only)
+// =========================================
+// `optionMap.rpcUrl`, `walletFile`, and `privateKey` are already in
+// `globalOptions` and are merged in by `makeCommand` for every command — re-listing
+// them here would re-register the flags and crash Commander with
+// "due to conflicting flag '--rpc-url'" at CLI startup.
+const escrowCommonOptions = [optionMap.escrowProgramId, optionMap.ant];
+makeCommand({
+    name: 'escrow-status',
+    description: 'Read the on-chain EscrowAnt PDA for an ANT mint (no signer needed).',
+    options: [optionMap.escrowProgramId, optionMap.ant],
+    action: escrowStatusCLICommand,
+});
+makeCommand({
+    name: 'escrow-deposit',
+    description: 'Lock an ANT into the trustless escrow program. Use --recipient-arweave <jwk> or --recipient-ethereum <0x...>.',
+    options: [
+        ...escrowCommonOptions,
+        optionMap.recipientArweave,
+        optionMap.recipientEthereum,
+    ],
+    action: escrowDepositCLICommand,
+});
+makeCommand({
+    name: 'escrow-cancel',
+    description: 'Pull an escrowed ANT back to the depositor. Closes the escrow PDA and refunds rent.',
+    options: escrowCommonOptions,
+    action: escrowCancelCLICommand,
+});
+makeCommand({
+    name: 'escrow-update-recipient',
+    description: 'Re-target an active escrow at a different Arweave/Ethereum identity. Rotates the on-chain nonce.',
+    options: [
+        ...escrowCommonOptions,
+        optionMap.newRecipientArweave,
+        optionMap.newRecipientEthereum,
+    ],
+    action: escrowUpdateRecipientCLICommand,
+});
+makeCommand({
+    name: 'escrow-claim-arweave',
+    description: 'Submit an Arweave RSA-PSS-4096 signature to release the ANT. Anyone can submit; only the named claimant receives.',
+    options: [
+        ...escrowCommonOptions,
+        optionMap.signatureFile,
+        optionMap.saltLen,
+        optionMap.claimant,
+    ],
+    action: escrowClaimArweaveCLICommand,
+});
+makeCommand({
+    name: 'escrow-claim-ethereum',
+    description: 'Submit an Ethereum ECDSA personal_sign signature (65 bytes r||s||v) to release the ANT.',
+    options: [
+        ...escrowCommonOptions,
+        optionMap.signatureFile,
+        optionMap.claimant,
+    ],
+    action: escrowClaimEthereumCLICommand,
+});
+if (process.argv[1].includes('bin/ar.io') || // Running from global .bin
+    process.argv[1].includes('cli/cli') // Running from source
 ) {
     program.parse(process.argv);
 }

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

@@ -1,74 +1,101 @@
 import { antRecordMetadataFromOptions, arioProcessIdFromOptions, assertConfirmationPrompt, booleanFromOptions, customTagsFromOptions, defaultTtlSecondsCLI, readARIOFromOptions, requiredStringFromOptions, stringArrayFromOptions, writeANTFromOptions, } from '../utils.js';
+function targetProtocolFromOptions(o) {
+    const raw = o.targetProtocol;
+    if (!raw || raw === 'arweave')
+        return 0;
+    if (raw === 'ipfs')
+        return 1;
+    throw new Error(`Invalid --target-protocol "${raw}". Must be "arweave" or "ipfs".`);
+}
 /** @deprecated -- use set-ant-base-name and set-ant-undername */
 export async function setAntRecordCLICommand(o) {
     const ttlSeconds = +(o.ttlSeconds ?? defaultTtlSecondsCLI);
     const undername = requiredStringFromOptions(o, 'undername');
     const transactionId = requiredStringFromOptions(o, 'transactionId');
-    const writeAnt = writeANTFromOptions(o);
+    const targetProtocol = targetProtocolFromOptions(o);
+    const writeAnt = await writeANTFromOptions(o);
     const recordParams = {
         undername,
         transactionId,
         ttlSeconds,
+        targetProtocol,
         ...antRecordMetadataFromOptions(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 writeANTFromOptions(o).setRecord(recordParams, customTagsFromOptions(o));
+    return (await writeANTFromOptions(o)).setRecord(recordParams, customTagsFromOptions(o));
 }
 export async function setAntBaseNameCLICommand(o) {
     const ttlSeconds = +(o.ttlSeconds ?? defaultTtlSecondsCLI);
     const transactionId = requiredStringFromOptions(o, 'transactionId');
+    const targetProtocol = targetProtocolFromOptions(o);
     const params = {
         transactionId,
         ttlSeconds,
+        targetProtocol,
         ...antRecordMetadataFromOptions(o),
     };
-    const writeAnt = writeANTFromOptions(o);
+    const writeAnt = await writeANTFromOptions(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 writeANTFromOptions(o).setBaseNameRecord(params, customTagsFromOptions(o));
+    return (await writeANTFromOptions(o)).setBaseNameRecord(params, customTagsFromOptions(o));
 }
 export async function setAntUndernameCLICommand(o) {
     const ttlSeconds = +(o.ttlSeconds ?? defaultTtlSecondsCLI);
     const undername = requiredStringFromOptions(o, 'undername');
     const transactionId = requiredStringFromOptions(o, 'transactionId');
+    const targetProtocol = targetProtocolFromOptions(o);
     const params = {
         undername,
         transactionId,
         ttlSeconds,
+        targetProtocol,
         ...antRecordMetadataFromOptions(o),
     };
-    const writeAnt = writeANTFromOptions(o);
+    const writeAnt = await writeANTFromOptions(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 writeANTFromOptions(o).setUndernameRecord(params, customTagsFromOptions(o));
+    return (await writeANTFromOptions(o)).setUndernameRecord(params, customTagsFromOptions(o));
 }
 export async function transferRecordOwnershipCLICommand(o) {
     const undername = requiredStringFromOptions(o, 'undername');
     const recipient = requiredStringFromOptions(o, 'recipient');
-    const writeAnt = writeANTFromOptions(o);
+    const writeAnt = await writeANTFromOptions(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 writeANTFromOptions(o).transferRecord({ undername, recipient }, customTagsFromOptions(o));
+    return (await writeANTFromOptions(o)).transferRecord({ undername, recipient }, customTagsFromOptions(o));
 }
 export async function upgradeAntCLICommand(o) {
-    const writeAnt = writeANTFromOptions(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) {
-        // Fetch all ArNS records that point to this ANT process
         const allRecords = await ario.getArNSRecords({
             filters: {
                 processId: writeAnt.processId,
             },
         });
-        // Filter records that belong to this ANT
         const affiliatedNames = allRecords.items.map((record) => record.name);
         names.push(...affiliatedNames);
     }
@@ -82,15 +109,14 @@ export async function upgradeAntCLICommand(o) {
             `Names that will be reassigned (${names.length}): ${names.join(', ')}`, o);
     }
     const result = reassignAffiliatedNames
-        ? await writeANTFromOptions(o).upgrade({
+        ? await (await writeANTFromOptions(o)).upgrade({
             reassignAffiliatedNames,
             arioProcessId,
         })
-        : await writeANTFromOptions(o).upgrade({
+        : await (await writeANTFromOptions(o)).upgrade({
             names,
             arioProcessId,
         });
-    // Serialize error objects for JSON compatibility
     const serializedFailedReassignedNames = {};
     for (const [name, failure] of Object.entries(result.failedReassignedNames)) {
         serializedFailedReassignedNames[name] = {

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

@@ -14,9 +14,19 @@
  * limitations under the License.
  */
 import { ANT } from '../../common/ant.js';
-import { assertConfirmationPrompt, assertEnoughBalanceForArNSPurchase, customTagsFromOptions, fundFromFromOptions, positiveIntegerFromOptions, recordTypeFromOptions, referrerFromOptions, requiredPositiveIntegerFromOptions, requiredStringFromOptions, stringArrayFromOptions, writeARIOFromOptions, } from '../utils.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) {
+    if (!parsed)
+        return undefined;
+    return parsed.map((s) => ({
+        kind: s.kind,
+        amount: s.amount,
+        ...(s.gateway ? { gateway: s.gateway } : {}),
+    }));
+}
 export async function buyRecordCLICommand(o) {
-    const { ario, signerAddress } = writeARIOFromOptions(o);
+    const { ario, signerAddress } = await writeARIOFromOptions(o);
     const name = requiredStringFromOptions(o, 'name');
     const type = recordTypeFromOptions(o);
     const years = positiveIntegerFromOptions(o, 'years');
@@ -56,13 +66,17 @@ export async function buyRecordCLICommand(o) {
         type,
         years,
         fundFrom: fundFromFromOptions(o),
+        gatewayAddress: o.gatewayAddress,
+        fundAsOperator: o.fundAsOperator,
+        withdrawalId: withdrawalIdFromOptions(o),
+        sources: coerceFundingPlanSources(fundingPlanFromOptions(o)),
         paidBy: stringArrayFromOptions(o, 'paidBy'),
         referrer,
     }, customTagsFromOptions(o));
 }
 export async function upgradeRecordCLICommand(o) {
     const name = requiredStringFromOptions(o, 'name');
-    const { ario, signerAddress } = writeARIOFromOptions(o);
+    const { ario, signerAddress } = await writeARIOFromOptions(o);
     const fundFrom = fundFromFromOptions(o);
     const referrer = referrerFromOptions(o);
     if (!o.skipConfirmation) {
@@ -90,6 +104,8 @@ export async function upgradeRecordCLICommand(o) {
     return ario.upgradeRecord({
         name,
         fundFrom,
+        gatewayAddress: o.gatewayAddress,
+        fundAsOperator: o.fundAsOperator,
         paidBy: stringArrayFromOptions(o, 'paidBy'),
         referrer,
     });
@@ -99,7 +115,7 @@ export async function extendLeaseCLICommand(o) {
     const years = requiredPositiveIntegerFromOptions(o, 'years');
     const fundFrom = fundFromFromOptions(o);
     const referrer = referrerFromOptions(o);
-    const { ario, signerAddress } = writeARIOFromOptions(o);
+    const { ario, signerAddress } = await writeARIOFromOptions(o);
     if (!o.skipConfirmation) {
         const existingRecord = await ario.getArNSRecord({
             name,
@@ -126,6 +142,9 @@ export async function extendLeaseCLICommand(o) {
     return ario.extendLease({
         name,
         years,
+        fundFrom,
+        gatewayAddress: o.gatewayAddress,
+        fundAsOperator: o.fundAsOperator,
         paidBy: stringArrayFromOptions(o, 'paidBy'),
         referrer,
     }, customTagsFromOptions(o));
@@ -135,7 +154,7 @@ export async function increaseUndernameLimitCLICommand(o) {
     const increaseCount = requiredPositiveIntegerFromOptions(o, 'increaseCount');
     const fundFrom = fundFromFromOptions(o);
     const referrer = referrerFromOptions(o);
-    const { ario, signerAddress } = writeARIOFromOptions(o);
+    const { ario, signerAddress } = await writeARIOFromOptions(o);
     if (!o.skipConfirmation) {
         const existingRecord = await ario.getArNSRecord({
             name,
@@ -159,12 +178,15 @@ export async function increaseUndernameLimitCLICommand(o) {
     return ario.increaseUndernameLimit({
         name,
         increaseCount,
+        fundFrom,
+        gatewayAddress: o.gatewayAddress,
+        fundAsOperator: o.fundAsOperator,
         paidBy: stringArrayFromOptions(o, 'paidBy'),
         referrer,
     }, customTagsFromOptions(o));
 }
 export async function requestPrimaryNameCLICommand(o) {
-    const { ario, signerAddress } = writeARIOFromOptions(o);
+    const { ario, signerAddress } = await writeARIOFromOptions(o);
     const fundFrom = fundFromFromOptions(o);
     const referrer = referrerFromOptions(o);
     const name = requiredStringFromOptions(o, 'name');
@@ -193,7 +215,7 @@ export async function requestPrimaryNameCLICommand(o) {
     return result.request;
 }
 export async function setPrimaryNameCLICommand(o) {
-    const { ario, signerAddress } = writeARIOFromOptions(o);
+    const { ario, signerAddress } = await writeARIOFromOptions(o);
     const name = requiredStringFromOptions(o, 'name');
     const fundFrom = fundFromFromOptions(o);
     const referrer = referrerFromOptions(o);
@@ -202,3 +224,20 @@ export async function setPrimaryNameCLICommand(o) {
     }
     return ario.setPrimaryName({ name, fundFrom, referrer });
 }
+/**
+ * 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.
+ *
+ * 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).
+ */
+export async function syncAttributesCLICommand(o) {
+    const name = requiredStringFromOptions(o, 'name');
+    const { ario } = await writeARIOFromOptions(o);
+    if (!o.skipConfirmation) {
+        await assertConfirmationPrompt(`Sync on-chain ANT traits for "${name}" to match the current ArnsRecord?`, o);
+    }
+    return ario.syncAttributes({ name });
+}