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

package/lib/cjs/common/io.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ARIOWriteable = exports.ARIOReadable = exports.ARIO = void 0;
+exports.ARIOWriteable = exports.ARIOReadable = exports.ARIO = exports.DEFAULT_SOLANA_RPC_URL = void 0;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -18,6 +18,8 @@ exports.ARIOWriteable = exports.ARIOReadable = exports.ARIO = void 0;
  */
 const aoconnect_1 = require("@permaweb/aoconnect");
 const constants_js_1 = require("../constants.js");
+const io_readable_js_1 = require("../solana/io-readable.js");
+const io_writeable_js_1 = require("../solana/io-writeable.js");
 const index_js_1 = require("../types/index.js");
 const ao_js_1 = require("../utils/ao.js");
 const arweave_js_1 = require("../utils/arweave.js");
@@ -30,9 +32,39 @@ const faucet_js_1 = require("./faucet.js");
 const hb_js_1 = require("./hyperbeam/hb.js");
 const logger_js_1 = require("./logger.js");
 const turbo_js_1 = require("./turbo.js");
+exports.DEFAULT_SOLANA_RPC_URL = 'https://api.mainnet-beta.solana.com';
 class ARIO {
     // Implementation
     static init(config) {
+        // Solana backend (explicit opt-in via `backend: 'solana'`)
+        if (config !== undefined &&
+            'backend' in config &&
+            config.backend === 'solana') {
+            if (config.signer) {
+                if (!config.rpcSubscriptions) {
+                    throw new Error('ARIO.init({ backend: "solana", signer }) requires rpcSubscriptions for transaction confirmation.');
+                }
+                return new io_writeable_js_1.SolanaARIOWriteable({
+                    rpc: config.rpc,
+                    rpcSubscriptions: config.rpcSubscriptions,
+                    commitment: config.commitment,
+                    signer: config.signer,
+                    coreProgramId: config.coreProgramId,
+                    garProgramId: config.garProgramId,
+                    arnsProgramId: config.arnsProgramId,
+                    antProgramId: config.antProgramId,
+                });
+            }
+            return new io_readable_js_1.SolanaARIOReadable({
+                rpc: config.rpc,
+                commitment: config.commitment,
+                coreProgramId: config.coreProgramId,
+                garProgramId: config.garProgramId,
+                arnsProgramId: config.arnsProgramId,
+                antProgramId: config.antProgramId,
+            });
+        }
+        // AO backend (default — preserves legacy behavior).
         if (config !== undefined && 'signer' in config) {
             return new ARIOWriteable(config);
         }
@@ -1419,5 +1451,14 @@ class ARIOWriteable extends ARIOReadable {
             tags: (0, arweave_js_1.pruneTags)(allTags),
         });
     }
