@ardrive/turbo-sdk 1.14.0-alpha.1 → 1.14.0-alpha.3

package/lib/cjs/cli/cli.js

@@ -35,23 +35,14 @@ const utils_js_1 = require("./utils.js");
     await (0, utils_js_1.runCommand)(command, commands_js_1.topUp);
 });
 (0, utils_js_1.applyOptions)(commander_1.program.command('crypto-fund').description('Top up a wallet with crypto'), [...options_js_1.walletOptions, options_js_1.optionMap.value]).action(async (_commandOptions, command) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const options = command.optsWithGlobals();
-    const token = (0, utils_js_1.tokenFromOptions)(options);
-    const value = (0, utils_js_1.valueFromOptions)(options);
-    const privateKey = await (0, utils_js_1.privateKeyFromOptions)(options);
-    const config = (0, utils_js_1.configFromOptions)(options);
-    try {
-        await (0, commands_js_1.cryptoFund)({ privateKey, value, token, config });
-        process.exit(0);
-    }
-    catch (error) {
-        (0, utils_js_1.exitWithErrorLog)(error);
-    }
+    await (0, utils_js_1.runCommand)(command, commands_js_1.cryptoFund);
 });
 (0, utils_js_1.applyOptions)(commander_1.program.command('upload-folder').description('Upload a folder using Turbo'), options_js_1.uploadFolderOptions).action(async (_commandOptions, command) => {
     await (0, utils_js_1.runCommand)(command, commands_js_1.uploadFolder);
 });
