@ar.io/sdk 3.10.0 → 3.11.0-alpha.2

package/lib/cjs/common/wayfinder/wayfinder.test.js

@@ -0,0 +1,253 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const axios_1 = __importDefault(require("axios"));
+const got_1 = __importDefault(require("got"));
+const node_assert_1 = __importDefault(require("node:assert"));
+const consumers_1 = require("node:stream/consumers");
+const node_test_1 = require("node:test");
+const random_js_1 = require("./routers/random.js");
+const wayfinder_js_1 = require("./wayfinder.js");
+const stubbedGateway = {
+    status: 'joined',
+    gatewayAddress: 'arweave',
+    operatorStake: 1000,
+    totalDelegatedStake: 1000,
+    startTimestamp: 1000,
+    settings: {
+        protocol: 'https',
+        fqdn: 'arweave.net',
+        port: 443,
+    },
+};
+const stubbedGatewaysProvider = {
+    getGateways: async () => [stubbedGateway],
+};
+(0, node_test_1.describe)('Wayfinder', () => {
+    (0, node_test_1.describe)('http wrapper', () => {
+        (0, node_test_1.describe)('fetch', () => {
+            let wayfinder;
+            (0, node_test_1.before)(() => {
+                wayfinder = new wayfinder_js_1.Wayfinder({
+                    httpClient: fetch,
+                    router: new random_js_1.RandomGatewayRouter({
+                        gatewaysProvider: stubbedGatewaysProvider,
+                    }),
+                });
+            });
+            (0, node_test_1.it)('should fetch the data using the selected gateway', async () => {
+                const nativeFetch = await fetch('https://ao.arweave.net');
+                const response = await wayfinder.request('ar://ao');
+                node_assert_1.default.strictEqual(response.status, 200);
+                node_assert_1.default.strictEqual(response.status, nativeFetch.status);
+                // assert the arns headers are the same
+                const arnsHeaders = Array.from(response.headers.entries()).filter(([key]) => key.startsWith('x-arns-'));
+                const nativeFetchHeaders = Array.from(nativeFetch.headers.entries()).filter(([key]) => key.startsWith('x-arns-'));
+                node_assert_1.default.deepStrictEqual(arnsHeaders, nativeFetchHeaders);
+                node_assert_1.default.deepStrictEqual(await response.text(), await nativeFetch.text());
+            });
+            (0, node_test_1.it)('should route a non-ar:// url as a normal fetch', async () => {
+                const [nativeFetch, response] = await Promise.all([
+                    fetch('https://arweave.net/', {
+                        method: 'HEAD',
+                    }),
+                    wayfinder.request('https://arweave.net/', {
+                        method: 'HEAD',
+                    }),
+                ]);
+                node_assert_1.default.strictEqual(response.status, 200);
+                node_assert_1.default.strictEqual(response.status, nativeFetch.status);
+                // TODO: ensure the headers are the same excluding unique headers
+                node_assert_1.default.deepStrictEqual(await response.text(), await nativeFetch.text());
+            });
+            for (const api of ['/info', '/metrics', '/block/current']) {
+                (0, node_test_1.it)(`supports native arweave node apis ${api}`, async () => {
+                    const [nativeFetch, response] = await Promise.all([
+                        fetch(`https://arweave.net${api}`),
+                        wayfinder.request(`ar:///${api}`),
+                    ]);
+                    node_assert_1.default.strictEqual(response.status, 200);
+                    node_assert_1.default.strictEqual(response.status, nativeFetch.status);
+                    // TODO: ensure the headers are the same excluding unique headers
+                    node_assert_1.default.deepStrictEqual(await response.text(), await nativeFetch.text());
+                });
+            }
+            for (const api of ['/ar-io/info', '/ar-io/__gateway_metrics']) {
+                (0, node_test_1.it)(`supports native ario node gateway apis ${api}`, async () => {
+                    const [nativeFetch, response] = await Promise.all([
+                        fetch(`https://arweave.net${api}`),
+                        wayfinder.request(`ar:///${api}`),
+                    ]);
+                    node_assert_1.default.strictEqual(response.status, 200);
+                    node_assert_1.default.strictEqual(response.status, nativeFetch.status);
+                    // TODO: ensure the headers are the same excluding unique headers
+                    node_assert_1.default.deepStrictEqual(await response.text(), await nativeFetch.text());
+                });
+            }
+            (0, node_test_1.it)('supports a post request to graphql', async () => {
+                const response = await wayfinder.request('ar:///graphql', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                    },
+                    body: JSON.stringify({
+                        query: `
+                query {
+                  transactions(
+                    ids: ["xf958qhCNGfDme1FtoiD6DtMfDENDbtxZpjOM_1tsMM"]
+                  ) {
+                    edges {
+                      cursor
+                      node {
+                        id
+                        tags {
+                          name
+                          value
+                        }
+                        block {
+                          height
+                          timestamp
+                        }
+                      }
+                    }
+                    pageInfo {
+                      hasNextPage
+                    }
+                  }
+                }
+            `,
+                    }),
+                });
+                node_assert_1.default.strictEqual(response.status, 200);
+            });
+            (0, node_test_1.it)('returns the error from the target gateway if the route is not found', async () => {
+                const [nativeFetch, response] = await Promise.all([
+                    fetch('https://arweave.net/not-found'),
+                    wayfinder.request('https://arweave.net/not-found'),
+                ]);
+                node_assert_1.default.strictEqual(response.status, nativeFetch.status);
+                node_assert_1.default.strictEqual(response.statusText, nativeFetch.statusText);
+                node_assert_1.default.deepStrictEqual(await response.text(), await nativeFetch.text());
+            });
+        });
+        (0, node_test_1.describe)('axios', () => {
+            let wayfinder;
+            (0, node_test_1.before)(() => {
+                wayfinder = new wayfinder_js_1.Wayfinder({
+                    httpClient: axios_1.default,
+                    router: new random_js_1.RandomGatewayRouter({
+                        gatewaysProvider: stubbedGatewaysProvider,
+                    }),
+                });
+            });
+            (0, node_test_1.it)('should fetch the data using axios default function against the target gateway', async () => {
+                const [nativeAxios, response] = await Promise.all([
+                    (0, axios_1.default)('https://ao.arweave.net'),
+                    wayfinder.request('ar://ao'),
+                ]);
+                node_assert_1.default.strictEqual(response.status, 200);
+                node_assert_1.default.strictEqual(response.status, nativeAxios.status);
+                // assert the arns headers are the same
+                const arnsHeaders = Object.entries(response.headers)
+                    .sort()
+                    .filter(([key]) => key.startsWith('x-arns-'));
+                const nativeAxiosHeaders = Object.entries(nativeAxios.headers).filter(([key]) => key.startsWith('x-arns-'));
+                node_assert_1.default.deepStrictEqual(arnsHeaders.sort(), nativeAxiosHeaders.sort());
+                node_assert_1.default.deepStrictEqual(response.data, nativeAxios.data);
+            });
+            (0, node_test_1.it)('should fetch the data using the axios.get method against the target gateway', async () => {
+                const [nativeAxios, response] = await Promise.all([
+                    axios_1.default.get('https://ao.arweave.net'),
+                    wayfinder.request.get('ar://ao'),
+                ]);
+                node_assert_1.default.strictEqual(response.status, 200);
+                node_assert_1.default.strictEqual(response.status, nativeAxios.status);
+                // assert the arns headers are the same
+                const arnsHeaders = Object.entries(response.headers)
+                    .sort()
+                    .filter(([key]) => key.startsWith('x-arns-'));
+                const nativeAxiosHeaders = Object.entries(nativeAxios.headers).filter(([key]) => key.startsWith('x-arns-'));
+                node_assert_1.default.deepStrictEqual(arnsHeaders.sort(), nativeAxiosHeaders.sort());
+                node_assert_1.default.deepStrictEqual(response.data, nativeAxios.data);
+            });
+            (0, node_test_1.it)('should route a non-ar:// url as a normal axios request', async () => {
+                const [nativeAxios, response] = await Promise.all([
+                    (0, axios_1.default)('https://arweave.net/'),
+                    wayfinder.request('https://arweave.net/'),
+                ]);
+                node_assert_1.default.strictEqual(response.status, 200);
+                node_assert_1.default.strictEqual(response.status, nativeAxios.status);
+                node_assert_1.default.deepStrictEqual(response.data, nativeAxios.data);
+                // TODO: ensure the headers are the same excluding unique headers
+            });
+            for (const api of ['/info', '/metrics', '/block/current']) {
+                (0, node_test_1.it)(`supports native arweave node apis ${api}`, async () => {
+                    const [nativeAxios, response] = await Promise.all([
+                        (0, axios_1.default)(`https://arweave.net${api}`),
+                        wayfinder.request(`ar:///${api}`),
+                    ]);
+                    node_assert_1.default.strictEqual(response.status, 200);
+                    node_assert_1.default.strictEqual(response.status, nativeAxios.status);
+                    // TODO: ensure the headers are the same excluding unique headers
+                    node_assert_1.default.deepStrictEqual(response.data, nativeAxios.data);
+                });
+            }
+            for (const api of ['/ar-io/info', '/ar-io/__gateway_metrics']) {
+                (0, node_test_1.it)(`supports native ario node gateway apis ${api}`, async () => {
+                    const [nativeAxios, response] = await Promise.all([
+                        (0, axios_1.default)(`https://arweave.net${api}`),
+                        wayfinder.request(`ar:///${api}`),
+                    ]);
+                    node_assert_1.default.strictEqual(response.status, 200);
+                    node_assert_1.default.strictEqual(response.status, nativeAxios.status);
+                    // TODO: ensure the headers are the same excluding unique headers
+                    node_assert_1.default.deepStrictEqual(response.data, nativeAxios.data);
+                });
+            }
+            (0, node_test_1.it)('should return the error from the target gateway if the route is not found', async () => {
+                const axiosInstance = axios_1.default.create({
+                    validateStatus: () => true, // don't throw so we can compare axios result with wrapped axios result
+                });
+                const wayfinder = new wayfinder_js_1.Wayfinder({
+                    httpClient: axiosInstance,
+                    router: new random_js_1.RandomGatewayRouter({
+                        gatewaysProvider: stubbedGatewaysProvider,
+                    }),
+                });
+                const [nativeAxios, response] = await Promise.all([
+                    axiosInstance('https://arweave.net/not-found'),
+                    wayfinder.request('https://arweave.net/not-found'),
+                ]);
+                node_assert_1.default.strictEqual(response.status, nativeAxios.status);
+                node_assert_1.default.strictEqual(response.data, nativeAxios.data);
+            });
+        });
+        (0, node_test_1.describe)('got', () => {
+            let wayfinder;
+            (0, node_test_1.before)(() => {
+                wayfinder = new wayfinder_js_1.Wayfinder({
+                    httpClient: got_1.default,
+                    router: new random_js_1.RandomGatewayRouter({
+                        gatewaysProvider: stubbedGatewaysProvider,
+                    }),
+                });
+            });
+            (0, node_test_1.it)('should fetch the data using the got default function against the target gateway', async () => {
+                const [nativeGot, response] = await Promise.all([
+                    (0, got_1.default)('https://ao.arweave.net'),
+                    wayfinder.request('ar://ao'),
+                ]);
+                node_assert_1.default.strictEqual(response.statusCode, 200);
+                node_assert_1.default.strictEqual(response.statusCode, nativeGot.statusCode);
+                node_assert_1.default.deepStrictEqual(response.body, nativeGot.body);
+            });
+            (0, node_test_1.it)('should stream the data using got.stream against the selected target gateway', async () => {
+                const nativeBuffer = await (0, consumers_1.buffer)(await got_1.default.stream('https://ao.arweave.net', { decompress: false }));
+                const wayfinderBuffer = await (0, consumers_1.buffer)(await wayfinder.request.stream('ar://ao', { decompress: false }));
+                node_assert_1.default.deepStrictEqual(wayfinderBuffer, nativeBuffer);
+            });
+        });
+    });
+});

