@ar.io/sdk 3.10.0-alpha.1 → 3.10.0

package/lib/cjs/common/io.js

@@ -1,14 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ARIOWriteable = exports.ARIOReadable = exports.ARIO = void 0;
+/**
+ * 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.
+ */
+const aoconnect_1 = require("@permaweb/aoconnect");
 const constants_js_1 = require("../constants.js");
-const io_js_1 = require("../types/io.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");
 const arweave_js_2 = require("./arweave.js");
 const ao_process_js_1 = require("./contracts/ao-process.js");
 const error_js_1 = require("./error.js");
-const turbo_js_1 = require("./turbo.js");
+const faucet_js_1 = require("./faucet.js");
 class ARIO {
     // Implementation
     static init(config) {
@@ -17,13 +33,62 @@ class ARIO {
         }
         return new ARIOReadable(config);
     }
+    static mainnet(config) {
+        if (config !== undefined && 'signer' in config) {
+            return new ARIOWriteable({
+                ...config,
+                process: new ao_process_js_1.AOProcess({
+                    processId: constants_js_1.ARIO_MAINNET_PROCESS_ID,
+                    ao: (0, aoconnect_1.connect)({
+                        CU_URL: 'https://cu.ardrive.io',
+                        ...config?.process?.ao,
+                    }),
+                }),
+            });
+        }
+        return new ARIOReadable({
+            ...config,
+            process: new ao_process_js_1.AOProcess({
+                processId: constants_js_1.ARIO_MAINNET_PROCESS_ID,
+            }),
+        });
+    }
+    static testnet(config) {
+        if (config !== undefined && 'signer' in config) {
+            return (0, faucet_js_1.createFaucet)({
+                arioInstance: new ARIOWriteable({
+                    ...config,
+                    process: new ao_process_js_1.AOProcess({
+                        processId: constants_js_1.ARIO_TESTNET_PROCESS_ID,
+                        ao: (0, aoconnect_1.connect)({
+                            CU_URL: 'https://cu.ardrive.io',
+                            ...config?.process?.ao,
+                        }),
+                    }),
+                }),
+                faucetApiUrl: config?.faucetUrl,
+            });
+        }
+        return (0, faucet_js_1.createFaucet)({
+            arioInstance: new ARIOReadable({
+                ...config,
+                process: new ao_process_js_1.AOProcess({
+                    processId: constants_js_1.ARIO_TESTNET_PROCESS_ID,
+                    ao: (0, aoconnect_1.connect)({
+                        CU_URL: 'https://cu.ardrive.io',
+                        ...config?.process?.ao,
+                    }),
+                }),
+            }),
+            faucetApiUrl: config?.faucetUrl,
+        });
+    }
 }
 exports.ARIO = ARIO;
 class ARIOReadable {
     process;
     epochSettings;
     arweave;
-    paymentProvider; // TODO: this could be an array/map of payment providers
     constructor(config) {
         this.arweave = config?.arweave ?? arweave_js_2.defaultArweave;
         if (config === undefined || Object.keys(config).length === 0) {
@@ -31,10 +96,10 @@ class ARIOReadable {
                 processId: constants_js_1.ARIO_MAINNET_PROCESS_ID,
             });
         }
-        else if ((0, io_js_1.isProcessConfiguration)(config)) {
+        else if ((0, index_js_1.isProcessConfiguration)(config)) {
             this.process = config.process;
         }
-        else if ((0, io_js_1.isProcessIdConfiguration)(config)) {
+        else if ((0, index_js_1.isProcessIdConfiguration)(config)) {
             this.process = new ao_process_js_1.AOProcess({
                 processId: config.processId,
             });
@@ -42,9 +107,6 @@ class ARIOReadable {
         else {
             throw new error_js_1.InvalidContractConfigurationError();
         }
-        this.paymentProvider = new turbo_js_1.TurboArNSPaymentProvider({
-            paymentUrl: config?.paymentUrl,
-        });
     }
     async getInfo() {
         return this.process.read({
@@ -376,20 +438,6 @@ class ARIOReadable {
     // TODO: Can overload this function to refine different types of cost details params
     async getCostDetails({ intent, type, years, name, quantity, fromAddress, fundFrom, }) {
         const replacedBuyRecordWithBuyName = intent === 'Buy-Record' ? 'Buy-Name' : intent;
-        if (fundFrom === 'turbo') {
-            const { mARIO, winc } = await this.paymentProvider.getArNSPriceDetails({
-                intent: replacedBuyRecordWithBuyName,
-                name,
-                quantity,
-                type,
-                years,
-            });
-            return {
-                tokenCost: +mARIO,
-                wincQty: winc,
-                discounts: [],
-            };
-        }
         const allTags = [
             { name: 'Action', value: 'Cost-Details' },
             {
@@ -557,8 +605,7 @@ class ARIOReadable {
 exports.ARIOReadable = ARIOReadable;
 class ARIOWriteable extends ARIOReadable {
     signer;
-    paymentProvider;
-    constructor({ signer, paymentUrl, ...config }) {
+    constructor({ signer, ...config }) {
         if (config === undefined) {
             super({
                 process: new ao_process_js_1.AOProcess({
@@ -570,10 +617,6 @@ class ARIOWriteable extends ARIOReadable {
             super(config);
         }
         this.signer = (0, ao_js_1.createAoSigner)(signer);
-        this.paymentProvider = new turbo_js_1.TurboArNSPaymentProvider({
-            signer: signer,
-            paymentUrl,
-        });
     }
     async transfer({ target, qty, }, options) {
         const { tags = [] } = options || {};
@@ -848,12 +891,6 @@ class ARIOWriteable extends ARIOReadable {
         });
     }
     async buyRecord(params, options) {
-        if (params.fundFrom === 'turbo') {
-            return this.paymentProvider.initiateArNSPurchase({
-                intent: 'Buy-Name',
-                ...params,
-            });
-        }
         const { tags = [] } = options || {};
         const allTags = [
             ...tags,
@@ -878,12 +915,6 @@ class ARIOWriteable extends ARIOReadable {
      * @returns {Promise<AoMessageResult>} The result of the upgrade
      */
     async upgradeRecord(params, options) {
-        if (params.fundFrom === 'turbo') {
-            return this.paymentProvider.initiateArNSPurchase({
-                intent: 'Upgrade-Name',
-                name: params.name,
-            });
-        }
         const { tags = [] } = options || {};
         const allTags = [
             ...tags,
@@ -906,12 +937,6 @@ class ARIOWriteable extends ARIOReadable {
      * @returns {Promise<AoMessageResult>} The result of the extension
      */
     async extendLease(params, options) {
-        if (params.fundFrom === 'turbo') {
-            return this.paymentProvider.initiateArNSPurchase({
-                intent: 'Extend-Lease',
-                ...params,
-            });
-        }
         const { tags = [] } = options || {};
         const allTags = [
             ...tags,
@@ -926,12 +951,6 @@ class ARIOWriteable extends ARIOReadable {
         });
     }
     async increaseUndernameLimit(params, options) {
-        if (params.fundFrom === 'turbo') {
-            return this.paymentProvider.initiateArNSPurchase({
-                intent: 'Increase-Undername-Limit',
-                ...params,
-            });
-        }
         const { tags = [] } = options || {};
         const allTags = [
             ...tags,
@@ -968,9 +987,6 @@ class ARIOWriteable extends ARIOReadable {
         });
     }
     async requestPrimaryName(params, options) {
-        if (params.fundFrom === 'turbo') {
-            throw new Error('Turbo funding is not yet supported for primary name requests');
-        }
         const { tags = [] } = options || {};
         const allTags = [
             ...tags,

package/lib/cjs/types/ant.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAoANTState = exports.AntInfoSchema = exports.AntHandlersSchema = exports.AntHandlerNames = exports.AntWriteHandlers = exports.AntReadHandlers = exports.AntStateSchema = exports.AntBalancesSchema = exports.AntControllersSchema = exports.AntRecordsSchema = exports.AntRecordSchema = exports.AntKeywordsSchema = exports.AntDescriptionSchema = exports.IntegerStringSchema = exports.AOAddressSchema = exports.ArweaveTxIdSchema = void 0;
+exports.AntInfoSchema = exports.AntHandlersSchema = exports.AntHandlerNames = exports.AntWriteHandlers = exports.AntReadHandlers = exports.AntStateSchema = exports.AntBalancesSchema = exports.AntControllersSchema = exports.AntRecordsSchema = exports.AntRecordSchema = exports.AntKeywordsSchema = exports.AntDescriptionSchema = exports.IntegerStringSchema = exports.AOAddressSchema = exports.ArweaveTxIdSchema = void 0;
+exports.isAoANTState = isAoANTState;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -136,4 +137,3 @@ exports.AntInfoSchema = zod_1.z.object({
 function isAoANTState(state) {
     return exports.AntStateSchema.safeParse(state).success;
 }
-exports.isAoANTState = isAoANTState;

package/lib/cjs/types/faucet.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/types/index.js

@@ -32,5 +32,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ant-registry.js"), exports);
 __exportStar(require("./ant.js"), exports);
 __exportStar(require("./common.js"), exports);
+__exportStar(require("./faucet.js"), exports);
 __exportStar(require("./io.js"), exports);
 __exportStar(require("./token.js"), exports);

package/lib/cjs/types/io.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLeasedArNSRecord = exports.isProcessIdConfiguration = exports.isProcessConfiguration = exports.isValidFundFrom = exports.fundFromOptions = exports.isValidIntent = exports.intentsUsingYears = exports.validIntents = exports.isDistributedEpoch = exports.isDistributedEpochData = void 0;
+exports.isValidFundFrom = exports.fundFromOptions = exports.isValidIntent = exports.intentsUsingYears = exports.validIntents = exports.isDistributedEpoch = exports.isDistributedEpochData = void 0;
+exports.isProcessConfiguration = isProcessConfiguration;
+exports.isProcessIdConfiguration = isProcessIdConfiguration;
+exports.isLeasedArNSRecord = isLeasedArNSRecord;
 const arweave_js_1 = require("../utils/arweave.js");
 const isDistributedEpochData = (data) => {
     return data.distributedTimestamp !== undefined;
@@ -28,23 +31,21 @@ const isValidIntent = (intent) => {
     return exports.validIntents.indexOf(intent) !== -1;
 };
 exports.isValidIntent = isValidIntent;
-exports.fundFromOptions = ['balance', 'stakes', 'any', 'turbo'];
+exports.fundFromOptions = ['balance', 'stakes', 'any'];
 const isValidFundFrom = (fundFrom) => {
     return exports.fundFromOptions.indexOf(fundFrom) !== -1;
 };
 exports.isValidFundFrom = isValidFundFrom;
 // Type-guard functions
 function isProcessConfiguration(config) {
-    return 'process' in config;
+    return config !== undefined && 'process' in config;
 }
-exports.isProcessConfiguration = isProcessConfiguration;
 function isProcessIdConfiguration(config) {
-    return ('processId' in config &&
+    return (config !== undefined &&
+        'processId' in config &&
         typeof config.processId === 'string' &&
         (0, arweave_js_1.validateArweaveId)(config.processId) === true);
 }
-exports.isProcessIdConfiguration = isProcessIdConfiguration;
 function isLeasedArNSRecord(record) {
     return record.type === 'lease';
 }
-exports.isLeasedArNSRecord = isLeasedArNSRecord;

package/lib/cjs/utils/ao.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeUnicodeFromError = exports.errorMessageFromOutput = exports.parseAoEpochData = exports.initANTStateForAddress = exports.defaultANTLogoId = exports.defaultTargetManifestId = exports.createAoSigner = exports.isAoSigner = exports.evolveANT = exports.spawnANT = void 0;
+exports.defaultANTLogoId = exports.defaultTargetManifestId = void 0;
+exports.spawnANT = spawnANT;
+exports.evolveANT = evolveANT;
+exports.isAoSigner = isAoSigner;
+exports.createAoSigner = createAoSigner;
+exports.initANTStateForAddress = initANTStateForAddress;
+exports.parseAoEpochData = parseAoEpochData;
+exports.errorMessageFromOutput = errorMessageFromOutput;
+exports.removeUnicodeFromError = removeUnicodeFromError;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -48,7 +56,6 @@ async function spawnANT({ signer, module = constants_js_1.AOS_MODULE_ID, ao = (0
     });
     return processId;
 }
-exports.spawnANT = spawnANT;
 async function evolveANT({ signer, processId, luaCodeTxId = constants_js_1.ANT_LUA_ID, ao = (0, aoconnect_1.connect)(), logger = index_js_1.Logger.default, arweave = arweave_js_1.defaultArweave, }) {
     const aosClient = new index_js_1.AOProcess({
         processId,
@@ -75,7 +82,6 @@ async function evolveANT({ signer, processId, luaCodeTxId = constants_js_1.ANT_L
     });
     return evolveMsgId;
 }
-exports.evolveANT = evolveANT;
 function isAoSigner(value) {
     const TagSchema = zod_1.z.object({
         name: zod_1.z.string(),
@@ -101,7 +107,6 @@ function isAoSigner(value) {
         return false;
     }
 }
-exports.isAoSigner = isAoSigner;
 function createAoSigner(signer) {
     if (isAoSigner(signer)) {
         return signer;
@@ -137,9 +142,10 @@ function createAoSigner(signer) {
         }));
         return signedData;
     };
+    // eslint-disable-next-line
+    // @ts-ignore Buffer vs ArrayBuffer type mismatch
     return aoSigner;
 }
-exports.createAoSigner = createAoSigner;
 exports.defaultTargetManifestId = '-k7t8xMoB8hW482609Z9F4bTFMC3MnuW8bTvTyT8pFI';
 exports.defaultANTLogoId = 'Sie_26dvgyok0PZD_-iQAFOhOd5YxDTkczOLoqTTL_A';
 function initANTStateForAddress({ owner, targetId, ttlSeconds = 3600, keywords = [], controllers = [], description = '', ticker = 'aos', name = 'ANT', logo = exports.defaultANTLogoId, }) {
@@ -160,7 +166,6 @@ function initANTStateForAddress({ owner, targetId, ttlSeconds = 3600, keywords =
         logo,
     };
 }
-exports.initANTStateForAddress = initANTStateForAddress;
 /**
  * Uses zod schema to parse the epoch data
  */
@@ -177,7 +182,6 @@ function parseAoEpochData(value) {
     });
     return epochDataSchema.parse(value);
 }
-exports.parseAoEpochData = parseAoEpochData;
 function errorMessageFromOutput(output) {
     const errorData = output.Error;
     // Attempt to extract error details from Messages.Tags if Error is undefined
@@ -196,7 +200,6 @@ function errorMessageFromOutput(output) {
     }
     return undefined;
 }
-exports.errorMessageFromOutput = errorMessageFromOutput;
 function removeUnicodeFromError(error) {
     //The regular expression /[\u001b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g is designed to match ANSI escape codes used for terminal formatting. These are sequences that begin with \u001b (ESC character) and are often followed by [ and control codes.
     const ESC = String.fromCharCode(27); // Represents '\u001b' or '\x1b'
@@ -204,4 +207,3 @@ function removeUnicodeFromError(error) {
         .replace(new RegExp(`${ESC}[\\[\\]()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]`, 'g'), '')
         .trim();
 }
-exports.removeUnicodeFromError = removeUnicodeFromError;

package/lib/cjs/utils/arweave.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeEligibleRewardsFromEpochData = exports.sortAndPaginateEpochDataIntoEligibleDistributions = exports.epochDistributionNoticeGqlQueryFallback = exports.epochDistributionNoticeGqlQuery = exports.getEpochDataFromGqlFallback = exports.getEpochDataFromGqlWithCUFallback = exports.getEpochDataFromGql = exports.paginationParamsToTags = exports.pruneTags = exports.isBlockHeight = exports.validateArweaveId = void 0;
+exports.epochDistributionNoticeGqlQueryFallback = exports.epochDistributionNoticeGqlQuery = exports.getEpochDataFromGqlFallback = exports.getEpochDataFromGqlWithCUFallback = exports.getEpochDataFromGql = exports.paginationParamsToTags = exports.pruneTags = exports.validateArweaveId = void 0;
+exports.isBlockHeight = isBlockHeight;
+exports.sortAndPaginateEpochDataIntoEligibleDistributions = sortAndPaginateEpochDataIntoEligibleDistributions;
+exports.removeEligibleRewardsFromEpochData = removeEligibleRewardsFromEpochData;
 const constants_js_1 = require("../constants.js");
 const io_js_1 = require("../types/io.js");
 const ao_js_1 = require("./ao.js");
@@ -11,7 +14,6 @@ exports.validateArweaveId = validateArweaveId;
 function isBlockHeight(height) {
     return height !== undefined && !isNaN(parseInt(height.toString()));
 }
-exports.isBlockHeight = isBlockHeight;
 /**
  * Prune tags that are undefined or empty.
  * @param tags - The tags to prune.
@@ -251,7 +253,6 @@ function sortAndPaginateEpochDataIntoEligibleDistributions(epochData, params) {
         sortBy,
     };
 }
-exports.sortAndPaginateEpochDataIntoEligibleDistributions = sortAndPaginateEpochDataIntoEligibleDistributions;
 function removeEligibleRewardsFromEpochData(epochData) {
     if (!(0, io_js_1.isDistributedEpoch)(epochData)) {
         return epochData;
@@ -268,4 +269,3 @@ function removeEligibleRewardsFromEpochData(epochData) {
         },
     };
 }
-exports.removeEligibleRewardsFromEpochData = removeEligibleRewardsFromEpochData;

package/lib/cjs/utils/base64.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRandomText = exports.sha256B64Url = exports.toB64Url = exports.fromB64Url = void 0;
+exports.fromB64Url = fromB64Url;
+exports.toB64Url = toB64Url;
+exports.sha256B64Url = sha256B64Url;
+exports.getRandomText = getRandomText;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -42,16 +45,13 @@ function fromB64Url(str) {
     const b64Str = base64urlToBase64(str);
     return Buffer.from(b64Str, 'base64');
 }
-exports.fromB64Url = fromB64Url;
 function toB64Url(buffer) {
     const b64Str = buffer.toString('base64');
     return base64urlFromBase64(b64Str);
 }
-exports.toB64Url = toB64Url;
 function sha256B64Url(input) {
     return toB64Url((0, crypto_1.createHash)('sha256').update(Uint8Array.from(input)).digest());
 }
-exports.sha256B64Url = sha256B64Url;
 function getRandomText(length = 32) {
     // Generate a buffer of random bytes
     const buffer = (0, crypto_1.randomBytes)(length);
@@ -60,4 +60,3 @@ function getRandomText(length = 32) {
         .join('')
         .slice(0, length);
 }
-exports.getRandomText = getRandomText;

package/lib/cjs/utils/json.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeDecode = void 0;
+exports.safeDecode = safeDecode;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function safeDecode(data) {
     try {
@@ -25,4 +25,3 @@ function safeDecode(data) {
         return data;
     }
 }
-exports.safeDecode = safeDecode;

package/lib/cjs/utils/schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSchemaResult = void 0;
+exports.parseSchemaResult = parseSchemaResult;
 /**
  * @param schema - zod schema
  * @param v - value to parse
@@ -13,4 +13,3 @@ function parseSchemaResult(schema, v) {
     }
     return schemaResult;
 }
-exports.parseSchemaResult = parseSchemaResult;

package/lib/cjs/version.js

@@ -17,4 +17,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-exports.version = '3.10.0-alpha.1';
+exports.version = '3.10.0';

package/lib/esm/cli/options.js

@@ -49,10 +49,6 @@ export const optionMap = {
         alias: '--cu-url <cuUrl>',
         description: 'The URL for a custom compute unit',
     },
-    paymentUrl: {
-        alias: '--payment-url <paymentUrl>',
-        description: 'The URL for a custom turbo payment service',
-    },
     processId: {
         alias: '--process-id <processId>',
         description: 'The process ID to interact with',
@@ -273,15 +269,9 @@ export const optionMap = {
         alias: '--logo <logo>',
         description: 'The ANT logo',
     },
-    token: {
-        alias: '-t, --token <type>',
-        description: 'Crypto token type for wallet or action',
-        default: 'arweave',
-    },
 };
 export const walletOptions = [
     optionMap.walletFile,
-    optionMap.token,
     // optionMap.mnemonic,
     optionMap.privateKey,
 ];
@@ -299,7 +289,6 @@ export const arnsPurchaseOptions = [
     ...writeActionOptions,
     optionMap.name,
     optionMap.fundFrom,
-    optionMap.paymentUrl,
 ];
 export const epochOptions = [optionMap.epochIndex, optionMap.timestamp];
 export const addressAndVaultIdOptions = [optionMap.address, optionMap.vaultId];
@@ -323,7 +312,6 @@ export const tokenCostOptions = [
     optionMap.quantity,
     optionMap.address,
     optionMap.fundFrom,
-    optionMap.paymentUrl,
 ];
 export const transferOptions = [
     ...writeActionOptions,

package/lib/esm/cli/utils.js

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { EthereumSigner } from '@dha-team/arbundles';
 import { connect } from '@permaweb/aoconnect';
 import { program } from 'commander';
 import { readFileSync } from 'fs';
@@ -78,7 +77,7 @@ export function arioProcessIdFromOptions({ arioProcessId, devnet, testnet, }) {
     }
     return ARIO_MAINNET_PROCESS_ID;
 }
-function walletFromOptions({ privateKey, walletFile, }) {
+function jwkFromOptions({ privateKey, walletFile, }) {
     if (privateKey !== undefined) {
         return JSON.parse(privateKey);
     }
@@ -88,7 +87,7 @@ function walletFromOptions({ privateKey, walletFile, }) {
     return undefined;
 }
 export function requiredJwkFromOptions(options) {
-    const jwk = walletFromOptions(options);
+    const jwk = jwkFromOptions(options);
     if (jwk === undefined) {
         throw new Error('No JWK provided for signing!\nPlease provide a stringified JWK with `--private-key` or the file path of a jwk.json file with `--wallet-file`');
     }
@@ -118,30 +117,13 @@ export function readARIOFromOptions(options) {
     setLoggerIfDebug(options);
     return ARIO.init({
         process: aoProcessFromOptions(options),
-        paymentUrl: options.paymentUrl,
     });
 }
-export function contractSignerFromOptions(options) {
-    const wallet = walletFromOptions(options);
-    if (wallet === undefined) {
-        return undefined;
-    }
-    const token = options.token ?? 'arweave';
-    if (token === 'ethereum') {
-        const signer = new EthereumSigner(wallet);
-        // For EthereumSigner, we need to convert the JWK to a string
-        return { signer, signerAddress: signer.publicKey.toString('hex') };
-    }
-    // TODO: Support other wallet types
-    const signer = new ArweaveSigner(wallet);
-    return { signer, signerAddress: jwkToAddress(wallet) };
-}
 export function requiredContractSignerFromOptions(options) {
-    const contractSigner = contractSignerFromOptions(options);
-    if (contractSigner === undefined) {
-        throw new Error('No signer provided for signing!\nPlease provide a stringified JWK or Ethereum private key with `--private-key` or the file path of an arweave.jwk.json or eth.private.key.txt file with `--wallet-file`');
-    }
-    return contractSigner;
+    // TODO: Support other wallet types
+    const jwk = requiredJwkFromOptions(options);
+    const signer = new ArweaveSigner(jwk);
+    return { signer, signerAddress: jwkToAddress(jwk) };
 }
 export function requiredAoSignerFromOptions(options) {
     return createAoSigner(requiredContractSignerFromOptions(options).signer);
@@ -153,7 +135,6 @@ export function writeARIOFromOptions(options) {
         ario: ARIO.init({
             process: aoProcessFromOptions(options),
             signer,
-            paymentUrl: options.paymentUrl,
         }),
         signerAddress,
     };
@@ -174,9 +155,10 @@ export function addressFromOptions(options) {
     if (options.address !== undefined) {
         return options.address;
     }
-    const signer = contractSignerFromOptions(options);
-    if (signer !== undefined) {
-        return signer.signerAddress;
+    // TODO: Support other wallet types
+    const jwk = jwkFromOptions(options);
+    if (jwk !== undefined) {
+        return jwkToAddress(jwk);
     }
     return undefined;
 }
@@ -299,9 +281,6 @@ export function requiredMARIOFromOptions(options, key) {
     return new ARIOToken(+options[key]).toMARIO();
 }
 export async function assertEnoughBalanceForArNSPurchase({ ario, address, costDetailsParams, }) {
-    if (costDetailsParams.fundFrom === 'turbo') {
-        return;
-    }
     const costDetails = await ario.getCostDetails(costDetailsParams);
     if (costDetails.fundingPlan) {
         if (costDetails.fundingPlan.shortfall > 0) {

package/lib/esm/common/ant-versions.js

@@ -70,14 +70,14 @@ export class ANTVersionsWritable extends ANTVersionsReadable {
         super(config);
         this.signer = createAoSigner(signer);
     }
-    async addVersion({ version, moduleId, luaSourceId, notes, }, { tags }) {
+    async addVersion(params, { tags }) {
         return this.process.send({
             tags: pruneTags([
                 { name: 'Action', value: 'Add-Version' },
-                { name: 'Version', value: version },
-                { name: 'Module-Id', value: moduleId },
-                { name: 'Lua-Source-Id', value: luaSourceId },
-                { name: 'Notes', value: notes },
+                { name: 'Version', value: params.version },
+                { name: 'Module-Id', value: params.moduleId },
+                { name: 'Lua-Source-Id', value: params.luaSourceId },
+                { name: 'Notes', value: params.notes },
                 ...(tags ?? []),
             ]),
             signer: this.signer,