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

package/lib/cjs/cli/options.js

@@ -52,6 +52,10 @@ exports.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',
@@ -272,9 +276,15 @@ exports.optionMap = {
         alias: '--logo <logo>',
         description: 'The ANT logo',
     },
+    token: {
+        alias: '-t, --token <type>',
+        description: 'Crypto token type for wallet or action',
+        default: 'arweave',
+    },
 };
 exports.walletOptions = [
     exports.optionMap.walletFile,
+    exports.optionMap.token,
     // optionMap.mnemonic,
     exports.optionMap.privateKey,
 ];
@@ -292,6 +302,7 @@ exports.arnsPurchaseOptions = [
     ...exports.writeActionOptions,
     exports.optionMap.name,
     exports.optionMap.fundFrom,
+    exports.optionMap.paymentUrl,
 ];
 exports.epochOptions = [exports.optionMap.epochIndex, exports.optionMap.timestamp];
 exports.addressAndVaultIdOptions = [exports.optionMap.address, exports.optionMap.vaultId];
@@ -315,6 +326,7 @@ exports.tokenCostOptions = [
     exports.optionMap.quantity,
     exports.optionMap.address,
     exports.optionMap.fundFrom,
+    exports.optionMap.paymentUrl,
 ];
 exports.transferOptions = [
     ...exports.writeActionOptions,

package/lib/cjs/cli/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertLockLengthInRange = exports.fundFromFromOptions = exports.getTokenCostParamsFromOptions = exports.getANTStateFromOptions = exports.requiredPositiveIntegerFromOptions = exports.positiveIntegerFromOptions = exports.requiredStringArrayFromOptions = exports.requiredStringFromOptions = exports.booleanFromOptions = exports.writeANTFromOptions = exports.readANTFromOptions = exports.requiredProcessIdFromOptions = exports.assertConfirmationPrompt = exports.confirmationPrompt = exports.assertEnoughMARIOBalance = exports.assertEnoughBalanceForArNSPurchase = exports.requiredMARIOFromOptions = exports.recordTypeFromOptions = exports.redelegateParamsFromOptions = exports.requiredTargetAndQuantityFromOptions = exports.gatewaySettingsFromOptions = exports.customTagsFromOptions = exports.requiredInitiatorFromOptions = exports.epochInputFromOptions = exports.paginationParamsFromOptions = exports.requiredAddressFromOptions = exports.addressFromOptions = exports.formatMARIOToARIOWithCommas = exports.formatARIOWithCommas = exports.writeARIOFromOptions = exports.requiredAoSignerFromOptions = exports.requiredContractSignerFromOptions = exports.readARIOFromOptions = exports.getLoggerFromOptions = exports.jwkToAddress = exports.requiredJwkFromOptions = exports.arioProcessIdFromOptions = exports.makeCommand = exports.applyOptions = exports.runCommand = exports.stringifyJsonForCLIDisplay = exports.defaultTtlSecondsCLI = void 0;
+exports.assertLockLengthInRange = exports.fundFromFromOptions = exports.getTokenCostParamsFromOptions = exports.getANTStateFromOptions = exports.requiredPositiveIntegerFromOptions = exports.positiveIntegerFromOptions = exports.requiredStringArrayFromOptions = exports.requiredStringFromOptions = exports.booleanFromOptions = exports.writeANTFromOptions = exports.readANTFromOptions = exports.requiredProcessIdFromOptions = exports.assertConfirmationPrompt = exports.confirmationPrompt = exports.assertEnoughMARIOBalance = exports.assertEnoughBalanceForArNSPurchase = exports.requiredMARIOFromOptions = exports.recordTypeFromOptions = exports.redelegateParamsFromOptions = exports.requiredTargetAndQuantityFromOptions = exports.gatewaySettingsFromOptions = exports.customTagsFromOptions = exports.requiredInitiatorFromOptions = exports.epochInputFromOptions = exports.paginationParamsFromOptions = exports.requiredAddressFromOptions = exports.addressFromOptions = exports.formatMARIOToARIOWithCommas = exports.formatARIOWithCommas = exports.writeARIOFromOptions = exports.requiredAoSignerFromOptions = exports.requiredContractSignerFromOptions = exports.contractSignerFromOptions = exports.readARIOFromOptions = exports.getLoggerFromOptions = exports.jwkToAddress = exports.requiredJwkFromOptions = exports.arioProcessIdFromOptions = exports.makeCommand = exports.applyOptions = exports.runCommand = exports.stringifyJsonForCLIDisplay = exports.defaultTtlSecondsCLI = void 0;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -19,6 +19,7 @@ exports.assertLockLengthInRange = exports.fundFromFromOptions = exports.getToken
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const arbundles_1 = require("@dha-team/arbundles");
 const aoconnect_1 = require("@permaweb/aoconnect");
 const commander_1 = require("commander");
 const fs_1 = require("fs");
@@ -88,7 +89,7 @@ function arioProcessIdFromOptions({ arioProcessId, devnet, testnet, }) {
     return index_js_1.ARIO_MAINNET_PROCESS_ID;
 }
 exports.arioProcessIdFromOptions = arioProcessIdFromOptions;
-function jwkFromOptions({ privateKey, walletFile, }) {
+function walletFromOptions({ privateKey, walletFile, }) {
     if (privateKey !== undefined) {
         return JSON.parse(privateKey);
     }
@@ -98,7 +99,7 @@ function jwkFromOptions({ privateKey, walletFile, }) {
     return undefined;
 }
 function requiredJwkFromOptions(options) {
-    const jwk = jwkFromOptions(options);
+    const jwk = walletFromOptions(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`');
     }
@@ -131,14 +132,32 @@ function readARIOFromOptions(options) {
     setLoggerIfDebug(options);
     return index_js_1.ARIO.init({
         process: aoProcessFromOptions(options),
+        paymentUrl: options.paymentUrl,
     });
 }
 exports.readARIOFromOptions = readARIOFromOptions;
-function requiredContractSignerFromOptions(options) {
+function contractSignerFromOptions(options) {
+    const wallet = walletFromOptions(options);
+    if (wallet === undefined) {
+        return undefined;
+    }
+    const token = options.token ?? 'arweave';
+    if (token === 'ethereum') {
+        const signer = new arbundles_1.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 jwk = requiredJwkFromOptions(options);
-    const signer = new index_js_1.ArweaveSigner(jwk);
-    return { signer, signerAddress: jwkToAddress(jwk) };
+    const signer = new index_js_1.ArweaveSigner(wallet);
+    return { signer, signerAddress: jwkToAddress(wallet) };
+}
+exports.contractSignerFromOptions = contractSignerFromOptions;
+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;
 }
 exports.requiredContractSignerFromOptions = requiredContractSignerFromOptions;
 function requiredAoSignerFromOptions(options) {
@@ -152,6 +171,7 @@ function writeARIOFromOptions(options) {
         ario: index_js_1.ARIO.init({
             process: aoProcessFromOptions(options),
             signer,
+            paymentUrl: options.paymentUrl,
         }),
         signerAddress,
     };
@@ -175,10 +195,9 @@ function addressFromOptions(options) {
     if (options.address !== undefined) {
         return options.address;
     }
-    // TODO: Support other wallet types
-    const jwk = jwkFromOptions(options);
-    if (jwk !== undefined) {
-        return jwkToAddress(jwk);
+    const signer = contractSignerFromOptions(options);
+    if (signer !== undefined) {
+        return signer.signerAddress;
     }
     return undefined;
 }
@@ -312,6 +331,9 @@ function requiredMARIOFromOptions(options, key) {
 }
 exports.requiredMARIOFromOptions = requiredMARIOFromOptions;
 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/cjs/common/ant-versions.js

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

package/lib/cjs/common/io.js

@@ -8,6 +8,7 @@ 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");
 class ARIO {
     // Implementation
     static init(config) {
@@ -22,6 +23,7 @@ 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) {
@@ -40,6 +42,9 @@ 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({
@@ -371,6 +376,20 @@ 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' },
             {
@@ -538,7 +557,8 @@ class ARIOReadable {
 exports.ARIOReadable = ARIOReadable;
 class ARIOWriteable extends ARIOReadable {
     signer;
-    constructor({ signer, ...config }) {
+    paymentProvider;
+    constructor({ signer, paymentUrl, ...config }) {
         if (config === undefined) {
             super({
                 process: new ao_process_js_1.AOProcess({
@@ -550,6 +570,10 @@ 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 || {};
@@ -824,6 +848,12 @@ 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,
@@ -848,6 +878,12 @@ 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,
@@ -870,6 +906,12 @@ 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,
@@ -884,6 +926,12 @@ 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,
@@ -920,6 +968,9 @@ 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/common/turbo.js

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TurboArNSPaymentProvider = exports.signedRequestHeadersFromSigner = 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 arbundles_1 = require("@dha-team/arbundles");
+const uuid_1 = require("uuid");
+const token_js_1 = require("../types/token.js");
+const base64_js_1 = require("../utils/base64.js");
+const http_client_js_1 = require("../utils/http-client.js");
+const url_js_1 = require("../utils/url.js");
+const logger_js_1 = require("./logger.js");
+async function signedRequestHeadersFromSigner({ signer, nonce = (0, uuid_1.v4)(), }) {
+    await signer.setPublicKey?.();
+    const signature = await signer.sign(Uint8Array.from(Buffer.from(nonce)));
+    let publicKey;
+    switch (signer.signatureType) {
+        case arbundles_1.SignatureConfig.ARWEAVE:
+            publicKey = (0, base64_js_1.toB64Url)(signer.publicKey);
+            break;
+        case arbundles_1.SignatureConfig.ETHEREUM:
+            publicKey = '0x' + signer.publicKey.toString('hex');
+            break;
+        // TODO: solana sig support
+        // case SignatureConfig.SOLANA:
+        // case SignatureConfig.ED25519:
+        default:
+            throw new Error(`Unsupported signer type for signing requests: ${signer.signatureType}`);
+    }
+    return {
+        'x-public-key': publicKey,
+        'x-nonce': nonce,
+        'x-signature': (0, base64_js_1.toB64Url)(Buffer.from(signature)),
+        'x-signature-type': signer.signatureType,
+    };
+}
+exports.signedRequestHeadersFromSigner = signedRequestHeadersFromSigner;
+class TurboArNSPaymentProvider {
+    paymentUrl;
+    axios;
+    logger;
+    signer;
+    constructor({ paymentUrl = 'https://payment.ardrive.io', axios = (0, http_client_js_1.createAxiosInstance)(), logger = logger_js_1.Logger.default, signer, }) {
+        this.paymentUrl = paymentUrl;
+        this.axios = axios;
+        this.logger = logger;
+        this.signer = signer;
+    }
+    async getArNSPriceDetails({ intent, name, quantity, type, years, }) {
+        const url = (0, url_js_1.urlWithSearchParams)({
+            baseUrl: `${this.paymentUrl}/v1/arns/price/${intent}/${name}`,
+            params: {
+                increaseQty: quantity,
+                type,
+                years,
+            },
+        });
+        const { data, status } = await this.axios.get(url);
+        this.logger.debug('getArNSPriceDetails', {
+            intent,
+            name,
+            quantity,
+            type,
+            years,
+            data,
+            status,
+        });
+        if (status !== 200) {
+            throw new Error('Failed to get ArNS purchase price ' + JSON.stringify(data));
+        }
+        if (!data.winc || !data.mARIO) {
+            throw new Error('Invalid response from Turbo ' + JSON.stringify(data));
+        }
+        return {
+            winc: data.winc,
+            mARIO: new token_js_1.mARIOToken(+data.mARIO),
+        };
+    }
+    async getPrice(params) {
+        const { winc } = await this.getArNSPriceDetails(params);
+        return +winc;
+    }
+    async initiateArNSPurchase({ intent, name, quantity, type, processId, years, }) {
+        if (!this.signer) {
+            throw new Error('Signer required for initiating ArNS purchase with Turbo');
+        }
+        const url = (0, url_js_1.urlWithSearchParams)({
+            baseUrl: `${this.paymentUrl}/v1/arns/purchase/${intent}/${name}`,
+            params: {
+                increaseQty: quantity,
+                processId,
+                type,
+                years,
+            },
+        });
+        const headers = await signedRequestHeadersFromSigner({
+            signer: this.signer,
+        });
+        const { data, status } = await this.axios.post(url, null, {
+            headers,
+        });
+        this.logger.debug('Initiated ArNS purchase', {
+            intent,
+            name,
+            quantity,
+            processId,
+            type,
+            years,
+            data,
+            status,
+        });
+        if (status !== 200) {
+            throw new Error('Failed to initiate ArNS purchase ' + JSON.stringify(data));
+        }
+        return {
+            id: data.arioWriteResult.id,
+            result: data.purchaseReceipt,
+        };
+    }
+}
+exports.TurboArNSPaymentProvider = TurboArNSPaymentProvider;

package/lib/cjs/types/io.js

@@ -28,7 +28,7 @@ const isValidIntent = (intent) => {
     return exports.validIntents.indexOf(intent) !== -1;
 };
 exports.isValidIntent = isValidIntent;
-exports.fundFromOptions = ['balance', 'stakes', 'any'];
+exports.fundFromOptions = ['balance', 'stakes', 'any', 'turbo'];
 const isValidFundFrom = (fundFrom) => {
     return exports.fundFromOptions.indexOf(fundFrom) !== -1;
 };

package/lib/cjs/utils/url.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.urlWithSearchParams = 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 urlWithSearchParams = ({ baseUrl, params, }) => {
+    const urlObj = new URL(baseUrl);
+    Object.entries(params).forEach(([key, value]) => {
+        if (value === undefined || value === null)
+            return;
+        urlObj.searchParams.set(key, value.toString());
+    });
+    return urlObj.toString();
+};
+exports.urlWithSearchParams = urlWithSearchParams;

package/lib/cjs/utils/url.test.js

@@ -0,0 +1,24 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const url_js_1 = require("./url.js");
+(0, node_test_1.test)('urlWithSearchParams prunes undefined values but keeps other falsey values', () => {
+    const result = (0, url_js_1.urlWithSearchParams)({
+        baseUrl: 'https://example.com',
+        params: {
+            number: 1,
+            string: 'string',
+            boolean: true,
+            empty: '',
+            zero: 0,
+            false: false,
+            null: null,
+            undef: undefined,
+        },
+    });
+    node_assert_1.default.strictEqual(result, 'https://example.com/?number=1&string=string&boolean=true&empty=&zero=0&false=false');
+});

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.9.1';
+exports.version = '3.10.0-alpha.1';

package/lib/esm/cli/options.js

@@ -49,6 +49,10 @@ 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',
@@ -269,9 +273,15 @@ 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,
 ];
@@ -289,6 +299,7 @@ export const arnsPurchaseOptions = [
     ...writeActionOptions,
     optionMap.name,
     optionMap.fundFrom,
+    optionMap.paymentUrl,
 ];
 export const epochOptions = [optionMap.epochIndex, optionMap.timestamp];
 export const addressAndVaultIdOptions = [optionMap.address, optionMap.vaultId];
@@ -312,6 +323,7 @@ export const tokenCostOptions = [
     optionMap.quantity,
     optionMap.address,
     optionMap.fundFrom,
+    optionMap.paymentUrl,
 ];
 export const transferOptions = [
     ...writeActionOptions,

package/lib/esm/cli/utils.js

@@ -13,6 +13,7 @@
  * 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';
@@ -77,7 +78,7 @@ export function arioProcessIdFromOptions({ arioProcessId, devnet, testnet, }) {
     }
     return ARIO_MAINNET_PROCESS_ID;
 }
-function jwkFromOptions({ privateKey, walletFile, }) {
+function walletFromOptions({ privateKey, walletFile, }) {
     if (privateKey !== undefined) {
         return JSON.parse(privateKey);
     }
@@ -87,7 +88,7 @@ function jwkFromOptions({ privateKey, walletFile, }) {
     return undefined;
 }
 export function requiredJwkFromOptions(options) {
-    const jwk = jwkFromOptions(options);
+    const jwk = walletFromOptions(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`');
     }
@@ -117,13 +118,30 @@ export function readARIOFromOptions(options) {
     setLoggerIfDebug(options);
     return ARIO.init({
         process: aoProcessFromOptions(options),
+        paymentUrl: options.paymentUrl,
     });
 }
-export function requiredContractSignerFromOptions(options) {
+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 jwk = requiredJwkFromOptions(options);
-    const signer = new ArweaveSigner(jwk);
-    return { signer, signerAddress: jwkToAddress(jwk) };
+    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;
 }
 export function requiredAoSignerFromOptions(options) {
     return createAoSigner(requiredContractSignerFromOptions(options).signer);
@@ -135,6 +153,7 @@ export function writeARIOFromOptions(options) {
         ario: ARIO.init({
             process: aoProcessFromOptions(options),
             signer,
+            paymentUrl: options.paymentUrl,
         }),
         signerAddress,
     };
@@ -155,10 +174,9 @@ export function addressFromOptions(options) {
     if (options.address !== undefined) {
         return options.address;
     }
-    // TODO: Support other wallet types
-    const jwk = jwkFromOptions(options);
-    if (jwk !== undefined) {
-        return jwkToAddress(jwk);
+    const signer = contractSignerFromOptions(options);
+    if (signer !== undefined) {
+        return signer.signerAddress;
     }
     return undefined;
 }
@@ -281,6 +299,9 @@ 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(params, { tags }) {
+    async addVersion({ version, moduleId, luaSourceId, notes, }, { tags }) {
         return this.process.send({
             tags: pruneTags([
                 { name: 'Action', value: 'Add-Version' },
-                { name: 'Version', value: params.version },
-                { name: 'Module-Id', value: params.moduleId },
-                { name: 'Lua-Source-Id', value: params.luaSourceId },
-                { name: 'Notes', value: params.notes },
+                { name: 'Version', value: version },
+                { name: 'Module-Id', value: moduleId },
+                { name: 'Lua-Source-Id', value: luaSourceId },
+                { name: 'Notes', value: notes },
                 ...(tags ?? []),
             ]),
             signer: this.signer,