@ardrive/turbo-sdk 1.41.3 → 1.42.0

package/lib/cjs/cli/options.js

@@ -76,16 +76,6 @@ exports.optionMap = {
         description: 'Set a custom payment service URL',
         default: undefined,
     },
-    processId: {
-        alias: '--process-id <processId>',
-        description: 'Set a custom target process ID for the action',
-        default: undefined,
-    },
-    cuUrl: {
-        alias: '--cu-url <cuUrl>',
-        description: 'Set a custom CU URL for the action',
-        default: undefined,
-    },
     dev: {
         alias: '--dev',
         description: 'Enable Turbo development endpoints',

package/lib/cjs/cli/utils.js

@@ -124,7 +124,9 @@ async function privateKeyFromOptions({ mnemonic, privateKey, walletFile, token,
     }
     else if (walletFile !== undefined) {
         const wallet = JSON.parse((0, fs_1.readFileSync)(walletFile, 'utf-8'));
-        return token === 'solana' ? bs58_1.default.encode(wallet) : wallet;
+        return token === 'solana' || token === 'ario'
+            ? bs58_1.default.encode(wallet)
+            : wallet;
     }
     else if (privateKey !== undefined) {
         return privateKey;
@@ -138,8 +140,6 @@ function configFromOptions(options) {
     let paymentUrl = undefined;
     let uploadUrl = undefined;
     let gatewayUrl = undefined;
-    let processId = undefined;
-    let cuUrl = undefined;
     if (options.local && options.dev) {
         throw new Error('Cannot use both --local and --dev flags');
     }
@@ -148,10 +148,6 @@ function configFromOptions(options) {
         paymentUrl = index_js_1.developmentTurboConfiguration.paymentServiceConfig.url;
         uploadUrl = index_js_1.developmentTurboConfiguration.uploadServiceConfig.url;
         gatewayUrl = common_js_1.tokenToDevGatewayMap[token];
-        if (options.token === 'ario') {
-            processId = common_js_1.tokenToDevAoConfigMap[token].processId;
-            cuUrl = common_js_1.tokenToDevAoConfigMap[token].cuUrl;
-        }
     }
     else if (options.local) {
         // Use local endpoints
@@ -163,10 +159,6 @@ function configFromOptions(options) {
         // Use default endpoints
         paymentUrl = index_js_1.defaultTurboConfiguration.paymentServiceConfig.url;
         uploadUrl = index_js_1.defaultTurboConfiguration.uploadServiceConfig.url;
-        if (options.token === 'ario') {
-            processId = common_js_1.defaultProdAoConfigs[token].processId;
-            cuUrl = common_js_1.defaultProdAoConfigs[token].cuUrl;
-        }
     }
     // Override gateway, payment, and upload service default endpoints if provided
     if (options.gateway !== undefined) {
@@ -178,19 +170,11 @@ function configFromOptions(options) {
     if (options.uploadUrl !== undefined) {
         uploadUrl = options.uploadUrl;
     }
-    if (options.cuUrl !== undefined) {
-        cuUrl = options.cuUrl;
-    }
-    if (options.processId !== undefined) {
-        processId = options.processId;
-    }
     const config = {
         paymentServiceConfig: { url: paymentUrl },
         uploadServiceConfig: { url: uploadUrl },
         gatewayUrl,
         token,
-        processId,
-        cuUrl,
     };
     return config;
 }

package/lib/cjs/common/factory.js

@@ -46,7 +46,7 @@ class TurboBaseFactory {
             paymentService,
         });
     }
-    getAuthenticatedTurbo({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, gatewayUrl, tokenMap, tokenTools, logger, walletAdapter, processId, cuUrl, }) {
+    getAuthenticatedTurbo({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, gatewayUrl, tokenMap, tokenTools, logger, walletAdapter, }) {
         token = token === 'pol' ? 'matic' : token;
         if (!token) {
             if (providedSigner) {
@@ -104,8 +104,6 @@ class TurboBaseFactory {
                 tokenTools = tokenMap.arweave;
             }
             tokenTools = index_js_1.defaultTokenMap[token]?.({
-                cuUrl,
-                processId,
                 gatewayUrl,
                 logger,
             });

package/lib/cjs/common/payment.js

@@ -33,6 +33,7 @@ class TurboUnauthenticatedPaymentService {
             logger: this.logger,
         });
         this.token = token;
+        this.url = url;
     }
     async getBalance(address) {
         const balance = await this.httpService.get({
@@ -144,6 +145,10 @@ class TurboUnauthenticatedPaymentService {
         return this.getCheckout(params);
     }
     async submitFundTransaction({ txId, }) {
+        this.logger.debug('Submitting fund transaction to Turbo...', {
+            txId,
+            url: this.url,
+        });
         const response = await this.httpService.post({
             endpoint: `/account/balance/${this.token}`,
             data: Buffer.from(JSON.stringify({ tx_id: txId })),
@@ -282,9 +287,6 @@ class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentServic
         if (!this.tokenTools) {
             throw new Error(`Token type not supported for crypto fund ${this.token}`);
         }
-        if (this.token === 'ario') {
-            throw new Error(`Top up with tokens is not supported for ARIO until after SOL migration is complete`);
-        }
         if (turboCreditDestinationAddress !== undefined) {
             if ((0, common_js_1.isAnyValidUserAddress)(turboCreditDestinationAddress) === false) {
                 throw new Error(`Invalid turboCreditDestinationAddress provided: ${turboCreditDestinationAddress}`);

package/lib/cjs/common/token/ario.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.ARIOToTokenAmount = exports.mARIOToTokenAmount = exports.ARIOToken = void 0;
 /**
@@ -16,68 +19,123 @@ exports.ARIOToTokenAmount = exports.mARIOToTokenAmount = exports.ARIOToken = voi
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const arbundles_1 = require("@dha-team/arbundles");
-const aoconnect_1 = require("@permaweb/aoconnect");
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
 const bignumber_js_1 = require("bignumber.js");
+const bs58_1 = __importDefault(require("bs58"));
 const common_js_1 = require("../../utils/common.js");
-const version_js_1 = require("../../version.js");
 const logger_js_1 = require("../logger.js");
+const solana_js_1 = require("./solana.js");
+const ARIO_SPL_MINT_ADDRESS = 'DcNnMuFxwhgV4WY1HVSaSEgr92bv2b1vUvEKiNxWqHdF';
+const DEVNET_ARIO_SPL_MINT_ADDRESS = '6vTw5CysRXQ4ybbHkDUiisHWVsBeMtUzYvJqs2iqHyaN';
+const ARIO_TOKEN_DECIMALS = 6;
 class ARIOToken {
-    constructor({ cuUrl = common_js_1.defaultProdAoConfigs.ario.cuUrl, logger = logger_js_1.Logger.default, pollingOptions = {
+    constructor({ gatewayUrl = common_js_1.defaultProdGatewayUrls.solana, logger = logger_js_1.Logger.default, pollingOptions = {
+        maxAttempts: 10,
+        pollingIntervalMs: 2_500,
         initialBackoffMs: 500,
-        pollingIntervalMs: 0, // no polling for ARIO process
-        maxAttempts: 0, // no polling for ARIO process
-    }, processId = common_js_1.defaultProdAoConfigs.ario.processId, } = {}) {
-        this.ao = (0, aoconnect_1.connect)({
-            CU_URL: cuUrl,
-        });
-        this.processId = processId;
+    }, } = {}) {
+        this.gatewayUrl = gatewayUrl;
+        this.connection = new web3_js_1.Connection(gatewayUrl, 'confirmed');
         this.pollingOptions = pollingOptions;
         this.logger = logger;
+        if (gatewayUrl.includes('devnet')) {
+            this.mintAddress = DEVNET_ARIO_SPL_MINT_ADDRESS;
+        }
+        else {
+            this.mintAddress = ARIO_SPL_MINT_ADDRESS;
+        }
     }
-    async createAndSubmitTx({ target, signer: { signer }, tokenAmount, turboCreditDestinationAddress, }) {
-        const tags = [
-            {
-                name: 'Action',
-                value: 'Transfer',
-            },
-            {
-                name: 'Recipient',
-                value: target,
-            },
-            {
-                name: 'Quantity',
-                value: tokenAmount.toString(),
-            },
-            {
-                name: 'Turbo-SDK',
-                value: version_js_1.version,
-            },
-        ];
+    async createAndSubmitTx({ target, signer, tokenAmount, turboCreditDestinationAddress, }) {
+        const ownerPublicKey = new web3_js_1.PublicKey(bs58_1.default.encode(Uint8Array.from(await signer.getPublicKey())));
+        const recipient = new web3_js_1.PublicKey(target);
+        const mint = new web3_js_1.PublicKey(this.mintAddress);
+        const fromAta = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, ownerPublicKey);
+        const toAta = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, recipient);
+        const tx = new web3_js_1.Transaction({
+            feePayer: ownerPublicKey,
+            ...(await this.connection.getLatestBlockhash()),
+        });
+        tx.add((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(ownerPublicKey, toAta, recipient, mint));
+        tx.add((0, spl_token_1.createTransferCheckedInstruction)(fromAta, mint, toAta, ownerPublicKey, BigInt(new bignumber_js_1.BigNumber(tokenAmount).toFixed(0)), ARIO_TOKEN_DECIMALS));
         if (turboCreditDestinationAddress !== undefined) {
-            tags.push({
-                name: 'Turbo-Credit-Destination-Address',
-                value: turboCreditDestinationAddress,
-            });
+            tx.add(new web3_js_1.TransactionInstruction({
+                programId: new web3_js_1.PublicKey(solana_js_1.memoProgramId),
+                keys: [],
+                data: Buffer.from('turboCreditDestinationAddress=' + turboCreditDestinationAddress),
+            }));
         }
-        const txId = await this.ao.message({
-            signer: createAoSigner(signer),
-            process: this.processId,
-            tags,
-        });
-        this.logger.debug('Submitted Transfer message to ARIO process...', {
+        const serializedTx = tx.serializeMessage();
+        const signature = await signer.signData(Uint8Array.from(serializedTx));
+        tx.addSignature(ownerPublicKey, Buffer.from(signature));
+        const txId = bs58_1.default.encode(signature);
+        await this.submitTx(tx, txId);
+        this.logger.debug('Submitted ARIO SPL transfer transaction...', {
             id: txId,
             target,
             tokenAmount,
-            processId: this.processId,
-            tags,
+            fromAta: fromAta.toBase58(),
+            toAta: toAta.toBase58(),
+            mint: mint.toBase58(),
         });
         return { id: txId, target, reward: '0' };
     }
-    async pollTxAvailability() {
-        // AO finality should be instant -- but we'll wait initial backoff to
-        // provide infra some time to crank without reading the whole result
-        return (0, common_js_1.sleep)(this.pollingOptions.initialBackoffMs);
+    async submitTx(tx, id) {
+        this.logger.debug('Submitting ARIO fund transaction...', { id });
+        await this.connection.sendRawTransaction(tx.serialize(), {
+            maxRetries: this.pollingOptions.maxAttempts,
+        });
+        if (tx.recentBlockhash === undefined ||
+            tx.lastValidBlockHeight === undefined) {
+            throw new Error('Failed to submit Transaction -- missing blockhash or lastValidBlockHeight from transaction creation. Solana Gateway Url:' +
+                this.gatewayUrl);
+        }
+        await this.connection.confirmTransaction({
+            signature: id,
+            blockhash: tx.recentBlockhash,
+            lastValidBlockHeight: tx.lastValidBlockHeight,
+        }, 'finalized');
+    }
+    async pollTxAvailability({ txId }) {
+        const { maxAttempts, pollingIntervalMs, initialBackoffMs } = this.pollingOptions;
+        this.logger.debug('Polling for ARIO SPL transaction...', {
+            txId,
+            pollingOptions: this.pollingOptions,
+            gatewayUrl: this.gatewayUrl,
+        });
+        await (0, common_js_1.sleep)(initialBackoffMs);
+        let attempts = 0;
+        while (attempts < maxAttempts) {
+            let status;
+            attempts++;
+            try {
+                const statuses = await this.connection.getSignatureStatuses([txId], {
+                    searchTransactionHistory: true,
+                });
+                status = {
+                    context: statuses.context,
+                    value: statuses.value[0],
+                };
+            }
+            catch (err) {
+                this.logger.debug('Failed to poll ARIO SPL transaction...', { err });
+            }
+            if (status && status.value && status.value.err !== null) {
+                throw new Error(`Transaction failed: ${status.value.err}`);
+            }
+            if (status && status.value && status.value.slot !== null) {
+                this.logger.debug('Transaction found!', { txId, status });
+                return;
+            }
+            this.logger.debug('ARIO SPL transaction not found, polling...', {
+                txId,
+                attempts,
+                maxAttempts,
+                pollingIntervalMs,
+            });
+            await (0, common_js_1.sleep)(pollingIntervalMs);
+        }
+        throw new Error('Transaction not found after polling, transaction id: ' + txId);
     }
 }
 exports.ARIOToken = ARIOToken;
@@ -85,40 +143,3 @@ const mARIOToTokenAmount = (mARIO) => mARIO;
 exports.mARIOToTokenAmount = mARIOToTokenAmount;
 const ARIOToTokenAmount = (ario) => new bignumber_js_1.BigNumber(ario).times(1e6).valueOf();
 exports.ARIOToTokenAmount = ARIOToTokenAmount;
-function createAoSigner(signer) {
-    if (!('publicKey' in signer)) {
-        return (0, aoconnect_1.createDataItemSigner)(signer);
-    }
-    const aoSigner = async ({ data, tags, target, anchor }) => {
-        // ensure appropriate permissions are granted with injected signers.
-        if (signer.publicKey === undefined &&
-            'setPublicKey' in signer &&
-            typeof signer.setPublicKey === 'function') {
-            await signer.setPublicKey();
-        }
-        if (signer instanceof arbundles_1.ArconnectSigner) {
-            // Sign using Arconnect signDataItem API
-            const signedDataItem = await signer['signer'].signDataItem({
-                data,
-                tags,
-                target,
-                anchor,
-            });
-            const dataItem = new arbundles_1.DataItem(Buffer.from(signedDataItem));
-            return {
-                id: dataItem.id,
-                raw: dataItem.getRaw(),
-            };
-        }
-        const dataItem = (0, arbundles_1.createData)(data ?? '', signer, { tags, target, anchor });
-        await dataItem.sign(signer);
-        const signedData = {
-            id: dataItem.id,
-            raw: dataItem.getRaw(),
-        };
-        return signedData;
-    };
-    // eslint-disable-next-line
-    // @ts-ignore Buffer vs ArrayBuffer type mismatch
-    return aoSigner;
-}

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

@@ -114,6 +114,7 @@ class SolanaToken {
                 throw new Error(`Transaction failed: ${status.value.err}`);
             }
             if (status && status.value && status.value.slot !== null) {
+                this.logger.debug('Transaction found!', { txId, status });
                 return;
             }
             this.logger.debug('Transaction not found, polling...', {

package/lib/cjs/node/factory.js

@@ -37,7 +37,7 @@ class TurboFactory extends factory_js_1.TurboBaseFactory {
         // Import the TurboAuthenticatedUploadService class from the node upload module
         return new upload_js_1.TurboAuthenticatedUploadService(config);
     }
-    static authenticated({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, tokenMap, gatewayUrl, tokenTools, walletAdapter, cuUrl, processId, }) {
+    static authenticated({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, tokenMap, gatewayUrl, tokenTools, walletAdapter, }) {
         return new TurboFactory().getAuthenticatedTurbo({
             privateKey,
             signer: providedSigner,
@@ -48,8 +48,6 @@ class TurboFactory extends factory_js_1.TurboBaseFactory {
             gatewayUrl,
             tokenTools,
             walletAdapter,
-            processId,
-            cuUrl,
             logger: this.logger,
         });
     }

package/lib/cjs/utils/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultProdAoConfigs = exports.defaultProdGatewayUrls = exports.tokenToDevAoConfigMap = exports.tokenToDevGatewayMap = void 0;
+exports.defaultProdGatewayUrls = exports.tokenToDevGatewayMap = void 0;
 exports.sleep = sleep;
 exports.isWeb = isWeb;
 exports.createTurboSigner = createTurboSigner;
@@ -49,7 +49,7 @@ const polygonTestnetRpc = 'https://rpc-amoy.polygon.technology';
 const baseMainnetRpc = 'https://mainnet.base.org';
 exports.tokenToDevGatewayMap = {
     arweave: 'https://turbo-gateway.com', // No arweave test net
-    ario: 'https://turbo-gateway.com', // No arweave test net
+    ario: 'https://api.devnet.solana.com',
     'base-ario': baseMainnetRpc, // No base-ario test net contract deployed
     solana: 'https://api.devnet.solana.com',
     ethereum: ethTestnetRpc,
@@ -61,15 +61,9 @@ exports.tokenToDevGatewayMap = {
     'base-usdc': baseTestnetRpc,
     'polygon-usdc': polygonTestnetRpc,
 };
-exports.tokenToDevAoConfigMap = {
-    ario: {
-        processId: 'agYcCFJtrMG6cqMuZfskIkFTGvUPddICmtQSBIoPdiA',
-        cuUrl: 'https://cu.ardrive.io',
-    },
-};
 exports.defaultProdGatewayUrls = {
     arweave: 'https://turbo-gateway.com',
-    ario: 'https://turbo-gateway.com',
+    ario: 'https://api.mainnet-beta.solana.com',
     'base-ario': baseMainnetRpc,
     solana: 'https://api.mainnet-beta.solana.com',
     ethereum: 'https://cloudflare-eth.com/',
@@ -81,12 +75,6 @@ exports.defaultProdGatewayUrls = {
     'base-usdc': baseMainnetRpc,
     'polygon-usdc': 'https://polygon-rpc.com/',
 };
-exports.defaultProdAoConfigs = {
-    ario: {
-        processId: 'qNvAoz0TgcH7DMg8BCVn8jF32QH5L6T29VjHxhHqqGE',
-        cuUrl: 'https://cu.ardrive.io',
-    },
-};
 function createTurboSigner({ signer: clientProvidedSigner, privateKey: clientProvidedPrivateKey, token = 'arweave', }) {
     if (clientProvidedSigner !== undefined) {
         if (clientProvidedSigner instanceof arbundles_1.InjectedEthereumSigner) {
@@ -106,6 +94,7 @@ function createTurboSigner({ signer: clientProvidedSigner, privateKey: clientPro
     }
     switch (token) {
         case 'solana':
+        case 'ario':
             return new arbundles_1.HexSolanaSigner(clientProvidedPrivateKey);
         case 'ethereum':
         case 'pol':
@@ -125,7 +114,6 @@ function createTurboSigner({ signer: clientProvidedSigner, privateKey: clientPro
             }
             return signerFromKyvePrivateKey(clientProvidedPrivateKey);
         case 'arweave':
-        case 'ario':
             if (!(0, types_js_1.isJWK)(clientProvidedPrivateKey)) {
                 throw new Error('A JWK must be provided for ArweaveSigner.');
             }
@@ -170,8 +158,8 @@ function isValidKyveAddress(address) {
 function isValidUserAddress(address, type) {
     switch (type) {
         case 'arweave':
-        case 'ario':
             return isValidArweaveBase64URL(address);
+        case 'ario':
         case 'solana':
             return isValidSolanaAddress(address);
         case 'ethereum':

package/lib/cjs/web/factory.js

@@ -37,7 +37,7 @@ class TurboFactory extends factory_js_1.TurboBaseFactory {
         // Import the TurboAuthenticatedUploadService class from the web upload module
         return new upload_js_1.TurboAuthenticatedUploadService(config);
     }
-    static authenticated({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, gatewayUrl, tokenMap, tokenTools, walletAdapter, cuUrl, processId, }) {
+    static authenticated({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, gatewayUrl, tokenMap, tokenTools, walletAdapter, }) {
         return new TurboFactory().getAuthenticatedTurbo({
             privateKey,
             signer: providedSigner,
@@ -49,8 +49,6 @@ class TurboFactory extends factory_js_1.TurboBaseFactory {
             tokenTools,
             logger: this.logger,
             walletAdapter,
-            cuUrl,
-            processId,
         });
     }
 }

package/lib/esm/cli/options.js

@@ -73,16 +73,6 @@ export const optionMap = {
         description: 'Set a custom payment service URL',
         default: undefined,
     },
-    processId: {
-        alias: '--process-id <processId>',
-        description: 'Set a custom target process ID for the action',
-        default: undefined,
-    },
-    cuUrl: {
-        alias: '--cu-url <cuUrl>',
-        description: 'Set a custom CU URL for the action',
-        default: undefined,
-    },
     dev: {
         alias: '--dev',
         description: 'Enable Turbo development endpoints',

package/lib/esm/cli/utils.js

@@ -16,7 +16,7 @@
 import bs58 from 'bs58';
 import { readFileSync, statSync } from 'fs';
 import { ExistingBalanceFunding, OnDemandFunding, TurboFactory, X402Funding, defaultTurboConfiguration, developmentTurboConfiguration, fiatCurrencyTypes, isCurrency, isTokenType, privateKeyFromKyveMnemonic, tokenToBaseMap, } from '../node/index.js';
-import { defaultProdAoConfigs, tokenToDevAoConfigMap, tokenToDevGatewayMap, } from '../utils/common.js';
+import { tokenToDevGatewayMap } from '../utils/common.js';
 import { NoWalletProvidedError } from './errors.js';
 export function exitWithErrorLog(error) {
     console.error(error instanceof Error ? error.message : error);
@@ -100,7 +100,9 @@ export async function privateKeyFromOptions({ mnemonic, privateKey, walletFile,
     }
     else if (walletFile !== undefined) {
         const wallet = JSON.parse(readFileSync(walletFile, 'utf-8'));
-        return token === 'solana' ? bs58.encode(wallet) : wallet;
+        return token === 'solana' || token === 'ario'
+            ? bs58.encode(wallet)
+            : wallet;
     }
     else if (privateKey !== undefined) {
         return privateKey;
@@ -114,8 +116,6 @@ export function configFromOptions(options) {
     let paymentUrl = undefined;
     let uploadUrl = undefined;
     let gatewayUrl = undefined;
-    let processId = undefined;
-    let cuUrl = undefined;
     if (options.local && options.dev) {
         throw new Error('Cannot use both --local and --dev flags');
     }
@@ -124,10 +124,6 @@ export function configFromOptions(options) {
         paymentUrl = developmentTurboConfiguration.paymentServiceConfig.url;
         uploadUrl = developmentTurboConfiguration.uploadServiceConfig.url;
         gatewayUrl = tokenToDevGatewayMap[token];
-        if (options.token === 'ario') {
-            processId = tokenToDevAoConfigMap[token].processId;
-            cuUrl = tokenToDevAoConfigMap[token].cuUrl;
-        }
     }
     else if (options.local) {
         // Use local endpoints
@@ -139,10 +135,6 @@ export function configFromOptions(options) {
         // Use default endpoints
         paymentUrl = defaultTurboConfiguration.paymentServiceConfig.url;
         uploadUrl = defaultTurboConfiguration.uploadServiceConfig.url;
-        if (options.token === 'ario') {
-            processId = defaultProdAoConfigs[token].processId;
-            cuUrl = defaultProdAoConfigs[token].cuUrl;
-        }
     }
     // Override gateway, payment, and upload service default endpoints if provided
     if (options.gateway !== undefined) {
@@ -154,19 +146,11 @@ export function configFromOptions(options) {
     if (options.uploadUrl !== undefined) {
         uploadUrl = options.uploadUrl;
     }
-    if (options.cuUrl !== undefined) {
-        cuUrl = options.cuUrl;
-    }
-    if (options.processId !== undefined) {
-        processId = options.processId;
-    }
     const config = {
         paymentServiceConfig: { url: paymentUrl },
         uploadServiceConfig: { url: uploadUrl },
         gatewayUrl,
         token,
-        processId,
-        cuUrl,
     };
     return config;
 }

package/lib/esm/common/factory.js

@@ -43,7 +43,7 @@ export class TurboBaseFactory {
             paymentService,
         });
     }
-    getAuthenticatedTurbo({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, gatewayUrl, tokenMap, tokenTools, logger, walletAdapter, processId, cuUrl, }) {
+    getAuthenticatedTurbo({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, gatewayUrl, tokenMap, tokenTools, logger, walletAdapter, }) {
         token = token === 'pol' ? 'matic' : token;
         if (!token) {
             if (providedSigner) {
@@ -101,8 +101,6 @@ export class TurboBaseFactory {
                 tokenTools = tokenMap.arweave;
             }
             tokenTools = defaultTokenMap[token]?.({
-                cuUrl,
-                processId,
                 gatewayUrl,
                 logger,
             });

package/lib/esm/common/payment.js

@@ -30,6 +30,7 @@ export class TurboUnauthenticatedPaymentService {
             logger: this.logger,
         });
         this.token = token;
+        this.url = url;
     }
     async getBalance(address) {
         const balance = await this.httpService.get({
@@ -141,6 +142,10 @@ export class TurboUnauthenticatedPaymentService {
         return this.getCheckout(params);
     }
     async submitFundTransaction({ txId, }) {
+        this.logger.debug('Submitting fund transaction to Turbo...', {
+            txId,
+            url: this.url,
+        });
         const response = await this.httpService.post({
             endpoint: `/account/balance/${this.token}`,
             data: Buffer.from(JSON.stringify({ tx_id: txId })),
@@ -278,9 +283,6 @@ export class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymen
         if (!this.tokenTools) {
             throw new Error(`Token type not supported for crypto fund ${this.token}`);
         }
-        if (this.token === 'ario') {
-            throw new Error(`Top up with tokens is not supported for ARIO until after SOL migration is complete`);
-        }
         if (turboCreditDestinationAddress !== undefined) {
             if (isAnyValidUserAddress(turboCreditDestinationAddress) === false) {
                 throw new Error(`Invalid turboCreditDestinationAddress provided: ${turboCreditDestinationAddress}`);