@ardrive/turbo-sdk 1.5.0 → 1.7.0-alpha.1

package/README.md

@@ -9,28 +9,31 @@ Welcome to the `@ardrive/turbo-sdk`! This SDK provides functionality for interac
 - [Installation](#installation)
 - [Quick Start](#quick-start)
 - [Usage](#usage)
-  - [NodeJS Environments](#nodejs)
-    - [CommonJS](#commonjs)
-    - [ESM](#esm)
-  - [Web Environments](#web)
-    - [Bundlers (Webpack, Rollup, ESbuild, etc.)](#bundlers-webpack-rollup-esbuild-etc)
-    - [Browser](#browser)
+  - [Web](#web)
+  - [NodeJS](#nodejs)
   - [Typescript](#typescript)
+  - [Examples](#examples)
 - [APIs](#apis)
   - [TurboFactory](#turbofactory)
+    - [`unauthenticated()`](#unauthenticated)
+    - [`authenticated()`](#authenticated)
   - [TurboUnauthenticatedClient](#turbounauthenticatedclient)
+    - [`getSupportedCurrencies()`](#getsupportedcurrencies)
+    - [`getSupportedCountries()`](#getsupportedcountries)
+    - [`getFiatToAR({ currency })`](#getfiattoar-currency-)
+    - [`getFiatRates()`](#getfiatrates)
+    - [`getWincForFiat({ amount })`](#getwincforfiat-amount-)
+    - [`getUploadCosts({ bytes })`](#getuploadcosts-bytes-)
+    - [`uploadSignedDataItem({ dataItemStreamFactory, dataItemSizeFactory, signal })`](#uploadsigneddataitem-dataitemstreamfactory-dataitemsizefactory-signal-)
+    - [`createCheckoutSession({ amount, owner })`](#createcheckoutsession-amount-owner-)
+    - [`submitFundTransaction({ txId })`](#submitfundtransaction-txid-)
   - [TurboAuthenticatedClient](#turboauthenticatedclient)
-- [Examples](./examples)
-  - [CJS](./examples/cjs/index.js)
-  - [ESM](./examples/esm/index.mjs)
-  - [Web](./examples/web/index.html)
+    - [`getBalance()`](#getbalance)
+    - [`getWincForFiat({ amount, promoCodes })`](#getwincforfiat-amount-promocodes-)
+    - [`createCheckoutSession({ amount, owner, promoCodes })`](#createcheckoutsession-amount-owner-promocodes-)
+    - [`uploadFile({ fileStreamFactory, fileSizeFactory, signal, dataItemOpts })`](#uploadfile-filestreamfactory-filesizefactory-signal-dataitemopts-)
+    - [`topUpWithTokens({ tokenAmount, feeMultiplier })`](#topupwithtokens-tokenamount-feemultiplier-)
 - [Developers](#developers)
-  - [Requirements](#requirements)
-  - [Setup & Build](#setup--build)
-  - [Testing](#testing)
-  - [Linting and Formatting](#linting--formatting)
-  - [Architecture](#architecture)
-- [Contributing](./CONTRIBUTING.md)
 
 ## Installation
 
@@ -156,198 +159,258 @@ import { TurboFactory } from '@ardrive/turbo-sdk/<node/web>';
 
 Types are exported from `./lib/types/[node/web]/index.d.ts` and should be automatically recognized, offering benefits such as type-checking and autocompletion.
 
+### Examples
+
+Examples are available in the [examples] directory. To run examples:
+
+- `yarn example:web` - opens up the example web page
+- `yarn example:cjs` - runs example CJS node script
+- `yarn example:esm` - runs example ESM node script
+
 ## APIs
 
 ### TurboFactory
 
-- `unauthenticated()` - Creates an instance of a client that accesses Turbo's unauthenticated services.
+#### `unauthenticated()`
 
-  ```typescript
-  const turbo = TurboFactory.unauthenticated();
-  ```
+Creates an instance of a client that accesses Turbo's unauthenticated services.
 
-- `authenticated()` - Creates an instance of a client that accesses Turbo's authenticated and unauthenticated services. Requires either a signer, or private key to be provided.
+```typescript
+const turbo = TurboFactory.unauthenticated();
+```
 
-  ```typescript
-  const jwk = await arweave.crypto.generateJWK();
-  const turbo = TurboFactory.authenticated({ privateKey: jwk });
-  ```
+#### `authenticated()`
+
+Creates an instance of a client that accesses Turbo's authenticated and unauthenticated services. Requires either a signer, or private key to be provided.
+
+```typescript
+const jwk = await arweave.crypto.generateJWK();
+const turbo = TurboFactory.authenticated({ privateKey: jwk });
+```
 
-  or
+or
 
-  ```typescript
-  const signer = new ArweaveSigner(jwk);
-  const turbo = TurboFactory.authenticated({ signer });
-  ```
+```typescript
+const signer = new ArweaveSigner(jwk);
+const turbo = TurboFactory.authenticated({ signer });
+```
 
 ### TurboUnauthenticatedClient
 
-- `getSupportedCurrencies()` - Returns the list of currencies supported by the Turbo Payment Service for topping up a user balance of AR Credits (measured in Winston Credits, or winc).
+#### `getSupportedCurrencies()`
 
-  ```typescript
-  const currencies = await turbo.getSupportedCurrencies();
-  ```
+Returns the list of currencies supported by the Turbo Payment Service for topping up a user balance of AR Credits (measured in Winston Credits, or winc).
 
-- `getSupportedCountries()` - Returns the list of countries supported by the Turbo Payment Service's top up workflow.
+```typescript
+const currencies = await turbo.getSupportedCurrencies();
+```
+
+#### `getSupportedCountries()`
 
-  ```typescript
-  const countries = await turbo.getSupportedCountries();
-  ```
+Returns the list of countries supported by the Turbo Payment Service's top up workflow.
 
-- `getFiatToAR({ currency })` - Returns the current raw fiat to AR conversion rate for a specific currency as reported by third-party pricing oracles.
+```typescript
+const countries = await turbo.getSupportedCountries();
+```
 
-  ```typescript
-  const fiatToAR = await turbo.getFiatToAR({ currency: 'USD' });
-  ```
+#### `getFiatToAR({ currency })`
 
-- `getFiatRates()` - Returns the current fiat rates for 1 GiB of data for supported currencies, including all top-up adjustments and fees.
+Returns the current raw fiat to AR conversion rate for a specific currency as reported by third-party pricing oracles.
 
-  ```typescript
-  const rates = await turbo.getFiatRates();
-  ```
-
-- `getWincForFiat({ amount })` - Returns the current amount of Winston Credits including all adjustments for the provided fiat currency, amount. To leverage promo codes, see [TurboAuthenticatedClient].
-
-  ```typescript
-  const { winc, paymentAmount, quotedPaymentAmount, adjustments } =
-    await turbo.getWincForFiat({
-      amount: USD(100),
-      // promo codes require an authenticated client
-    });
-  ```
-
-- `getUploadCosts({ bytes })` - Returns the estimated cost in Winston Credits for the provided file sizes, including all upload adjustments and fees.
-
-  ```typescript
-  const [uploadCostForFile] = await turbo.getUploadCosts({ bytes: [1024] });
-  const { winc, adjustments } = uploadCostForFile;
-  ```
-
-- `uploadSignedDataItem({ dataItemStreamFactory, dataItemSizeFactory, signal })` - Uploads a signed data item. The provided `dataItemStreamFactory` should produce a NEW signed data item stream each time is it invoked. The `dataItemSizeFactory` is a function that returns the size of the file. The `signal` is an optional [AbortSignal] that can be used to cancel the upload or timeout the request.
-
-  ```typescript
-  const filePath = path.join(__dirname, './my-signed-data-item');
-  const dataItemSize = fs.statSync(filePath).size;
-  const uploadResponse = await turbo.uploadSignedDataItem({
-    dataItemStreamFactory: () => fs.createReadStream(filePath),
-    dataItemSizeFactory: () => dataItemSize,
-    signal: AbortSignal.timeout(10_000), // cancel the upload after 10 seconds
+```typescript
+const fiatToAR = await turbo.getFiatToAR({ currency: 'USD' });
+```
+
+#### `getFiatRates()`
+
+Returns the current fiat rates for 1 GiB of data for supported currencies, including all top-up adjustments and fees.
+
+```typescript
+const rates = await turbo.getFiatRates();
+```
+
+#### `getWincForFiat({ amount })`
+
+Returns the current amount of Winston Credits including all adjustments for the provided fiat currency, amount. To leverage promo codes, see [TurboAuthenticatedClient].
+
+```typescript
+const { winc, paymentAmount, quotedPaymentAmount, adjustments } =
+  await turbo.getWincForFiat({
+    amount: USD(100),
+    // promo codes require an authenticated client
   });
-  ```
-
-- `createCheckoutSession({ amount, owner })` - Creates a Stripe checkout session for a Turbo Top Up with the provided amount, currency, owner. The returned URL can be opened in the browser, all payments are processed by Stripe. To leverage promo codes, see [TurboAuthenticatedClient].
-
-  ```typescript
-  const { url, winc, paymentAmount, quotedPaymentAmount, adjustments } =
-    await turbo.createCheckoutSession({
-      amount: USD(10.0), // $10.00 USD
-      owner: publicArweaveAddress,
-      // promo codes require an authenticated client
-    });
-
-  // Open checkout session in a browser
-  if (process.platform === 'darwin') {
-    // macOS
-    exec(`open ${url}`);
-  } else if (process.platform === 'win32') {
-    // Windows
-    exec(`start "" "${url}"`, { shell: true });
-  } else {
-    // Linux/Unix
-    open(url);
-  }
-  ```
-
-- `submitFundTransaction({ txId })` - Submits the transaction ID of a funding transaction to Turbo Payment Service for top up processing. The `txId` is the transaction ID of the transaction to be submitted.
-
-  - Note: Use this API if you've already executed your token transfer to the Turbo wallet. Otherwise, consider using `topUpWithTokens` to execute a new token transfer to the Turbo wallet and submit its resulting transaction ID for top up processing all in one go
-
-  ```typescript
-  const turbo = TurboFactory.unauthenticated(); // defaults to arweave token type
-  const { status, id, ...fundResult } = await turbo.submitFundTransaction({
-    txId: 'my-valid-arweave-fund-transaction-id',
+```
+
+#### `getUploadCosts({ bytes })`
+
+Returns the estimated cost in Winston Credits for the provided file sizes, including all upload adjustments and fees.
+
+```typescript
+const [uploadCostForFile] = await turbo.getUploadCosts({ bytes: [1024] });
+const { winc, adjustments } = uploadCostForFile;
+```
+
+#### `uploadSignedDataItem({ dataItemStreamFactory, dataItemSizeFactory, signal })`
+
+Uploads a signed data item. The provided `dataItemStreamFactory` should produce a NEW signed data item stream each time is it invoked. The `dataItemSizeFactory` is a function that returns the size of the file. The `signal` is an optional [AbortSignal] that can be used to cancel the upload or timeout the request.
+
+```typescript
+const filePath = path.join(__dirname, './my-signed-data-item');
+const dataItemSize = fs.statSync(filePath).size;
+const uploadResponse = await turbo.uploadSignedDataItem({
+  dataItemStreamFactory: () => fs.createReadStream(filePath),
+  dataItemSizeFactory: () => dataItemSize,
+  signal: AbortSignal.timeout(10_000), // cancel the upload after 10 seconds
+});
+```
+
+#### `createCheckoutSession({ amount, owner })`
+
+Creates a Stripe checkout session for a Turbo Top Up with the provided amount, currency, owner. The returned URL can be opened in the browser, all payments are processed by Stripe. To leverage promo codes, see [TurboAuthenticatedClient].
+
+```typescript
+const { url, winc, paymentAmount, quotedPaymentAmount, adjustments } =
+  await turbo.createCheckoutSession({
+    amount: USD(10.0), // $10.00 USD
+    owner: publicArweaveAddress,
+    // promo codes require an authenticated client
   });
-  ```
+
+// Open checkout session in a browser
+if (process.platform === 'darwin') {
+  // macOS
+  exec(`open ${url}`);
+} else if (process.platform === 'win32') {
+  // Windows
+  exec(`start "" "${url}"`, { shell: true });
+} else {
+  // Linux/Unix
+  open(url);
+}
+```
+
+##### Top up to ETH or SOL wallets
+
+```ts
+const turbo = TurboFactory.unauthenticated({ token: 'ethereum' });
+
+const { url, winc, paymentAmount } = await turbo.createCheckoutSession({
+  amount: USD(10.0), // $10.00 USD
+  owner: publicEthereumAddress,
+});
+```
+
+```ts
+const turbo = TurboFactory.unauthenticated({ token: 'solana' });
+
+const { url, winc, paymentAmount } = await turbo.createCheckoutSession({
+  amount: USD(10.0), // $10.00 USD
+  owner: publicSolanaAddress,
+});
+```
+
+#### `submitFundTransaction({ txId })`
+
+Submits the transaction ID of a funding transaction to Turbo Payment Service for top up processing. The `txId` is the transaction ID of the transaction to be submitted.
+
+- Note: Use this API if you've already executed your token transfer to the Turbo wallet. Otherwise, consider using `topUpWithTokens` to execute a new token transfer to the Turbo wallet and submit its resulting transaction ID for top up processing all in one go
+
+```typescript
+const turbo = TurboFactory.unauthenticated(); // defaults to arweave token type
+const { status, id, ...fundResult } = await turbo.submitFundTransaction({
+  txId: 'my-valid-arweave-fund-transaction-id',
+});
+```
 
 ### TurboAuthenticatedClient
 
-- `getBalance()` - Issues a signed request to get the credit balance of a wallet measured in AR (measured in Winston Credits, or winc).
-
-  ```typescript
-  const { winc: balance } = await turbo.getBalance();
-  ```
-
-- `getWincForFiat({ amount, promoCodes })` - Returns the current amount of Winston Credits including all adjustments for the provided fiat currency, amount, and optional promo codes.
-
-  ```typescript
-  const { winc, paymentAmount, quotedPaymentAmount, adjustments } =
-    await turbo.getWincForFiat({
-      amount: USD(100),
-      promoCodes: ['MY_PROMO_CODE'], // promo codes require an authenticated client
-    });
-  ```
-
-- `createCheckoutSession({ amount, owner, promoCodes })` - Creates a Stripe checkout session for a Turbo Top Up with the provided amount, currency, owner, and optional promo codes. The returned URL can be opened in the browser, all payments are processed by Stripe. Promo codes require an authenticated client.
-
-  ```typescript
-  const { url, winc, paymentAmount, quotedPaymentAmount, adjustments } =
-    await turbo.createCheckoutSession({
-      amount: USD(10.0), // $10.00 USD
-      owner: publicArweaveAddress,
-      promoCodes: ['MY_PROMO_CODE'], // promo codes require an authenticated client
-    });
-
-  // Open checkout session in a browser
-  if (process.platform === 'darwin') {
-    // macOS
-    exec(`open ${url}`);
-  } else if (process.platform === 'win32') {
-    // Windows
-    exec(`start "" "${url}"`, { shell: true });
-  } else {
-    // Linux/Unix
-    open(url);
-  }
-  ```
-
-- `uploadFile({ fileStreamFactory, fileSizeFactory, signal, dataItemOpts })` - Signs and uploads a raw file. The provided `fileStreamFactory` should produce a NEW file data stream each time is it invoked. The `fileSizeFactory` is a function that returns the size of the file. The `signal` is an optional [AbortSignal] that can be used to cancel the upload or timeout the request. `dataItemOpts` is an optional object that can be used to configure tags, target, and anchor for the data item upload.
-
-  ```typescript
-  const filePath = path.join(__dirname, './my-unsigned-file.txt');
-  const fileSize = fs.stateSync(filePath).size;
-  const uploadResult = await turbo.uploadFile({
-    fileStreamFactory: () => fs.createReadStream(filePath),
-    fileSizeFactory: () => fileSize,
-    dataItemOpts: {
-      // optional
-      tags: [
-        {
-          name: 'Content-Type',
-          value: 'text/plain',
-        },
-        {
-          name: 'My-Custom-Tag',
-          value: 'my-custom-value',
-        },
-      ],
-      // no timeout or AbortSignal provided
-    },
-  });
-  ```
+#### `getBalance()`
+
+Issues a signed request to get the credit balance of a wallet measured in AR (measured in Winston Credits, or winc).
+
+```typescript
+const { winc: balance } = await turbo.getBalance();
+```
+
+#### `getWincForFiat({ amount, promoCodes })`
+
+Returns the current amount of Winston Credits including all adjustments for the provided fiat currency, amount, and optional promo codes.
 
-- `topUpWithTokens({ tokenAmount, feeMultiplier })` - Tops up the connected wallet with Credits by submitting a payment transaction for the token amount to the Turbo wallet and then submitting that transaction id to Turbo Payment Service for top up processing.
+```typescript
+const { winc, paymentAmount, quotedPaymentAmount, adjustments } =
+  await turbo.getWincForFiat({
+    amount: USD(100),
+    promoCodes: ['MY_PROMO_CODE'], // promo codes require an authenticated client
+  });
+```
 
-  - The `tokenAmount` is the amount of tokens in the token type's smallest unit value (e.g: Winston for arweave token type) to fund the wallet with.
-  - The `feeMultiplier` (optional) is the multiplier to apply to the reward for the transaction to modify its chances of being mined. Credits will be added to the wallet balance after the transaction is confirmed on the given blockchain. Defaults to 1.0, meaning no multiplier.
+#### `createCheckoutSession({ amount, owner, promoCodes })`
 
-  ```typescript
-  const turbo = TurboFactory.authenticated({ signer, token: 'arweave' });
+Creates a Stripe checkout session for a Turbo Top Up with the provided amount, currency, owner, and optional promo codes. The returned URL can be opened in the browser, all payments are processed by Stripe. Promo codes require an authenticated client.
 
-  const { winc, status, id, ...fundResult } = await turbo.topUpWithTokens({
-    tokenAmount: WinstonToTokenAmount(100_000_000), // 0.0001 AR
-    feeMultiplier: 1.1, // 10% increase in reward for improved mining chances
+```typescript
+const { url, winc, paymentAmount, quotedPaymentAmount, adjustments } =
+  await turbo.createCheckoutSession({
+    amount: USD(10.0), // $10.00 USD
+    owner: publicArweaveAddress,
+    promoCodes: ['MY_PROMO_CODE'], // promo codes require an authenticated client
   });
-  ```
+
+// Open checkout session in a browser
+if (process.platform === 'darwin') {
+  // macOS
+  exec(`open ${url}`);
+} else if (process.platform === 'win32') {
+  // Windows
+  exec(`start "" "${url}"`, { shell: true });
+} else {
+  // Linux/Unix
+  open(url);
+}
+```
+
+#### `uploadFile({ fileStreamFactory, fileSizeFactory, signal, dataItemOpts })`
+
+Signs and uploads a raw file. The provided `fileStreamFactory` should produce a NEW file data stream each time is it invoked. The `fileSizeFactory` is a function that returns the size of the file. The `signal` is an optional [AbortSignal] that can be used to cancel the upload or timeout the request. `dataItemOpts` is an optional object that can be used to configure tags, target, and anchor for the data item upload.
+
+```typescript
+const filePath = path.join(__dirname, './my-unsigned-file.txt');
+const fileSize = fs.stateSync(filePath).size;
+const uploadResult = await turbo.uploadFile({
+  fileStreamFactory: () => fs.createReadStream(filePath),
+  fileSizeFactory: () => fileSize,
+  dataItemOpts: {
+    // optional
+    tags: [
+      {
+        name: 'Content-Type',
+        value: 'text/plain',
+      },
+      {
+        name: 'My-Custom-Tag',
+        value: 'my-custom-value',
+      },
+    ],
+    // no timeout or AbortSignal provided
+  },
+});
+```
+
+#### `topUpWithTokens({ tokenAmount, feeMultiplier })`
+
+Tops up the connected wallet with Credits by submitting a payment transaction for the token amount to the Turbo wallet and then submitting that transaction id to Turbo Payment Service for top up processing.
+
+- The `tokenAmount` is the amount of tokens in the token type's smallest unit value (e.g: Winston for arweave token type) to fund the wallet with.
+- The `feeMultiplier` (optional) is the multiplier to apply to the reward for the transaction to modify its chances of being mined. Credits will be added to the wallet balance after the transaction is confirmed on the given blockchain. Defaults to 1.0, meaning no multiplier.
+
+```typescript
+const turbo = TurboFactory.authenticated({ signer, token: 'arweave' });
+
+const { winc, status, id, ...fundResult } = await turbo.topUpWithTokens({
+  tokenAmount: WinstonToTokenAmount(100_000_000), // 0.0001 AR
+  feeMultiplier: 1.1, // 10% increase in reward for improved mining chances
+});
+```
 
 ## Developers
 

package/bundles/web.bundle.min.js

@@ -95846,9 +95846,9 @@ var require_scrypt = __commonJS({
   }
 });
 
-// node_modules/base-x/node_modules/safe-buffer/index.js
+// node_modules/arbundles/node_modules/safe-buffer/index.js
 var require_safe_buffer = __commonJS({
-  "node_modules/base-x/node_modules/safe-buffer/index.js"(exports13, module2) {
+  "node_modules/arbundles/node_modules/safe-buffer/index.js"(exports13, module2) {
     "use strict";
     init_dirname();
     init_buffer2();
@@ -95908,9 +95908,9 @@ var require_safe_buffer = __commonJS({
   }
 });
 
-// node_modules/base-x/src/index.js
+// node_modules/arbundles/node_modules/base-x/src/index.js
 var require_src = __commonJS({
-  "node_modules/base-x/src/index.js"(exports13, module2) {
+  "node_modules/arbundles/node_modules/base-x/src/index.js"(exports13, module2) {
     "use strict";
     init_dirname();
     init_buffer2();
@@ -96042,9 +96042,9 @@ var require_src = __commonJS({
   }
 });
 
-// node_modules/bs58/index.js
+// node_modules/arbundles/node_modules/bs58/index.js
 var require_bs58 = __commonJS({
-  "node_modules/bs58/index.js"(exports13, module2) {
+  "node_modules/arbundles/node_modules/bs58/index.js"(exports13, module2) {
     "use strict";
     init_dirname();
     init_buffer2();
@@ -130843,7 +130843,7 @@ var import_winston = __toESM(require_winston(), 1);
 init_dirname();
 init_buffer2();
 init_process2();
-var version21 = "1.5.0-alpha.4";
+var version21 = "1.6.0";
 
 // src/common/logger.ts
 var TurboWinstonLogger = class {
@@ -139243,7 +139243,7 @@ var TurboUnauthenticatedPaymentService = class {
     uiMode = "hosted"
   }, headers) {
     const { amount: paymentAmount, type: currencyType } = amount;
-    const endpoint = `/top-up/checkout-session/${owner}/${currencyType}/${paymentAmount}?uiMode=${uiMode}${promoCodes.length > 0 ? `&${this.appendPromoCodesToQuery(promoCodes)}` : ""}`;
+    const endpoint = `/top-up/checkout-session/${owner}/${currencyType}/${paymentAmount}?uiMode=${uiMode}${promoCodes.length > 0 ? `&${this.appendPromoCodesToQuery(promoCodes)}` : ""}&token=${this.token}`;
     const { adjustments, paymentSession, topUpQuote } = await this.httpService.get({
       endpoint,
       headers
@@ -139355,6 +139355,9 @@ var TurboAuthenticatedPaymentService = class extends TurboUnauthenticatedPayment
     feeMultiplier = 1,
     tokenAmount: tokenAmountV
   }) {
+    if (!this.tokenMap[this.token]) {
+      throw new Error(`Token type not supported for crypto fund ${this.token}`);
+    }
     const tokenAmount = new BigNumber2(tokenAmountV);
     const target = await this.getTargetWalletForFund();
     this.logger.debug("Funding account...", {
@@ -139402,8 +139405,10 @@ var TurboUnauthenticatedUploadService = class {
   constructor({
     url = defaultUploadServiceURL,
     retryConfig,
-    logger: logger19 = new TurboWinstonLogger()
+    logger: logger19 = new TurboWinstonLogger(),
+    token = "arweave"
   }) {
+    this.token = token;
     this.logger = logger19;
     this.httpService = new TurboHTTPService({
       url: `${url}/v1`,
@@ -139419,7 +139424,7 @@ var TurboUnauthenticatedUploadService = class {
     const fileSize = dataItemSizeFactory();
     this.logger.debug("Uploading signed data item...");
     return this.httpService.post({
-      endpoint: `/tx`,
+      endpoint: `/tx/${this.token}`,
       signal,
       data: dataItemStreamFactory(),
       headers: {
@@ -139434,9 +139439,10 @@ var TurboAuthenticatedUploadService = class extends TurboUnauthenticatedUploadSe
     url = defaultUploadServiceURL,
     retryConfig,
     signer,
-    logger: logger19
+    logger: logger19,
+    token
   }) {
-    super({ url, retryConfig, logger: logger19 });
+    super({ url, retryConfig, logger: logger19, token });
     this.signer = signer;
   }
   async uploadFile({
@@ -139454,7 +139460,7 @@ var TurboAuthenticatedUploadService = class extends TurboUnauthenticatedUploadSe
     const fileSize = dataItemSizeFactory();
     this.logger.debug("Uploading signed data item...");
     return this.httpService.post({
-      endpoint: `/tx`,
+      endpoint: `/tx/${this.token}`,
       signal,
       data: signedDataItem,
       headers: {
@@ -139678,6 +139684,24 @@ var TurboDataItemAbstractSigner = class {
     this.logger = logger19;
     this.signer = signer;
   }
+  get sigConfig() {
+    if (this.signer instanceof EthereumSigner) {
+      return {
+        signatureLength: 65,
+        ownerLength: 65
+      };
+    }
+    if (this.signer instanceof HexSolanaSigner2) {
+      return {
+        signatureLength: 64,
+        ownerLength: 32
+      };
+    }
+    return {
+      ownerLength: 512,
+      signatureLength: 512
+    };
+  }
   async generateSignedRequestHeaders() {
     const nonce = randomBytes(16).toString("hex");
     const buffer2 = Buffer2.from(nonce);
@@ -139777,6 +139801,13 @@ var TurboFactory = class extends TurboBaseFactory {
     let signer;
     if (providedSigner) {
       signer = providedSigner;
+      if (!token) {
+        if (signer instanceof EthereumSigner) {
+          token = "ethereum";
+        } else if (signer instanceof HexSolanaSigner2) {
+          token = "solana";
+        }
+      }
     } else if (privateKey) {
       signer = new ArweaveSigner(privateKey);
     } else {
@@ -139809,6 +139840,7 @@ var TurboFactory = class extends TurboBaseFactory {
 init_dirname();
 init_buffer2();
 init_process2();
+var allowedFiatTokens = ["arweave", "solana", "ethereum"];
 var tokenTypes = [
   "arweave"
   /*'solana', 'ethereum'*/
@@ -139822,8 +139854,10 @@ export {
   BRL,
   CAD,
   EUR,
+  EthereumSigner,
   GBP,
   HKD,
+  HexSolanaSigner2 as HexSolanaSigner,
   INR,
   JPY,
   SGD,
@@ -139839,6 +139873,7 @@ export {
   USD,
   WinstonToTokenAmount,
   ZeroDecimalCurrency,
+  allowedFiatTokens,
   defaultPaymentServiceURL,
   defaultTurboConfiguration,
   defaultUploadServiceURL,

package/lib/cjs/common/payment.js

@@ -74,7 +74,7 @@ class TurboUnauthenticatedPaymentService {
         const { amount: paymentAmount, type: currencyType } = amount;
         const endpoint = `/top-up/checkout-session/${owner}/${currencyType}/${paymentAmount}?uiMode=${uiMode}${promoCodes.length > 0
             ? `&${this.appendPromoCodesToQuery(promoCodes)}`
-            : ''}`;
+            : ''}&token=${this.token}`;
         const { adjustments, paymentSession, topUpQuote } = await this.httpService.get({
             endpoint,
             headers,
@@ -173,6 +173,9 @@ class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentServic
         return walletAddress;
     }
     async topUpWithTokens({ feeMultiplier = 1, tokenAmount: tokenAmountV, }) {
+        if (!this.tokenMap[this.token]) {
+            throw new Error(`Token type not supported for crypto fund ${this.token}`);
+        }
         const tokenAmount = new bignumber_js_1.BigNumber(tokenAmountV);
         const target = await this.getTargetWalletForFund();
         this.logger.debug('Funding account...', {