package/lib/cjs/types/ant.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.SpawnANTStateSchema = 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.
@@ -81,6 +81,17 @@ exports.AntStateSchema = zod_1.z.object({
         .boolean()
         .describe('Flag indicating whether the ANT has been initialized.'),
 });
+exports.SpawnANTStateSchema = zod_1.z.object({
+    name: zod_1.z.string().describe('The name of the ANT.'),
+    ticker: zod_1.z.string().describe('The ticker symbol for the ANT.'),
+    description: zod_1.z.string().describe('The description for the ANT.'),
+    keywords: exports.AntKeywordsSchema.describe('The keywords for the ANT.'),
+    owner: exports.AOAddressSchema.describe('The Owners address.'),
+    controllers: exports.AntControllersSchema.describe('Controllers of the ANT who have administrative privileges.'),
+    records: exports.AntRecordsSchema.describe('Records associated with the ANT.'),
+    balances: exports.AntBalancesSchema.describe('Balance details for each address holding the ANT.'),
+    logo: exports.ArweaveTxIdSchema.describe('Transaction ID of the ANT logo.'),
+});
 exports.AntReadHandlers = [
     'balance',
     'balances',

package/lib/cjs/types/index.js

@@ -35,3 +35,4 @@ __exportStar(require("./common.js"), exports);
 __exportStar(require("./faucet.js"), exports);
 __exportStar(require("./io.js"), exports);
 __exportStar(require("./token.js"), exports);
+__exportStar(require("./wayfinder.js"), exports);

package/lib/cjs/types/io.js

@@ -31,7 +31,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/types/wayfinder.js

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

package/lib/cjs/utils/ao.js

@@ -30,8 +30,13 @@ const zod_1 = require("zod");
 const arweave_js_1 = require("../common/arweave.js");
 const index_js_1 = require("../common/index.js");
 const constants_js_1 = require("../constants.js");
+const ant_js_1 = require("../types/ant.js");
+const schema_js_1 = require("./schema.js");
 async function spawnANT({ signer, module = constants_js_1.AOS_MODULE_ID, ao = (0, aoconnect_1.connect)(), scheduler = constants_js_1.DEFAULT_SCHEDULER_ID, state, antRegistryId = constants_js_1.ANT_REGISTRY_ID, logger = index_js_1.Logger.default, authority = constants_js_1.AO_AUTHORITY, }) {
     // TODO: use On-Boot data handler for bootstrapping state instead of initialize-state
+    if (state) {
+        (0, schema_js_1.parseSchemaResult)(ant_js_1.SpawnANTStateSchema, state);
+    }
     const processId = await ao.spawn({
         module,
         scheduler,

package/lib/cjs/utils/random.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.randomInt = 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 crypto_1 = require("crypto");
+/**
+ * Cryptographically secure helper for randomness, does not support seeding
+ * @param min - the minimum value
+ * @param max - the maximum value
+ * @returns a random integer between min and max
+ */
+const randomInt = (min, max) => {
+    const [rand] = crypto_1.webcrypto.getRandomValues(new Uint32Array(1));
+    return min + (rand % (max - min));
+};
+exports.randomInt = randomInt;

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/utils/utils.test.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = require("node:assert");
 const node_test_1 = require("node:test");
+const ao_js_1 = require("./ao.js");
 const arweave_js_1 = require("./arweave.js");
-const index_js_1 = require("./index.js");
 (0, node_test_1.describe)('pruneTags', () => {
     (0, node_test_1.it)('should remove tags with undefined values', () => {
         const tags = [
@@ -45,7 +45,7 @@ const index_js_1 = require("./index.js");
         const output = {
             Error: 'Error message',
         };
-        const errorMessage = (0, index_js_1.errorMessageFromOutput)(output);
+        const errorMessage = (0, ao_js_1.errorMessageFromOutput)(output);
         node_assert_1.strict.equal(errorMessage, 'Error message');
     });
     (0, node_test_1.it)('should return error message from Error tag', () => {
@@ -56,7 +56,7 @@ const index_js_1 = require("./index.js");
                 },
             ],
         };
-        const errorMessage = (0, index_js_1.errorMessageFromOutput)(output);
+        const errorMessage = (0, ao_js_1.errorMessageFromOutput)(output);
         node_assert_1.strict.equal(errorMessage, 'Error message');
     });
     (0, node_test_1.it)('should return error message from Error tag if Error field is undefined', () => {
@@ -67,7 +67,7 @@ const index_js_1 = require("./index.js");
                 },
             ],
         };
-        const errorMessage = (0, index_js_1.errorMessageFromOutput)(output);
+        const errorMessage = (0, ao_js_1.errorMessageFromOutput)(output);
         node_assert_1.strict.equal(errorMessage, 'Error message');
     });
     (0, node_test_1.it)('should return undefined if no error message is present', () => {
@@ -78,21 +78,21 @@ const index_js_1 = require("./index.js");
                 },
             ],
         };
