@ardrive/turbo-sdk 1.7.1 → 1.8.0

package/lib/esm/common/factory.js

@@ -1,7 +1,28 @@
+/**
+ * Copyright (C) 2022-2023 Permanent Data Solutions, Inc. All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import { ArweaveSigner, EthereumSigner, HexSolanaSigner } from 'arbundles';
+import { TurboNodeSigner } from '../node/signer.js';
+import { isJWK, } from '../types.js';
+import { TurboWebArweaveSigner } from '../web/signer.js';
 import { TurboWinstonLogger } from './logger.js';
-import { TurboUnauthenticatedPaymentService } from './payment.js';
-import { TurboUnauthenticatedClient } from './turbo.js';
-import { TurboUnauthenticatedUploadService } from './upload.js';
+import { TurboAuthenticatedPaymentService, TurboUnauthenticatedPaymentService, } from './payment.js';
+import { defaultTokenMap } from './token/index.js';
+import { TurboAuthenticatedClient, TurboUnauthenticatedClient, } from './turbo.js';
+import { TurboAuthenticatedUploadService, TurboUnauthenticatedUploadService, } from './upload.js';
 export class TurboBaseFactory {
     static setLogLevel(level) {
         this.logger.setLogLevel(level);
@@ -23,5 +44,82 @@ export class TurboBaseFactory {
             paymentService,
         });
     }
+    static getSigner(providedSigner, providedPrivateKey, token) {
+        let signer;
+        if (providedSigner !== undefined) {
+            signer = providedSigner;
+        }
+        else if (providedPrivateKey !== undefined) {
+            if (token === 'solana') {
+                signer = new HexSolanaSigner(providedPrivateKey);
+                // TODO: else if (token === 'ethereum') {signer = new EthereumSigner(providedPrivateKey);}
+            }
+            else {
+                if (!isJWK(providedPrivateKey)) {
+                    throw new Error('A JWK must be provided for ArweaveSigner.');
+                }
+                signer = new ArweaveSigner(providedPrivateKey);
+            }
+        }
+        else {
+            throw new Error('A privateKey or signer must be provided.');
+        }
+        if (typeof window !== 'undefined') {
+            return new TurboWebArweaveSigner({
+                signer,
+                logger: this.logger,
+            });
+        }
+        return new TurboNodeSigner({
+            signer,
+            logger: this.logger,
+        });
+    }
+    static authenticated({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, tokenMap, gatewayUrl, tokenTools, }) {
+        if (!token) {
+            if (providedSigner) {
+                // Derive token from signer if not provided
+                if (providedSigner instanceof EthereumSigner) {
+                    token = 'ethereum';
+                }
+                else if (providedSigner instanceof HexSolanaSigner) {
+                    token = 'solana';
+                }
+                else {
+                    token = 'arweave';
+                }
+            }
+            else {
+                token = 'arweave';
+            }
+        }
+        const turboSigner = this.getSigner(providedSigner, privateKey, token);
+        if (!tokenTools) {
+            if (tokenMap && token === 'arweave') {
+                tokenTools = tokenMap.arweave;
+            }
+            tokenTools = defaultTokenMap[token]?.({
+                gatewayUrl,
+                logger: this.logger,
+            });
+        }
+        const paymentService = new TurboAuthenticatedPaymentService({
+            ...paymentServiceConfig,
+            signer: turboSigner,
+            logger: this.logger,
+            token,
+            tokenTools,
+        });
+        const uploadService = new TurboAuthenticatedUploadService({
+            ...uploadServiceConfig,
+            signer: turboSigner,
+            logger: this.logger,
+            token,
+        });
+        return new TurboAuthenticatedClient({
+            uploadService,
+            paymentService,
+        });
+    }
 }
 TurboBaseFactory.logger = new TurboWinstonLogger();

package/lib/esm/common/index.js

@@ -18,4 +18,4 @@ export * from './upload.js';
 export * from './payment.js';
 export * from './turbo.js';
 export * from './currency.js';
-export * from './token.js';
+export * from './token/index.js';

package/lib/esm/common/payment.js

@@ -17,7 +17,6 @@
 import { BigNumber } from 'bignumber.js';
 import { TurboHTTPService } from './http.js';
 import { TurboWinstonLogger } from './logger.js';
-import { ArweaveToken } from './token.js';
 export const developmentPaymentServiceURL = 'https://payment.ardrive.dev';
 export const defaultPaymentServiceURL = 'https://payment.ardrive.io';
 export class TurboUnauthenticatedPaymentService {
@@ -130,14 +129,10 @@ export class TurboUnauthenticatedPaymentService {
 }
 // NOTE: to avoid redundancy, we use inheritance here - but generally prefer composition over inheritance
 export class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentService {
-    constructor({ url = defaultPaymentServiceURL, retryConfig, signer, logger = new TurboWinstonLogger(), token = 'arweave', tokenMap = {
-        arweave: new ArweaveToken({
-            logger,
-        }),
-    }, }) {
+    constructor({ url = defaultPaymentServiceURL, retryConfig, signer, logger = new TurboWinstonLogger(), token = 'arweave', tokenTools, }) {
         super({ url, retryConfig, logger, token });
         this.signer = signer;
-        this.tokenMap = tokenMap;
+        this.tokenTools = tokenTools;
     }
     async getBalance() {
         const headers = await this.signer.generateSignedRequestHeaders();
@@ -169,7 +164,7 @@ export class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymen
         return walletAddress;
     }
     async topUpWithTokens({ feeMultiplier = 1, tokenAmount: tokenAmountV, }) {
-        if (!this.tokenMap[this.token]) {
+        if (!this.tokenTools) {
             throw new Error(`Token type not supported for crypto fund ${this.token}`);
         }
         const tokenAmount = new BigNumber(tokenAmountV);
@@ -179,18 +174,16 @@ export class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymen
             tokenAmount,
             target,
         });
-        const fundTx = await this.tokenMap[this.token].createSignedTx({
+        const fundTx = await this.tokenTools.createAndSubmitTx({
             target,
             tokenAmount,
             feeMultiplier,
             signer: this.signer,
         });
         const txId = fundTx.id;
-        this.logger.debug('Submitting fund transaction...', { txId });
-        await this.tokenMap[this.token].submitTx({ tx: fundTx });
         try {
             // Let transaction settle some time
-            await this.tokenMap[this.token].pollForTxBeingAvailable({ txId });
+            await this.tokenTools.pollForTxBeingAvailable({ txId });
             return {
                 ...(await this.submitFundTransaction({ txId })),
                 target: fundTx.target,

package/lib/esm/common/signer.js

@@ -16,6 +16,7 @@
  */
 import { EthereumSigner, HexSolanaSigner } from 'arbundles';
 import { randomBytes } from 'crypto';
