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

package/lib/types/cli/commands/pruneCommands.d.ts

@@ -13,19 +13,19 @@ type PruneOptions = WriteActionCLIOptions & {
     arnsRecords?: string[];
     returnedNames?: string[];
 };
-export declare function pruneExpiredNamesCLICommand(o: PruneOptions): Promise<import("../../types/common.js").AoMessageResult | {
+export declare function pruneExpiredNamesCLICommand(o: PruneOptions): Promise<import("../../types/common.js").MessageResult | {
     message: string;
 }>;
-export declare function pruneNameToReturnedCLICommand(o: PruneOptions): Promise<import("../../types/common.js").AoMessageResult>;
-export declare function pruneReturnedNamesCLICommand(o: PruneOptions): Promise<import("../../types/common.js").AoMessageResult | {
+export declare function pruneNameToReturnedCLICommand(o: PruneOptions): Promise<import("../../types/common.js").MessageResult>;
+export declare function pruneReturnedNamesCLICommand(o: PruneOptions): Promise<import("../../types/common.js").MessageResult | {
     message: string;
 }>;
-export declare function pruneExpiredReservationCLICommand(o: PruneOptions): Promise<import("../../types/common.js").AoMessageResult>;
-export declare function pruneGatewayCLICommand(o: PruneOptions): Promise<import("../../types/common.js").AoMessageResult>;
-export declare function finalizeGoneCLICommand(o: PruneOptions): Promise<import("../../types/common.js").AoMessageResult>;
-export declare function closeObservationCLICommand(o: PruneOptions): Promise<import("../../types/common.js").AoMessageResult>;
-export declare function closeEmptyDelegationCLICommand(o: PruneOptions): Promise<import("../../types/common.js").AoMessageResult>;
-export declare function closeDrainedWithdrawalCLICommand(o: PruneOptions): Promise<import("../../types/common.js").AoMessageResult>;
-export declare function releaseVaultCLICommand(o: PruneOptions): Promise<import("../../types/common.js").AoMessageResult>;
-export declare function closeExpiredRequestCLICommand(o: PruneOptions): Promise<import("../../types/common.js").AoMessageResult>;
+export declare function pruneExpiredReservationCLICommand(o: PruneOptions): Promise<import("../../types/common.js").MessageResult>;
+export declare function pruneGatewayCLICommand(o: PruneOptions): Promise<import("../../types/common.js").MessageResult>;
+export declare function finalizeGoneCLICommand(o: PruneOptions): Promise<import("../../types/common.js").MessageResult>;
+export declare function closeObservationCLICommand(o: PruneOptions): Promise<import("../../types/common.js").MessageResult>;
+export declare function closeEmptyDelegationCLICommand(o: PruneOptions): Promise<import("../../types/common.js").MessageResult>;
+export declare function closeDrainedWithdrawalCLICommand(o: PruneOptions): Promise<import("../../types/common.js").MessageResult>;
+export declare function releaseVaultCLICommand(o: PruneOptions): Promise<import("../../types/common.js").MessageResult>;
+export declare function closeExpiredRequestCLICommand(o: PruneOptions): Promise<import("../../types/common.js").MessageResult>;
 export {};

package/lib/types/cli/commands/readCommands.d.ts

@@ -13,64 +13,67 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { AoArNSNameDataWithName, AoDelegation, AoGatewayDelegateWithAddress, AoGatewayVault, AoGetCostDetailsParams } from '../../types/io.js';
+import { ArNSNameDataWithName, Delegation, GatewayDelegateWithAddress, GatewayVault, GetCostDetailsParams, UserWithdrawal } from '../../types/io.js';
 import { AddressAndNameCLIOptions, AddressAndVaultIdCLIOptions, AddressCLIOptions, CLIOptionsFromAoParams, EpochCLIOptions, GetTokenCostCLIOptions, GlobalCLIOptions, NameCLIOptions, PaginationAddressCLIOptions, PaginationCLIOptions } from '../types.js';
-export declare function getGateway(o: AddressCLIOptions): Promise<import("../../types/io.js").AoGateway>;
-export declare function listGateways(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoGatewayWithAddress> | {
+export declare function getGateway(o: AddressCLIOptions): Promise<import("../../types/io.js").Gateway>;
+export declare function listGateways(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").GatewayWithAddress> | {
     message: string;
 }>;
-export declare function listAllDelegatesCLICommand(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoAllDelegates> | {
+export declare function listAllDelegatesCLICommand(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AllDelegates> | {
     message: string;
 }>;
-export declare function getGatewayDelegates(o: AddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<AoGatewayDelegateWithAddress> | {
+export declare function getGatewayDelegates(o: AddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<GatewayDelegateWithAddress> | {
     message: string;
 }>;
-export declare function getDelegations(o: PaginationAddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<AoDelegation> | {
+export declare function getDelegations(o: PaginationAddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<Delegation> | {
     message: string;
 }>;
 export declare function getAllowedDelegates(o: PaginationAddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<string> | {
     message: string;
 }>;
-export declare function getArNSRecord(o: NameCLIOptions): Promise<import("../../types/io.js").AoArNSNameData>;
-export declare function listArNSRecords(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<AoArNSNameDataWithName> | {
+export declare function getArNSRecord(o: NameCLIOptions): Promise<import("../../types/io.js").ArNSNameData>;
+export declare function listArNSRecords(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<ArNSNameDataWithName> | {
     message: string;
 }>;
-export declare function listArNSRecordsForAddress(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<AoArNSNameDataWithName> | {
+export declare function listArNSRecordsForAddress(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<ArNSNameDataWithName> | {
     message: string;
 }>;
-export declare function getArNSReservedName(o: NameCLIOptions): Promise<import("../../types/io.js").AoArNSReservedNameData>;
-export declare function listArNSReservedNames(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoArNSReservedNameDataWithName> | {
+export declare function getArNSReservedName(o: NameCLIOptions): Promise<import("../../types/io.js").ArNSReservedNameData>;
+export declare function listArNSReservedNames(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").ArNSReservedNameDataWithName> | {
     message: string;
 }>;
-export declare function getArNSReturnedName(o: NameCLIOptions): Promise<import("../../types/io.js").AoReturnedName>;
-export declare function listArNSReturnedNames(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoReturnedName> | {
+export declare function getArNSReturnedName(o: NameCLIOptions): Promise<import("../../types/io.js").ReturnedName>;
+export declare function listArNSReturnedNames(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").ReturnedName> | {
     message: string;
 }>;
-export declare function getEpoch(o: EpochCLIOptions): Promise<import("../../types/io.js").AoEpochData<import("../../types/io.js").AoEpochDistributionData>>;
-export declare function getPrescribedObservers(o: EpochCLIOptions): Promise<import("../../types/io.js").AoWeightedObserver[]>;
+export declare function getEpoch(o: EpochCLIOptions): Promise<import("../../types/io.js").EpochData<import("../../types/io.js").EpochDistributionData>>;
+export declare function getPrescribedObservers(o: EpochCLIOptions): Promise<import("../../types/io.js").WeightedObserver[]>;
 export declare function getPrescribedNames(o: EpochCLIOptions): Promise<string[]>;
 export declare function getTokenCost(o: GetTokenCostCLIOptions): Promise<{
     mARIOTokenCost: number;
     message: string;
 }>;
-export declare function getCostDetails(o: GlobalCLIOptions & CLIOptionsFromAoParams<AoGetCostDetailsParams>): Promise<{
+export declare function getCostDetails(o: GlobalCLIOptions & CLIOptionsFromAoParams<GetCostDetailsParams>): Promise<{
     message: string;
     tokenCost: number;
     discounts: import("../../types/io.js").CostDiscount[];
-    returnedNameDetails?: import("../../types/io.js").AoReturnedName & {
+    returnedNameDetails?: import("../../types/io.js").ReturnedName & {
         basePrice: number;
     };
-    fundingPlan?: import("../../types/io.js").AoFundingPlan;
+    fundingPlan?: import("../../types/io.js").FundingPlan;
     wincQty?: string;
 }>;
-export declare function getPrimaryName(o: AddressAndNameCLIOptions): Promise<import("../../types/common.js").AoPrimaryName>;
-export declare function getGatewayVaults(o: PaginationAddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<AoGatewayVault> | {
+export declare function getPrimaryName(o: AddressAndNameCLIOptions): Promise<import("../../types/common.js").PrimaryName>;
+export declare function getGatewayVaults(o: PaginationAddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<GatewayVault> | {
     message: string;
 }>;
-export declare function getAllGatewayVaults(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoAllGatewayVaults> | {
+export declare function getAllGatewayVaults(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AllGatewayVaults> | {
     message: string;
 }>;
-export declare function getVault(o: AddressAndVaultIdCLIOptions): Promise<import("../../types/io.js").AoVaultData>;
+export declare function getWithdrawals(o: PaginationAddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<UserWithdrawal> | {
+    message: string;
+}>;
+export declare function getVault(o: AddressAndVaultIdCLIOptions): Promise<import("../../types/io.js").VaultData>;
 export declare function resolveArNSName(o: NameCLIOptions): Promise<import("../../types/io.js").ArNSNameResolutionData>;
 export declare function listAntsForAddress(o: AddressCLIOptions): Promise<{
     Owned: string[];

package/lib/types/cli/commands/transfer.d.ts

@@ -13,28 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { AoCreateVaultParams, AoExtendVaultParams, AoIncreaseVaultParams, AoRevokeVaultParams, AoVaultedTransferParams } from '../../types/io.js';
+import { CreateVaultParams, ExtendVaultParams, IncreaseVaultParams, RevokeVaultParams, VaultedTransferParams } from '../../types/io.js';
 import { CLIWriteOptionsFromAoParams, JsonSerializable, TransferCLIOptions } from '../types.js';
 export declare function transferCLICommand(options: TransferCLIOptions): Promise<{
     senderAddress: string;
-    transferResult: import("../../types/common.js").AoMessageResult<Record<string, string | number | boolean | null>>;
+    transferResult: import("../../types/common.js").MessageResult<Record<string, string | number | boolean | null>>;
     message: string;
 } | {
     message: string;
 }>;
-export declare function vaultedTransferCLICommand(o: CLIWriteOptionsFromAoParams<AoVaultedTransferParams>): Promise<JsonSerializable>;
-export declare function revokeVaultCLICommand(o: CLIWriteOptionsFromAoParams<AoRevokeVaultParams>): Promise<JsonSerializable>;
-export declare function createVaultCLICommand(o: CLIWriteOptionsFromAoParams<AoCreateVaultParams>): Promise<JsonSerializable>;
-export declare function extendVaultCLICommand(o: CLIWriteOptionsFromAoParams<AoExtendVaultParams>): Promise<{
+export declare function vaultedTransferCLICommand(o: CLIWriteOptionsFromAoParams<VaultedTransferParams>): Promise<JsonSerializable>;
+export declare function revokeVaultCLICommand(o: CLIWriteOptionsFromAoParams<RevokeVaultParams>): Promise<JsonSerializable>;
+export declare function createVaultCLICommand(o: CLIWriteOptionsFromAoParams<CreateVaultParams>): Promise<JsonSerializable>;
+export declare function extendVaultCLICommand(o: CLIWriteOptionsFromAoParams<ExtendVaultParams>): Promise<{
     senderAddress: string;
-    transferResult: import("../../types/common.js").AoMessageResult<Record<string, string | number | boolean | null>>;
+    transferResult: import("../../types/common.js").MessageResult<Record<string, string | number | boolean | null>>;
     message: string;
 } | {
     message: string;
 }>;
-export declare function increaseVaultCLICommand(o: CLIWriteOptionsFromAoParams<AoIncreaseVaultParams>): Promise<{
+export declare function increaseVaultCLICommand(o: CLIWriteOptionsFromAoParams<IncreaseVaultParams>): Promise<{
     senderAddress: string;
-    transferResult: import("../../types/common.js").AoMessageResult<Record<string, string | number | boolean | null>>;
+    transferResult: import("../../types/common.js").MessageResult<Record<string, string | number | boolean | null>>;
     message: string;
 } | {
     message: string;

package/lib/types/cli/options.d.ts

@@ -27,33 +27,6 @@ export declare const optionMap: {
         description: string;
         type: string;
     };
-    testnet: {
-        alias: string;
-        description: string;
-        type: string;
-    };
-    devnet: {
-        alias: string;
-        description: string;
-        type: string;
-    };
-    arioProcessId: {
-        alias: string;
-        description: string;
-    };
-    antRegistryProcessId: {
-        alias: string;
-        description: string;
-    };
-    hyperbeamUrl: {
-        alias: string;
-        description: string;
-    };
-    ao: {
-        alias: string;
-        description: string;
-        type: string;
-    };
     rpcUrl: {
         alias: string;
         description: string;
@@ -110,14 +83,6 @@ export declare const optionMap: {
         alias: string;
         description: string;
     };
-    cuUrl: {
-        alias: string;
-        description: string;
-    };
-    paymentUrl: {
-        alias: string;
-        description: string;
-    };
     processId: {
         alias: string;
         description: string;
@@ -194,10 +159,6 @@ export declare const optionMap: {
         description: string;
         type: string;
     };
-    services: {
-        alias: string;
-        description: string;
-    };
     skipConfirmation: {
         alias: string;
         description: string;
@@ -360,11 +321,6 @@ export declare const optionMap: {
         description: string;
         type: string;
     };
-    removeControllers: {
-        alias: string;
-        description: string;
-        type: string;
-    };
     lockLengthMs: {
         alias: string;
         description: string;
@@ -381,10 +337,6 @@ export declare const optionMap: {
         alias: string;
         description: string;
     };
-    module: {
-        alias: string;
-        description: string;
-    };
     metadataUri: {
         alias: string;
         description: string;
@@ -403,11 +355,6 @@ export declare const optionMap: {
         alias: string;
         description: string;
     };
-    reassignAffiliatedNames: {
-        alias: string;
-        description: string;
-        type: string;
-    };
     gateway: {
         alias: string;
         description: string;
@@ -528,10 +475,6 @@ export declare const setAntUndernameOptions: {
     alias: string;
     description: string;
 }[];
-export declare const upgradeAntOptions: {
-    alias: string;
-    description: string;
-}[];
 export declare const transferRecordOwnershipOptions: {
     alias: string;
     description: string;

package/lib/types/cli/types.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { AoAddressParams, AoArNSNameParams, AoGetVaultParams, AoJoinNetworkParams, AoTokenCostParams, PaginationParams } from '../types/io.js';
+import { AddressParams, ArNSNameParams, GetVaultParams, JoinNetworkParams, PaginationParams, TokenCostParams } from '../types/io.js';
 export type SupportedCLITokenType = 'ethereum' | 'arweave';
 export type WalletCLIOptions = {
     walletFile?: string;
@@ -21,21 +21,13 @@ export type WalletCLIOptions = {
     privateKey?: string;
 };
 export type GlobalCLIOptions = WalletCLIOptions & {
-    devnet: boolean;
-    testnet: boolean;
     mainnet: boolean;
     debug: boolean;
-    ao?: boolean;
     rpcUrl?: string;
     antProgramId?: string;
     coreProgramId?: string;
     garProgramId?: string;
     arnsProgramId?: string;
-    arioProcessId?: string;
-    antRegistryProcessId?: string;
-    hyperbeamUrl?: string;
-    cuUrl?: string;
-    paymentUrl?: string;
 };
 export type WriteActionCLIOptions = GlobalCLIOptions & {
     tags?: string[];
@@ -66,7 +58,7 @@ export type CLIWriteOptionsFromAoAntParams<T> = CLIWriteOptionsFromAoParams<T &
     processId: string;
 }>;
 export type PaginationCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<PaginationParams>;
-export type AddressCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<AoAddressParams>;
+export type AddressCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<AddressParams>;
 export type ProcessIdCLIOptions = GlobalCLIOptions & {
     processId?: string;
 };
@@ -81,17 +73,17 @@ export type EpochCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<{
     epochIndex: number;
     timestamp: number;
 }>;
-export type GetTokenCostCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<AoTokenCostParams>;
+export type GetTokenCostCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<TokenCostParams>;
 export type PaginationAddressCLIOptions = AddressCLIOptions & PaginationCLIOptions;
-export type NameCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<AoArNSNameParams>;
+export type NameCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<ArNSNameParams>;
 export type NameWriteCLIOptions = WriteActionCLIOptions & NameCLIOptions;
-export type AddressAndVaultIdCLIOptions = CLIOptionsFromAoParams<AoGetVaultParams> & GlobalCLIOptions;
+export type AddressAndVaultIdCLIOptions = CLIOptionsFromAoParams<GetVaultParams> & GlobalCLIOptions;
 export type AddressAndVaultIdCLIWriteOptions = WriteActionCLIOptions & AddressAndVaultIdCLIOptions;
 export type TransferCLIOptions = WriteActionCLIOptions & {
     quantity?: string;
     target?: string;
 };
-export type JoinNetworkCLIOptions = WriteActionCLIOptions & CLIOptionsFromAoParams<AoJoinNetworkParams>;
+export type JoinNetworkCLIOptions = WriteActionCLIOptions & CLIOptionsFromAoParams<JoinNetworkParams>;
 export type UpdateGatewaySettingsCLIOptions = Omit<JoinNetworkCLIOptions, 'operatorStake'>;
 export type DelegateStakeCLIOptions = TransferCLIOptions;
 export type RedelegateStakeCLIOptions = TransferCLIOptions & {

package/lib/types/cli/utils.d.ts

@@ -1,7 +1,11 @@
-import { JWKInterface } from 'arweave/node/lib/wallet.js';
 import { Command, OptionValues } from 'commander';
-import { ARIOToken, AoANTRead, AoANTRegistryRead, AoANTWrite, AoARIORead, AoARIOWrite, AoGetCostDetailsParams, AoRedelegateStakeParams, AoSigner, AoUpdateGatewaySettingsParams, ContractSigner, EpochInput, FundFrom, Logger, PaginationParams, SpawnANTState, WriteOptions, mARIOToken } from '../node/index.js';
-import { ANTStateCLIOptions, AddressCLIOptions, EpochCLIOptions, GetTokenCostCLIOptions, GlobalCLIOptions, InitiatorCLIOptions, JsonSerializable, PaginationCLIOptions, ProcessIdCLIOptions, RedelegateStakeCLIOptions, TransferCLIOptions, UpdateGatewaySettingsCLIOptions, WalletCLIOptions, WriteActionCLIOptions } from './types.js';
+import { Logger } from '../common/logger.js';
+import type { ANTRegistryRead } from '../types/ant-registry.js';
+import type { ANTRead, ANTWrite } from '../types/ant.js';
+import type { WriteOptions } from '../types/common.js';
+import type { ARIORead, ARIOWrite, EpochInput, FundFrom, GetCostDetailsParams, PaginationParams, RedelegateStakeParams, UpdateGatewaySettingsParams } from '../types/io.js';
+import { ARIOToken, mARIOToken } from '../types/token.js';
+import { ANTStateCLIOptions, AddressCLIOptions, EpochCLIOptions, GetTokenCostCLIOptions, GlobalCLIOptions, InitiatorCLIOptions, JsonSerializable, PaginationCLIOptions, ProcessIdCLIOptions, RedelegateStakeCLIOptions, TransferCLIOptions, UpdateGatewaySettingsCLIOptions, WriteActionCLIOptions } from './types.js';
 export declare const defaultTtlSecondsCLI = 3600;
 export declare function stringifyJsonForCLIDisplay(json: JsonSerializable | unknown): string;
 export declare function runCommand<O extends OptionValues>(command: Command, action: (options: O) => Promise<JsonSerializable>): Promise<void>;
@@ -17,42 +21,42 @@ export declare function makeCommand<O extends OptionValues = GlobalCLIOptions>({
     action?: (options: O) => Promise<JsonSerializable>;
     options?: CommanderOption[];
 }): Command;
-export declare function arioProcessIdFromOptions({ arioProcessId, devnet, testnet, }: GlobalCLIOptions): string;
-export declare function antRegistryIdFromOptions({ antRegistryProcessId, testnet, }: GlobalCLIOptions): string;
-export declare function requiredJwkFromOptions(options: WalletCLIOptions): JWKInterface;
-export declare function jwkToAddress(jwk: JWKInterface): string;
 export declare function getLoggerFromOptions(options: GlobalCLIOptions): Logger;
-export declare function readARIOFromOptions(options: GlobalCLIOptions): AoARIORead;
-export declare function readANTRegistryFromOptions(options: ProcessIdCLIOptions): Promise<AoANTRegistryRead>;
-export declare function contractSignerFromOptions(options: WalletCLIOptions): {
-    signer: ContractSigner;
-    signerAddress: string;
-} | undefined;
-export declare function requiredContractSignerFromOptions(options: WalletCLIOptions): {
-    signer: ContractSigner;
-    signerAddress: string;
-};
-export declare function requiredAoSignerFromOptions(options: WalletCLIOptions): AoSigner;
+export declare function readARIOFromOptions(options: GlobalCLIOptions): ARIORead;
+export declare function readANTRegistryFromOptions(options: ProcessIdCLIOptions): Promise<ANTRegistryRead>;
 export declare function writeARIOFromOptions(options: GlobalCLIOptions): Promise<{
-    ario: AoARIOWrite;
+    ario: ARIOWrite;
     signerAddress: string;
 }>;
 export declare function formatARIOWithCommas(value: ARIOToken): string;
 export declare function formatMARIOToARIOWithCommas(value: mARIOToken): string;
-/** helper to get address from --address option first, then check wallet options  */
+/**
+ * Resolve the wallet address from CLI options. Priority order:
+ *   1. `--address <addr>` — used verbatim.
+ *   2. `--wallet-file <path-to-keypair.json>` — derive the Solana pubkey
+ *      from the keypair file (last 32 bytes of the 64-byte secret-key
+ *      array are the public key; base58-encode them).
+ *   3. `--private-key <base58-secret>` — base58-decode the secret, take
+ *      the trailing 32 bytes as the pubkey. Matches the keypair-file
+ *      path; kept aligned with `loadSolanaSignerFromOptions` so cost
+ *      / funding lookups work even when the user authenticates with
+ *      only a private key.
+ *
+ * Returns `undefined` when none of those is set. Use
+ * `requiredAddressFromOptions` for callers that must have an address.
+ */
 export declare function addressFromOptions<O extends AddressCLIOptions>(options: O): string | undefined;
 export declare function requiredAddressFromOptions<O extends AddressCLIOptions>(options: O): string;
 export declare function paginationParamsFromOptions<O extends PaginationCLIOptions, R>(options: O): PaginationParams<R>;
 export declare function epochInputFromOptions(options: EpochCLIOptions): EpochInput;
 export declare function requiredInitiatorFromOptions(options: InitiatorCLIOptions): string;
 export declare function customTagsFromOptions<O extends WriteActionCLIOptions>(options: O): WriteOptions;
-export declare function servicesFromOptions(services?: string): any;
-export declare function gatewaySettingsFromOptions(options: UpdateGatewaySettingsCLIOptions): AoUpdateGatewaySettingsParams;
+export declare function gatewaySettingsFromOptions(options: UpdateGatewaySettingsCLIOptions): UpdateGatewaySettingsParams;
 export declare function requiredTargetAndQuantityFromOptions(options: TransferCLIOptions): {
     target: string;
     arioQuantity: ARIOToken;
 };
-export declare function redelegateParamsFromOptions(options: RedelegateStakeCLIOptions): AoRedelegateStakeParams & {
+export declare function redelegateParamsFromOptions(options: RedelegateStakeCLIOptions): RedelegateStakeParams & {
     stakeQty: mARIOToken;
 };
 export declare function recordTypeFromOptions<O extends {
@@ -60,12 +64,12 @@ export declare function recordTypeFromOptions<O extends {
 }>(options: O): 'lease' | 'permabuy';
 export declare function requiredMARIOFromOptions<O extends GlobalCLIOptions>(options: O, key: string): mARIOToken;
 export declare function assertEnoughBalanceForArNSPurchase({ ario, address, costDetailsParams, }: {
-    ario: AoARIORead;
+    ario: ARIORead;
     address: string;
-    costDetailsParams: AoGetCostDetailsParams;
+    costDetailsParams: GetCostDetailsParams;
 }): Promise<void>;
 export declare function assertEnoughMARIOBalance({ address, ario, mARIOQuantity, }: {
-    ario: AoARIORead;
+    ario: ARIORead;
     address: string;
     mARIOQuantity: mARIOToken | number;
 }): Promise<void>;
@@ -74,15 +78,14 @@ export declare function assertConfirmationPrompt<O extends {
     skipConfirmation?: boolean;
 }>(message: string, options: O): Promise<boolean>;
 export declare function requiredProcessIdFromOptions<O extends ProcessIdCLIOptions>(o: O): string;
-export declare function readANTFromOptions(options: ProcessIdCLIOptions): Promise<AoANTRead>;
-export declare function writeANTFromOptions(options: ProcessIdCLIOptions, signer?: ContractSigner): Promise<AoANTWrite>;
+export declare function readANTFromOptions(options: ProcessIdCLIOptions): Promise<ANTRead>;
+export declare function writeANTFromOptions(options: ProcessIdCLIOptions): Promise<ANTWrite>;
 export declare function booleanFromOptions<O extends GlobalCLIOptions>(options: O, key: string): boolean;
 export declare function requiredStringFromOptions<O extends GlobalCLIOptions>(options: O, key: string): string;
 export declare function stringArrayFromOptions<O extends GlobalCLIOptions>(options: O, key: string): string[] | undefined;
 export declare function requiredStringArrayFromOptions<O extends GlobalCLIOptions>(options: O, key: string): string[];
 export declare function positiveIntegerFromOptions<O extends GlobalCLIOptions>(options: O, key: string): number | undefined;
 export declare function requiredPositiveIntegerFromOptions<O extends GlobalCLIOptions>(options: O, key: string): number;
-export declare function getANTStateFromOptions(options: ANTStateCLIOptions): SpawnANTState;
 /**
  * Spawn a fresh ANT on Solana from CLI options.
  *
@@ -91,10 +94,9 @@ export declare function getANTStateFromOptions(options: ANTStateCLIOptions): Spa
  * `ario_ant::initialize` into a single transaction. The signer's address
  * becomes the ANT owner on chain — no separate `--address` is required.
  *
- * Maps the CLI's AO-shaped options (`--name`, `--ticker`, `--description`,
+ * Maps the user-facing options (`--name`, `--ticker`, `--description`,
  * `--keywords`, `--logo`, `--target` for the @ record tx id) onto the Solana
- * `InitializeAntParams` payload. AO-only state fields like `controllers` and
- * `balances` are intentionally dropped — they don't exist on Solana.
+ * `InitializeAntParams` payload.
  */
 export declare function spawnSolanaANTFromOptions(options: ANTStateCLIOptions): Promise<import('../solana/spawn-ant.js').SpawnSolanaANTResult>;
 export declare function getTokenCostParamsFromOptions(o: GetTokenCostCLIOptions): {

package/lib/types/common/ant-registry.d.ts

@@ -1,31 +1,32 @@
-import { AoANTRegistryRead, AoANTRegistryWrite } from '../types/ant-registry.js';
-import { AoMessageResult, ProcessConfiguration, WithSigner } from '../types/index.js';
-import { AOProcess } from './index.js';
-import { ILogger } from './logger.js';
-type ANTRegistryProcessConfig = Required<ProcessConfiguration> & {
-    strict?: boolean;
-    hyperbeamUrl?: string;
-    logger?: ILogger;
-};
-type ANTRegistryNoSigner = ANTRegistryProcessConfig;
-type ANTRegistryWithSigner = WithSigner<ANTRegistryProcessConfig>;
 /**
- * Solana-backend config for the ANT Registry.
+ * 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 type { Address, Commitment, TransactionSigner } from '@solana/kit';
+import type { SolanaRpc } from '../solana/types.js';
+import type { ANTRegistryRead, ANTRegistryWrite } from '../types/ant-registry.js';
+import type { ILogger } from './logger.js';
+/**
+ * Read-only config for `ANTRegistry.init`.
  *
  * Reads the per-user paginated ACL on-chain (ADR-012): a head `AclConfig`
  * PDA + N `AclPage` PDAs holding `(asset, role)` tuples for ANTs the user
- * owns or controls. Pass a `signer` to opt into the writeable variant,
- * which adds the preflight resolvers used by the contract-required ACL
- * accounts (`add_controller`, `remove_controller`, `transfer`) plus the
- * spawn / ex-controller workflow helpers and the standalone heal-flow
- * instruction builders. See
- * `sdk/src/solana/ant-registry-{readable,writeable}.ts` for the
- * implementations.
+ * owns or controls. See `src/solana/ant-registry-readable.ts`.
  */
-export type SolanaANTRegistryReadConfig = {
-    backend: 'solana';
-    rpc: import('../solana/types.js').SolanaRpc;
-    commitment?: import('@solana/kit').Commitment;
+export type ANTRegistryReadConfig = {
+    rpc: SolanaRpc;
+    commitment?: Commitment;
     logger?: ILogger;
     /**
      * Override the ario-ant program ID. Required against any cluster other
@@ -34,59 +35,19 @@ export type SolanaANTRegistryReadConfig = {
      * from `migration/localnet/out/localnet.env` (`ARIO_ANT_PROGRAM_ID`) on
      * localnet.
      */
-    antProgramId?: import('@solana/kit').Address;
-};
-export type SolanaANTRegistryWriteConfig = SolanaANTRegistryReadConfig & {
-    /**
-     * Solana signer used as the rent payer on `register_acl_config` /
-     * `add_acl_page` and as the authoriser for any bundled write tx.
-     */
-    signer: import('@solana/kit').TransactionSigner;
+    antProgramId?: Address;
 };
 /**
- * @deprecated Prefer `SolanaANTRegistryReadConfig` /
- * `SolanaANTRegistryWriteConfig`. Kept as an alias for back-compat.
+ * Writeable config — adds a signer used as rent payer on
+ * `register_acl_config` / `add_acl_page` and as the authoriser on any
+ * bundled write tx. See `src/solana/ant-registry-writeable.ts` for the
+ * preflight resolvers used by `add_controller`, `remove_controller`,
+ * `transfer`, and the spawn / ex-controller workflow helpers.
  */
-export type SolanaANTRegistryConfig = SolanaANTRegistryReadConfig;
+export type ANTRegistryWriteConfig = ANTRegistryReadConfig & {
+    signer: TransactionSigner;
+};
 export declare class ANTRegistry {
-    static init(config: SolanaANTRegistryWriteConfig): Promise<AoANTRegistryWrite>;
-    static init(config: SolanaANTRegistryReadConfig): Promise<AoANTRegistryRead>;
-    static init(): AoANTRegistryRead;
-    static init(config: ANTRegistryNoSigner): AoANTRegistryRead;
-    static init(config: ANTRegistryWithSigner): AoANTRegistryWrite;
-}
-export declare class AoANTRegistryReadable implements AoANTRegistryRead {
-    protected process: AOProcess;
-    private hyperbeamUrl;
-    private checkHyperBeamPromise;
-    private logger;
-    constructor(config?: ANTRegistryProcessConfig & {
-        logger?: ILogger;
-    });
-    /**
-     * Check if the process is HyperBeam compatible. If so, we'll use the HyperBeam node to fetch the state.
-     *
-     * @returns {Promise<boolean>} True if the process is HyperBeam compatible, false otherwise.
-     */
-    private checkHyperBeamCompatibility;
-    accessControlList({ address, }: {
-        address: string;
-    }): Promise<{
-        Owned: string[];
-        Controlled: string[];
-    }>;
-    getAntsForAddress({ address, }: {
-        address: string;
-    }): Promise<{
-        Owned: string[];
-        Controlled: string[];
-    }>;
-}
-export declare class AoANTRegistryWriteable extends AoANTRegistryReadable implements AoANTRegistryWrite {
-    private signer;
-    constructor({ signer, ...config }: WithSigner<ANTRegistryProcessConfig>);
-    register({ processId, }: {
-        processId: string;
-    }): Promise<AoMessageResult>;
+    static init(config: ANTRegistryWriteConfig): Promise<ANTRegistryWrite>;
+    static init(config: ANTRegistryReadConfig): Promise<ANTRegistryRead>;
 }
-export {};