@ardrive/turbo-sdk 2.0.0 → 2.1.0-alpha.2

package/lib/cjs/cli/utils.js

@@ -115,7 +115,7 @@ async function optionalPrivateKeyFromOptions(options) {
 async function privateKeyFromOptions({ privateKey, walletFile, token, }) {
     if (walletFile !== undefined) {
         const wallet = JSON.parse((0, fs_1.readFileSync)(walletFile, 'utf-8'));
-        return token === 'solana' || token === 'ario'
+        return token === 'solana' || token === 'ario' || token === 'solana-usdc'
             ? bs58_1.default.encode(wallet)
             : wallet;
     }

package/lib/cjs/common/factory.js

@@ -126,7 +126,7 @@ class TurboBaseFactory {
         });
     }
     signerFromAdapter(walletAdapter, token) {
-        if (token === 'solana') {
+        if (types_js_1.supportedSolanaSignerTokens.has(token)) {
             if (!(0, types_js_1.isSolanaWalletAdapter)(walletAdapter)) {
                 throw new Error('Unsupported wallet adapter -- must implement publicKey and signMessage');
             }

package/lib/cjs/common/signer.js

@@ -48,7 +48,11 @@ class TurboDataItemAbstractSigner {
     }
     ownerToNativeAddress(owner, token) {
         switch (token) {
+            // `solana-usdc` is an ordinary Solana wallet paying with an SPL token,
+            // and the payment service credits the base58 sender address it reads off
+            // the transfer — so its native address is the same bs58 form as `solana`.
             case 'solana':
+            case 'solana-usdc':
                 return bs58_1.default.encode(Uint8Array.from((0, base64_js_1.fromB64Url)(owner)));
             case 'ethereum':
             case 'matic':

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

@@ -1,7 +1,4 @@
 "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;
 /**
@@ -19,123 +16,23 @@ exports.ARIOToTokenAmount = exports.mARIOToTokenAmount = exports.ARIOToken = voi
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-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 logger_js_1 = require("../logger.js");
-const solana_js_1 = require("./solana.js");
+const spl_js_1 = require("./spl.js");
 const ARIO_SPL_MINT_ADDRESS = 'DcNnMuFxwhgV4WY1HVSaSEgr92bv2b1vUvEKiNxWqHdF';
 const DEVNET_ARIO_SPL_MINT_ADDRESS = '6vTw5CysRXQ4ybbHkDUiisHWVsBeMtUzYvJqs2iqHyaN';
 const ARIO_TOKEN_DECIMALS = 6;
-class ARIOToken {
-    constructor({ gatewayUrl = common_js_1.defaultProdGatewayUrls.solana, logger = logger_js_1.Logger.default, pollingOptions = {
-        maxAttempts: 10,
-        pollingIntervalMs: 2_500,
-        initialBackoffMs: 500,
-    }, } = {}) {
-        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, 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) {
-            tx.add(new web3_js_1.TransactionInstruction({
-                programId: new web3_js_1.PublicKey(solana_js_1.memoProgramId),
-                keys: [],
-                data: Buffer.from('turboCreditDestinationAddress=' + turboCreditDestinationAddress),
-            }));
-        }
-        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,
-            fromAta: fromAta.toBase58(),
-            toAta: toAta.toBase58(),
-            mint: mint.toBase58(),
-        });
-        return { id: txId, target, reward: '0' };
-    }
-    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,
+class ARIOToken extends spl_js_1.SplToken {
+    constructor({ gatewayUrl = common_js_1.defaultProdGatewayUrls.ario, ...config } = {}) {
+        super({
+            ...config,
+            gatewayUrl,
+            tokenName: 'ARIO',
+            decimals: ARIO_TOKEN_DECIMALS,
+            mintAddress: gatewayUrl.includes('devnet')
+                ? DEVNET_ARIO_SPL_MINT_ADDRESS
+                : ARIO_SPL_MINT_ADDRESS,
         });
-        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;

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

@@ -23,6 +23,7 @@ const baseEth_js_1 = require("./baseEth.js");
 const ethereum_js_1 = require("./ethereum.js");
 const polygon_js_1 = require("./polygon.js");
 const solana_js_1 = require("./solana.js");
+const solanaUsdc_js_1 = require("./solanaUsdc.js");
 const usdc_js_1 = require("./usdc.js");
 exports.defaultTokenMap = {
     arweave: (config) => new arweave_js_1.ArweaveToken(config),
@@ -35,6 +36,7 @@ exports.defaultTokenMap = {
     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 }),
+    'solana-usdc': (config) => new solanaUsdc_js_1.SolanaUsdcToken(config),
 };
 const ethExponent = 18;
 const usdcExponent = 6;
@@ -50,6 +52,7 @@ exports.exponentMap = {
     usdc: usdcExponent,
     'base-usdc': usdcExponent,
     'polygon-usdc': usdcExponent,
+    'solana-usdc': usdcExponent,
 };
 exports.tokenToBaseMap = {
     arweave: (a) => (0, arweave_js_1.ARToTokenAmount)(a),
@@ -62,6 +65,7 @@ exports.tokenToBaseMap = {
     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),
+    'solana-usdc': (a) => (0, usdc_js_1.USDCToTokenAmount)(a),
 };
 function isTokenType(token) {
     return types_js_1.tokenTypes.includes(token);
@@ -72,3 +76,5 @@ __exportStar(require("./solana.js"), exports);
 __exportStar(require("./ethereum.js"), exports);
 __exportStar(require("./baseEth.js"), exports);
 __exportStar(require("./polygon.js"), exports);
+__exportStar(require("./spl.js"), exports);
+__exportStar(require("./solanaUsdc.js"), exports);

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaUsdcToken = exports.DEVNET_SOLANA_USDC_MINT_ADDRESS = exports.SOLANA_USDC_MINT_ADDRESS = void 0;
+const common_js_1 = require("../../utils/common.js");
+const spl_js_1 = require("./spl.js");
+/** Circle's USDC mints on Solana. Both are 6-decimal SPL Token mints. */
+exports.SOLANA_USDC_MINT_ADDRESS = 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
+exports.DEVNET_SOLANA_USDC_MINT_ADDRESS = '4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU';
+const USDC_TOKEN_DECIMALS = 6;
+/**
+ * USDC (SPL) on Solana. Signed with the ordinary Solana signer — the payer's
+ * USDC lives in an associated token account derived from the same keypair, so
+ * no extra wallet or approval step is involved.
+ */
+class SolanaUsdcToken extends spl_js_1.SplToken {
+    constructor({ gatewayUrl = common_js_1.defaultProdGatewayUrls['solana-usdc'], mintAddress, ...config } = {}) {
+        super({
+            ...config,
+            gatewayUrl,
+            tokenName: 'USDC',
+            decimals: USDC_TOKEN_DECIMALS,
+            mintAddress: mintAddress ??
+                (gatewayUrl.includes('devnet')
+                    ? exports.DEVNET_SOLANA_USDC_MINT_ADDRESS
+                    : exports.SOLANA_USDC_MINT_ADDRESS),
+        });
+    }
+}
+exports.SolanaUsdcToken = SolanaUsdcToken;

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

@@ -0,0 +1,186 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SplToken = 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 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 types_js_1 = require("../../types.js");
+const common_js_1 = require("../../utils/common.js");
+const logger_js_1 = require("../logger.js");
+const solana_js_1 = require("./solana.js");
+/**
+ * Funding by an **SPL token transfer on Solana**: an idempotent
+ * create-associated-token-account, a `transferChecked` to the recipient's ATA,
+ * and an optional `turboCreditDestinationAddress=` memo when the credit should
+ * land on a different Turbo account than the payer.
+ *
+ * This is the generic shape of what `ARIOToken` has always done — ARIO is an SPL
+ * token — so a second SPL token (USDC) is a mint and a decimals value, not a
+ * second implementation. The payment service verifies both with one class too
+ * (`SolanaSplGateway`).
+ *
+ * Two constraints worth knowing before pointing this at a third token:
+ *  - The associated token accounts are derived for the CLASSIC SPL Token
+ *    program (Tokenkeg), which is what ARIO and USDC use. A Token-2022 mint
+ *    derives a different ATA, so it would need its own program id threading
+ *    through `getAssociatedTokenAddressSync`. It fails loudly on-chain rather
+ *    than silently paying the wrong account.
+ *  - `decimals` must match the mint's own. `transferChecked` carries the value
+ *    and the chain rejects a mismatch, so a wrong value fails the transaction
+ *    instead of transferring a wrong amount.
+ */
+class SplToken {
+    constructor({ mintAddress, decimals, tokenName = 'SPL', gatewayUrl = common_js_1.defaultProdGatewayUrls.solana, logger = logger_js_1.Logger.default, pollingOptions = {
+        maxAttempts: 10,
+        pollingIntervalMs: 2_500,
+        initialBackoffMs: 500,
+    }, }) {
+        this.gatewayUrl = gatewayUrl;
+        this.connection = new web3_js_1.Connection(gatewayUrl, 'confirmed');
+        this.pollingOptions = pollingOptions;
+        this.logger = logger;
+        this.mintAddress = mintAddress;
+        this.decimals = decimals;
+        this.tokenName = tokenName;
+    }
+    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)), this.decimals));
+        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, signature } = signer.walletAdapter !== undefined &&
+            (0, types_js_1.isSolanaWalletAdapter)(signer.walletAdapter)
+            ? await this.signWithWallet(tx, signer.walletAdapter)
+            : await this.signWithKey(tx, ownerPublicKey, signer);
+        const txId = bs58_1.default.encode(signature);
+        await this.submitTx(signedTx, txId);
+        this.logger.debug(`Submitted ${this.tokenName} SPL transfer transaction...`, {
+            id: txId,
+            target,
+            tokenAmount,
+            fromAta: fromAta.toBase58(),
+            toAta: toAta.toBase58(),
+            mint: mint.toBase58(),
+        });
+        return { id: txId, target, reward: '0' };
+    }
+    /** Sign the message bytes directly: a private-key signer holds the key. */
+    async signWithKey(tx, ownerPublicKey, signer) {
+        const signature = await signer.signData(Uint8Array.from(tx.serializeMessage()));
+        tx.addSignature(ownerPublicKey, Buffer.from(signature));
+        return { signedTx: tx, signature };
+    }
+    /**
+     * Have a browser wallet sign the transaction itself, as the SOL path does.
+     *
+     * A wallet signs through `signTransaction`, not `signMessage`: it refuses, or
+     * cannot display, a serialized transaction handed to it as a message. It may
+     * also add instructions of its own before signing (compute budget, guards),
+     * so the transaction submitted is the one it returns, never ours with its
+     * signature attached. Deserializing drops `lastValidBlockHeight`, so that is
+     * carried over for confirmation.
+     */
+    async signWithWallet(tx, walletAdapter) {
+        const signedTx = await walletAdapter.signTransaction(tx);
+        const signature = signedTx.signature;
+        if (signature === null) {
+            throw new Error(`Wallet returned an unsigned ${this.tokenName} transfer transaction`);
+        }
+        signedTx.recentBlockhash ??= tx.recentBlockhash;
+        signedTx.lastValidBlockHeight ??= tx.lastValidBlockHeight;
+        return { signedTx, signature: Uint8Array.from(signature) };
+    }
+    async submitTx(tx, id) {
+        this.logger.debug(`Submitting ${this.tokenName} 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 ${this.tokenName} 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 ${this.tokenName} 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(`${this.tokenName} 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.SplToken = SplToken;

package/lib/cjs/common/upload.js

@@ -249,6 +249,7 @@ class TurboAuthenticatedBaseUploadService extends TurboUnauthenticatedUploadServ
             'solana',
             'base-eth',
             'base-usdc',
+            'solana-usdc',
         ];
         this.signer = signer;
         this.paymentService = paymentService;

package/lib/cjs/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.arNSFiatPurchaseMethods = exports.arNSActions = exports.arNSPurchaseIntents = exports.validChunkingModes = exports.isJWK = exports.isWebUploadFolderParams = exports.isNodeUploadFolderParams = exports.multipartFinalizedStatus = exports.multipartFailedStatus = exports.multipartPendingStatus = exports.X402Funding = exports.OnDemandFunding = exports.ExistingBalanceFunding = exports.supportedEvmSignerTokens = exports.tokenTypes = exports.fiatCurrencyTypes = void 0;
+exports.arNSFiatPurchaseMethods = exports.arNSActions = exports.arNSPurchaseIntents = exports.validChunkingModes = exports.isJWK = exports.isWebUploadFolderParams = exports.isNodeUploadFolderParams = exports.multipartFinalizedStatus = exports.multipartFailedStatus = exports.multipartPendingStatus = exports.X402Funding = exports.OnDemandFunding = exports.ExistingBalanceFunding = exports.supportedEvmSignerTokens = exports.supportedSolanaSignerTokens = exports.tokenTypes = exports.fiatCurrencyTypes = void 0;
 exports.isCurrency = isCurrency;
 exports.isEthPrivateKey = isEthPrivateKey;
 exports.isSolanaWalletAdapter = isSolanaWalletAdapter;
@@ -32,7 +32,19 @@ exports.tokenTypes = [
     'usdc',
     'base-usdc',
     'polygon-usdc',
+    // USDC (SPL) on Solana — signed with the Solana signer, not an EVM one.
+    'solana-usdc',
 ];
+/**
+ * Tokens paid from a Solana wallet: SOL natively, and ARIO and USDC as SPL
+ * transfers signed by the same ed25519 key. A private key for any of these
+ * builds a Solana signer, so a Solana wallet adapter must as well.
+ */
+exports.supportedSolanaSignerTokens = new Set([
+    'solana',
+    'ario',
+    'solana-usdc',
+]);
 exports.supportedEvmSignerTokens = new Set([
     'ethereum',
     'base-eth',

package/lib/cjs/utils/common.js

@@ -50,6 +50,7 @@ exports.tokenToDevGatewayMap = {
     usdc: ethTestnetRpc,
     'base-usdc': baseTestnetRpc,
     'polygon-usdc': polygonTestnetRpc,
+    'solana-usdc': 'https://api.devnet.solana.com',
 };
 exports.defaultProdGatewayUrls = {
     arweave: 'https://turbo-gateway.com',
@@ -62,6 +63,7 @@ exports.defaultProdGatewayUrls = {
     usdc: 'https://cloudflare-eth.com/',
     'base-usdc': baseMainnetRpc,
     'polygon-usdc': 'https://polygon-rpc.com/',
+    'solana-usdc': 'https://api.mainnet-beta.solana.com',
 };
 function createTurboSigner({ signer: clientProvidedSigner, privateKey: clientProvidedPrivateKey, token = 'arweave', }) {
     if (clientProvidedSigner !== undefined) {
@@ -83,6 +85,7 @@ function createTurboSigner({ signer: clientProvidedSigner, privateKey: clientPro
     switch (token) {
         case 'solana':
         case 'ario':
+        case 'solana-usdc':
             return new arbundles_1.HexSolanaSigner(clientProvidedPrivateKey);
         case 'ethereum':
         case 'pol':
@@ -128,6 +131,7 @@ function isValidUserAddress(address, type) {
             return isValidArweaveBase64URL(address);
         case 'ario':
         case 'solana':
+        case 'solana-usdc':
             return isValidSolanaAddress(address);
         case 'ethereum':
         case 'base-eth':

package/lib/cjs/version.js

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

package/lib/esm/cli/utils.js

@@ -91,7 +91,7 @@ export async function optionalPrivateKeyFromOptions(options) {
 export async function privateKeyFromOptions({ privateKey, walletFile, token, }) {
     if (walletFile !== undefined) {
         const wallet = JSON.parse(readFileSync(walletFile, 'utf-8'));
-        return token === 'solana' || token === 'ario'
+        return token === 'solana' || token === 'ario' || token === 'solana-usdc'
             ? bs58.encode(wallet)
             : wallet;
     }

package/lib/esm/common/factory.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { HexInjectedSolanaSigner, InjectedEthereumSigner, SignatureConfig, } from '@dha-team/arbundles';
-import { isEthereumWalletAdapter, isSolanaWalletAdapter, supportedEvmSignerTokens, } from '../types.js';
+import { isEthereumWalletAdapter, isSolanaWalletAdapter, supportedEvmSignerTokens, supportedSolanaSignerTokens, } from '../types.js';
 import { Logger } from './logger.js';
 import { TurboAuthenticatedPaymentService, TurboUnauthenticatedPaymentService, } from './payment.js';
 import { defaultTokenMap } from './token/index.js';
@@ -123,7 +123,7 @@ export class TurboBaseFactory {
         });
     }
     signerFromAdapter(walletAdapter, token) {
-        if (token === 'solana') {
+        if (supportedSolanaSignerTokens.has(token)) {
             if (!isSolanaWalletAdapter(walletAdapter)) {
                 throw new Error('Unsupported wallet adapter -- must implement publicKey and signMessage');
             }

package/lib/esm/common/signer.js

@@ -41,7 +41,11 @@ export class TurboDataItemAbstractSigner {
     }
     ownerToNativeAddress(owner, token) {
         switch (token) {
+            // `solana-usdc` is an ordinary Solana wallet paying with an SPL token,
+            // and the payment service credits the base58 sender address it reads off
+            // the transfer — so its native address is the same bs58 form as `solana`.
             case 'solana':
+            case 'solana-usdc':
                 return bs58.encode(Uint8Array.from(fromB64Url(owner)));
             case 'ethereum':
             case 'matic':