-        const errorMessage = (0, index_js_1.errorMessageFromOutput)(output);
+        const errorMessage = (0, ao_js_1.errorMessageFromOutput)(output);
         node_assert_1.strict.equal(errorMessage, undefined);
     });
     (0, node_test_1.it)('should return error message with line number', () => {
         const output = {
             Error: '[string "aos"]:123: Error message',
         };
-        const errorMessage = (0, index_js_1.errorMessageFromOutput)(output);
+        const errorMessage = (0, ao_js_1.errorMessageFromOutput)(output);
         node_assert_1.strict.equal(errorMessage, 'Error message (line 123)');
     });
     (0, node_test_1.it)('should return error message with line number and remove unicode', () => {
         const output = {
             Error: '[string "aos"]:123: Error message\u001b[0m',
         };
-        const errorMessage = (0, index_js_1.errorMessageFromOutput)(output);
+        const errorMessage = (0, ao_js_1.errorMessageFromOutput)(output);
         node_assert_1.strict.equal(errorMessage, 'Error message (line 123)');
     });
     const knownErrorMessages = '\u001b[31mError\u001b[90m handling message with Action = Register\u001b[0m\n\u001b[32m[string ".handlers"]:723: [string "aos"]:128: Already registered\u001b[0m\n\n\u001b[90mstack traceback:\n\t[string ".process"]:871: in function \'.process.handle\'\u001b[0m\n\n\u001b[31merror:\n\u001b[0m[string ".handlers"]:723: [string "aos"]:128: Already registered';
