@ar.io/sdk 1.2.0-alpha.9 → 1.2.1

package/lib/cjs/common/ant-ao.js

@@ -19,6 +19,13 @@ class AoANTReadable {
             throw new error_js_1.InvalidContractConfigurationError();
         }
     }
+    async getState() {
+        const tags = [{ name: 'Action', value: 'State' }];
+        const res = await this.process.read({
+            tags,
+        });
+        return res;
+    }
     async getInfo() {
         const tags = [{ name: 'Action', value: 'Info' }];
         const info = await this.process.read({
@@ -38,7 +45,7 @@ class AoANTReadable {
     async getRecord({ undername }) {
         const tags = [
             { name: 'Sub-Domain', value: undername },
-            { name: 'Action', value: 'Get-Record' },
+            { name: 'Action', value: 'Record' },
         ];
         const record = await this.process.read({
             tags,
@@ -54,7 +61,7 @@ class AoANTReadable {
      * ````
      */
     async getRecords() {
-        const tags = [{ name: 'Action', value: 'Get-Records' }];
+        const tags = [{ name: 'Action', value: 'Records' }];
         const records = await this.process.read({
             tags,
         });
@@ -81,7 +88,7 @@ class AoANTReadable {
      * ```
      */
     async getControllers() {
-        const tags = [{ name: 'Action', value: 'Get-Controllers' }];
+        const tags = [{ name: 'Action', value: 'Controllers' }];
         const controllers = await this.process.read({
             tags,
         });
@@ -182,7 +189,7 @@ class AoANTWriteable extends AoANTReadable {
      */
     async addController({ controller, }) {
         const tags = [
-            { name: 'Action', value: 'Set-Controller' },
+            { name: 'Action', value: 'Add-Controller' },
             { name: 'Controller', value: controller },
         ];
         return this.process.send({

package/lib/cjs/common/contracts/ao-process.js

@@ -19,6 +19,7 @@ exports.AOProcess = void 0;
  */
 const aoconnect_1 = require("@permaweb/aoconnect");
 const arbundles_1 = require("arbundles");
+const json_js_1 = require("../../utils/json.js");
 const version_js_1 = require("../../version.js");
 const error_js_1 = require("../error.js");
 const logger_js_1 = require("../logger.js");
@@ -60,18 +61,22 @@ class AOProcess {
                     process: this.processId,
                     tags,
                 });
+                if (result.Messages.length === 0) {
+                    throw new Error(`Process ${this.processId} does not support provided action.`);
+                }
                 const tagsOutput = result.Messages[0].Tags;
                 const error = tagsOutput.find((tag) => tag.name === 'Error');
                 if (error) {
                     throw new Error(`${error.Value}: ${result.Messages[0].Data}`);
                 }
-                if (result.Messages.length === 0) {
-                    throw new Error('Process does not support provided action.');
-                }
                 this.logger.debug(`Read interaction result`, {
                     result: result.Messages[0].Data,
                 });
-                const response = JSON.parse(result.Messages[0].Data);
+                // return empty object if no data is returned
+                if (result.Messages[0].Data === undefined) {
+                    return {};
+                }
+                const response = (0, json_js_1.safeDecode)(result.Messages[0].Data);
                 return response;
             }
             catch (e) {
@@ -131,7 +136,13 @@ class AOProcess {
                     const result = output.Messages[0].Data;
                     throw new error_js_1.WriteInteractionError(`${error.Value}: ${result}`);
                 }
-                const resultData = JSON.parse(output.Messages[0].Data);
+                if (output.Messages.length === 0) {
+                    throw new Error(`Process ${this.processId} does not support provided action.`);
+                }
+                if (output.Messages[0].Data === undefined) {
+                    return { id: messageId };
+                }
+                const resultData = (0, json_js_1.safeDecode)(output.Messages[0].Data);
                 this.logger.debug('Message result data', {
                     resultData,
                     messageId,

package/lib/cjs/common/io.js

@@ -45,7 +45,7 @@ class IOReadable {
     constructor(config, arweave = arweave_1.default.init({})) {
         if (!config) {
             this.process = new ao_process_js_1.AOProcess({
-                processId: constants_js_1.ioDevnetProcessId,
+                processId: constants_js_1.IO_TESTNET_PROCESS_ID,
             });
         }
         else if ((0, io_js_1.isProcessConfiguration)(config)) {
@@ -64,31 +64,47 @@ class IOReadable {
         }
         this.arweave = arweave;
     }
-    async getEpoch(epoch) {
+    async getInfo() {
+        return this.process.read({
+            tags: [{ name: 'Action', value: 'Info' }],
+        });
+    }
+    async getEpochSettings(params) {
         const allTags = [
-            { name: 'Action', value: 'Epoch' },
+            { name: 'Action', value: 'Epoch-Settings' },
             {
-                // TODO: default this to the current network time
                 name: 'Timestamp',
-                value: epoch.timestamp?.toString() ?? '',
+                value: params?.timestamp?.toString() ??
+                    (await this.arweave.blocks.getCurrent().catch(() => {
+                        return { timestamp: Date.now() }; // fallback to current time
+                    })).timestamp.toString(),
             },
             {
-                name: 'BlockHeight',
-                value: epoch?.blockHeight?.toString(),
+                name: 'Epoch-Index',
+                value: params?.epochIndex?.toString(),
+            },
+        ];
+        const prunedTags = allTags.filter((tag) => tag.value !== undefined);
+        return this.process.read({
+            tags: prunedTags,
+        });
+    }
+    async getEpoch(epoch) {
+        const allTags = [
+            { name: 'Action', value: 'Epoch' },
+            {
+                name: 'Timestamp',
+                value: epoch?.timestamp?.toString() ??
+                    (await this.arweave.blocks.getCurrent().catch(() => {
+                        return { timestamp: Date.now() }; // fallback to current time
+                    })).timestamp.toString(),
             },
             {
-                name: 'EpochIndex',
+                name: 'Epoch-Index',
                 value: epoch?.epochIndex?.toString(),
             },
         ];
         const prunedTags = allTags.filter((tag) => tag.value !== undefined);
-        // if it only contains the action, add default timestamp
-        if (prunedTags.length === 1) {
-            prunedTags.push({
-                name: 'Timestamp',
-                value: (await this.arweave.blocks.getCurrent()).timestamp.toString(),
-            });
-        }
         return this.process.read({
             tags: prunedTags,
         });
@@ -108,13 +124,13 @@ class IOReadable {
     }
     async getArNSReservedNames() {
         return this.process.read({
-            tags: [{ name: 'Action', value: 'ReservedNames' }],
+            tags: [{ name: 'Action', value: 'Reserved-Names' }],
         });
     }
     async getArNSReservedName({ name, }) {
         return this.process.read({
             tags: [
-                { name: 'Action', value: 'ReservedName' },
+                { name: 'Action', value: 'Reserved-Name' },
                 { name: 'Name', value: name },
             ],
         });
@@ -149,125 +165,98 @@ class IOReadable {
         return this.process.read({
             tags: [
                 { name: 'Action', value: 'Epoch' },
-                { name: 'Timestamp', value: `${Date.now()}` },
+                {
+                    name: 'Timestamp',
+                    value: (await this.arweave.blocks.getCurrent().catch(() => {
+                        return { timestamp: Date.now() }; // fallback to current time
+                    })).timestamp.toString(),
+                },
             ],
         });
     }
     async getPrescribedObservers(epoch) {
         const allTags = [
-            { name: 'Action', value: 'EpochPrescribedObservers' },
+            { name: 'Action', value: 'Epoch-Prescribed-Observers' },
             {
                 name: 'Timestamp',
-                value: epoch.timestamp?.toString(),
+                value: epoch?.timestamp?.toString() ??
+                    (await this.arweave.blocks.getCurrent().catch(() => {
+                        return { timestamp: Date.now() }; // fallback to current time
+                    })).timestamp.toString(),
             },
             {
-                name: 'BlockHeight',
-                value: epoch?.blockHeight?.toString(),
-            },
-            {
-                name: 'EpochIndex',
+                name: 'Epoch-Index',
                 value: epoch?.epochIndex?.toString(),
             },
         ];
         const prunedTags = allTags.filter((tag) => tag.value !== undefined);
-        // if it only contains the action, add default timestamp
-        if (prunedTags.length === 1) {
-            prunedTags.push({
-                name: 'Timestamp',
-                value: `${Date.now()}`,
-            });
-        }
         return this.process.read({
             tags: prunedTags,
         });
     }
     async getPrescribedNames(epoch) {
         const allTags = [
-            { name: 'Action', value: 'EpochPrescribedNames' },
+            { name: 'Action', value: 'Epoch-Prescribed-Names' },
             {
                 name: 'Timestamp',
-                value: epoch.timestamp?.toString(),
-            },
-            {
-                name: 'BlockHeight',
-                value: epoch?.blockHeight?.toString(),
+                value: epoch?.timestamp?.toString() ??
+                    (await this.arweave.blocks.getCurrent().catch(() => {
+                        return { timestamp: Date.now() }; // fallback to current time
+                    })).timestamp.toString(),
             },
             {
-                name: 'EpochIndex',
+                name: 'Epoch-Index',
                 value: epoch?.epochIndex?.toString(),
             },
         ];
         const prunedTags = allTags.filter((tag) => tag.value !== undefined);
-        // if it only contains the action, add default timestamp
-        if (prunedTags.length === 1) {
-            prunedTags.push({
-                name: 'Timestamp',
-                value: `${Date.now()}`, // TODO; replace with fetch the current network time
-            });
-        }
         return this.process.read({
             tags: prunedTags,
         });
     }
     async getObservations(epoch) {
         const allTags = [
-            { name: 'Action', value: 'EpochObservations' },
+            { name: 'Action', value: 'Epoch-Observations' },
             {
                 name: 'Timestamp',
-                value: epoch.timestamp?.toString(),
-            },
-            {
-                name: 'BlockHeight',
-                value: epoch?.blockHeight?.toString(),
+                value: epoch?.timestamp?.toString() ??
+                    (await this.arweave.blocks.getCurrent().catch(() => {
+                        return { timestamp: `${Date.now()}` }; // fallback to current time
+                    })).timestamp.toString(),
             },
             {
-                name: 'EpochIndex',
+                name: 'Epoch-Index',
                 value: epoch?.epochIndex?.toString(),
             },
         ];
         const prunedTags = allTags.filter((tag) => tag.value !== undefined);
-        // if it only contains the action, add default timestamp
-        if (prunedTags.length === 1) {
-            prunedTags.push({
-                name: 'Timestamp',
-                value: (await this.arweave.blocks.getCurrent()).timestamp.toString(),
-            });
-        }
         return this.process.read({
             tags: prunedTags,
         });
     }
     async getDistributions(epoch) {
         const allTags = [
-            { name: 'Action', value: 'EpochDistributions' },
+            { name: 'Action', value: 'Epoch-Distributions' },
             {
                 name: 'Timestamp',
-                value: epoch.timestamp?.toString() ?? '',
+                value: epoch?.timestamp?.toString() ??
+                    (await this.arweave.blocks.getCurrent().catch(() => {
+                        return { timestamp: Date.now() }; // fallback to current time
+                    })).timestamp.toString(),
             },
             {
-                name: 'BlockHeight',
-                value: epoch?.blockHeight?.toString(),
-            },
-            {
-                name: 'EpochIndex',
+                name: 'Epoch-Index',
                 value: epoch?.epochIndex?.toString(),
             },
         ];
         const prunedTags = allTags.filter((tag) => tag.value !== undefined);
-        // if it only contains the action, add default timestamp
-        if (prunedTags.length === 1) {
-            prunedTags.push({
-                name: 'Timestamp',
-                value: (await this.arweave.blocks.getCurrent()).timestamp.toString(),
-            });
-        }
         return this.process.read({
             tags: prunedTags,
         });
     }
     async getTokenCost({ intent, purchaseType, years, name, quantity, }) {
         const allTags = [
-            { name: 'Action', value: 'TokenCost' },
+            { name: 'Action', value: 'Token-Cost' },
             {
                 name: 'Intent',
                 value: intent,
@@ -285,9 +274,15 @@ class IOReadable {
                 value: quantity?.toString(),
             },
             {
-                name: 'PurchaseType',
+                name: 'Purchase-Type',
                 value: purchaseType,
             },
+            {
+                name: 'Timestamp',
+                value: (await this.arweave.blocks.getCurrent().catch(() => {
+                    return { timestamp: Date.now() }; // fallback to current time
+                })).timestamp.toString(),
+            },
         ];
         const prunedTags = allTags.filter((tag) => tag.value !== undefined);
         return this.process.read({
@@ -302,7 +297,7 @@ class IOWriteable extends IOReadable {
         if (Object.keys(config).length === 0) {
             super({
                 process: new ao_process_js_1.AOProcess({
-                    processId: constants_js_1.ioDevnetProcessId,
+                    processId: constants_js_1.IO_TESTNET_PROCESS_ID,
                 }),
             });
             this.signer = signer;
@@ -345,17 +340,17 @@ class IOWriteable extends IOReadable {
         const { tags = [] } = options || {};
         const allTags = [
             ...tags,
-            { name: 'Action', value: 'JoinNetwork' },
+            { name: 'Action', value: 'Join-Network' },
             {
-                name: 'OperatorStake',
+                name: 'Operator-Stake',
                 value: operatorStake.valueOf().toString(),
             },
             {
-                name: 'AllowDelegatedStaking',
+                name: 'Allow-Delegated-Staking',
                 value: allowDelegatedStaking.toString(),
             },
             {
-                name: 'DelegateRewardShareRatio',
+                name: 'Delegate-Reward-Share-Ratio',
                 value: delegateRewardShareRatio.toString(),
             },
             {
@@ -367,7 +362,7 @@ class IOWriteable extends IOReadable {
                 value: label,
             },
             {
-                name: 'MinDelegatedStake',
+                name: 'Min-Delegated-Stake',
                 value: minDelegatedStake.valueOf().toString(),
             },
             {
@@ -387,11 +382,11 @@ class IOWriteable extends IOReadable {
                 value: protocol,
             },
             {
-                name: 'AutoStake',
+                name: 'Auto-Stake',
                 value: autoStake.toString(),
             },
             {
-                name: 'ObserverAddress',
+                name: 'Observer-Address',
                 value: observerAddress,
             },
         ];
@@ -405,27 +400,27 @@ class IOWriteable extends IOReadable {
         const { tags = [] } = options || {};
         const allTags = [
             ...tags,
-            { name: 'Action', value: 'UpdateGatewaySettings' },
+            { name: 'Action', value: 'Update-Gateway-Settings' },
             { name: 'Label', value: label },
             { name: 'Note', value: note },
             { name: 'FQDN', value: fqdn },
             { name: 'Port', value: port?.toString() },
             { name: 'Properties', value: properties },
             { name: 'Protocol', value: protocol },
-            { name: 'ObserverAddress', value: observerAddress },
+            { name: 'Observer-Address', value: observerAddress },
             {
-                name: 'AllowDelegatedStaking',
+                name: 'Allow-Delegated-Staking',
                 value: allowDelegatedStaking?.toString(),
             },
             {
-                name: 'DelegateRewardShareRatio',
+                name: 'Delegate-Reward-Share-Ratio',
                 value: delegateRewardShareRatio?.toString(),
             },
             {
-                name: 'MinDelegatedStake',
+                name: 'Min-Delegated-Stake',
                 value: minDelegatedStake?.valueOf().toString(),
             },
-            { name: 'AutoStake', value: autoStake?.toString() },
+            { name: 'Auto-Stake', value: autoStake?.toString() },
         ];
         const prunedTags = allTags.filter((tag) => tag.value !== undefined);
         return this.process.send({
@@ -439,7 +434,7 @@ class IOWriteable extends IOReadable {
             signer: this.signer,
             tags: [
                 ...tags,
-                { name: 'Action', value: 'DelegateStake' },
+                { name: 'Action', value: 'Delegate-Stake' },
                 { name: 'Target', value: params.target },
                 { name: 'Quantity', value: params.stakeQty.valueOf().toString() },
             ],
@@ -451,7 +446,7 @@ class IOWriteable extends IOReadable {
             signer: this.signer,
             tags: [
                 ...tags,
-                { name: 'Action', value: 'DecreaseDelegateStake' },
+                { name: 'Action', value: 'Decrease-Delegate-Stake' },
                 { name: 'Target', value: params.target },
                 { name: 'Quantity', value: params.decreaseQty.valueOf().toString() },
             ],
@@ -463,7 +458,7 @@ class IOWriteable extends IOReadable {
             signer: this.signer,
             tags: [
                 ...tags,
-                { name: 'Action', value: 'IncreaseOperatorStake' },
+                { name: 'Action', value: 'Increase-Operator-Stake' },
                 { name: 'Quantity', value: params.increaseQty.valueOf().toString() },
             ],
         });
@@ -474,7 +469,7 @@ class IOWriteable extends IOReadable {
             signer: this.signer,
             tags: [
                 ...tags,
-                { name: 'Action', value: 'DecreaseOperatorStake' },
+                { name: 'Action', value: 'Decrease-Operator-Stake' },
                 { name: 'Quantity', value: params.decreaseQty.valueOf().toString() },
             ],
         });
@@ -485,13 +480,13 @@ class IOWriteable extends IOReadable {
             signer: this.signer,
             tags: [
                 ...tags,
-                { name: 'Action', value: 'SaveObservations' },
+                { name: 'Action', value: 'Save-Observations' },
                 {
-                    name: 'ReportTxId',
+                    name: 'Report-Tx-Id',
                     value: params.reportTxId,
                 },
                 {
-                    name: 'FailedGateways',
+                    name: 'Failed-Gateways',
                     value: params.failedGateways.join(','),
                 },
             ],
@@ -505,11 +500,11 @@ class IOWriteable extends IOReadable {
         const { tags = [] } = options || {};
         const allTags = [
             ...tags,
-            { name: 'Action', value: 'BuyRecord' },
+            { name: 'Action', value: 'Buy-Record' },
             { name: 'Name', value: params.name },
             { name: 'Years', value: params.years?.toString() ?? '1' },
-            { name: 'ProcessId', value: params.processId },
-            { name: 'PurchaseType', value: params.type || 'lease' },
+            { name: 'Process-Id', value: params.processId },
+            { name: 'Purchase-Type', value: params.type || 'lease' },
         ];
         const prunedTags = allTags.filter((tag) => tag.value !== undefined);
         return this.process.send({
@@ -523,7 +518,7 @@ class IOWriteable extends IOReadable {
             signer: this.signer,
             tags: [
                 ...tags,
-                { name: 'Action', value: 'ExtendLease' },
+                { name: 'Action', value: 'Extend-Lease' },
                 { name: 'Name', value: params.name },
                 { name: 'Years', value: params.years.toString() },
             ],
@@ -535,7 +530,7 @@ class IOWriteable extends IOReadable {
             signer: this.signer,
             tags: [
                 ...tags,
-                { name: 'Action', value: 'IncreaseUndernameLimit' },
+                { name: 'Action', value: 'Increase-Undername-Limit' },
                 { name: 'Name', value: params.name },
                 { name: 'Quantity', value: params.increaseCount.toString() },
             ],

package/lib/cjs/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_SCHEDULER_ID = exports.ANT_LUA_ID = exports.AOS_MODULE_ID = exports.MIO_PER_IO = exports.ioDevnetProcessId = exports.ARNS_DEVNET_REGISTRY_TX = exports.ARNS_TESTNET_REGISTRY_TX = exports.SORT_KEY_REGEX = exports.FQDN_REGEX = exports.ARWEAVE_TX_REGEX = void 0;
+exports.DEFAULT_SCHEDULER_ID = exports.ANT_LUA_ID = exports.AOS_MODULE_ID = exports.MIO_PER_IO = exports.IO_TESTNET_PROCESS_ID = exports.ioDevnetProcessId = exports.IO_DEVNET_PROCESS_ID = exports.ARNS_DEVNET_REGISTRY_TX = exports.ARNS_TESTNET_REGISTRY_TX = exports.SORT_KEY_REGEX = exports.FQDN_REGEX = exports.ARWEAVE_TX_REGEX = void 0;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc. All Rights Reserved.
  *
@@ -24,8 +24,11 @@ exports.FQDN_REGEX = new RegExp('^(?:(?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{
 exports.SORT_KEY_REGEX = new RegExp('^[0-9]{12},[0-9]{13},[a-fA-F0-9]{64}$');
 exports.ARNS_TESTNET_REGISTRY_TX = process.env.ARNS_REGISTRY_TX ?? 'bLAgYxAdX2Ry-nt6aH2ixgvJXbpsEYm28NgJgyqfs-U';
 exports.ARNS_DEVNET_REGISTRY_TX = '_NctcA2sRy1-J4OmIQZbYFPM17piNcbdBPH2ncX2RL8';
-exports.ioDevnetProcessId = 'GaQrvEMKBpkjofgnBi_B3IgIDmY_XYelVLB6GcRGrHc';
+exports.IO_DEVNET_PROCESS_ID = 'GaQrvEMKBpkjofgnBi_B3IgIDmY_XYelVLB6GcRGrHc';
+// backwards compatibility - TODO: remove in v2.0.0
+exports.ioDevnetProcessId = exports.IO_DEVNET_PROCESS_ID;
+exports.IO_TESTNET_PROCESS_ID = 'agYcCFJtrMG6cqMuZfskIkFTGvUPddICmtQSBIoPdiA';
 exports.MIO_PER_IO = 1_000_000;
-exports.AOS_MODULE_ID = '9afQ1PLf2mrshqCTZEzzJTR2gWaC9zNPnYgYEqg1Pt4';
-exports.ANT_LUA_ID = 'obPBMsBWmG5q2qODj3y-zdKiuhZaJC_nuBaQRvORKkU';
+exports.AOS_MODULE_ID = 'cbn0KKrBZH7hdNkNokuXLtGryrWM--PjSTBqIzw9Kkk';
+exports.ANT_LUA_ID = '3OlGzE5mrsN2GsxCYM0Tae1KzWepGOr5a94deOWmApM';
 exports.DEFAULT_SCHEDULER_ID = '_GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA';