@ardrive/turbo-sdk 1.16.0-alpha.1 → 1.16.0-alpha.2

package/README.md

@@ -738,11 +738,12 @@ turbo top-up --address 'crypto-wallet-public-native-address' --token ethereum --
 
 ##### `crypto-fund`
 
-Fund a wallet with Turbo Credits by submitting a payment transaction for the crypto amount to the Turbo wallet and then submitting that transaction id to Turbo Payment Service for top up processing.
+Fund a wallet with Turbo Credits by submitting a payment transaction for the crypto amount to the Turbo wallet and then submitting that transaction id to Turbo Payment Service for top up processing. Alternatively, submit a transaction ID of an existing funding transaction to Turbo Payment Service for top up processing.
 
 Command Options:
 
 - `-v, --value <value>` - Value of crypto token for fund. e.g: 0.0001 for 0.0001 KYVE
+- `-i, --tx-id <txId>` - Transaction ID of an existing funding transaction
 
 e.g:
 
@@ -750,6 +751,10 @@ e.g:
 turbo crypto-fund --value 0.0001 --token kyve --private-key 'b27...45c'
 ```
 
+```shell
+turbo crypto-fund --tx-id 'my-valid-arweave-fund-transaction-id' --token arweave
+```
+
 ##### `upload-folder`
 
 Upload a folder of files and create and upload a manifest file for the folder upload to the Turbo Upload Service.

package/bundles/web.bundle.min.js

@@ -310504,7 +310504,7 @@ var import_winston = __toESM(require_winston(), 1);
 init_dirname();
 init_buffer2();
 init_process2();
-var version16 = "1.15.0";
+var version16 = "1.16.0-alpha.1";
 
 // src/common/logger.ts
 var TurboWinstonLogger = class _TurboWinstonLogger {

package/lib/cjs/cli/cli.js

@@ -34,7 +34,7 @@ const utils_js_1 = require("./utils.js");
 (0, utils_js_1.applyOptions)(commander_1.program.command('top-up').description('Top up a Turbo address with Fiat'), [...options_js_1.walletOptions, options_js_1.optionMap.address, options_js_1.optionMap.value, options_js_1.optionMap.currency]).action(async (_commandOptions, command) => {
     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) => {
+(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, options_js_1.optionMap.txId]).action(async (_commandOptions, command) => {
     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) => {

package/lib/cjs/cli/commands.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBalance = getBalance;
 exports.cryptoFund = cryptoFund;
@@ -24,6 +27,7 @@ exports.uploadFile = uploadFile;
  */
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
+const prompts_1 = __importDefault(require("prompts"));
 const index_js_1 = require("../node/index.js");
 const common_js_1 = require("../utils/common.js");
 const version_js_1 = require("../version.js");
@@ -50,13 +54,34 @@ async function getBalance(options) {
 /** Fund the connected signer with crypto */
 async function cryptoFund(options) {
     const value = options.value;
+    const txId = options.txId;
+    if (txId !== undefined) {
+        const turbo = index_js_1.TurboFactory.unauthenticated((0, utils_js_1.configFromOptions)(options));
+        const result = await turbo.submitFundTransaction({ txId: txId });
+        console.log('Submitted existing crypto fund transaction to payment service: \n', JSON.stringify(result, null, 2));
+        return;
+    }
     if (value === undefined) {
-        throw new Error('Must provide a --value to top up');
+        throw new Error('Must provide a --value or --transaction-id for crypto-fund command');
     }
     const turbo = await (0, utils_js_1.turboFromOptions)(options);
     const token = (0, utils_js_1.tokenFromOptions)(options);
+    const tokenAmount = index_js_1.tokenToBaseMap[token](value);
+    const { winc } = await turbo.getWincForToken({ tokenAmount });
+    if (!options.skipConfirmation) {
+        const { confirm } = await (0, prompts_1.default)({
+            type: 'confirm',
+            name: 'confirm',
+            message: `This command will send a payment transaction for ${value} ${token} to the connected bundler's wallet in exchange for ~${(+winc / 1_000_000_000_000).toFixed(12)} Credits. This is in addition to any typical gas fees on the given network. Would you like to proceed with this funding?`,
+            initial: true,
+        });
+        if (!confirm) {
+            console.log('Aborted crypto fund transaction');
+            return;
+        }
+    }
     const result = await turbo.topUpWithTokens({
-        tokenAmount: index_js_1.tokenToBaseMap[token](value),
+        tokenAmount,
     });
     console.log('Sent crypto fund transaction: \n', JSON.stringify(result, null, 2));
 }

package/lib/cjs/cli/options.js

@@ -28,6 +28,10 @@ exports.optionMap = {
         description: 'Fiat currency type to use for the action',
         default: 'usd',
     },
