@ardrive/turbo-sdk 1.33.1 → 1.34.0-alpha.2

package/lib/cjs/cli/cli.js

@@ -41,7 +41,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, index_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, options_js_1.optionMap.txId]).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, options_js_1.optionMap.address]).action(async (_commandOptions, command) => {
     await (0, utils_js_1.runCommand)(command, index_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/cryptoFund.js

@@ -28,6 +28,7 @@ const utils_js_1 = require("../utils.js");
 async function cryptoFund(options) {
     const value = options.value;
     const txId = options.txId;
+    const address = options.address;
     if (txId !== undefined) {
         const turbo = factory_js_1.TurboFactory.unauthenticated((0, utils_js_1.configFromOptions)(options));
         const result = await turbo.submitFundTransaction({ txId: txId });
@@ -47,7 +48,7 @@ async function cryptoFund(options) {
         const { confirm } = await (0, prompts_1.default)({
             type: 'confirm',
             name: 'confirm',
-            message: `\nTransaction details:\n\n  Amount: ${value} ${token}\n  Target: ${targetWallet}\n  Est Credits to receive: ${credits}\n  Credit recipient: ${await turbo.signer.getNativeAddress()}\n  Note: Network Dependent Gas Fees May Apply\n\nThis payment is non-refundable.  Proceed with transaction?`,
+            message: `\nTransaction details:\n\n  Amount: ${value} ${token}\n  Target: ${targetWallet}\n  Est Credits to receive: ${credits}\n  Credit recipient: ${address ?? (await turbo.signer.getNativeAddress())}\n  Note: Network Dependent Gas Fees May Apply\n\nThis payment is non-refundable.  Proceed with transaction?`,
             initial: true,
         });
         if (!confirm) {
@@ -57,6 +58,7 @@ async function cryptoFund(options) {
     }
     const result = await turbo.topUpWithTokens({
         tokenAmount,
+        turboCreditDestinationAddress: address,
     });
     console.log('Sent crypto fund transaction: \n', JSON.stringify(result, null, 2));
 }

package/lib/cjs/common/payment.js

@@ -18,6 +18,7 @@ exports.TurboAuthenticatedPaymentService = exports.TurboUnauthenticatedPaymentSe
  */
 const bignumber_js_1 = require("bignumber.js");
 const axiosClient_js_1 = require("../utils/axiosClient.js");
+const common_js_1 = require("../utils/common.js");
 const http_js_1 = require("./http.js");
 const logger_js_1 = require("./logger.js");
 const index_js_1 = require("./token/index.js");
@@ -151,31 +152,37 @@ class TurboUnauthenticatedPaymentService {
             return {
                 id: response.creditedTransaction.transactionId,
                 quantity: response.creditedTransaction.transactionQuantity,
-                owner: response.creditedTransaction.destinationAddress,
+                owner: response.creditedTransaction.transactionSenderAddress ??
+                    response.creditedTransaction.destinationAddress,
                 winc: response.creditedTransaction.winstonCreditAmount,
                 token: response.creditedTransaction.tokenType,
                 status: 'confirmed',
                 block: response.creditedTransaction.blockHeight,
+                recipient: response.creditedTransaction.destinationAddress,
             };
         }
         else if ('pendingTransaction' in response) {
             return {
                 id: response.pendingTransaction.transactionId,
                 quantity: response.pendingTransaction.transactionQuantity,
-                owner: response.pendingTransaction.destinationAddress,
+                owner: response.pendingTransaction.transactionSenderAddress ??
+                    response.pendingTransaction.destinationAddress,
                 winc: response.pendingTransaction.winstonCreditAmount,
                 token: response.pendingTransaction.tokenType,
                 status: 'pending',
+                recipient: response.pendingTransaction.destinationAddress,
             };
         }
         else if ('failedTransaction' in response) {
             return {
                 id: response.failedTransaction.transactionId,
                 quantity: response.failedTransaction.transactionQuantity,
-                owner: response.failedTransaction.destinationAddress,
+                owner: response.failedTransaction.transactionSenderAddress ??
+                    response.failedTransaction.destinationAddress,
                 winc: response.failedTransaction.winstonCreditAmount,
                 token: response.failedTransaction.tokenType,
                 status: 'failed',
+                recipient: response.failedTransaction.destinationAddress,
             };
         }
         throw new Error('Unknown response from payment service: ' + response);
@@ -271,10 +278,15 @@ class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentServic
         }
         return walletAddress;
     }
-    async topUpWithTokens({ feeMultiplier = 1, tokenAmount: tokenAmountV, }) {
+    async topUpWithTokens({ feeMultiplier = 1, tokenAmount: tokenAmountV, turboCreditDestinationAddress, }) {
         if (!this.tokenTools) {
             throw new Error(`Token type not supported for crypto fund ${this.token}`);
         }
+        if (turboCreditDestinationAddress !== undefined) {
+            if ((0, common_js_1.isAnyValidUserAddress)(turboCreditDestinationAddress) === false) {
+                throw new Error(`Invalid turboCreditDestinationAddress provided: ${turboCreditDestinationAddress}`);
+            }
+        }
         const tokenAmount = new bignumber_js_1.BigNumber(tokenAmountV);
         const target = await this.getTargetWalletForFund();
         this.logger.debug('Funding account...', {
@@ -287,6 +299,7 @@ class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentServic
             tokenAmount,
             feeMultiplier,
             signer: this.signer,
+            turboCreditDestinationAddress,
         });
         const txId = fundTx.id;
         try {

package/lib/cjs/common/signer.js

@@ -34,6 +34,8 @@ const tweetnacl_1 = __importDefault(require("tweetnacl"));
 const types_js_1 = require("../types.js");
 const base64_js_1 = require("../utils/base64.js");
 const logger_js_1 = require("./logger.js");
+const ethereum_js_1 = require("./token/ethereum.js");
+const solana_js_1 = require("./token/solana.js");
 /**
  * Abstract class for signing TurboDataItems.
  */
@@ -52,6 +54,9 @@ class TurboDataItemAbstractSigner {
             case 'matic':
             case 'pol':
             case 'base-eth':
+            case 'usdc':
+            case 'base-usdc':
+            case 'polygon-usdc':
                 return (0, ethers_2.computeAddress)((0, signing_key_1.computePublicKey)((0, base64_js_1.fromB64Url)(owner)));
             case 'kyve':
                 return (0, amino_1.pubkeyToAddress)({
@@ -81,7 +86,7 @@ class TurboDataItemAbstractSigner {
         return this.ownerToNativeAddress((0, base64_js_1.toB64Url)(await this.getPublicKey()), this.token);
     }
     /** Let the signer handle sending tx for better compat with cross chain libraries/web wallets */
-    async sendTransaction({ target, amount, gatewayUrl, }) {
+    async sendTransaction({ target, amount, gatewayUrl, turboCreditDestinationAddress, }) {
         if (this.walletAdapter) {
             if ((0, types_js_1.isSolanaWalletAdapter)(this.walletAdapter)) {
                 const connection = new web3_js_1.Connection(gatewayUrl, 'confirmed');
@@ -95,6 +100,14 @@ class TurboDataItemAbstractSigner {
                     toPubkey: new web3_js_1.PublicKey(target),
                     lamports: +new bignumber_js_1.BigNumber(amount),
                 }));
+                if (turboCreditDestinationAddress !== undefined) {
+                    tx.add(new web3_js_1.TransactionInstruction({
+                        programId: new web3_js_1.PublicKey(solana_js_1.memoProgramId),
+                        keys: [],
+                        data: Buffer.from('turboCreditDestinationAddress=' +
+                            turboCreditDestinationAddress),
+                    }));
+                }
                 const signedTx = await this.walletAdapter.signTransaction(tx);
                 const id = await connection.sendRawTransaction(signedTx.serialize());
                 return id;
@@ -109,6 +122,7 @@ class TurboDataItemAbstractSigner {
             const { hash } = await signer.sendTransaction({
                 to: target,
                 value: (0, ethers_1.parseEther)(amount.toFixed(18)),
+                data: (0, ethereum_js_1.ethDataFromTurboCreditDestinationAddress)(turboCreditDestinationAddress),
             });
             return hash;
         }
@@ -121,6 +135,7 @@ class TurboDataItemAbstractSigner {
         const tx = await ethWalletAndProvider.sendTransaction({
             to: target,
             value: (0, ethers_1.parseEther)(amount.toFixed(18)),
+            data: (0, ethereum_js_1.ethDataFromTurboCreditDestinationAddress)(turboCreditDestinationAddress),
         });
         this.logger.debug('Sent transaction', { tx });
         return tx.hash;

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

@@ -35,34 +35,42 @@ class ARIOToken {
         this.pollingOptions = pollingOptions;
         this.logger = logger;
     }
-    async createAndSubmitTx({ target, signer: { signer }, tokenAmount, }) {
+    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,
+            },
+        ];
+        if (turboCreditDestinationAddress !== undefined) {
+            tags.push({
+                name: 'Turbo-Credit-Destination-Address',
+                value: turboCreditDestinationAddress,
+            });
+        }
         const txId = await this.ao.message({
             signer: createAoSigner(signer),
             process: this.processId,
-            tags: [
-                {
-                    name: 'Action',
-                    value: 'Transfer',
-                },
-                {
-                    name: 'Recipient',
-                    value: target,
-                },
-                {
-                    name: 'Quantity',
-                    value: tokenAmount.toString(),
-                },
-                {
-                    name: 'Turbo-SDK',
-                    value: version_js_1.version,
-                },
-            ],
+            tags,
         });
         this.logger.debug('Submitted Transfer message to ARIO process...', {
             id: txId,
             target,
             tokenAmount,
             processId: this.processId,
+            tags,
         });
         return { id: txId, target, reward: '0' };
     }

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

@@ -46,7 +46,7 @@ class ArweaveToken {
         this.mintU = mintU;
         this.pollingOptions = pollingOptions;
     }
-    async createAndSubmitTx({ feeMultiplier, target, tokenAmount, signer, }) {
+    async createAndSubmitTx({ feeMultiplier, target, tokenAmount, signer, turboCreditDestinationAddress, }) {
         const tx = await this.arweave.createTransaction({
             target,
             quantity: tokenAmount.toString(),
@@ -63,6 +63,9 @@ class ArweaveToken {
             tx.addTag('Contract', 'KTzTXT_ANmF84fWEKHzWURD1LWd9QaFR9yfYUwH2Lxw'); // cspell:enable
             tx.addTag('Input', JSON.stringify({ function: 'mint' }));
         }
+        if (turboCreditDestinationAddress !== undefined) {
+            tx.addTag('Turbo-Credit-Destination-Address', turboCreditDestinationAddress);
+        }
         const publicKeyB64Url = (0, base64_js_1.toB64Url)(await signer.getPublicKey());
         tx.setOwner(publicKeyB64Url);
         const dataToSign = await tx.getSignatureData();

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

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseEthToken = void 0;
+exports.BaseEthToken = exports.defaultBaseNetworkPollingOptions = void 0;
 const common_js_1 = require("../../utils/common.js");
 const ethereum_js_1 = require("./ethereum.js");
+exports.defaultBaseNetworkPollingOptions = {
+    initialBackoffMs: 2_500,
+    maxAttempts: 10,
+    pollingIntervalMs: 750,
+};
 class BaseEthToken extends ethereum_js_1.EthereumToken {
-    constructor({ logger, gatewayUrl = common_js_1.defaultProdGatewayUrls['base-eth'], pollingOptions = {
-        initialBackoffMs: 2_500,
-        maxAttempts: 10,
-        pollingIntervalMs: 2_500,
-    }, } = {}) {
+    constructor({ logger, gatewayUrl = common_js_1.defaultProdGatewayUrls['base-eth'], pollingOptions = exports.defaultBaseNetworkPollingOptions, } = {}) {
         super({
             logger,
             gatewayUrl,

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

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ERC20Token = void 0;
+/**
+ * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const arbundles_1 = require("@dha-team/arbundles");
+const ethers_1 = require("ethers");
+const types_js_1 = require("../../types.js");
+const common_js_1 = require("../../utils/common.js");
+const logger_js_1 = require("../logger.js");
+const ethereum_js_1 = require("./ethereum.js");
+class ERC20Token extends ethereum_js_1.EthereumToken {
+    constructor({ tokenContractAddress, logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = common_js_1.defaultProdGatewayUrls.ethereum, pollingOptions, }) {
+        super({ logger, gatewayUrl, pollingOptions });
+        this.tokenContract = new ethers_1.ethers.Contract(tokenContractAddress, [
+            'function decimals() view returns (uint8)',
+            'function balanceOf(address) view returns (uint256)',
+            'function transfer(address to, uint256 value) returns (bool)',
+        ], this.rpcProvider);
+    }
+    async createAndSubmitTx({ target, tokenAmount, signer, turboCreditDestinationAddress, }) {
+        try {
+            let connected;
+            let walletOrSigner;
+            if (signer.signer instanceof arbundles_1.EthereumSigner) {
+                const provider = new ethers_1.JsonRpcProvider(this.gatewayUrl);
+                // 🧩 CLI / Node path
+                const keyHex = Buffer.from(signer.signer.key).toString('hex');
+                walletOrSigner = new ethers_1.Wallet(keyHex, provider);
+                connected = this.tokenContract.connect(walletOrSigner);
+            }
+            else if (signer.walletAdapter !== undefined &&
+                (0, types_js_1.isEthereumWalletAdapter)(signer.walletAdapter)) {
+                walletOrSigner = signer.walletAdapter.getSigner();
+                connected = this.tokenContract.connect(walletOrSigner);
+            }
+            else {
+                throw new Error('Unsupported signer -- must be EthereumSigner or have a walletAdapter implementing getSigner');
+            }
+            // Encode transfer data
+            const baseTransferData = connected.interface.encodeFunctionData('transfer', [target, tokenAmount.toString()]);
+            let finalData = baseTransferData;
+            // Append optional memo data with turbo credit destination address
+            const memoData = (0, ethereum_js_1.ethDataFromTurboCreditDestinationAddress)(turboCreditDestinationAddress);
+            if (memoData !== undefined) {
+                // remove the "0x" prefix and append
+                finalData += memoData.slice(2);
+            }
+            const txRequest = {
+                to: await connected.getAddress(),
+                data: finalData,
+            };
+            this.logger.debug('Submitting ERC20 transfer', {
+                target,
+                tokenAmount: tokenAmount.toString(),
+                rpcEndpoint: this.gatewayUrl,
+                txRequest,
+            });
+            const tx = await walletOrSigner.sendTransaction(txRequest);
+            this.logger.debug('ERC20 transfer submitted', {
+                txHash: tx.hash,
+                target,
+                tx,
+            });
+            return { id: tx.hash, target };
+        }
+        catch (e) {
+            this.logger.error('Error creating/submitting ERC20 tx', {
+                error: e instanceof Error ? e.message : e,
+                target,
+                tokenAmount,
+                rpcEndpoint: this.gatewayUrl,
+            });
+            throw e;
+        }
+    }
+}
+exports.ERC20Token = ERC20Token;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EthereumToken = exports.ETHToTokenAmount = exports.weiToTokenAmount = void 0;
+exports.EthereumToken = exports.defaultEthereumPollingOptions = exports.ETHToTokenAmount = exports.weiToTokenAmount = void 0;
+exports.ethDataFromTurboCreditDestinationAddress = ethDataFromTurboCreditDestinationAddress;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -24,29 +25,42 @@ const weiToTokenAmount = (wei) => wei;
 exports.weiToTokenAmount = weiToTokenAmount;
 const ETHToTokenAmount = (eth) => new bignumber_js_1.BigNumber(eth).times(1e18).valueOf();
 exports.ETHToTokenAmount = ETHToTokenAmount;
+exports.defaultEthereumPollingOptions = {
+    initialBackoffMs: 25_000,
+    maxAttempts: 10,
+    pollingIntervalMs: 1_500,
+};
 class EthereumToken {
-    constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = common_js_1.defaultProdGatewayUrls.ethereum, pollingOptions = {
-        maxAttempts: 10,
-        pollingIntervalMs: 4_000,
-        initialBackoffMs: 10_000,
-    }, } = {}) {
+    constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = common_js_1.defaultProdGatewayUrls.ethereum, pollingOptions = exports.defaultEthereumPollingOptions, } = {}) {
         this.logger = logger;
         this.gatewayUrl = gatewayUrl;
         this.pollingOptions = pollingOptions;
         this.rpcProvider = new ethers_1.ethers.JsonRpcProvider(gatewayUrl);
     }
-    async createAndSubmitTx({ target, tokenAmount, signer, }) {
-        // convert wei to eth
-        const eth = tokenAmount.shiftedBy(-18);
-        const txId = await signer.sendTransaction({
-            target,
-            amount: eth,
-            gatewayUrl: this.gatewayUrl,
-        });
-        return {
-            id: txId,
-            target,
-        };
+    async createAndSubmitTx({ target, tokenAmount, signer, turboCreditDestinationAddress, }) {
+        try {
+            // convert wei to eth
+            const eth = tokenAmount.shiftedBy(-18);
+            const txId = await signer.sendTransaction({
+                target,
+                amount: eth,
+                gatewayUrl: this.gatewayUrl,
+                turboCreditDestinationAddress,
+            });
+            return {
+                id: txId,
+                target,
+            };
+        }
+        catch (e) {
+            this.logger.error('Error creating and submitting Ethereum tx', {
+                error: e instanceof Error ? e.message : e,
+                target,
+                tokenAmount,
+                rpcEndpoint: this.gatewayUrl,
+            });
+            throw e;
+        }
     }
     async getTxAvailability(txId) {
         const tx = await this.rpcProvider.getTransaction(txId);
@@ -77,3 +91,9 @@ class EthereumToken {
     }
 }
 exports.EthereumToken = EthereumToken;
+function ethDataFromTurboCreditDestinationAddress(turboCreditDestinationAddress) {
+    if (turboCreditDestinationAddress !== undefined) {
+        return (0, ethers_1.hexlify)((0, ethers_1.toUtf8Bytes)('turboCreditDestinationAddress=' + turboCreditDestinationAddress));
+    }
+    return undefined;
+}

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

@@ -24,6 +24,7 @@ const ethereum_js_1 = require("./ethereum.js");
 const kyve_js_1 = require("./kyve.js");
 const polygon_js_1 = require("./polygon.js");
 const solana_js_1 = require("./solana.js");
+const usdc_js_1 = require("./usdc.js");
 exports.defaultTokenMap = {
     arweave: (config) => new arweave_js_1.ArweaveToken(config),
     ario: (config) => new ario_js_1.ARIOToken(config),
@@ -33,8 +34,12 @@ exports.defaultTokenMap = {
     kyve: (config) => new kyve_js_1.KyveToken(config),
     matic: (config) => new polygon_js_1.PolygonToken(config),
     pol: (config) => new polygon_js_1.PolygonToken(config),
+    usdc: (config) => new usdc_js_1.USDCToken({ network: 'ethereum', ...config }),
+    'base-usdc': (config) => new usdc_js_1.USDCToken({ network: 'base', ...config }),
+    'polygon-usdc': (config) => new usdc_js_1.USDCToken({ network: 'polygon', ...config }),
 };
 const ethExponent = 18;
+const usdcExponent = 6;
 exports.exponentMap = {
     arweave: 12,
     ario: 6,
@@ -44,6 +49,9 @@ exports.exponentMap = {
     kyve: 6,
     matic: ethExponent,
     pol: ethExponent,
+    usdc: usdcExponent,
+    'base-usdc': usdcExponent,
+    'polygon-usdc': usdcExponent,
 };
 exports.tokenToBaseMap = {
     arweave: (a) => (0, arweave_js_1.ARToTokenAmount)(a),
@@ -54,6 +62,9 @@ exports.tokenToBaseMap = {
     kyve: (a) => (0, kyve_js_1.KYVEToTokenAmount)(a),
     matic: (a) => (0, polygon_js_1.POLToTokenAmount)(a),
     pol: (a) => (0, polygon_js_1.POLToTokenAmount)(a),
+    usdc: (a) => (0, usdc_js_1.USDCToTokenAmount)(a),
+    'base-usdc': (a) => (0, usdc_js_1.USDCToTokenAmount)(a),
+    'polygon-usdc': (a) => (0, usdc_js_1.USDCToTokenAmount)(a),
 };
 function isTokenType(token) {
     return types_js_1.tokenTypes.includes(token);

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

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PolygonToken = exports.POLToTokenAmount = void 0;
+exports.PolygonToken = exports.defaultPolygonPollingOptions = exports.POLToTokenAmount = void 0;
 const common_js_1 = require("../../utils/common.js");
 const logger_js_1 = require("../logger.js");
 const ethereum_js_1 = require("./ethereum.js");
 exports.POLToTokenAmount = ethereum_js_1.ETHToTokenAmount;
+exports.defaultPolygonPollingOptions = {
+    maxAttempts: 10,
+    initialBackoffMs: 5_000,
+    pollingIntervalMs: 1_000,
+};
 class PolygonToken extends ethereum_js_1.EthereumToken {
-    constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = common_js_1.defaultProdGatewayUrls.pol, pollingOptions = {
-        maxAttempts: 10,
-        pollingIntervalMs: 4_000,
-        initialBackoffMs: 5_000,
-    }, } = {}) {
+    constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = common_js_1.defaultProdGatewayUrls.pol, pollingOptions = exports.defaultPolygonPollingOptions, } = {}) {
         super({ logger, gatewayUrl, pollingOptions });
     }
 }

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaToken = exports.SOLToTokenAmount = exports.lamportToTokenAmount = void 0;
+exports.SolanaToken = exports.memoProgramId = exports.SOLToTokenAmount = exports.lamportToTokenAmount = void 0;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -30,6 +30,7 @@ const lamportToTokenAmount = (winston) => winston;
 exports.lamportToTokenAmount = lamportToTokenAmount;
 const SOLToTokenAmount = (sol) => new bignumber_js_1.BigNumber(sol).times(1e9).valueOf();
 exports.SOLToTokenAmount = SOLToTokenAmount;
+exports.memoProgramId = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
 class SolanaToken {
     constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = common_js_1.defaultProdGatewayUrls.solana, pollingOptions = {
         maxAttempts: 10,
@@ -41,12 +42,13 @@ class SolanaToken {
         this.connection = new web3_js_1.Connection(gatewayUrl, 'confirmed');
         this.pollingOptions = pollingOptions;
     }
-    async createAndSubmitTx({ target, tokenAmount, signer, }) {
+    async createAndSubmitTx({ target, tokenAmount, signer, turboCreditDestinationAddress, }) {
         if (signer.signer instanceof arbundles_1.HexInjectedSolanaSigner) {
             const id = await signer.sendTransaction({
                 amount: tokenAmount,
                 target,
                 gatewayUrl: this.gatewayUrl,
+                turboCreditDestinationAddress,
             });
             return { target, id };
         }
@@ -60,6 +62,13 @@ class SolanaToken {
             toPubkey: new web3_js_1.PublicKey(target),
             lamports: +new bignumber_js_1.BigNumber(tokenAmount),
         }));
+        if (turboCreditDestinationAddress !== undefined) {
+            tx.add(new web3_js_1.TransactionInstruction({
+                programId: new web3_js_1.PublicKey(exports.memoProgramId),
+                keys: [],
+                data: Buffer.from('turboCreditDestinationAddress=' + turboCreditDestinationAddress),
+            }));
+        }
         const serializedTx = tx.serializeMessage();
         const signature = await signer.signData(Uint8Array.from(serializedTx));
         tx.addSignature(publicKey, Buffer.from(signature));

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

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.USDCToken = exports.USDCToTokenAmount = exports.mUSDCToTokenAmount = exports.usdcNetworks = void 0;
+/**
+ * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const bignumber_js_1 = require("bignumber.js");
+const common_js_1 = require("../../utils/common.js");
+const baseEth_js_1 = require("./baseEth.js");
+const erc20_js_1 = require("./erc20.js");
+const ethereum_js_1 = require("./ethereum.js");
+const polygon_js_1 = require("./polygon.js");
+/**
+ * Known USDC contract addresses and default RPCs by network
+ */
+const usdcNetworks = (useDevnet = false) => ({
+    ethereum: {
+        tokenContractAddress: useDevnet
+            ? ethSepoliaUsdcAddress
+            : ethMainnetUsdcAddress,
+        rpcEndpoint: useDevnet
+            ? common_js_1.tokenToDevGatewayMap.ethereum
+            : common_js_1.defaultProdGatewayUrls.ethereum,
+        defaultPollingOptions: ethereum_js_1.defaultEthereumPollingOptions,
+    },
+    base: {
+        tokenContractAddress: useDevnet
+            ? baseSepoliaUsdcAddress
+            : baseMainnetUsdcAddress,
+        rpcEndpoint: useDevnet
+            ? common_js_1.tokenToDevGatewayMap['base-eth']
+            : common_js_1.defaultProdGatewayUrls['base-eth'],
+        defaultPollingOptions: baseEth_js_1.defaultBaseNetworkPollingOptions,
+    },
+    polygon: {
+        tokenContractAddress: useDevnet
+            ? polygonAmoyUsdcAddress
+            : polygonMainnetUsdcAddress,
+        rpcEndpoint: useDevnet
+            ? common_js_1.tokenToDevGatewayMap.pol
+            : common_js_1.defaultProdGatewayUrls.pol,
+        defaultPollingOptions: polygon_js_1.defaultPolygonPollingOptions,
+    },
+});
+exports.usdcNetworks = usdcNetworks;
+const ethMainnetUsdcAddress = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48';
+const baseMainnetUsdcAddress = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913';
+const polygonMainnetUsdcAddress = '0x3c499c542cef5e3811e1192ce70d8cc03d5c3359';
+const ethSepoliaUsdcAddress = '0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238';
+const baseSepoliaUsdcAddress = '0x036CbD53842c5426634e7929541eC2318f3dCF7e';
+const polygonAmoyUsdcAddress = '0x41e94eb019c0762f9bfcf9fb1e58725bfb0e7582';
+const mUSDCToTokenAmount = (mUSDC) => mUSDC;
+exports.mUSDCToTokenAmount = mUSDCToTokenAmount;
+const USDCToTokenAmount = (usdc) => new bignumber_js_1.BigNumber(usdc).times(1e6).valueOf();
+exports.USDCToTokenAmount = USDCToTokenAmount;
+class USDCToken extends erc20_js_1.ERC20Token {
+    constructor({ network = 'ethereum', logger, gatewayUrl, tokenContractAddress, pollingOptions, useDevnet, } = {}) {
+        if (useDevnet === undefined) {
+            const keywords = ['sepolia', 'amoy'];
+            useDevnet = keywords.some((keyword) => (gatewayUrl ?? '').toLowerCase().includes(keyword));
+        }
+        const { tokenContractAddress: usdcContractAddress, rpcEndpoint, defaultPollingOptions, } = (0, exports.usdcNetworks)(useDevnet)[network];
+        super({
+            tokenContractAddress: tokenContractAddress ?? usdcContractAddress,
+            logger,
+            gatewayUrl: gatewayUrl ?? rpcEndpoint,
+            pollingOptions: pollingOptions ?? defaultPollingOptions,
+        });
+    }
+}
+exports.USDCToken = USDCToken;

package/lib/cjs/common/upload.js

@@ -94,7 +94,12 @@ exports.TurboUnauthenticatedUploadService = TurboUnauthenticatedUploadService;
 class TurboAuthenticatedBaseUploadService extends TurboUnauthenticatedUploadService {
     constructor({ url = exports.defaultUploadServiceURL, retryConfig, signer, logger, token, paymentService, }) {
         super({ url, retryConfig, logger, token });
-        this.enabledOnDemandTokens = ['ario', 'solana', 'base-eth'];
+        this.enabledOnDemandTokens = [
+            'ario',
+            'solana',
+            'base-eth',
+            'base-usdc',
+        ];
         this.signer = signer;
         this.paymentService = paymentService;
     }

package/lib/cjs/types.js

@@ -31,6 +31,9 @@ exports.tokenTypes = [
     'matic',
     'pol',
     'base-eth',
+    'usdc',
+    'base-usdc',
+    'polygon-usdc',
 ];
 class ExistingBalanceFunding {
 }