@ar.io/sdk 4.0.0-solana.6 → 4.0.0-solana.7

package/README.md

@@ -11,14 +11,6 @@ This is the home of the ar.io SDK. This SDK provides functionality for interacti
 - [Table of Contents](#table-of-contents)
 - [Installation](#installation)
 - [Quick Start](#quick-start)
-- [Usage](#usage)
-- [ARIO Contract](#ario-contract)
-- [ANT Contracts](#ant-contracts)
-- [Token Conversion](#token-conversion)
-- [Logging](#logging)
-- [Pagination](#pagination)
-- [Resources](#resources)
-- [Developers](#developers)
 
 <!-- tocstop -->
 
@@ -114,7 +106,7 @@ const gateways = await ario.getGateways();
 
 ## Usage
 
-The SDK is provided in both CommonJS and ESM formats and is compatible with bundlers such as Webpack, Rollup, and ESbuild. Utilize the appropriately named exports provided by this SDK's [package.json] based on your project's configuration. Refer to the [examples] directory to see how to use the SDK in various environments.
+The SDK is published as an ES module (`"type": "module"`) and is compatible with modern bundlers such as Webpack, Rollup, ESbuild, and Vite. CommonJS consumers should migrate to ESM (Node 18+ supports ESM natively, and modern bundlers handle ESM packages out of the box). Utilize the appropriately named exports provided by this SDK's [package.json] based on your project's configuration. Refer to the [examples] directory to see how to use the SDK in various environments.
 
 ### Web
 
@@ -148,8 +140,6 @@ const gateways = await ario.getGateways();
 
 ### Node
 
-#### ESM (NodeNext)
-
 ```javascript
 import { ARIO } from "@ar.io/sdk/node";
 
@@ -159,17 +149,6 @@ const ario = ARIO.mainnet();
 const gateways = await ario.getGateways();
 ```
 
-#### CJS
-
-```javascript
-import { ARIO } from "@ar.io/sdk";
-
-// set up client
-const ario = ARIO.mainnet();
-// fetch gateways
-const gateways = await ario.getGateways();
-```
-
 ### Typescript
 
 The SDK provides TypeScript types. When you import the SDK in a TypeScript project types are exported from `./lib/types/[node/web]/index.d.ts` and should be automatically recognized by package managers, offering benefits such as type-checking and autocompletion.
@@ -3355,7 +3334,6 @@ For more information on how to use AO and AO Connect within this library, please
 - `yarn test:e2e` - runs e2e tests
 - `yarn test:unit` - runs unit tests
 - `yarn example:web` - opens up the example web page
-- `yarn example:cjs` - runs example CJS node script
 - `yarn example:esm` - runs example ESM node script
 - `yarn example:vite` - runs example Vite web page
 

package/lib/esm/solana/ant-readable.js

@@ -12,11 +12,11 @@ import bs58 from 'bs58';
 // AntRecordMetadata discriminator — regenerate via `yarn codegen` after IDL rebase
 // to expose ANT_RECORD_METADATA_DISCRIMINATOR. Until then, compute inline.
 import { createHash as __createHash } from 'crypto';
+import { ANT_RECORD_DISCRIMINATOR } from '@ar.io/solana-contracts/ant';
 import { Logger } from '../common/logger.js';
 import { SolanaANTRegistryReadable } from './ant-registry-readable.js';
 import { ANT_CONFIG_VERSION, ARIO_ANT_PROGRAM_ID } from './constants.js';
 import { deserializeAntConfig, deserializeAntControllers, deserializeAntRecord, deserializeAntRecordMetadata, } from './deserialize.js';
-import { ANT_RECORD_DISCRIMINATOR } from './generated/ant/accounts/antRecord.js';
 const ANT_RECORD_METADATA_DISCRIMINATOR = new Uint8Array(__createHash('sha256')
     .update('account:AntRecordMetadata')
     .digest()

package/lib/esm/solana/ant-registry-writeable.js

@@ -38,10 +38,10 @@
  * registry's signer) acts as the rent payer for everything bundled here.
  */
 import { address, } from '@solana/kit';
+import { getAddAclPageInstruction, getCloseAclConfigInstruction, getCloseAclPageInstruction, getRecordAclControllerInstructionAsync, getRecordAclOwnerInstruction, getRegisterAclConfigInstruction, getRemoveAclControllerInstructionAsync, getRemoveAclOwnerInstruction, } from '@ar.io/solana-contracts/ant';
 import { SolanaANTRegistryReadable, } from './ant-registry-readable.js';
 import { ACL_ROLE_CONTROLLER, ACL_ROLE_OWNER, MAX_ACL_PAGE_ENTRIES, } from './constants.js';
 import { deserializeAclConfig, deserializeAclPage } from './deserialize.js';
-import { getAddAclPageInstruction, getCloseAclConfigInstruction, getCloseAclPageInstruction, getRecordAclControllerInstructionAsync, getRecordAclOwnerInstruction, getRegisterAclConfigInstruction, getRemoveAclControllerInstructionAsync, getRemoveAclOwnerInstruction, } from './generated/ant/instructions/index.js';
 import { getAccountInfoLegacy, getMultipleAccountsInfoLegacy, } from './json-rpc.js';
 import { getAclConfigPDA, getAclPagePDA } from './pda.js';
 /** Map the cross-backend role string → on-chain `u8` byte. */

package/lib/esm/solana/ant-writeable.js

@@ -28,10 +28,10 @@
  *        if a marketplace transfer bypasses this SDK entirely.
  */
 import { address, } from '@solana/kit';
+import { getAddControllerInstructionAsync, getMigrateAntInstructionAsync, getReconcileInstructionAsync, getRemoveControllerInstructionAsync, getRemoveRecordInstructionAsync, getSetDescriptionInstructionAsync, getSetKeywordsInstructionAsync, getSetLogoInstructionAsync, getSetNameInstructionAsync, getSetRecordInstructionAsync, getSetRecordMetadataInstructionAsync, getSetTickerInstructionAsync, getTransferInstructionAsync, getTransferRecordInstructionAsync, } from '@ar.io/solana-contracts/ant';
 import { SolanaANTReadable } from './ant-readable.js';
 import { SolanaANTRegistryWriteable } from './ant-registry-writeable.js';
 import { deserializeAntControllers } from './deserialize.js';
-import { getAddControllerInstructionAsync, getMigrateAntInstructionAsync, getReconcileInstructionAsync, getRemoveControllerInstructionAsync, getRemoveRecordInstructionAsync, getSetDescriptionInstructionAsync, getSetKeywordsInstructionAsync, getSetLogoInstructionAsync, getSetNameInstructionAsync, getSetRecordInstructionAsync, getSetRecordMetadataInstructionAsync, getSetTickerInstructionAsync, getTransferInstructionAsync, getTransferRecordInstructionAsync, } from './generated/ant/instructions/index.js';
 import { getAccountInfoLegacy } from './json-rpc.js';
 import { getAntControllersPDA, getAntRecordMetadataPDA, getAntRecordPDA, } from './pda.js';
 import { sendAndConfirm } from './send.js';

package/lib/esm/solana/deserialize.js

@@ -28,9 +28,9 @@
  *   - Enum: 1-byte variant index
  */
 import { getAddressDecoder, getAddressEncoder, } from '@solana/kit';
+import { getBalanceDecoder } from '@ar.io/solana-contracts/core';
+import { getEpochDecoder } from '@ar.io/solana-contracts/gar';
 import { RATE_SCALE } from './constants.js';
-import { getBalanceDecoder } from './generated/core/accounts/balance.js';
-import { getEpochDecoder } from './generated/gar/accounts/epoch.js';
 const addressDecoder = getAddressDecoder();
 const addressEncoder = getAddressEncoder();
 // =========================================

package/lib/esm/solana/escrow.js

@@ -15,12 +15,11 @@
  * in `./generated/ant-escrow/instructions/` — they own the discriminator,
  * Borsh codec, and account-meta wiring derived from the on-chain IDL.
  */
+import { fetchMaybeEscrowAnt, fetchMaybeEscrowToken, getCancelDepositInstruction, getCancelTokenDepositInstruction, getCancelVaultDepositInstruction, getClaimAntArweaveAttestedInstruction, getClaimAntEthereumInstruction, getClaimTokensArweaveAttestedInstruction, getClaimTokensEthereumInstruction, getClaimVaultArweaveAttestedInstruction, getClaimVaultEthereumInstruction, getDepositAntInstruction, getDepositTokensInstruction, getDepositVaultInstruction, getUpdateRecipientInstruction, getUpdateTokenRecipientInstruction, getUpdateVaultRecipientInstruction, } from '@ar.io/solana-contracts/ant-escrow';
+import { fetchMaybeVaultCounter, getVaultedTransferInstructionAsync, } from '@ar.io/solana-contracts/core';
 import { Logger } from '../common/logger.js';
 import { getAssociatedTokenAddressKit } from './ata.js';
 import { ARIO_ANT_ESCROW_PROGRAM_ID, ARIO_CORE_PROGRAM_ID, ESCROW_ARWEAVE_PUBKEY_LEN, ESCROW_ASSET_TYPE_VAULT, ESCROW_ETHEREUM_PUBKEY_LEN, ESCROW_PROTOCOL_ARWEAVE, ESCROW_PROTOCOL_ETHEREUM, } from './constants.js';
-import { fetchMaybeEscrowAnt, fetchMaybeEscrowToken, getCancelDepositInstruction, getCancelTokenDepositInstruction, getCancelVaultDepositInstruction, getClaimAntArweaveInstruction, getClaimAntEthereumInstruction, getClaimTokensArweaveInstruction, getClaimTokensEthereumInstruction, getClaimVaultArweaveInstruction, getClaimVaultEthereumInstruction, getDepositAntInstruction, getDepositTokensInstruction, getDepositVaultInstruction, getUpdateRecipientInstruction, getUpdateTokenRecipientInstruction, getUpdateVaultRecipientInstruction, } from './generated/ant-escrow/index.js';
-import { fetchMaybeVaultCounter } from './generated/core/accounts/vaultCounter.js';
-import { getVaultedTransferInstructionAsync } from './generated/core/instructions/vaultedTransfer.js';
 import { getEscrowAntPDA, getEscrowTokenPDA, getEscrowVaultPDA, getVaultCounterPDA, getVaultPDA, } from './pda.js';
 import { sendAndConfirm } from './send.js';
 /** Map the Codama-generated `EscrowAnt` raw decoded type to our public
@@ -172,24 +171,37 @@ export class ANTEscrow {
         // provide comfortable headroom.
         return this.send([ix], 400_000);
     }
+    /**
+     * Build the ANT-claim-via-Arweave-attested instruction.
+     *
+     * **API note**: this method previously took user-side RSA-PSS params
+     * (`signature`, `saltLen`, `messageNonce`). The on-chain ix was
+     * renamed to `claim_ant_arweave_attested` (canonical contracts
+     * `ar-io-solana-contracts` PR-19+): verification is now via
+     * instruction-introspection of a preceding Ed25519 sigverify ix
+     * issued by the off-chain attestor (see
+     * `migration/attestor/`). Those data args are no longer fed to the
+     * builder. Callers MUST prepend the attestor's sigverify ix to the
+     * transaction or it will fail on-chain. A higher-level helper that
+     * fetches the attestor's signature and assembles the full tx is
+     * tracked as a follow-up.
+     *
+     * @deprecated Args `signature`, `saltLen`, `messageNonce` are
+     * ignored. Use the new attested flow.
+     */
     async claimArweaveIx(args) {
-        if (args.signature.length !== 512) {
-            throw new Error('arweave signature must be 512 bytes');
-        }
         if (args.messageNonce.length !== 32) {
             throw new Error('messageNonce must be 32 bytes');
         }
         const signer = this.requireSigner('claimArweave');
         const [escrow] = await getEscrowAntPDA(args.antMint, this.programId);
-        return getClaimAntArweaveInstruction({
+        return getClaimAntArweaveAttestedInstruction({
             escrow,
             antAsset: args.antMint,
             claimant: args.claimant,
             depositor: args.depositor,
             payer: signer,
             messageNonce: args.messageNonce,
-            signature: args.signature,
-            saltLen: args.saltLen,
         }, { programAddress: this.programId });
     }
     /** Submit an Ethereum ECDSA secp256k1 + EIP-191 signature. */
@@ -466,16 +478,17 @@ export class TokenEscrow {
         // RSA-PSS-4096 verification is CU-intensive; use 400K.
         return this.send(createAtaIx ? [createAtaIx, ix] : [ix], 400_000);
     }
+    /**
+     * @deprecated Args `signature`, `saltLen`, `messageNonce` are ignored.
+     * Use the new attested flow — see `claimArweaveIx` doc.
+     */
     async claimTokensArweaveIx(args) {
-        if (args.signature.length !== 512) {
-            throw new Error('arweave signature must be 512 bytes');
-        }
         if (args.messageNonce.length !== 32) {
             throw new Error('messageNonce must be 32 bytes');
         }
         const signer = this.requireSigner('claimTokensArweave');
         const [escrow] = await getEscrowTokenPDA(args.depositor, args.assetId, this.programId);
-        return getClaimTokensArweaveInstruction({
+        return getClaimTokensArweaveAttestedInstruction({
             escrow,
             escrowTokenAccount: args.escrowTokenAccount,
             claimantTokenAccount: args.claimantTokenAccount,
@@ -483,8 +496,6 @@ export class TokenEscrow {
             depositor: args.depositor,
             payer: signer,
             messageNonce: args.messageNonce,
-            signature: args.signature,
-            saltLen: args.saltLen,
         }, { programAddress: this.programId });
     }
     /**
@@ -545,7 +556,11 @@ export class TokenEscrow {
         }
         const signer = this.requireSigner('claimVaultArweave');
         const [escrowPda] = await getEscrowVaultPDA(args.depositor, args.assetId, this.programId);
-        const claimIx = getClaimVaultArweaveInstruction({
+        // `args.signature` and `args.saltLen` are no longer fed to the
+        // builder — the on-chain `claim_vault_arweave_attested` ix verifies
+        // the attestor's Ed25519 signature via instruction-introspection
+        // of a preceding sigverify ix. See doc on `claimArweaveIx`.
+        const claimIx = getClaimVaultArweaveAttestedInstruction({
             escrow: escrowPda,
             escrowTokenAccount: args.escrowTokenAccount,
             claimantTokenAccount: args.claimantTokenAccount,
@@ -554,8 +569,6 @@ export class TokenEscrow {
             depositor: args.depositor,
             payer: signer,
             messageNonce: escrow.nonce,
-            signature: args.signature,
-            saltLen: args.saltLen ?? 32,
         }, { programAddress: this.programId });
         const ixs = await this.maybeBundleVaultedTransfer(escrow, args, claimIx);
         return this.send(ixs, 400_000);

package/lib/esm/solana/events.js

@@ -28,11 +28,11 @@
  * pull-based model.
  */
 import { getBase64Encoder, } from '@solana/kit';
-import { ARIO_ANT_ESCROW_PROGRAM_ADDRESS } from './generated/ant-escrow/program-address.js';
-import { ARIO_ANT_PROGRAM_ADDRESS } from './generated/ant/program-address.js';
-import { ARIO_ARNS_PROGRAM_ADDRESS } from './generated/arns/program-address.js';
-import { ARIO_CORE_PROGRAM_ADDRESS } from './generated/core/program-address.js';
-import { ARIO_GAR_PROGRAM_ADDRESS } from './generated/gar/program-address.js';
+import { ARIO_ANT_PROGRAM_ADDRESS } from '@ar.io/solana-contracts/ant';
+import { ARIO_ANT_ESCROW_PROGRAM_ADDRESS } from '@ar.io/solana-contracts/ant-escrow';
+import { ARIO_ARNS_PROGRAM_ADDRESS } from '@ar.io/solana-contracts/arns';
+import { ARIO_CORE_PROGRAM_ADDRESS } from '@ar.io/solana-contracts/core';
+import { ARIO_GAR_PROGRAM_ADDRESS } from '@ar.io/solana-contracts/gar';
 import * as escrowEvents from './generated/ant-escrow/events/index.js';
 import * as antEvents from './generated/ant/events/index.js';
 import * as arnsEvents from './generated/arns/events/index.js';

package/lib/esm/solana/funding-plan.js

@@ -29,7 +29,7 @@
  * `TooManyFundingSources` / `TooManyDelegationSources`.
  */
 import { AccountRole, fetchEncodedAccount, getAddressDecoder, } from '@solana/kit';
-import { ARIO_GAR_PROGRAM_ADDRESS as ARIO_GAR_PROGRAM_ID } from './generated/gar/program-address.js';
+import { ARIO_GAR_PROGRAM_ADDRESS as ARIO_GAR_PROGRAM_ID } from '@ar.io/solana-contracts/gar';
 import { getDelegationPDA, getGatewayPDA, getWithdrawalCounterPDA, getWithdrawalPDA, } from './pda.js';
 // ---------------------------------------------------------------------------
 // Public types

package/lib/esm/solana/io-readable.js

@@ -7,24 +7,14 @@
  */
 import { address, fetchEncodedAccount, fetchEncodedAccounts, getAddressDecoder, } from '@solana/kit';
 import bs58 from 'bs58';
+import { ARNS_RECORD_DISCRIMINATOR, RESERVED_NAME_DISCRIMINATOR, RETURNED_NAME_DISCRIMINATOR, getArnsConfigDecoder, getArnsRecordDecoder, getReservedNameDecoder, getReturnedNameDecoder, } from '@ar.io/solana-contracts/arns';
+import { PRIMARY_NAME_DISCRIMINATOR, PRIMARY_NAME_REQUEST_DISCRIMINATOR, VAULT_DISCRIMINATOR, getPrimaryNameRequestDecoder, getVaultDecoder, } from '@ar.io/solana-contracts/core';
+import { ALLOWLIST_ENTRY_DISCRIMINATOR, DELEGATION_DISCRIMINATOR, GATEWAY_DISCRIMINATOR, GatewayStatus, OBSERVATION_DISCRIMINATOR, WITHDRAWAL_DISCRIMINATOR, getDelegationDecoder, getGatewayDecoder, getWithdrawalDecoder, } from '@ar.io/solana-contracts/gar';
 import { Logger } from '../common/logger.js';
 import { SolanaANTRegistryReadable } from './ant-registry-readable.js';
 import { getAssociatedTokenAddressKit } from './ata.js';
 import { ARIO_ANT_PROGRAM_ID, ARIO_ARNS_PROGRAM_ID, ARIO_CORE_PROGRAM_ID, ARIO_GAR_PROGRAM_ID, ARNS_RECORD_ANT_OFFSET, RATE_SCALE, } from './constants.js';
 import { deserializeAllowlist, deserializeArioConfig, deserializeArnsRecord, deserializeDelegation, deserializeDemandFactor, deserializeEpoch, deserializeEpochSettings, deserializeEpochSettingsFull, deserializeGarSettings, deserializeGarSupplyCounters, deserializeGateway, deserializeObservation, deserializePrimaryName, deserializePrimaryNameRequest, deserializeRedelegationRecord, deserializeReservedName, deserializeReturnedName, deserializeVault, deserializeWithdrawal, } from './deserialize.js';
-import { getArnsConfigDecoder } from './generated/arns/accounts/arnsConfig.js';
-import { ARNS_RECORD_DISCRIMINATOR, getArnsRecordDecoder, } from './generated/arns/accounts/arnsRecord.js';
-import { RESERVED_NAME_DISCRIMINATOR, getReservedNameDecoder, } from './generated/arns/accounts/reservedName.js';
-import { RETURNED_NAME_DISCRIMINATOR, getReturnedNameDecoder, } from './generated/arns/accounts/returnedName.js';
-import { PRIMARY_NAME_DISCRIMINATOR } from './generated/core/accounts/primaryName.js';
-import { PRIMARY_NAME_REQUEST_DISCRIMINATOR, getPrimaryNameRequestDecoder, } from './generated/core/accounts/primaryNameRequest.js';
-import { VAULT_DISCRIMINATOR, getVaultDecoder, } from './generated/core/accounts/vault.js';
-import { ALLOWLIST_ENTRY_DISCRIMINATOR } from './generated/gar/accounts/allowlistEntry.js';
-import { DELEGATION_DISCRIMINATOR, getDelegationDecoder, } from './generated/gar/accounts/delegation.js';
-import { GATEWAY_DISCRIMINATOR, getGatewayDecoder, } from './generated/gar/accounts/gateway.js';
-import { OBSERVATION_DISCRIMINATOR } from './generated/gar/accounts/observation.js';
-import { WITHDRAWAL_DISCRIMINATOR, getWithdrawalDecoder, } from './generated/gar/accounts/withdrawal.js';
-import { GatewayStatus } from './generated/gar/types/index.js';
 import { TOKEN_PROGRAM_ADDRESS } from './instruction.js';
 import { getArioConfigPDA, getArnsRecordPDA, getArnsRecordPDAFromHash, getArnsSettingsPDA, getDemandFactorPDA, getEpochPDA, getEpochSettingsPDA, getGarSettingsPDA, getGatewayPDA, getGatewayRegistryPDA, getObserverLookupPDA, getPrimaryNamePDA, getPrimaryNameRequestPDA, getReservedNamePDA, getReturnedNamePDA, getVaultPDA, } from './pda.js';
 const addressDecoder = getAddressDecoder();

package/lib/esm/solana/io-writeable.js

@@ -19,12 +19,11 @@
  *      surface for them.
  */
 import { AccountRole, address, fetchEncodedAccount, getAddressDecoder, } from '@solana/kit';
+import { PurchaseType, getBuyNameFromDelegationInstructionAsync, getBuyNameFromFundingPlanInstructionAsync, getBuyNameFromOperatorStakeInstructionAsync, getBuyNameFromWithdrawalInstructionAsync, getBuyNameInstructionAsync, getBuyReturnedNameFromDelegationInstructionAsync, getBuyReturnedNameFromFundingPlanInstructionAsync, getBuyReturnedNameFromOperatorStakeInstructionAsync, getBuyReturnedNameFromWithdrawalInstructionAsync, getBuyReturnedNameInstructionAsync, getExtendLeaseFromDelegationInstructionAsync, getExtendLeaseFromFundingPlanInstructionAsync, getExtendLeaseFromOperatorStakeInstructionAsync, getExtendLeaseFromWithdrawalInstructionAsync, getExtendLeaseInstructionAsync, getIncreaseUndernameLimitFromDelegationInstructionAsync, getIncreaseUndernameLimitFromFundingPlanInstructionAsync, getIncreaseUndernameLimitFromOperatorStakeInstructionAsync, getIncreaseUndernameLimitFromWithdrawalInstructionAsync, getIncreaseUndernameLimitInstructionAsync, getPruneExpiredNamesInstructionAsync, getPruneExpiredReservationInstruction, getPruneNameToReturnedInstructionAsync, getPruneReturnedNamesInstructionAsync, getReassignNameInstructionAsync, getReleaseNameInstructionAsync, getUpgradeNameFromDelegationInstructionAsync, getUpgradeNameFromFundingPlanInstructionAsync, getUpgradeNameFromOperatorStakeInstructionAsync, getUpgradeNameFromWithdrawalInstructionAsync, getUpgradeNameInstructionAsync, } from '@ar.io/solana-contracts/arns';
+import { FundingSourceKind as GeneratedFundingSourceKindEnum } from '@ar.io/solana-contracts/gar';
 import { buildCreateAtaIdempotentIx, getAssociatedTokenAddressKit, } from './ata.js';
 import { deserializeArnsRecord, deserializeEpochSettingsFull, } from './deserialize.js';
 import { buildFundingPlan as buildFundingPlanCore, buildFundingPlanRemainingAccounts, computeResidueIndexes, predictResidueVaults, } from './funding-plan.js';
-import { getBuyNameFromDelegationInstructionAsync, getBuyNameFromFundingPlanInstructionAsync, getBuyNameFromOperatorStakeInstructionAsync, getBuyNameFromWithdrawalInstructionAsync, getBuyNameInstructionAsync, getBuyReturnedNameFromDelegationInstructionAsync, getBuyReturnedNameFromFundingPlanInstructionAsync, getBuyReturnedNameFromOperatorStakeInstructionAsync, getBuyReturnedNameFromWithdrawalInstructionAsync, getBuyReturnedNameInstructionAsync, getExtendLeaseFromDelegationInstructionAsync, getExtendLeaseFromFundingPlanInstructionAsync, getExtendLeaseFromOperatorStakeInstructionAsync, getExtendLeaseFromWithdrawalInstructionAsync, getExtendLeaseInstructionAsync, getIncreaseUndernameLimitFromDelegationInstructionAsync, getIncreaseUndernameLimitFromFundingPlanInstructionAsync, getIncreaseUndernameLimitFromOperatorStakeInstructionAsync, getIncreaseUndernameLimitFromWithdrawalInstructionAsync, getIncreaseUndernameLimitInstructionAsync, getPruneExpiredNamesInstructionAsync, getPruneExpiredReservationInstruction, getPruneNameToReturnedInstructionAsync, getPruneReturnedNamesInstructionAsync, getReassignNameInstructionAsync, getReleaseNameInstructionAsync, getUpgradeNameFromDelegationInstructionAsync, getUpgradeNameFromFundingPlanInstructionAsync, getUpgradeNameFromOperatorStakeInstructionAsync, getUpgradeNameFromWithdrawalInstructionAsync, getUpgradeNameInstructionAsync, } from './generated/arns/instructions/index.js';
-import { PurchaseType } from './generated/arns/types/index.js';
-import { FundingSourceKind as GeneratedFundingSourceKindEnum } from './generated/gar/types/index.js';
 /** Maps the SDK's user-facing FundingSourceKind string union to the
  *  Codama-generated enum used by the on-chain ix payload. */
 function toGeneratedFundingSourceSpec(s) {
@@ -36,14 +35,12 @@ function toGeneratedFundingSourceSpec(s) {
     };
     return { kind: kindMap[s.kind], amount: s.amount };
 }
+import { getSyncAttributesInstruction } from '@ar.io/solana-contracts/ant';
+import { getApprovePrimaryNameInstructionAsync, getCloseExpiredRequestInstruction, getCreateVaultInstructionAsync, getExtendVaultInstructionAsync, getIncreaseVaultInstructionAsync, getReleaseVaultInstructionAsync, getRequestAndSetPrimaryNameFromFundingPlanInstructionAsync, getRequestPrimaryNameFromFundingPlanInstructionAsync, getRequestPrimaryNameInstructionAsync, getRevokeVaultInstructionAsync, getVaultedTransferInstructionAsync, } from '@ar.io/solana-contracts/core';
+import { getDelegationDecoder, getGatewayDecoder, } from '@ar.io/solana-contracts/gar';
+import { Protocol, getAllowDelegateInstructionAsync, getCancelWithdrawalInstruction, getClaimDelegateFromLeavingGatewayInstructionAsync, getClaimWithdrawalInstructionAsync, getCloseDrainedWithdrawalInstruction, getCloseEmptyDelegationInstruction, getCloseEpochInstructionAsync, getCloseObservationInstructionAsync, getCreateEpochInstructionAsync, getDecreaseDelegateStakeInstructionAsync, getDecreaseOperatorStakeInstructionAsync, getDelegateStakeInstructionAsync, getDisallowDelegateInstructionAsync, getDistributeEpochInstructionAsync, getFinalizeGoneInstructionAsync, getIncreaseOperatorStakeInstructionAsync, getInstantWithdrawalInstructionAsync, getJoinNetworkInstructionAsync, getLeaveNetworkInstructionAsync, getPrescribeEpochInstructionAsync, getPruneGatewayInstructionAsync, getRedelegateStakeInstructionAsync, getSaveObservationsInstructionAsync, getSetAllowlistEnabledInstructionAsync, getTallyWeightsInstructionAsync, getUpdateGatewaySettingsInstructionAsync, } from '@ar.io/solana-contracts/gar';
 import { getTransferCheckedInstruction } from '@solana-program/token';
 import { TOKEN_DECIMALS } from './constants.js';
-import { getSyncAttributesInstruction } from './generated/ant/instructions/syncAttributes.js';
-import { getApprovePrimaryNameInstructionAsync, getCloseExpiredRequestInstruction, getCreateVaultInstructionAsync, getExtendVaultInstructionAsync, getIncreaseVaultInstructionAsync, getReleaseVaultInstructionAsync, getRequestAndSetPrimaryNameFromFundingPlanInstructionAsync, getRequestPrimaryNameFromFundingPlanInstructionAsync, getRequestPrimaryNameInstructionAsync, getRevokeVaultInstructionAsync, getVaultedTransferInstructionAsync, } from './generated/core/instructions/index.js';
-import { getDelegationDecoder } from './generated/gar/accounts/delegation.js';
-import { getGatewayDecoder } from './generated/gar/accounts/gateway.js';
-import { getAllowDelegateInstructionAsync, getCancelWithdrawalInstruction, getClaimDelegateFromLeavingGatewayInstructionAsync, getClaimWithdrawalInstructionAsync, getCloseDrainedWithdrawalInstruction, getCloseEmptyDelegationInstruction, getCloseEpochInstructionAsync, getCloseObservationInstructionAsync, getCreateEpochInstructionAsync, getDecreaseDelegateStakeInstructionAsync, getDecreaseOperatorStakeInstructionAsync, getDelegateStakeInstructionAsync, getDisallowDelegateInstructionAsync, getDistributeEpochInstructionAsync, getFinalizeGoneInstructionAsync, getIncreaseOperatorStakeInstructionAsync, getInstantWithdrawalInstructionAsync, getJoinNetworkInstructionAsync, getLeaveNetworkInstructionAsync, getPrescribeEpochInstructionAsync, getPruneGatewayInstructionAsync, getRedelegateStakeInstructionAsync, getSaveObservationsInstructionAsync, getSetAllowlistEnabledInstructionAsync, getTallyWeightsInstructionAsync, getUpdateGatewaySettingsInstructionAsync, } from './generated/gar/instructions/index.js';
-import { Protocol } from './generated/gar/types/index.js';
 import { SolanaARIOReadable } from './io-readable.js';
 import { getAntRecordPDA, getArioConfigPDA, getArnsRecordPDA, getArnsRegistryPDA, getArnsSettingsPDA, getDelegationPDA, getDemandFactorPDA, getEpochPDA, getEpochSettingsPDA, getGarSettingsPDA, getGatewayPDA, getGatewayRegistryPDA, getObservationPDA, getObserverLookupPDA, getPrimaryNamePDA, getPrimaryNameRequestPDA, getPrimaryNameReversePDA, getReservedNamePDA, getReturnedNamePDA, getVaultPDA, getWithdrawalCounterPDA, getWithdrawalPDA, hashName, } from './pda.js';
 import { sendAndConfirm } from './send.js';

package/lib/esm/solana/spawn-ant.js

@@ -16,10 +16,10 @@
  * helper is for.
  */
 import { addSignersToTransactionMessage, appendTransactionMessageInstructions, createTransactionMessage, generateKeyPairSigner, getSignatureFromTransaction, pipe, sendAndConfirmTransactionFactory, setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, signTransactionMessageWithSigners, } from '@solana/kit';
+import { getInitializeInstructionAsync } from '@ar.io/solana-contracts/ant';
 import { getSetComputeUnitLimitInstruction, getSetComputeUnitPriceInstruction, } from '@solana-program/compute-budget';
 import { SolanaANTRegistryWriteable } from './ant-registry-writeable.js';
 import { ARIO_ANT_PROGRAM_ID } from './constants.js';
-import { getInitializeInstructionAsync } from './generated/ant/instructions/index.js';
 import { getCreateV1Instruction } from './generated/mpl-core/instructions/index.js';
 import { DataState } from './generated/mpl-core/types/index.js';
 import { getAntRecordPDA } from './pda.js';

package/lib/esm/version.js

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-export const version = '4.0.0-solana.6';
+export const version = '4.0.0-solana.7';

package/lib/types/solana/escrow.d.ts

@@ -114,12 +114,34 @@ export declare class ANTEscrow {
         signature: Uint8Array;
         saltLen?: number;
     }): Promise<string>;
+    /**
+     * Build the ANT-claim-via-Arweave-attested instruction.
+     *
+     * **API note**: this method previously took user-side RSA-PSS params
+     * (`signature`, `saltLen`, `messageNonce`). The on-chain ix was
+     * renamed to `claim_ant_arweave_attested` (canonical contracts
+     * `ar-io-solana-contracts` PR-19+): verification is now via
+     * instruction-introspection of a preceding Ed25519 sigverify ix
+     * issued by the off-chain attestor (see
+     * `migration/attestor/`). Those data args are no longer fed to the
+     * builder. Callers MUST prepend the attestor's sigverify ix to the
+     * transaction or it will fail on-chain. A higher-level helper that
+     * fetches the attestor's signature and assembles the full tx is
+     * tracked as a follow-up.
+     *
+     * @deprecated Args `signature`, `saltLen`, `messageNonce` are
+     * ignored. Use the new attested flow.
+     */
     claimArweaveIx(args: {
         antMint: Address;
         claimant: Address;
-        signature: Uint8Array;
-        saltLen: number;
+        /** @deprecated unused — superseded by attestor sigverify ix */
+        signature?: Uint8Array;
+        /** @deprecated unused — superseded by attestor sigverify ix */
+        saltLen?: number;
         depositor: Address;
+        /** 32-byte nonce from the on-chain Escrow PDA; still part of the
+         *  canonical claim payload that the attestor signs. */
         messageNonce: Uint8Array;
     }): Promise<Instruction>;
     /** Submit an Ethereum ECDSA secp256k1 + EIP-191 signature. */
@@ -233,14 +255,21 @@ export declare class TokenEscrow {
         signature: Uint8Array;
         saltLen?: number;
     }): Promise<string>;
+    /**
+     * @deprecated Args `signature`, `saltLen`, `messageNonce` are ignored.
+     * Use the new attested flow — see `claimArweaveIx` doc.
+     */
     claimTokensArweaveIx(args: {
         depositor: Address;
         assetId: Uint8Array;
         claimant: Address;
         claimantTokenAccount: Address;
         escrowTokenAccount: Address;
-        signature: Uint8Array;
-        saltLen: number;
+        /** @deprecated unused — superseded by attestor sigverify ix */
+        signature?: Uint8Array;
+        /** @deprecated unused — superseded by attestor sigverify ix */
+        saltLen?: number;
+        /** 32-byte nonce from the on-chain Escrow PDA. */
         messageNonce: Uint8Array;
     }): Promise<Instruction>;
     /**

package/lib/types/solana/events.d.ts

@@ -28,11 +28,11 @@
  * pull-based model.
  */
 import { type Rpc, type Signature, type SolanaRpcApi } from '@solana/kit';
-import { ARIO_ANT_ESCROW_PROGRAM_ADDRESS } from './generated/ant-escrow/program-address.js';
-import { ARIO_ANT_PROGRAM_ADDRESS } from './generated/ant/program-address.js';
-import { ARIO_ARNS_PROGRAM_ADDRESS } from './generated/arns/program-address.js';
-import { ARIO_CORE_PROGRAM_ADDRESS } from './generated/core/program-address.js';
-import { ARIO_GAR_PROGRAM_ADDRESS } from './generated/gar/program-address.js';
+import { ARIO_ANT_PROGRAM_ADDRESS } from '@ar.io/solana-contracts/ant';
+import { ARIO_ANT_ESCROW_PROGRAM_ADDRESS } from '@ar.io/solana-contracts/ant-escrow';
+import { ARIO_ARNS_PROGRAM_ADDRESS } from '@ar.io/solana-contracts/arns';
+import { ARIO_CORE_PROGRAM_ADDRESS } from '@ar.io/solana-contracts/core';
+import { ARIO_GAR_PROGRAM_ADDRESS } from '@ar.io/solana-contracts/gar';
 import * as escrowEvents from './generated/ant-escrow/events/index.js';
 import * as antEvents from './generated/ant/events/index.js';
 import * as arnsEvents from './generated/arns/events/index.js';

package/lib/types/version.d.ts

@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export declare const version = "4.0.0-solana.5";
+export declare const version = "4.0.0-solana.6";

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ar.io/sdk",
-  "version": "4.0.0-solana.6",
+  "version": "4.0.0-solana.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ar-io/ar-io-sdk.git"
   },
-  "main": "./lib/cjs/node/index.js",
+  "main": "./lib/esm/node/index.js",
   "module": "./lib/esm/node/index.js",
   "types": "./lib/types/node/index.d.ts",
   "type": "module",
@@ -27,28 +27,23 @@
   "exports": {
     ".": {
       "types": "./lib/types/node/index.d.ts",
-      "import": "./lib/esm/node/index.js",
-      "require": "./lib/cjs/node/index.js"
+      "import": "./lib/esm/node/index.js"
     },
     "./node": {
       "types": "./lib/types/node/index.d.ts",
-      "import": "./lib/esm/node/index.js",
-      "require": "./lib/cjs/node/index.js"
+      "import": "./lib/esm/node/index.js"
     },
     "./web": {
       "types": "./lib/types/web/index.d.ts",
-      "import": "./lib/esm/web/index.js",
-      "require": "./lib/cjs/web/index.js"
+      "import": "./lib/esm/web/index.js"
     },
     "./solana": {
       "types": "./lib/types/solana/index.d.ts",
-      "import": "./lib/esm/solana/index.js",
-      "require": "./lib/cjs/solana/index.js"
+      "import": "./lib/esm/solana/index.js"
     },
     "./solana/generated": {
       "types": "./lib/types/solana/generated/index.d.ts",
-      "import": "./lib/esm/solana/generated/index.js",
-      "require": "./lib/cjs/solana/generated/index.js"
+      "import": "./lib/esm/solana/generated/index.js"
     }
   },
   "bin": {
@@ -57,25 +52,22 @@
   "scripts": {
     "build:web": "node bundle.mjs",
     "build:esm": "yarn tsc -p tsconfig.json",
-    "build:cjs": "yarn tsc -p tsconfig.cjs.json && echo \"{\\\"type\\\": \\\"commonjs\\\"}\" > lib/cjs/package.json",
-    "build": "yarn clean && yarn build:web && yarn build:esm && yarn build:cjs",
+    "build": "yarn clean && yarn build:web && yarn build:esm",
     "clean": "rimraf [ lib bundles coverage tests/contracts tests/wallets ]",
     "lint:fix": "biome check --write --unsafe",
     "lint:check": "biome check --unsafe",
     "format:fix": "biome format --write",
     "format:check": "biome format",
     "test": "yarn test:unit && yarn test:e2e",
-    "test:cjs": "yarn build:cjs && yarn link && cd ./tests/e2e/cjs && yarn && yarn test",
     "test:esm": "yarn build:esm && yarn link && cd ./tests/e2e/esm && yarn && yarn test",
     "test:web": "yarn build:esm && yarn link && cd ./tests/e2e/web && yarn && yarn test",
     "test:unit": "c8 tsx --test --test-reporter=spec --enable-source-maps --trace-warnings $(find src -type f -name '*.test.ts')",
     "test:link": "yarn build && yarn link",
-    "test:e2e": "yarn test:cjs && yarn test:esm && yarn test:web",
+    "test:e2e": "yarn test:esm && yarn test:web",
     "test:integration": "yarn build:esm && yarn link && cd ./tests/integration && yarn && yarn test",
     "prepare": "husky install",
     "docs:update": "markdown-toc-gen insert README.md --max-depth 2",
     "example:esm": "cd examples/esm && yarn && node index.mjs",
-    "example:cjs": "yarn build:cjs && yarn link && cd examples/cjs && yarn && node index.cjs",
     "example:web": "yarn build:web && http-server --port 8080 --host -o examples/web",
     "example:vite": "yarn build:esm && yarn link && cd examples/vite && yarn && yarn start",
     "cli:local": "node lib/esm/cli/cli.js",
@@ -130,6 +122,7 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
+    "@ar.io/solana-contracts": "0.1.0-devnet.0",
     "@ardrive/turbo-sdk": "^1.19.0",
     "@dha-team/arbundles": "^1.0.1",
     "@permaweb/aoconnect": "0.0.68",