+    txId: {
+        alias: '-i, --tx-id <txId>',
+        description: 'Transaction ID or hash to use for action',
+    },
     address: {
         alias: '-a, --address <nativeAddress>',
         description: 'Native address to use for action',
@@ -70,6 +74,11 @@ exports.optionMap = {
         description: 'Disable logging',
         default: false,
     },
+    skipConfirmation: {
+        alias: '--skip-confirmation',
+        description: 'Skip all confirmation prompts',
+        default: false,
+    },
     folderPath: {
         alias: '-f, --folder-path <folderPath>',
         description: 'Directory to upload',
@@ -107,6 +116,7 @@ exports.globalOptions = [
     exports.optionMap.debug,
     exports.optionMap.quiet,
     exports.optionMap.token,
+    exports.optionMap.skipConfirmation,
 ];
 exports.uploadFolderOptions = [
     ...exports.walletOptions,

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

package/lib/esm/cli/cli.js

@@ -32,7 +32,7 @@ applyOptions(program.command('balance').description('Get balance of a Turbo addr
 applyOptions(program.command('top-up').description('Top up a Turbo address with Fiat'), [...walletOptions, optionMap.address, optionMap.value, optionMap.currency]).action(async (_commandOptions, command) => {
     await runCommand(command, topUp);
 });
-applyOptions(program.command('crypto-fund').description('Top up a wallet with crypto'), [...walletOptions, optionMap.value]).action(async (_commandOptions, command) => {
+applyOptions(program.command('crypto-fund').description('Top up a wallet with crypto'), [...walletOptions, optionMap.value, optionMap.txId]).action(async (_commandOptions, command) => {
     await runCommand(command, cryptoFund);
 });
 applyOptions(program.command('upload-folder').description('Upload a folder using Turbo'), uploadFolderOptions).action(async (_commandOptions, command) => {

package/lib/esm/cli/commands.js

@@ -16,6 +16,7 @@
  */
 import { exec } from 'node:child_process';
 import { createReadStream, statSync } from 'node:fs';
+import prompts from 'prompts';
 import { TurboFactory, currencyMap, fiatCurrencyTypes, isCurrency, tokenToBaseMap, } from '../node/index.js';
 import { sleep } from '../utils/common.js';
 import { version } from '../version.js';
@@ -42,13 +43,34 @@ export async function getBalance(options) {
 /** Fund the connected signer with crypto */
 export async function cryptoFund(options) {
     const value = options.value;
+    const txId = options.txId;
+    if (txId !== undefined) {
+        const turbo = TurboFactory.unauthenticated(configFromOptions(options));
+        const result = await turbo.submitFundTransaction({ txId: txId });
+        console.log('Submitted existing crypto fund transaction to payment service: \n', JSON.stringify(result, null, 2));
+        return;
+    }
     if (value === undefined) {
-        throw new Error('Must provide a --value to top up');
+        throw new Error('Must provide a --value or --transaction-id for crypto-fund command');
     }
     const turbo = await turboFromOptions(options);
     const token = tokenFromOptions(options);
+    const tokenAmount = tokenToBaseMap[token](value);
+    const { winc } = await turbo.getWincForToken({ tokenAmount });
+    if (!options.skipConfirmation) {
+        const { confirm } = await prompts({
+            type: 'confirm',
+            name: 'confirm',
+            message: `This command will send a payment transaction for ${value} ${token} to the connected bundler's wallet in exchange for ~${(+winc / 1_000_000_000_000).toFixed(12)} Credits. This is in addition to any typical gas fees on the given network. Would you like to proceed with this funding?`,
+            initial: true,
+        });
+        if (!confirm) {
+            console.log('Aborted crypto fund transaction');
+            return;
+        }
+    }
     const result = await turbo.topUpWithTokens({
-        tokenAmount: tokenToBaseMap[token](value),
+        tokenAmount,
     });
     console.log('Sent crypto fund transaction: \n', JSON.stringify(result, null, 2));
 }

package/lib/esm/cli/options.js

@@ -25,6 +25,10 @@ export const optionMap = {
         description: 'Fiat currency type to use for the action',
         default: 'usd',
     },
+    txId: {
+        alias: '-i, --tx-id <txId>',
+        description: 'Transaction ID or hash to use for action',
+    },
     address: {
         alias: '-a, --address <nativeAddress>',
         description: 'Native address to use for action',
@@ -67,6 +71,11 @@ export const optionMap = {
         description: 'Disable logging',
         default: false,
     },
+    skipConfirmation: {
+        alias: '--skip-confirmation',
+        description: 'Skip all confirmation prompts',
+        default: false,
+    },
     folderPath: {
         alias: '-f, --folder-path <folderPath>',
         description: 'Directory to upload',
@@ -104,6 +113,7 @@ export const globalOptions = [
     optionMap.debug,
     optionMap.quiet,
     optionMap.token,
+    optionMap.skipConfirmation,
 ];
 export const uploadFolderOptions = [
     ...walletOptions,

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.16.0-alpha.1';
+export const version = '1.16.0-alpha.2';

package/lib/types/cli/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/cli/commands.ts"],"names":[],"mappings":"AA4BA,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,YAAY,CAAC;AASpB,wBAAsB,UAAU,CAAC,OAAO,EAAE,cAAc,iBAgCvD;AAED,4CAA4C;AAC5C,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,iBAkB1D;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,iBA4DhD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,QAWlC;AAQD,wBAAsB,YAAY,CAChC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB1E"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/cli/commands.ts"],"names":[],"mappings":"AA6BA,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,YAAY,CAAC;AASpB,wBAAsB,UAAU,CAAC,OAAO,EAAE,cAAc,iBAgCvD;AAED,4CAA4C;AAC5C,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,iBAsD1D;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,iBA4DhD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,QAWlC;AAQD,wBAAsB,YAAY,CAChC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB1E"}

package/lib/types/cli/options.d.ts

@@ -25,6 +25,10 @@ export declare const optionMap: {
         readonly description: "Fiat currency type to use for the action";
         readonly default: "usd";
     };
+    readonly txId: {
+        readonly alias: "-i, --tx-id <txId>";
+        readonly description: "Transaction ID or hash to use for action";
+    };
     readonly address: {
         readonly alias: "-a, --address <nativeAddress>";
         readonly description: "Native address to use for action";
@@ -65,6 +69,11 @@ export declare const optionMap: {
         readonly description: "Disable logging";
         readonly default: false;
     };
+    readonly skipConfirmation: {
+        readonly alias: "--skip-confirmation";
+        readonly description: "Skip all confirmation prompts";
+        readonly default: false;
+    };
     readonly folderPath: {
         readonly alias: "-f, --folder-path <folderPath>";
         readonly description: "Directory to upload";
@@ -121,6 +130,10 @@ export declare const globalOptions: ({
     readonly alias: "--quiet";
     readonly description: "Disable logging";
     readonly default: false;
+} | {
+    readonly alias: "--skip-confirmation";
+    readonly description: "Skip all confirmation prompts";
+    readonly default: false;
 })[];
 export declare const uploadFolderOptions: ({
     readonly alias: "-w, --wallet-file <filePath>";

package/lib/types/cli/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/cli/options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkFZ,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;IAIzB,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;IAMzB,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;IAO/B,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;;;;IAAyC,CAAC"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/cli/options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2FZ,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;IAIzB,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;IAOzB,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;IAO/B,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;;;;IAAyC,CAAC"}

package/lib/types/cli/types.d.ts

@@ -19,6 +19,7 @@ export type GlobalOptions = {
     gateway: string | undefined;
     debug: boolean;
     quiet: boolean;
+    skipConfirmation: boolean;
     token: string;
 };
 export type WalletOptions = GlobalOptions & {
@@ -45,5 +46,6 @@ export type UploadFileOptions = WalletOptions & {
 };
 export type CryptoFundOptions = WalletOptions & {
     value: string | undefined;
+    txId: string | undefined;
 };
 //# sourceMappingURL=types.d.ts.map

package/lib/types/cli/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cli/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,MAAM,aAAa,GAAG;IAC1B,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAC1C,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,aAAa,GAAG;IAC3C,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG;IAC1C,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cli/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,MAAM,aAAa,GAAG;IAC1B,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,gBAAgB,EAAE,OAAO,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAC1C,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,aAAa,GAAG;IAC3C,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG;IAC1C,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B,CAAC"}

package/lib/types/version.d.ts

@@ -14,5 +14,5 @@
  * 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 declare const version = "1.15.0";
+export declare const version = "1.16.0-alpha.1";
 //# sourceMappingURL=version.d.ts.map

package/lib/types/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,eAAO,MAAM,OAAO,WAAW,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,eAAO,MAAM,OAAO,mBAAmB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ardrive/turbo-sdk",
-  "version": "1.16.0-alpha.1",
+  "version": "1.16.0-alpha.2",
   "main": "./lib/cjs/node/index.js",
   "types": "./lib/types/node/index.d.ts",
   "module": "./lib/esm/node/index.js",
@@ -91,6 +91,7 @@
     "ethers": "^6.12.0",
     "mime-types": "^2.1.35",
     "plimit-lit": "^3.0.1",
+    "prompts": "^2.4.2",
     "tweetnacl": "^1.0.3",
     "winston": "^3.14.1"
   },
@@ -106,6 +107,7 @@
     "@types/mime-types": "^2.1.4",
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.4.8",
+    "@types/prompts": "^2.4.9",
     "@types/sinon": "^10.0.15",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^6.4.0",