+    /**
+     * AO backend stub — `syncAttributes` is a Solana-only on-chain reconciliation
+     * for the ANT NFT's Attributes plugin. AO ANTs have no NFT trait surface, so
+     * there is nothing to sync.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    async syncAttributes(_params, _options) {
+        throw new Error('syncAttributes is only supported on the Solana backend (use ARIO.init({ backend: "solana", ... })).');
+    }
 }
 exports.ARIOWriteable = ARIOWriteable;

package/lib/cjs/common/marketplace.js

@@ -35,7 +35,6 @@ class ArNSMarketplaceRead {
     async getInfo() {
         return this.process.read({
             tags: [{ name: 'Action', value: 'Info' }],
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' && tag.value === 'Info-Notice'),
         });
     }
     async getPaginatedIntents({ cursor, limit, sortBy, sortOrder, filters, } = {}) {
@@ -50,8 +49,6 @@ class ArNSMarketplaceRead {
         const filteredTags = tags.filter((tag) => tag.value !== undefined);
         return this.process.read({
             tags: filteredTags,
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' &&
-                tag.value === 'Get-Paginated-Intents-Notice'),
         });
     }
     async getIntent(intentId) {
@@ -60,7 +57,6 @@ class ArNSMarketplaceRead {
                 { name: 'Action', value: 'Get-Intent-By-Id' },
                 { name: 'Intent-Id', value: intentId },
             ],
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' && tag.value === 'Get-Intent-By-Id-Notice'),
         });
     }
     async getIntentByANTId(antId) {
@@ -96,10 +92,7 @@ class ArNSMarketplaceRead {
             },
         ];
         const filteredTags = tags.filter((tag) => tag.value !== undefined);
-        return this.process.read({
-            tags: filteredTags,
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' && tag.value === 'Get-Orders-Notice'),
-        });
+        return this.process.read({ tags: filteredTags });
     }
     /**
      * Get a single order by ID
@@ -112,7 +105,6 @@ class ArNSMarketplaceRead {
                 { name: 'Action', value: 'Get-Order' },
                 { name: 'Order-Id', value: orderId },
             ],
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' && tag.value === 'Get-Order-Notice'),
         });
     }
     async getOrderByANTId(antId) {
@@ -135,8 +127,6 @@ class ArNSMarketplaceRead {
                 { name: 'Action', value: 'Get-Paginated-Balances' },
                 ...(0, index_js_1.paginationParamsToTags)(params),
             ],
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' &&
-                tag.value === 'Get-Paginated-Balances-Notice'),
         });
     }
     /**
@@ -148,7 +138,6 @@ class ArNSMarketplaceRead {
                 { name: 'Action', value: 'Get-Balance' },
                 { name: 'Address', value: address },
             ],
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' && tag.value === 'Get-Balance-Notice'),
         });
     }
     async getUserAssets({ address, arioProcessId, }) {
@@ -249,7 +238,6 @@ class ArNSMarketplaceWrite extends ArNSMarketplaceRead {
                 { name: 'Quantity', value: params.amount },
             ],
             signer: this.signer,
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' && tag.value === 'Withdraw-Ario-Notice'),
         });
     }
     async createIntent({ antId, orderType, quantity, price, expirationTime, minimumPrice, decreaseInterval, }) {
@@ -267,7 +255,6 @@ class ArNSMarketplaceWrite extends ArNSMarketplaceRead {
         return this.process.send({
             tags: filteredTags,
             signer: this.signer,
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' && tag.value === 'Create-Intent-Notice'),
         });
     }
     async pushANTIntentResolution(intentId) {
@@ -277,8 +264,6 @@ class ArNSMarketplaceWrite extends ArNSMarketplaceRead {
                 { name: 'X-Intent-Id', value: intentId },
             ],
             signer: this.signer,
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' &&
-                tag.value === 'Push-ANT-Intent-Resolution-Notice'),
         });
     }
     async settleAuction(params) {
@@ -292,14 +277,11 @@ class ArNSMarketplaceWrite extends ArNSMarketplaceRead {
         return this.process.send({
             tags: filteredTags,
             signer: this.signer,
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' && tag.value === 'Settle-Auction-Notice'),
         });
     }
     async listNameForSale({ name, expirationTime, price, type, walletAddress, minimumPrice, decreaseInterval, onProgress = (event) => {
         this.logger.info(`List name for sale progress: ${event.step}`);
-    }, }, timeoutOptions) {
-        const maxRetries = timeoutOptions?.maxRetries ?? 15;
-        const statusPollIntervalMs = timeoutOptions?.statusPollIntervalMs ?? 3000;
+    }, }) {
         // Get arns record for the current ant id associated with it
         const record = await this.ario.getArNSRecord({ name: name });
         this.logger.info(`Record ${name} found: ${JSON.stringify(record)}`);
@@ -359,26 +341,10 @@ class ArNSMarketplaceWrite extends ArNSMarketplaceRead {
             // check error for existing intent. Will be a contract error message.
             const isExistingIntentError = error.message.includes('An intent already exists for this ANT ID');
             if (isExistingIntentError) {
-                let fetchedIntent;
-                let lastIntentError = null;
-                for (let attempt = 0; attempt <= maxRetries; attempt++) {
-                    try {
-                        fetchedIntent = await this.getIntentByANTId(antId);
-                        lastIntentError = null;
-                        break;
-                    }
-                    catch (getIntentError) {
-                        lastIntentError = getIntentError;
-                        this.logger.error(`Failed to get intent (attempt ${attempt + 1}/${maxRetries + 1}): ${getIntentError.message}`);
-                        if (attempt < maxRetries) {
-                            const backoffMs = statusPollIntervalMs * Math.pow(2, attempt);
-                            await new Promise((resolve) => setTimeout(resolve, backoffMs));
-                        }
-                    }
-                }
-                if (lastIntentError !== null || fetchedIntent === undefined) {
+                intent = await this.getIntentByANTId(antId).catch((getIntentError) => {
+                    this.logger.error(`Failed to get intent: ${getIntentError.message}`);
                     const intentError = new Error('An intent already exists for this ANT ID but failed to get intent:\n\n' +
-                        (lastIntentError?.message ?? 'Unknown error'));
+                        getIntentError.message);
                     onProgress({
                         step: 'error',
                         name,
@@ -387,8 +353,7 @@ class ArNSMarketplaceWrite extends ArNSMarketplaceRead {
                         failedStep: 'creating-intent',
                     });
                     throw intentError;
-                }
-                intent = fetchedIntent;
+                });
             }
             else {
                 // Possible to get other errors, eg insufficient deposited ario balance. Rethrow them here.
@@ -426,32 +391,12 @@ class ArNSMarketplaceWrite extends ArNSMarketplaceRead {
                 step: 'transferring-ant',
                 ...transferAntEventData,
             });
-            let transferResult;
-            let lastTransferError = null;
-            for (let attempt = 0; attempt <= maxRetries; attempt++) {
-                try {
-                    transferResult = await ant.transfer({
-                        target: this.process.processId,
-                        removeControllers: false, // important: do not remove the controllers of the ANT to prevent loss of control
-                    }, {
-                        tags: [{ name: 'X-Intent-Id', value: intent.intentId }],
-                    });
-                    lastTransferError = null;
-                    break;
-                }
-                catch (error) {
-                    lastTransferError = error;
-                    this.logger.error(`Failed to transfer ANT (attempt ${attempt + 1}/${maxRetries + 1}): ${error.message}`);
-                    if (attempt < maxRetries) {
-                        const backoffMs = statusPollIntervalMs * Math.pow(2, attempt);
-                        await new Promise((resolve) => setTimeout(resolve, backoffMs));
-                    }
-                }
-            }
-            if (lastTransferError !== null || transferResult === undefined) {
-                throw lastTransferError ?? new Error('Failed to transfer ANT');
-            }
-            antTransferResult = transferResult;
+            antTransferResult = await ant.transfer({
+                target: this.process.processId,
+                removeControllers: false, // important: do not remove the controllers of the ANT to prevent loss of control
+            }, {
+                tags: [{ name: 'X-Intent-Id', value: intent.intentId }],
+            });
             this.logger.info(`ANT transferred: ${JSON.stringify(antTransferResult)}`);
             onProgress({
                 step: 'ant-transferred',
@@ -480,20 +425,24 @@ class ArNSMarketplaceWrite extends ArNSMarketplaceRead {
         // This is to ensure the order is created before returning the result for ux purposes.
         // This may still fail, in which case we return the intent and ant transfer result and handle the error in the client.
         let order = null;
-        for (let attempt = 0; attempt <= maxRetries; attempt++) {
+        let tries = 0;
+        while (order === null && tries < 5) {
             try {
                 order = await this.getOrderByANTId(antId).catch((error) => {
-                    this.logger.warn(`Failed to get order: ${error.message}`);
+                    console.log(new Error('Failed to get order: ' + error.message));
                     return null;
                 });
-                if (order !== null) {
-                    break;
-                }
-                if (attempt < maxRetries) {
+                if (order === null) {
+                    await new Promise((resolve) => setTimeout(resolve, 1000));
                     this.logger.info(`Waiting for order to be created...`);
-                    const backoffMs = statusPollIntervalMs * Math.pow(2, attempt);
-                    await new Promise((resolve) => setTimeout(resolve, backoffMs));
+                    if (tries === 5) {
+                        this.logger.error(`Failed to get order after ${tries} attempts`);
+                        throw new Error(`Failed to get order after ${tries} attempts`);
+                    }
+                    tries++;
                 }
+                // if the order is found, break the loop
+                break;
             }
             catch (error) {
                 this.logger.error(`Failed to get order: ${error.message}`);
@@ -550,7 +499,6 @@ class ArNSMarketplaceWrite extends ArNSMarketplaceRead {
         return this.process.send({
             tags,
             signer: this.signer,
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' && tag.value === 'Cancel-Order-Notice'),
         });
     }
     async createOrder({ swapToken, quantity, orderType, price, expirationTime, minimumPrice, decreaseInterval, transferDenomination, }) {
@@ -570,7 +518,6 @@ class ArNSMarketplaceWrite extends ArNSMarketplaceRead {
         return this.process.send({
             tags: filteredTags,
             signer: this.signer,
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' && tag.value === 'Create-Order-Notice'),
         });
     }
     async buyFixedPriceANT(params) {
@@ -643,8 +590,6 @@ class ArNSMarketplaceWrite extends ArNSMarketplaceRead {
                 { name: 'Bid-Amount', value: params.bidAmount },
             ],
             signer: this.signer,
-            select: (message) => message.Tags.some((tag) => tag.name === 'Action' &&
-                tag.value === 'Bid-On-English-Auction-Notice'),
         });
     }
     /**

package/lib/cjs/constants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_CU_URL = exports.DEFAULT_SCHEDULER_ID = exports.AO_AUTHORITY = exports.ANT_LUA_ID = exports.AOS_MODULE_ID = exports.MARIO_PER_ARIO = exports.MARKETPLACE_CONTRACT_ID = exports.ANT_REGISTRY_ID = exports.ANT_REGISTRY_TESTNET_ID = exports.ARIO_MAINNET_PROCESS_ID = exports.ARIO_TESTNET_PROCESS_ID = exports.arioDevnetProcessId = exports.ARIO_DEVNET_PROCESS_ID = exports.FQDN_REGEX = exports.ARWEAVE_TX_REGEX = void 0;
+exports.DEFAULT_SCHEDULER_ID = exports.AO_AUTHORITY = exports.ANT_LUA_ID = exports.AOS_MODULE_ID = exports.MARIO_PER_ARIO = exports.MARKETPLACE_CONTRACT_ID = exports.ANT_REGISTRY_ID = exports.ANT_REGISTRY_TESTNET_ID = exports.ARIO_MAINNET_PROCESS_ID = exports.ARIO_TESTNET_PROCESS_ID = exports.arioDevnetProcessId = exports.ARIO_DEVNET_PROCESS_ID = exports.FQDN_REGEX = exports.ARIO_LOGO_TX_ID = exports.AR_IO_PROTOCOL = exports.ARWEAVE_TX_REGEX = void 0;
+exports.arweaveUri = arweaveUri;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -17,6 +18,19 @@ exports.DEFAULT_CU_URL = exports.DEFAULT_SCHEDULER_ID = exports.AO_AUTHORITY = e
  * limitations under the License.
  */
 exports.ARWEAVE_TX_REGEX = new RegExp('^[a-zA-Z0-9_-]{43}$');