+import nacl from 'tweetnacl';
 import { toB64Url } from '../utils/base64.js';
 /**
  * Abstract class for signing TurboDataItems.
@@ -59,6 +60,16 @@ export class TurboDataItemAbstractSigner {
         return this.signer.publicKey;
     }
     async signData(dataToSign) {
+        if (this.signer instanceof HexSolanaSigner) {
+            const privateKey = this.signer.key;
+            const publicKey = Uint8Array.from(await this.getPublicKey());
+            // Concatenate the private and public keys correctly
+            const combinedKey = new Uint8Array(privateKey.length + publicKey.length);
+            combinedKey.set(privateKey);
+            combinedKey.set(publicKey, privateKey.length);
+            const signature = nacl.sign.detached(dataToSign, combinedKey);
+            return signature;
+        }
         return this.signer.sign(dataToSign);
     }
 }

package/lib/esm/common/{token.js → token/arweave.js}

@@ -16,23 +16,23 @@
  */
 import Arweave from '@irys/arweave';
 import { BigNumber } from 'bignumber.js';
-import { sha256B64Url, toB64Url } from '../utils/base64.js';
-import { sleep } from '../utils/common.js';
-import { TurboWinstonLogger } from './logger.js';
+import { sha256B64Url, toB64Url } from '../../utils/base64.js';
+import { sleep } from '../../utils/common.js';
+import { TurboWinstonLogger } from '../logger.js';
 export class ArweaveToken {
-    constructor({ arweave = Arweave.init({
-        url: 'https://arweave.net',
+    constructor({ gatewayUrl = 'https://arweave.net', arweave = Arweave.init({
+        url: gatewayUrl,
     }), logger = new TurboWinstonLogger(), mintU = true, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 3000,
         initialBackoffMs: 7000,
-    }, }) {
+    }, } = {}) {
         this.arweave = arweave;
         this.logger = logger;
         this.mintU = mintU;
         this.pollingOptions = pollingOptions;
     }
-    async createSignedTx({ feeMultiplier, target, tokenAmount, signer, }) {
+    async createAndSubmitTx({ feeMultiplier, target, tokenAmount, signer, }) {
         const tx = await this.arweave.createTransaction({
             target,
             quantity: tokenAmount.toString(),
@@ -60,7 +60,9 @@ export class ArweaveToken {
             owner: publicKeyB64Url,
             signature: toB64Url(signatureBuffer),
         });
-        return tx;
+        this.logger.debug('Submitting fund transaction...', { id });
+        await this.submitTx(tx);
+        return { id, target, reward: tx.reward };
     }
     async pollForTxBeingAvailable({ txId, }) {
         const { maxAttempts, pollingIntervalMs, initialBackoffMs } = this.pollingOptions;
@@ -105,12 +107,13 @@ export class ArweaveToken {
         }
         throw new Error('Transaction not found after polling, transaction id: ' + txId);
     }
-    async submitTx({ tx }) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async submitTx(tx) {
         try {
             const response = await this.arweave.transactions.post(tx);
             if (response.status !== 200) {
                 throw new Error('Failed to post transaction -- ' +
-                    `Status ${response.status}, ${response.statusText}`);
+                    `Status ${response.status}, ${response.statusText}, ${response.data}`);
             }
             this.logger.debug('Successfully posted fund transaction...', { tx });
         }

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

@@ -0,0 +1,9 @@
+import { ArweaveToken } from './arweave.js';
+import { SolanaToken } from './solana.js';
+export const defaultTokenMap = {
+    arweave: (config) => new ArweaveToken(config),
+    solana: (config) => new SolanaToken(config),
+    // ethereum: (config: TokenConfig) => new EthereumToken(config)
+};
+export * from './arweave.js';
+export * from './solana.js';

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

@@ -0,0 +1,103 @@
+/**
+ * Copyright (C) 2022-2023 Permanent Data Solutions, Inc. All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import { Connection, PublicKey, SystemProgram, Transaction, } from '@solana/web3.js';
+import { BigNumber } from 'bignumber.js';
+import bs58 from 'bs58';
+import { sleep } from '../../utils/common.js';
+import { TurboWinstonLogger } from '../logger.js';
+export const lamportToTokenAmount = (winston) => winston;
+export const SOLToTokenAmount = (sol) => new BigNumber(sol).times(1e9).valueOf();
+export class SolanaToken {
+    constructor({ logger = new TurboWinstonLogger(), gatewayUrl = 'https://api.mainnet-beta.solana.com', pollingOptions = {
+        maxAttempts: 10,
+        pollingIntervalMs: 5000,
+        initialBackoffMs: 7000,
+    }, } = {}) {
+        this.logger = logger;
+        this.gatewayUrl = gatewayUrl;
+        this.connection = new Connection(gatewayUrl, 'confirmed');
+        this.pollingOptions = pollingOptions;
+    }
+    async createAndSubmitTx({ target, tokenAmount, signer, }) {
+        const publicKey = new PublicKey(bs58.encode(await signer.getPublicKey()));
+        const tx = new Transaction({
+            feePayer: publicKey,
+            ...(await this.connection.getLatestBlockhash()),
+        });
+        tx.add(SystemProgram.transfer({
+            fromPubkey: publicKey,
+            toPubkey: new PublicKey(target),
+            lamports: +new BigNumber(tokenAmount),
+        }));
+        const serializedTx = tx.serializeMessage();
+        const signature = await signer.signData(serializedTx);
+        tx.addSignature(publicKey, Buffer.from(signature));
+        const id = bs58.encode(signature);
+        await this.submitTx(tx, id);
+        return { id, target };
+    }
+    async submitTx(tx, id) {
+        this.logger.debug('Submitting 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 pollForTxBeingAvailable({ txId, }) {
+        const { maxAttempts, pollingIntervalMs, initialBackoffMs } = this.pollingOptions;
+        this.logger.debug('Polling for transaction...', {
+            txId,
+            pollingOptions: this.pollingOptions,
+        });
+        await sleep(initialBackoffMs);
+        let attempts = 0;
+        while (attempts < maxAttempts) {
+            let status = undefined;
+            attempts++;
+            try {
+                status = await this.connection.getSignatureStatus(txId);
+            }
+            catch (err) {
+                // Continue retries when request errors
+                this.logger.debug('Failed to poll for 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) {
+                return;
+            }
+            this.logger.debug('Transaction not found, polling...', {
+                txId,
+                attempts,
+                maxAttempts,
+                pollingIntervalMs,
+            });
+            await sleep(pollingIntervalMs);
+        }
+        throw new Error('Transaction not found after polling, transaction id: ' + txId);
+    }
+}

package/lib/esm/node/factory.js

@@ -14,55 +14,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { ArweaveSigner, EthereumSigner, HexSolanaSigner } from 'arbundles';
 import { TurboBaseFactory } from '../common/factory.js';
-import { TurboAuthenticatedClient, TurboAuthenticatedPaymentService, TurboAuthenticatedUploadService, } from '../common/index.js';
-import { TurboWebArweaveSigner } from '../web/signer.js';
-import { TurboNodeSigner } from './signer.js';
 export class TurboFactory extends TurboBaseFactory {
-    static authenticated({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, tokenMap, token, }) {
-        let signer;
-        if (providedSigner) {
-            signer = providedSigner;
-            if (!token) {
-                if (signer instanceof EthereumSigner) {
-                    token = 'ethereum';
-                }
-                else if (signer instanceof HexSolanaSigner) {
-                    token = 'solana';
-                }
-            }
-        }
-        else if (privateKey) {
-            signer = new ArweaveSigner(privateKey);
-        }
-        else {
-            throw new Error('A privateKey or signer must be provided.');
-        }
-        // when in browser, we use TurboWebArweaveSigner
-        const turboSigner = typeof window !== 'undefined'
-            ? new TurboWebArweaveSigner({
-                signer,
-                logger: this.logger,
-            })
-            : new TurboNodeSigner({
-                signer,
-                logger: this.logger,
-            });
-        const paymentService = new TurboAuthenticatedPaymentService({
-            ...paymentServiceConfig,
-            signer: turboSigner,
-            logger: this.logger,
-            tokenMap,
-        });
-        const uploadService = new TurboAuthenticatedUploadService({
-            ...uploadServiceConfig,
-            signer: turboSigner,
-            logger: this.logger,
-        });
-        return new TurboAuthenticatedClient({
-            uploadService,
-            paymentService,
-        });
-    }
 }

package/lib/esm/types.js

@@ -1,3 +1,4 @@
 // TODO: Remove this var and Allow all tokens when crypto fund implemented for each PE-5993, PE-5992
 export const allowedFiatTokens = ['arweave', 'solana', 'ethereum'];
-export const tokenTypes = ['arweave' /*'solana', 'ethereum'*/];
+export const tokenTypes = ['arweave', 'solana' /* 'ethereum'*/];
+export const isJWK = (wallet) => wallet.kty !== undefined;

package/lib/esm/version.js

@@ -15,4 +15,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-export const version = '1.7.1';
+export const version = '1.8.0';

package/lib/esm/web/factory.js

@@ -16,43 +16,76 @@
  */
 import { ArweaveSigner, EthereumSigner, HexSolanaSigner } from 'arbundles';
 import { TurboBaseFactory } from '../common/factory.js';
-import { TurboAuthenticatedClient, TurboAuthenticatedPaymentService, TurboAuthenticatedUploadService, } from '../common/index.js';
+import { TurboAuthenticatedClient, TurboAuthenticatedPaymentService, TurboAuthenticatedUploadService, defaultTokenMap, } from '../common/index.js';
+import { isJWK, } from '../types.js';
 import { TurboWebArweaveSigner } from './signer.js';
 export class TurboFactory extends TurboBaseFactory {
-    static authenticated({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, tokenMap, token, }) {
+    static getSigner(providedSigner, providedPrivateKey, token) {
         let signer;
-        if (providedSigner) {
+        if (providedSigner !== undefined) {
             signer = providedSigner;
-            if (!token) {
-                if (signer instanceof EthereumSigner) {
-                    token = 'ethereum';
-                }
-                else if (signer instanceof HexSolanaSigner) {
-                    token = 'solana';
+        }
+        else if (providedPrivateKey !== undefined) {
+            if (token === 'solana') {
+                signer = new HexSolanaSigner(providedPrivateKey);
+                // TODO: else if (token === 'ethereum') {signer = new EthereumSigner(providedPrivateKey);}
+            }
+            else {
+                if (!isJWK(providedPrivateKey)) {
+                    throw new Error('A JWK must be provided for ArweaveSigner.');
                 }
+                signer = new ArweaveSigner(providedPrivateKey);
             }
         }
-        else if (privateKey) {
-            signer = new ArweaveSigner(privateKey);
-        }
         else {
             throw new Error('A privateKey or signer must be provided.');
         }
-        const turboSigner = new TurboWebArweaveSigner({
+        return new TurboWebArweaveSigner({
             signer,
             logger: this.logger,
         });
+    }
+    static authenticated({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, gatewayUrl, tokenMap, tokenTools, }) {
+        if (!token) {
+            if (providedSigner) {
+                // Derive token from signer if not provided
+                if (providedSigner instanceof EthereumSigner) {
+                    token = 'ethereum';
+                }
+                else if (providedSigner instanceof HexSolanaSigner) {
+                    token = 'solana';
+                }
+                else {
+                    token = 'arweave';
+                }
+            }
+            else {
+                token = 'arweave';
+            }
+        }
+        const turboSigner = this.getSigner(providedSigner, privateKey, token);
+        token ??= 'arweave'; // default to arweave if token is not provided
+        if (!tokenTools) {
+            if (tokenMap && token === 'arweave') {
+                tokenTools = tokenMap.arweave;
+            }
+            tokenTools = defaultTokenMap[token]?.({
+                gatewayUrl,
+                logger: this.logger,
+            });
+        }
         const paymentService = new TurboAuthenticatedPaymentService({
             ...paymentServiceConfig,
             signer: turboSigner,
             logger: this.logger,
-            tokenMap,
             token,
+            tokenTools,
         });
         const uploadService = new TurboAuthenticatedUploadService({
             ...uploadServiceConfig,
             signer: turboSigner,
             logger: this.logger,
+            token,
         });
         return new TurboAuthenticatedClient({
             uploadService,

package/lib/types/common/factory.d.ts

@@ -1,26 +1,13 @@
-/**
- * Copyright (C) 2022-2023 Permanent Data Solutions, Inc. All Rights Reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import { TurboUnauthenticatedConfiguration } from '../types.js';
+import { CreditableTokenType, TurboAuthenticatedConfiguration, TurboSigner, TurboUnauthenticatedConfiguration, TurboWallet } from '../types.js';
 import { TurboWinstonLogger } from './logger.js';
-import { TurboUnauthenticatedClient } from './turbo.js';
+import { TurboDataItemAbstractSigner } from './signer.js';
+import { TurboAuthenticatedClient, TurboUnauthenticatedClient } from './turbo.js';
 export declare class TurboBaseFactory {
     protected static logger: TurboWinstonLogger;
     static setLogLevel(level: string): void;
     static setLogFormat(format: string): void;
     static unauthenticated({ paymentServiceConfig, uploadServiceConfig, }?: TurboUnauthenticatedConfiguration): TurboUnauthenticatedClient;
+    protected static getSigner(providedSigner: TurboSigner | undefined, providedPrivateKey: TurboWallet | undefined, token: CreditableTokenType): TurboDataItemAbstractSigner;
+    static authenticated({ privateKey, signer: providedSigner, paymentServiceConfig, uploadServiceConfig, token, tokenMap, gatewayUrl, tokenTools, }: TurboAuthenticatedConfiguration): TurboAuthenticatedClient;
 }
 //# sourceMappingURL=factory.d.ts.map

package/lib/types/common/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/common/factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,iCAAiC,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAGxD,qBAAa,gBAAgB;IAC3B,SAAS,CAAC,MAAM,CAAC,MAAM,qBAA4B;IAEnD,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM;IAIhC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM;IAIlC,MAAM,CAAC,eAAe,CAAC,EACrB,oBAAyB,EACzB,mBAAwB,GACzB,GAAE,iCAAsC;CAc1C"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/common/factory.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,mBAAmB,EACnB,+BAA+B,EAC/B,WAAW,EACX,iCAAiC,EACjC,WAAW,EAEZ,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAKjD,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AAMpB,qBAAa,gBAAgB;IAC3B,SAAS,CAAC,MAAM,CAAC,MAAM,qBAA4B;IAEnD,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM;IAIhC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM;IAIlC,MAAM,CAAC,eAAe,CAAC,EACrB,oBAAyB,EACzB,mBAAwB,GACzB,GAAE,iCAAsC;IAezC,SAAS,CAAC,MAAM,CAAC,SAAS,CACxB,cAAc,EAAE,WAAW,GAAG,SAAS,EACvC,kBAAkB,EAAE,WAAW,GAAG,SAAS,EAC3C,KAAK,EAAE,mBAAmB,GACzB,2BAA2B;IA+B9B,MAAM,CAAC,aAAa,CAAC,EACnB,UAAU,EACV,MAAM,EAAE,cAAc,EACtB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,EACL,QAAQ,EACR,UAAU,EACV,UAAU,GACX,EAAE,+BAA+B;CA8CnC"}

package/lib/types/common/index.d.ts

@@ -18,5 +18,5 @@ export * from './upload.js';
 export * from './payment.js';
 export * from './turbo.js';
 export * from './currency.js';
-export * from './token.js';
+export * from './token/index.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/types/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC"}

package/lib/types/common/payment.d.ts

@@ -1,4 +1,4 @@
-import { CreditableTokenType, Currency, TokenMap, TurboAuthenticatedPaymentServiceConfiguration, TurboAuthenticatedPaymentServiceInterface, TurboBalanceResponse, TurboCheckoutSessionParams, TurboCheckoutSessionResponse, TurboCountriesResponse, TurboCryptoFundResponse, TurboCurrenciesResponse, TurboDataItemSigner, TurboFiatToArResponse, TurboFundWithTokensParams, TurboLogger, TurboPriceResponse, TurboRatesResponse, TurboSignedRequestHeaders, TurboSubmitFundTxResponse, TurboUnauthenticatedPaymentServiceConfiguration, TurboUnauthenticatedPaymentServiceInterface, TurboWincForFiatParams, TurboWincForFiatResponse } from '../types.js';
+import { CreditableTokenType, Currency, TokenTools, TurboAuthenticatedPaymentServiceConfiguration, TurboAuthenticatedPaymentServiceInterface, TurboBalanceResponse, TurboCheckoutSessionParams, TurboCheckoutSessionResponse, TurboCountriesResponse, TurboCryptoFundResponse, TurboCurrenciesResponse, TurboDataItemSigner, TurboFiatToArResponse, TurboFundWithTokensParams, TurboLogger, TurboPriceResponse, TurboRatesResponse, TurboSignedRequestHeaders, TurboSubmitFundTxResponse, TurboUnauthenticatedPaymentServiceConfiguration, TurboUnauthenticatedPaymentServiceInterface, TurboWincForFiatParams, TurboWincForFiatResponse } from '../types.js';
 import { TurboHTTPService } from './http.js';
 export declare const developmentPaymentServiceURL = "https://payment.ardrive.dev";
 export declare const defaultPaymentServiceURL = "https://payment.ardrive.io";
@@ -26,8 +26,8 @@ export declare class TurboUnauthenticatedPaymentService implements TurboUnauthen
 }
 export declare class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentService implements TurboAuthenticatedPaymentServiceInterface {
     protected readonly signer: TurboDataItemSigner;
-    protected readonly tokenMap: TokenMap;
-    constructor({ url, retryConfig, signer, logger, token, tokenMap, }: TurboAuthenticatedPaymentServiceConfiguration);
+    protected readonly tokenTools: TokenTools | undefined;
+    constructor({ url, retryConfig, signer, logger, token, tokenTools, }: TurboAuthenticatedPaymentServiceConfiguration);
     getBalance(): Promise<TurboBalanceResponse>;
     getWincForFiat({ amount, promoCodes, }: TurboWincForFiatParams): Promise<TurboWincForFiatResponse>;
     createCheckoutSession(params: TurboCheckoutSessionParams): Promise<TurboCheckoutSessionResponse>;

package/lib/types/common/payment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payment.d.ts","sourceRoot":"","sources":["../../../src/common/payment.ts"],"names":[],"mappings":"AAkBA,OAAO,EACL,mBAAmB,EACnB,QAAQ,EACR,QAAQ,EAER,6CAA6C,EAC7C,yCAAyC,EACzC,oBAAoB,EACpB,0BAA0B,EAC1B,4BAA4B,EAC5B,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,EAEzB,WAAW,EAEX,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,yBAAyB,EACzB,+CAA+C,EAC/C,2CAA2C,EAC3C,sBAAsB,EACtB,wBAAwB,EACzB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAI7C,eAAO,MAAM,4BAA4B,gCAAgC,CAAC;AAC1E,eAAO,MAAM,wBAAwB,+BAA+B,CAAC;AAErE,qBAAa,kCACX,YAAW,2CAA2C;IAEtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACjD,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;IAC9B,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;gBAElC,EACV,GAA8B,EAC9B,WAAW,EACX,MAAiC,EACjC,KAAiB,GAClB,EAAE,+CAA+C;IAU3C,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAM3C,WAAW,CAAC,EACjB,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,QAAQ,CAAC;KACpB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAM3B,qBAAqB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAMxD,sBAAsB,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAMpD,cAAc,CAAC,EAC1B,KAAK,GACN,EAAE;QACD,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAW1B,cAAc,CAAC,EACpB,MAAM,GACP,EAAE,sBAAsB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAO7D,SAAS,CAAC,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM;cAK/C,WAAW,CACzB,EACE,MAAM,EACN,KAAK,EACL,UAAe,EACf,MAAiB,GAClB,EAAE,0BAA0B,EAC7B,OAAO,CAAC,EAAE,yBAAyB,GAClC,OAAO,CAAC,4BAA4B,CAAC;IA0BjC,qBAAqB,CAC1B,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,4BAA4B,CAAC;IAI3B,qBAAqB,CAAC,EACjC,IAAI,GACL,EAAE;QACD,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,OAAO,CAAC,yBAAyB,CAAC;CAqCvC;AAED,qBAAa,gCACX,SAAQ,kCACR,YAAW,yCAAyC;IAEpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;IAC/C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;gBAE1B,EACV,GAA8B,EAC9B,WAAW,EACX,MAAM,EACN,MAAiC,EACjC,KAAiB,EACjB,QAIC,GACF,EAAE,6CAA6C;IAMnC,UAAU,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAY3C,cAAc,CAAC,EAC1B,MAAM,EACN,UAAe,GAChB,EAAE,sBAAsB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAShD,qBAAqB,CAChC,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,4BAA4B,CAAC;YAO1B,sBAAsB;IAYvB,eAAe,CAAC,EAC3B,aAAiB,EACjB,WAAW,EAAE,YAAY,GAC1B,EAAE,yBAAyB,GAAG,OAAO,CAAC,uBAAuB,CAAC;CA2ChE"}
+{"version":3,"file":"payment.d.ts","sourceRoot":"","sources":["../../../src/common/payment.ts"],"names":[],"mappings":"AAkBA,OAAO,EACL,mBAAmB,EACnB,QAAQ,EACR,UAAU,EAEV,6CAA6C,EAC7C,yCAAyC,EACzC,oBAAoB,EACpB,0BAA0B,EAC1B,4BAA4B,EAC5B,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,EAEzB,WAAW,EAEX,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,yBAAyB,EACzB,+CAA+C,EAC/C,2CAA2C,EAC3C,sBAAsB,EACtB,wBAAwB,EACzB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C,eAAO,MAAM,4BAA4B,gCAAgC,CAAC;AAC1E,eAAO,MAAM,wBAAwB,+BAA+B,CAAC;AAErE,qBAAa,kCACX,YAAW,2CAA2C;IAEtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACjD,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;IAC9B,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;gBAElC,EACV,GAA8B,EAC9B,WAAW,EACX,MAAiC,EACjC,KAAiB,GAClB,EAAE,+CAA+C;IAU3C,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAM3C,WAAW,CAAC,EACjB,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,QAAQ,CAAC;KACpB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAM3B,qBAAqB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAMxD,sBAAsB,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAMpD,cAAc,CAAC,EAC1B,KAAK,GACN,EAAE;QACD,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAW1B,cAAc,CAAC,EACpB,MAAM,GACP,EAAE,sBAAsB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAO7D,SAAS,CAAC,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM;cAK/C,WAAW,CACzB,EACE,MAAM,EACN,KAAK,EACL,UAAe,EACf,MAAiB,GAClB,EAAE,0BAA0B,EAC7B,OAAO,CAAC,EAAE,yBAAyB,GAClC,OAAO,CAAC,4BAA4B,CAAC;IA0BjC,qBAAqB,CAC1B,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,4BAA4B,CAAC;IAI3B,qBAAqB,CAAC,EACjC,IAAI,GACL,EAAE;QACD,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,OAAO,CAAC,yBAAyB,CAAC;CAqCvC;AAED,qBAAa,gCACX,SAAQ,kCACR,YAAW,yCAAyC;IAEpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;IAC/C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;gBAE1C,EACV,GAA8B,EAC9B,WAAW,EACX,MAAM,EACN,MAAiC,EACjC,KAAiB,EACjB,UAAU,GACX,EAAE,6CAA6C;IAMnC,UAAU,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAY3C,cAAc,CAAC,EAC1B,MAAM,EACN,UAAe,GAChB,EAAE,sBAAsB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAShD,qBAAqB,CAChC,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,4BAA4B,CAAC;YAO1B,sBAAsB;IAYvB,eAAe,CAAC,EAC3B,aAAiB,EACjB,WAAW,EAAE,YAAY,GAC1B,EAAE,yBAAyB,GAAG,OAAO,CAAC,uBAAuB,CAAC;CAwChE"}

package/lib/types/common/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../../src/common/signer.ts"],"names":[],"mappings":";AAmBA,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,EAChB,WAAW,EACX,0BAA0B,EAC1B,WAAW,EACZ,MAAM,aAAa,CAAC;AAGrB;;GAEG;AACH,8BAAsB,2BACpB,YAAW,mBAAmB;IAE9B,QAAQ,CAAC,YAAY,CAAC,EACpB,iBAAiB,EACjB,eAAe,EACf,YAAY,GACb,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAE5E,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;IAC9B,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;gBAElB,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,yBAAyB;IAKzD,SAAS,KAAK,SAAS,IAAI;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,CAmB1E;IAEY,4BAA4B;;;;;IAY5B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;CAGnE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../../src/common/signer.ts"],"names":[],"mappings":";AAoBA,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,EAChB,WAAW,EACX,0BAA0B,EAC1B,WAAW,EACZ,MAAM,aAAa,CAAC;AAGrB;;GAEG;AACH,8BAAsB,2BACpB,YAAW,mBAAmB;IAE9B,QAAQ,CAAC,YAAY,CAAC,EACpB,iBAAiB,EACjB,eAAe,EACf,YAAY,GACb,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAE5E,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;IAC9B,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;gBAElB,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,yBAAyB;IAKzD,SAAS,KAAK,SAAS,IAAI;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,CAmB1E;IAEY,4BAA4B;;;;;IAY5B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;CAgBnE"}