@@ -100,7 +100,7 @@ const index_js_1 = require("./index.js");
         const output = {
             Error: knownErrorMessages,
         };
-        const errorMessage = (0, index_js_1.errorMessageFromOutput)(output);
+        const errorMessage = (0, ao_js_1.errorMessageFromOutput)(output);
         node_assert_1.strict.equal(errorMessage, 'Already registered (line 128)');
     });
 });

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';
+exports.version = '3.11.0-alpha.2';

package/lib/cjs/web/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArconnectSigner = exports.ArweaveSigner = void 0;
+exports.EthereumSigner = exports.InjectedEthereumSigner = exports.ArconnectSigner = exports.ArweaveSigner = void 0;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -33,6 +33,8 @@ exports.ArconnectSigner = exports.ArweaveSigner = void 0;
 var arbundles_1 = require("@dha-team/arbundles");
 Object.defineProperty(exports, "ArweaveSigner", { enumerable: true, get: function () { return arbundles_1.ArweaveSigner; } });
 Object.defineProperty(exports, "ArconnectSigner", { enumerable: true, get: function () { return arbundles_1.ArconnectSigner; } });
+Object.defineProperty(exports, "InjectedEthereumSigner", { enumerable: true, get: function () { return arbundles_1.InjectedEthereumSigner; } });
+Object.defineProperty(exports, "EthereumSigner", { enumerable: true, get: function () { return arbundles_1.EthereumSigner; } });
 __exportStar(require("../types/index.js"), exports);
 __exportStar(require("../common/index.js"), exports);
 __exportStar(require("../constants.js"), exports);

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) {