+/** ar:// protocol prefix for location-independent Arweave references */
+exports.AR_IO_PROTOCOL = 'ar://';
+/** Default AR.IO logo Arweave TX ID (32x32 PNG) */
+exports.ARIO_LOGO_TX_ID = 'WMLnh8pQL-UIXZMpdU2NUIriHfcFB5Bc49V8jTHjsZc';
+/**
+ * Construct an ar:// URI from an Arweave TX ID or ArNS name.
+ *
+ * - ar://{txId} — raw 43-char TX ID, resolved by wallets via arweave.net gateway
+ * - ar://{arnsName} — ArNS name, resolved by AR.IO gateways and Wayfinder SDK
+ */
+function arweaveUri(txIdOrName) {
+    return `${exports.AR_IO_PROTOCOL}${txIdOrName}`;
+}
 /** FQDN regex that matches the one used in the ArNS contract. */
 exports.FQDN_REGEX = new RegExp('^(?:(?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{1,63}$');
 exports.ARIO_DEVNET_PROCESS_ID = 'GaQrvEMKBpkjofgnBi_B3IgIDmY_XYelVLB6GcRGrHc';
@@ -38,4 +52,3 @@ exports.AOS_MODULE_ID = 'nEjlSFA_8narJlVHApbczDPkMc9znSqYtqtf1iOdoxM';
 exports.ANT_LUA_ID = 'sOW9Sdm1yoPRrzerC5iu1nsupp4e6I-HnJyYVHzvzQo';
 exports.AO_AUTHORITY = 'fcoN_xJeisVsPXA-trzVAuIiqO3ydLQxM-L4XbrQKzY';
 exports.DEFAULT_SCHEDULER_ID = '_GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA';
-exports.DEFAULT_CU_URL = 'https://cu.ardrive.io';