+(0, utils_js_1.applyOptions)(commander_1.program.command('upload-file').description('Upload a file using Turbo'), options_js_1.uploadFileOptions).action(async (_commandOptions, command) => {
+    await (0, utils_js_1.runCommand)(command, commands_js_1.uploadFile);
+});
 if (process.argv[1].includes('bin/turbo') || // Running from global .bin
     process.argv[1].includes('cli/cli') // Running from source
 ) {

package/lib/cjs/cli/commands.js

@@ -5,6 +5,7 @@ exports.cryptoFund = cryptoFund;
 exports.topUp = topUp;
 exports.openUrl = openUrl;
 exports.uploadFolder = uploadFolder;
+exports.uploadFile = uploadFile;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc. All Rights Reserved.
  *
@@ -22,6 +23,7 @@ exports.uploadFolder = uploadFolder;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 const node_child_process_1 = require("node:child_process");
+const node_fs_1 = require("node:fs");
 const index_js_1 = require("../node/index.js");
 const common_js_1 = require("../utils/common.js");
 const version_js_1 = require("../version.js");
@@ -46,13 +48,14 @@ async function getBalance(options) {
     console.log(`Turbo Balance for Wallet Address "${await turbo.signer.getNativeAddress()}"\nCredits: ${+winc / 1_000_000_000_000}`);
 }
 /** Fund the connected signer with crypto */
-async function cryptoFund({ value, privateKey, token, config, }) {
-    const authenticatedTurbo = index_js_1.TurboFactory.authenticated({
-        ...config,
-        privateKey: privateKey,
-        token,
-    });
-    const result = await authenticatedTurbo.topUpWithTokens({
+async function cryptoFund(options) {
+    const value = options.value;
+    if (value === undefined) {
+        throw new Error('Must provide a --value to top up');
+    }
+    const turbo = await (0, utils_js_1.turboFromOptions)(options);
+    const token = (0, utils_js_1.tokenFromOptions)(options);
+    const result = await turbo.topUpWithTokens({
         tokenAmount: index_js_1.tokenToBaseMap[token](value),
     });
     console.log('Sent crypto fund transaction: \n', JSON.stringify(result, null, 2));
@@ -118,11 +121,7 @@ const turboCliTags = [
     { name: 'App-Platform', value: process.platform },
 ];
 async function uploadFolder(options) {
-    const privateKey = await (0, utils_js_1.privateKeyFromOptions)(options);
-    const turbo = index_js_1.TurboFactory.authenticated({
-        ...(0, utils_js_1.configFromOptions)(options),
-        privateKey,
-    });
+    const turbo = await (0, utils_js_1.turboFromOptions)(options);
     const { disableManifest, fallbackFile, folderPath, indexFile, maxConcurrentUploads, } = (0, utils_js_1.getUploadFolderOptions)(options);
     const result = await turbo.uploadFolder({
         folderPath: folderPath,
@@ -136,3 +135,17 @@ async function uploadFolder(options) {
     });
     console.log('Uploaded folder:', JSON.stringify(result, null, 2));
 }
+async function uploadFile(options) {
+    const { filePath } = options;
+    if (filePath === undefined) {
+        throw new Error('Must provide a --file-path to upload');
+    }
+    const turbo = await (0, utils_js_1.turboFromOptions)(options);
+    const fileSize = (0, node_fs_1.statSync)(filePath).size;
+    const result = await turbo.uploadFile({
+        fileStreamFactory: () => (0, node_fs_1.createReadStream)(filePath),
+        fileSizeFactory: () => fileSize,
+        dataItemOpts: { tags: [...turboCliTags] }, // TODO: Inject user tags
+    });
+    console.log('Uploaded file:', JSON.stringify(result, null, 2));
+}

package/lib/cjs/cli/options.js

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadFolderOptions = exports.globalOptions = exports.walletOptions = exports.optionMap = void 0;
+exports.uploadFileOptions = exports.uploadFolderOptions = exports.globalOptions = exports.walletOptions = exports.optionMap = void 0;
 exports.optionMap = {
     token: {
         alias: '-t, --token <type>',
@@ -74,6 +74,10 @@ exports.optionMap = {
         alias: '-f, --folder-path <folderPath>',
         description: 'Directory to upload',
     },
+    filePath: {
+        alias: '-f, --file-path <filePath>',
+        description: 'File to upload',
+    },
     indexFile: {
         alias: '--index-file <indexFile>',
         description: 'Index file to use in the manifest created for folder upload',
@@ -85,7 +89,7 @@ exports.optionMap = {
     manifest: {
         alias: '--no-manifest',
         description: 'Disable manifest creation with --no-manifest',
-        default: false,
+        default: true,
     },
     maxConcurrency: {
         alias: '--max-concurrency <maxConcurrency>',
@@ -112,3 +116,4 @@ exports.uploadFolderOptions = [
     exports.optionMap.manifest,
     exports.optionMap.maxConcurrency,
 ];
+exports.uploadFileOptions = [...exports.walletOptions, exports.optionMap.filePath];

package/lib/cjs/cli/types.js

@@ -1,2 +1,18 @@
 "use strict";
+/**
+ * Copyright (C) 2022-2024 Permanent Data Solutions, Inc. All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/cli/utils.js

@@ -13,6 +13,7 @@ exports.addressOrPrivateKeyFromOptions = addressOrPrivateKeyFromOptions;
 exports.optionalPrivateKeyFromOptions = optionalPrivateKeyFromOptions;
 exports.privateKeyFromOptions = privateKeyFromOptions;
 exports.configFromOptions = configFromOptions;
+exports.turboFromOptions = turboFromOptions;
 exports.getUploadFolderOptions = getUploadFolderOptions;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc. All Rights Reserved.
@@ -132,9 +133,11 @@ const tokenToDevGatewayMap = {
     kyve: 'https://api.korellia.kyve.network',
     // matic: 'https://rpc-amoy.polygon.technology',
 };
-function configFromOptions({ gateway, dev, token, }) {
+function configFromOptions(options) {
     let config = {};
-    if (dev) {
+    const token = tokenFromOptions(options);
+    config.token = token;
+    if (options.dev) {
         config = index_js_1.developmentTurboConfiguration;
         config.gatewayUrl = tokenToDevGatewayMap[token];
     }
@@ -142,13 +145,22 @@ function configFromOptions({ gateway, dev, token, }) {
         config = index_js_1.defaultTurboConfiguration;
     }
     // If gateway is provided, override the default or dev gateway
-    if (gateway !== undefined) {
-        config.gatewayUrl = gateway;
+    if (options.gateway !== undefined) {
+        config.gatewayUrl = options.gateway;
     }
-    config.token = token;
     return config;
 }
+async function turboFromOptions(options) {
+    const privateKey = await privateKeyFromOptions(options);
+    return index_js_1.TurboFactory.authenticated({
+        ...configFromOptions(options),
+        privateKey,
+    });
+}
 function getUploadFolderOptions(options) {
+    if (options.folderPath === undefined) {
+        throw new Error('--folder-path is required');
+    }
     return {
         folderPath: options.folderPath,
         indexFile: options.indexFile,

package/lib/cjs/common/signer.js

@@ -20,12 +20,12 @@ exports.TurboDataItemAbstractSigner = void 0;
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+const arbundles_1 = require("@ar.io/arbundles");
 const amino_1 = require("@cosmjs/amino");
 const crypto_1 = require("@cosmjs/crypto");
 const encoding_1 = require("@cosmjs/encoding");
 const signing_key_1 = require("@ethersproject/signing-key");
 const sdk_js_1 = require("@kyvejs/sdk/dist/sdk.js");
-const arbundles_1 = require("arbundles");
 const bs58_1 = __importDefault(require("bs58"));
 const crypto_2 = require("crypto");
 const ethers_1 = require("ethers");

package/lib/cjs/common/token/arweave.js

@@ -20,21 +20,26 @@ exports.ARToTokenAmount = exports.WinstonToTokenAmount = exports.ArweaveToken =
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-const arweave_1 = __importDefault(require("@irys/arweave"));
+const arweave_1 = __importDefault(require("arweave"));
 const bignumber_js_1 = require("bignumber.js");
 const node_buffer_1 = require("node:buffer");
 const base64_js_1 = require("../../utils/base64.js");
 const common_js_1 = require("../../utils/common.js");
 const logger_js_1 = require("../logger.js");
 class ArweaveToken {
-    constructor({ gatewayUrl = 'https://arweave.net', arweave = arweave_1.default.init({
-        url: gatewayUrl,
-    }), logger = logger_js_1.TurboWinstonLogger.default, mintU = true, pollingOptions = {
+    constructor({ gatewayUrl = 'https://arweave.net', arweave, logger = logger_js_1.TurboWinstonLogger.default, mintU = true, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 3_000,
         initialBackoffMs: 7_000,
     }, } = {}) {
-        this.arweave = arweave;
+        const url = new URL(gatewayUrl);
+        this.arweave =
+            arweave ??
+                arweave_1.default.init({
+                    host: url.hostname,
+                    port: url.port,
+                    protocol: url.protocol.replace(':', ''),
+                });
         this.logger = logger;
         this.mintU = mintU;
         this.pollingOptions = pollingOptions;

package/lib/cjs/common/token/kyve.js

@@ -20,10 +20,10 @@ exports.signerFromKyveMnemonic = signerFromKyveMnemonic;
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+const arbundles_1 = require("@ar.io/arbundles");
 const amino_1 = require("@cosmjs/amino");
 const crypto_1 = require("@cosmjs/crypto");
 const encoding_1 = require("@cosmjs/encoding");
-const arbundles_1 = require("arbundles");
 const bignumber_js_1 = require("bignumber.js");
 const axiosClient_js_1 = require("../../utils/axiosClient.js");
 const common_js_1 = require("../../utils/common.js");

package/lib/cjs/node/factory.js

@@ -17,7 +17,7 @@ exports.TurboFactory = void 0;
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-const arbundles_1 = require("arbundles");
+const arbundles_1 = require("@ar.io/arbundles");
 const factory_js_1 = require("../common/factory.js");
 const index_js_1 = require("../common/index.js");
 const payment_js_1 = require("../common/payment.js");

package/lib/cjs/node/signer.js

@@ -17,7 +17,7 @@ exports.TurboNodeSigner = exports.HexSolanaSigner = exports.EthereumSigner = exp
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-const arbundles_1 = require("arbundles");
+const arbundles_1 = require("@ar.io/arbundles");
 Object.defineProperty(exports, "ArconnectSigner", { enumerable: true, get: function () { return arbundles_1.ArconnectSigner; } });
 Object.defineProperty(exports, "ArweaveSigner", { enumerable: true, get: function () { return arbundles_1.ArweaveSigner; } });
 Object.defineProperty(exports, "EthereumSigner", { enumerable: true, get: function () { return arbundles_1.EthereumSigner; } });

package/lib/cjs/utils/common.js

@@ -21,10 +21,10 @@ exports.signerFromKyveMnemonic = signerFromKyveMnemonic;
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+const arbundles_1 = require("@ar.io/arbundles");
 const amino_1 = require("@cosmjs/amino");
 const crypto_1 = require("@cosmjs/crypto");
 const encoding_1 = require("@cosmjs/encoding");
-const arbundles_1 = require("arbundles");
 const types_js_1 = require("../types.js");
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));

package/lib/cjs/version.js

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

package/lib/cjs/web/factory.js

@@ -17,7 +17,7 @@ exports.TurboFactory = void 0;
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-const arbundles_1 = require("arbundles");
+const arbundles_1 = require("@ar.io/arbundles");
 const factory_js_1 = require("../common/factory.js");
 const index_js_1 = require("../common/index.js");
 const common_js_1 = require("../utils/common.js");

package/lib/cjs/web/signer.js

@@ -17,7 +17,7 @@ exports.TurboWebArweaveSigner = exports.HexSolanaSigner = exports.EthereumSigner
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-const arbundles_1 = require("arbundles");
+const arbundles_1 = require("@ar.io/arbundles");
 Object.defineProperty(exports, "ArconnectSigner", { enumerable: true, get: function () { return arbundles_1.ArconnectSigner; } });
 Object.defineProperty(exports, "ArweaveSigner", { enumerable: true, get: function () { return arbundles_1.ArweaveSigner; } });
 Object.defineProperty(exports, "EthereumSigner", { enumerable: true, get: function () { return arbundles_1.EthereumSigner; } });

package/lib/esm/cli/cli.js

@@ -18,9 +18,9 @@
 // eslint-disable-next-line header/header -- This is a CLI file
 import { program } from 'commander';
 import { version } from '../version.js';
-import { cryptoFund, getBalance, topUp, uploadFolder } from './commands.js';
-import { globalOptions, optionMap, uploadFolderOptions, walletOptions, } from './options.js';
-import { applyOptions, configFromOptions, exitWithErrorLog, privateKeyFromOptions, runCommand, tokenFromOptions, valueFromOptions, } from './utils.js';
+import { cryptoFund, getBalance, topUp, uploadFile, uploadFolder, } from './commands.js';
+import { globalOptions, optionMap, uploadFileOptions, uploadFolderOptions, walletOptions, } from './options.js';
+import { applyOptions, runCommand } from './utils.js';
 applyOptions(program
     .name('turbo')
     .version(version)
@@ -33,23 +33,14 @@ applyOptions(program.command('top-up').description('Top up a Turbo address with
     await runCommand(command, topUp);
 });
 applyOptions(program.command('crypto-fund').description('Top up a wallet with crypto'), [...walletOptions, optionMap.value]).action(async (_commandOptions, command) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const options = command.optsWithGlobals();
-    const token = tokenFromOptions(options);
-    const value = valueFromOptions(options);
-    const privateKey = await privateKeyFromOptions(options);
-    const config = configFromOptions(options);
-    try {
-        await cryptoFund({ privateKey, value, token, config });
-        process.exit(0);
-    }
-    catch (error) {
-        exitWithErrorLog(error);
-    }
+    await runCommand(command, cryptoFund);
 });
 applyOptions(program.command('upload-folder').description('Upload a folder using Turbo'), uploadFolderOptions).action(async (_commandOptions, command) => {
     await runCommand(command, uploadFolder);
 });
+applyOptions(program.command('upload-file').description('Upload a file using Turbo'), uploadFileOptions).action(async (_commandOptions, command) => {
+    await runCommand(command, uploadFile);
+});
 if (process.argv[1].includes('bin/turbo') || // Running from global .bin
     process.argv[1].includes('cli/cli') // Running from source
 ) {

package/lib/esm/cli/commands.js

@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { exec } from 'node:child_process';
+import { createReadStream, statSync } from 'node:fs';
 import { TurboFactory, currencyMap, fiatCurrencyTypes, isCurrency, tokenToBaseMap, } from '../node/index.js';
 import { sleep } from '../utils/common.js';
 import { version } from '../version.js';
-import { addressOrPrivateKeyFromOptions, configFromOptions, getUploadFolderOptions, privateKeyFromOptions, } from './utils.js';
+import { addressOrPrivateKeyFromOptions, configFromOptions, getUploadFolderOptions, tokenFromOptions, turboFromOptions, } from './utils.js';
 export async function getBalance(options) {
     const config = configFromOptions(options);
     const { address, privateKey } = await addressOrPrivateKeyFromOptions(options);
@@ -39,13 +40,14 @@ export async function getBalance(options) {
     console.log(`Turbo Balance for Wallet Address "${await turbo.signer.getNativeAddress()}"\nCredits: ${+winc / 1_000_000_000_000}`);
 }
 /** Fund the connected signer with crypto */
-export async function cryptoFund({ value, privateKey, token, config, }) {
-    const authenticatedTurbo = TurboFactory.authenticated({
-        ...config,
-        privateKey: privateKey,
-        token,
-    });
-    const result = await authenticatedTurbo.topUpWithTokens({
+export async function cryptoFund(options) {
+    const value = options.value;
+    if (value === undefined) {
+        throw new Error('Must provide a --value to top up');
+    }
+    const turbo = await turboFromOptions(options);
+    const token = tokenFromOptions(options);
+    const result = await turbo.topUpWithTokens({
         tokenAmount: tokenToBaseMap[token](value),
     });
     console.log('Sent crypto fund transaction: \n', JSON.stringify(result, null, 2));
@@ -111,11 +113,7 @@ const turboCliTags = [
     { name: 'App-Platform', value: process.platform },
 ];
 export async function uploadFolder(options) {
-    const privateKey = await privateKeyFromOptions(options);
-    const turbo = TurboFactory.authenticated({
-        ...configFromOptions(options),
-        privateKey,
-    });
+    const turbo = await turboFromOptions(options);
     const { disableManifest, fallbackFile, folderPath, indexFile, maxConcurrentUploads, } = getUploadFolderOptions(options);
     const result = await turbo.uploadFolder({
         folderPath: folderPath,
@@ -129,3 +127,17 @@ export async function uploadFolder(options) {
     });
     console.log('Uploaded folder:', JSON.stringify(result, null, 2));
 }
+export async function uploadFile(options) {
+    const { filePath } = options;
+    if (filePath === undefined) {
+        throw new Error('Must provide a --file-path to upload');
+    }
+    const turbo = await turboFromOptions(options);
+    const fileSize = statSync(filePath).size;
+    const result = await turbo.uploadFile({
+        fileStreamFactory: () => createReadStream(filePath),
+        fileSizeFactory: () => fileSize,
+        dataItemOpts: { tags: [...turboCliTags] }, // TODO: Inject user tags
+    });
+    console.log('Uploaded file:', JSON.stringify(result, null, 2));
+}

package/lib/esm/cli/options.js

@@ -71,6 +71,10 @@ export const optionMap = {
         alias: '-f, --folder-path <folderPath>',
         description: 'Directory to upload',
     },
+    filePath: {
+        alias: '-f, --file-path <filePath>',
+        description: 'File to upload',
+    },
     indexFile: {
         alias: '--index-file <indexFile>',
         description: 'Index file to use in the manifest created for folder upload',
@@ -82,7 +86,7 @@ export const optionMap = {
     manifest: {
         alias: '--no-manifest',
         description: 'Disable manifest creation with --no-manifest',
-        default: false,
+        default: true,
     },
     maxConcurrency: {
         alias: '--max-concurrency <maxConcurrency>',
@@ -109,3 +113,4 @@ export const uploadFolderOptions = [
     optionMap.manifest,
     optionMap.maxConcurrency,
 ];
+export const uploadFileOptions = [...walletOptions, optionMap.filePath];

package/lib/esm/cli/types.js

@@ -1 +1,17 @@
+/**
+ * Copyright (C) 2022-2024 Permanent Data Solutions, Inc. All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 export {};

package/lib/esm/cli/utils.js

@@ -16,7 +16,7 @@
  */
 import bs58 from 'bs58';
 import { readFileSync, statSync } from 'fs';
-import { defaultTurboConfiguration, developmentTurboConfiguration, isTokenType, privateKeyFromKyveMnemonic, } from '../node/index.js';
+import { TurboFactory, defaultTurboConfiguration, developmentTurboConfiguration, isTokenType, privateKeyFromKyveMnemonic, } from '../node/index.js';
 import { NoWalletProvidedError } from './errors.js';
 export function exitWithErrorLog(error) {
     console.error(error instanceof Error ? error.message : error);
@@ -116,9 +116,11 @@ const tokenToDevGatewayMap = {
     kyve: 'https://api.korellia.kyve.network',
     // matic: 'https://rpc-amoy.polygon.technology',
 };
-export function configFromOptions({ gateway, dev, token, }) {
+export function configFromOptions(options) {
     let config = {};
-    if (dev) {
+    const token = tokenFromOptions(options);
+    config.token = token;
+    if (options.dev) {
         config = developmentTurboConfiguration;
         config.gatewayUrl = tokenToDevGatewayMap[token];
     }
@@ -126,13 +128,22 @@ export function configFromOptions({ gateway, dev, token, }) {
         config = defaultTurboConfiguration;
     }
     // If gateway is provided, override the default or dev gateway
-    if (gateway !== undefined) {
-        config.gatewayUrl = gateway;
+    if (options.gateway !== undefined) {
+        config.gatewayUrl = options.gateway;
     }
-    config.token = token;
     return config;
 }
+export async function turboFromOptions(options) {
+    const privateKey = await privateKeyFromOptions(options);
+    return TurboFactory.authenticated({
+        ...configFromOptions(options),
+        privateKey,
+    });
+}
 export function getUploadFolderOptions(options) {
+    if (options.folderPath === undefined) {
+        throw new Error('--folder-path is required');
+    }
     return {
         folderPath: options.folderPath,
         indexFile: options.indexFile,

package/lib/esm/common/signer.js

@@ -14,12 +14,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+import { EthereumSigner, HexSolanaSigner } from '@ar.io/arbundles';
 import { pubkeyToAddress } from '@cosmjs/amino';
 import { Secp256k1 } from '@cosmjs/crypto';
 import { toBase64 } from '@cosmjs/encoding';
 import { computePublicKey } from '@ethersproject/signing-key';
 import { KyveSDK } from '@kyvejs/sdk/dist/sdk.js';
-import { EthereumSigner, HexSolanaSigner } from 'arbundles';
 import bs58 from 'bs58';
 import { randomBytes } from 'crypto';
 import { Wallet as EthereumWallet, ethers, parseEther } from 'ethers';

package/lib/esm/common/token/arweave.js

@@ -14,21 +14,26 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import Arweave from '@irys/arweave';
+import Arweave from 'arweave';
 import { BigNumber } from 'bignumber.js';
 import { Buffer } from 'node:buffer';
 import { sha256B64Url, toB64Url } from '../../utils/base64.js';
 import { sleep } from '../../utils/common.js';
 import { TurboWinstonLogger } from '../logger.js';
 export class ArweaveToken {
-    constructor({ gatewayUrl = 'https://arweave.net', arweave = Arweave.init({
-        url: gatewayUrl,
-    }), logger = TurboWinstonLogger.default, mintU = true, pollingOptions = {
+    constructor({ gatewayUrl = 'https://arweave.net', arweave, logger = TurboWinstonLogger.default, mintU = true, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 3_000,
         initialBackoffMs: 7_000,
     }, } = {}) {
-        this.arweave = arweave;
+        const url = new URL(gatewayUrl);
+        this.arweave =
+            arweave ??
+                Arweave.init({
+                    host: url.hostname,
+                    port: url.port,
+                    protocol: url.protocol.replace(':', ''),
+                });
         this.logger = logger;
         this.mintU = mintU;
         this.pollingOptions = pollingOptions;

package/lib/esm/common/token/kyve.js

@@ -14,10 +14,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+import { EthereumSigner } from '@ar.io/arbundles';
 import { Secp256k1HdWallet, makeCosmoshubPath } from '@cosmjs/amino';
 import { Slip10, Slip10Curve } from '@cosmjs/crypto';
 import { toHex } from '@cosmjs/encoding';
-import { EthereumSigner } from 'arbundles';
 import { BigNumber } from 'bignumber.js';
 import { createAxiosInstance } from '../../utils/axiosClient.js';
 import { sleep } from '../../utils/common.js';

package/lib/esm/node/factory.js

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { EthereumSigner, HexSolanaSigner } from 'arbundles';
+import { EthereumSigner, HexSolanaSigner } from '@ar.io/arbundles';
 import { TurboBaseFactory } from '../common/factory.js';
 import { defaultTokenMap } from '../common/index.js';
 import { TurboAuthenticatedPaymentService } from '../common/payment.js';

package/lib/esm/node/signer.js

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { ArconnectSigner, ArweaveSigner, EthereumSigner, HexSolanaSigner, serializeTags, streamSigner, } from 'arbundles';
+import { ArconnectSigner, ArweaveSigner, EthereumSigner, HexSolanaSigner, serializeTags, streamSigner, } from '@ar.io/arbundles';
 import { Buffer } from 'node:buffer';
 import { TurboDataItemAbstractSigner } from '../common/signer.js';
 import { fromB64Url } from '../utils/base64.js';

package/lib/esm/utils/common.js

@@ -14,10 +14,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+import { ArweaveSigner, EthereumSigner, HexSolanaSigner, } from '@ar.io/arbundles';
 import { Secp256k1HdWallet, makeCosmoshubPath } from '@cosmjs/amino';
 import { Slip10, Slip10Curve } from '@cosmjs/crypto';
 import { toHex } from '@cosmjs/encoding';
-import { ArweaveSigner, EthereumSigner, HexSolanaSigner } from 'arbundles';
 import { isEthPrivateKey, isJWK, isKyvePrivateKey, } from '../types.js';
 export function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));

package/lib/esm/version.js

@@ -15,4 +15,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-export const version = '1.14.0-alpha.1';
+export const version = '1.14.0-alpha.3';

package/lib/esm/web/factory.js

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { EthereumSigner, HexSolanaSigner } from 'arbundles';
+import { EthereumSigner, HexSolanaSigner } from '@ar.io/arbundles';
 import { TurboBaseFactory } from '../common/factory.js';
 import { TurboAuthenticatedClient, TurboAuthenticatedPaymentService, defaultTokenMap, } from '../common/index.js';
 import { createTurboSigner } from '../utils/common.js';

package/lib/esm/web/signer.js

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { ArconnectSigner, ArweaveSigner, EthereumSigner, HexSolanaSigner, createData, } from 'arbundles';
+import { ArconnectSigner, ArweaveSigner, EthereumSigner, HexSolanaSigner, createData, } from '@ar.io/arbundles';
 import { TurboDataItemAbstractSigner } from '../common/signer.js';
 import { readableStreamToBuffer } from '../utils/readableStream.js';
 /**