@ardrive/turbo-sdk 1.0.0-alpha.20 → 1.0.0-alpha.22

package/lib/cjs/common/upload.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TurboAuthenticatedUploadService = exports.TurboUnauthenticatedUploadService = void 0;
 const http_js_1 = require("./http.js");
@@ -18,17 +9,17 @@ class TurboUnauthenticatedUploadService {
             retryConfig,
         });
     }
-    uploadSignedDataItem({ dataItemStreamFactory, signal, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // TODO: add p-limit constraint or replace with separate upload class
-            return this.httpService.post({
-                endpoint: `/tx`,
-                signal,
-                data: dataItemStreamFactory(),
-                headers: {
-                    'content-type': 'application/octet-stream',
-                },
-            });
+    async uploadSignedDataItem({ dataItemStreamFactory, dataItemSizeFactory, signal, }) {
+        const fileSize = dataItemSizeFactory();
+        // TODO: add p-limit constraint or replace with separate upload class
+        return this.httpService.post({
+            endpoint: `/tx`,
+            signal,
+            data: dataItemStreamFactory(),
+            headers: {
+                'content-type': 'application/octet-stream',
+                'content-length': `${fileSize}`,
+            },
         });
     }
 }
@@ -39,20 +30,22 @@ class TurboAuthenticatedUploadService extends TurboUnauthenticatedUploadService
         super({ url, retryConfig });
         this.signer = signer;
     }
-    uploadFile({ fileStreamFactory, signal, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const signedDataItem = yield this.signer.signDataItem({
-                fileStreamFactory,
-            });
-            // TODO: add p-limit constraint or replace with separate upload class
-            return this.httpService.post({
-                endpoint: `/tx`,
-                signal,
-                data: signedDataItem,
-                headers: {
-                    'content-type': 'application/octet-stream',
-                },
-            });
+    async uploadFile({ fileStreamFactory, fileSizeFactory, signal, }) {
+        const { dataItemStreamFactory, dataItemSizeFactory } = await this.signer.signDataItem({
+            fileStreamFactory,
+            fileSizeFactory,
+        });
+        const signedDataItem = dataItemStreamFactory();
+        const fileSize = dataItemSizeFactory();
+        // TODO: add p-limit constraint or replace with separate upload class
+        return this.httpService.post({
+            endpoint: `/tx`,
+            signal,
+            data: signedDataItem,
+            headers: {
+                'content-type': 'application/octet-stream',
+                'content-length': `${fileSize}`,
+            },
         });
     }
 }

package/lib/cjs/node/factory.js

@@ -23,8 +23,14 @@ const signer_js_1 = require("./signer.js");
 class TurboFactory extends factory_js_1.TurboBaseFactory {
     static authenticated({ privateKey, paymentServiceConfig = {}, uploadServiceConfig = {}, }) {
         const signer = new signer_js_1.TurboNodeArweaveSigner({ privateKey });
-        const paymentService = new index_js_1.TurboAuthenticatedPaymentService(Object.assign(Object.assign({}, paymentServiceConfig), { signer }));
-        const uploadService = new index_js_1.TurboAuthenticatedUploadService(Object.assign(Object.assign({}, uploadServiceConfig), { signer }));
+        const paymentService = new index_js_1.TurboAuthenticatedPaymentService({
+            ...paymentServiceConfig,
+            signer,
+        });
+        const uploadService = new index_js_1.TurboAuthenticatedUploadService({
+            ...uploadServiceConfig,
+            signer,
+        });
         return new index_js_1.TurboAuthenticatedClient({
             uploadService,
             paymentService,

package/lib/cjs/node/signer.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -39,23 +30,52 @@ class TurboNodeArweaveSigner {
         this.privateKey = privateKey;
         this.signer = new arbundles_1.ArweaveSigner(this.privateKey);
     }
-    signDataItem({ fileStreamFactory, }) {
+    async signDataItem({ fileStreamFactory, fileSizeFactory, }) {
         // TODO: replace with our own signer implementation
         const [stream1, stream2] = [fileStreamFactory(), fileStreamFactory()];
-        return (0, arbundles_1.streamSigner)(stream1, stream2, this.signer);
+        const signedDataItem = await (0, arbundles_1.streamSigner)(stream1, stream2, this.signer);
+        // TODO: support target, anchor, and tags
+        const signedDataItemSize = this.calculateSignedDataHeadersSize({
+            dataSize: fileSizeFactory(),
+        });
+        return {
+            dataItemStreamFactory: () => signedDataItem,
+            dataItemSizeFactory: () => signedDataItemSize,
+        };
     }
     // NOTE: this might be better in a parent class or elsewhere - easy enough to leave in here now and does require specific environment version of crypto
-    generateSignedRequestHeaders() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const nonce = (0, node_crypto_1.randomBytes)(16).toString('hex');
-            const buffer = Buffer.from(nonce);
-            const signature = yield index_js_1.default.crypto.sign(this.privateKey, buffer);
-            return {
-                'x-public-key': this.privateKey.n,
-                'x-nonce': nonce,
-                'x-signature': (0, base64_js_1.toB64Url)(Buffer.from(signature)),
-            };
-        });
+    async generateSignedRequestHeaders() {
+        const nonce = (0, node_crypto_1.randomBytes)(16).toString('hex');
+        const buffer = Buffer.from(nonce);
+        const signature = await index_js_1.default.crypto.sign(this.privateKey, buffer);
+        return {
+            'x-public-key': this.privateKey.n,
+            'x-nonce': nonce,
+            'x-signature': (0, base64_js_1.toB64Url)(Buffer.from(signature)),
+        };
+    }
+    // TODO: make dynamic that accepts anchor and target and tags to return the size of the headers + data
+    // reference https://github.com/ArweaveTeam/arweave-standards/blob/master/ans/ANS-104.md#13-dataitem-format
+    calculateSignedDataHeadersSize({ dataSize }) {
+        const anchor = 1; // + whatever they provide (max of 33)
+        const target = 1; // + whatever they provide (max of 33)
+        const tags = 0;
+        const signatureLength = 512;
+        const ownerLength = 512;
+        const signatureTypeLength = 2;
+        const numOfTagsLength = 8; // https://github.com/Bundlr-Network/arbundles/blob/master/src/tags.ts#L191-L198
+        const numOfTagsBytesLength = 8;
+        return [
+            anchor,
+            target,
+            tags,
+            signatureLength,
+            ownerLength,
+            signatureTypeLength,
+            numOfTagsLength,
+            numOfTagsBytesLength,
+            dataSize,
+        ].reduce((totalSize, currentSize) => (totalSize += currentSize));
     }
 }
 exports.TurboNodeArweaveSigner = TurboNodeArweaveSigner;

package/lib/cjs/utils/axiosClient.js

@@ -56,7 +56,10 @@ const createAxiosInstance = ({ axiosConfig = {}, retryConfig = {
         console.debug(`Request failed, ${error}. Retry attempt #${retryCount}...`);
     },
 }, }) => {
-    const axiosInstance = axios_1.default.create(Object.assign(Object.assign({}, axiosConfig), { validateStatus: () => true }));
+    const axiosInstance = axios_1.default.create({
+        ...axiosConfig,
+        validateStatus: () => true, // don't throw on non-200 status codes
+    });
     // eslint-disable-next-line
     if (retryConfig.retries && retryConfig.retries > 0) {
         (0, axios_retry_1.default)(axiosInstance, retryConfig);

package/lib/cjs/utils/readableStream.js

@@ -1,28 +1,19 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readableStreamToBuffer = void 0;
-function readableStreamToBuffer({ stream, }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const reader = stream.getReader();
-        const chunks = [];
-        let done = false;
-        while (!done) {
-            const { done: streamDone, value } = yield reader.read();
-            done = streamDone;
-            if (!done) {
-                chunks.push(value);
-            }
+async function readableStreamToBuffer({ stream, size, }) {
+    const reader = stream.getReader();
+    const buffer = Buffer.alloc(size);
+    let offset = 0;
+    let done = false;
+    while (!done) {
+        const { done: streamDone, value } = await reader.read();
+        done = streamDone;
+        if (!done) {
+            buffer.set(value, offset);
+            offset += value.byteLength;
         }
-        return Buffer.concat(chunks);
-    });
+    }
+    return buffer;
 }
 exports.readableStreamToBuffer = readableStreamToBuffer;

package/lib/cjs/web/factory.js

@@ -23,8 +23,14 @@ const signer_js_1 = require("./signer.js");
 class TurboFactory extends factory_js_1.TurboBaseFactory {
     static authenticated({ privateKey, paymentServiceConfig = {}, uploadServiceConfig = {}, }) {
         const signer = new signer_js_1.TurboWebArweaveSigner({ privateKey });
-        const paymentService = new index_js_1.TurboAuthenticatedPaymentService(Object.assign(Object.assign({}, paymentServiceConfig), { signer }));
-        const uploadService = new index_js_1.TurboAuthenticatedUploadService(Object.assign(Object.assign({}, uploadServiceConfig), { signer }));
+        const paymentService = new index_js_1.TurboAuthenticatedPaymentService({
+            ...paymentServiceConfig,
+            signer,
+        });
+        const uploadService = new index_js_1.TurboAuthenticatedUploadService({
+            ...uploadServiceConfig,
+            signer,
+        });
         return new index_js_1.TurboAuthenticatedClient({
             uploadService,
             paymentService,

package/lib/cjs/web/signer.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -39,33 +30,33 @@ class TurboWebArweaveSigner {
         this.privateKey = privateKey;
         this.signer = new arbundles_1.ArweaveSigner(this.privateKey);
     }
-    signDataItem({ fileStreamFactory, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // TODO: converts the readable stream to a buffer bc incrementally signing ReadableStreams is not trivial
-            const buffer = yield (0, readableStream_js_1.readableStreamToBuffer)({
-                stream: fileStreamFactory(),
-                // TODO: add payload size to get performance improvements
-            });
-            const signedDataItem = (0, arbundles_1.createData)(buffer, this.signer);
-            yield signedDataItem.sign(this.signer);
-            return signedDataItem.getRaw();
+    async signDataItem({ fileStreamFactory, fileSizeFactory, }) {
+        // TODO: converts the readable stream to a buffer bc incrementally signing ReadableStreams is not trivial
+        const buffer = await (0, readableStream_js_1.readableStreamToBuffer)({
+            stream: fileStreamFactory(),
+            size: fileSizeFactory(),
         });
+        // TODO: support target, anchor and tags for upload
+        const signedDataItem = (0, arbundles_1.createData)(buffer, this.signer, {});
+        await signedDataItem.sign(this.signer);
+        return {
+            // while this returns a Buffer - it needs to match our return type for uploading
+            dataItemStreamFactory: () => signedDataItem.getRaw(),
+            dataItemSizeFactory: () => signedDataItem.getRaw().length,
+        };
     }
     // NOTE: this might be better in a parent class or elsewhere - easy enough to leave in here now and does require specific environment version of crypto
-    generateSignedRequestHeaders() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            // a bit hacky - but arweave exports cause issues in tests vs. browser
-            const arweave = (_a = arweave_1.default.default) !== null && _a !== void 0 ? _a : arweave_1.default;
-            const nonce = (0, node_crypto_1.randomBytes)(16).toString('hex');
-            const buffer = Buffer.from(nonce);
-            const signature = yield arweave.crypto.sign(this.privateKey, buffer, {});
-            return {
-                'x-public-key': this.privateKey.n,
-                'x-nonce': nonce,
-                'x-signature': (0, base64_js_1.toB64Url)(Buffer.from(signature)),
-            };
-        });
+    async generateSignedRequestHeaders() {
+        // a bit hacky - but arweave exports cause issues in tests vs. browser
+        const arweave = arweave_1.default.default ?? arweave_1.default;
+        const nonce = (0, node_crypto_1.randomBytes)(16).toString('hex');
+        const buffer = Buffer.from(nonce);
+        const signature = await arweave.crypto.sign(this.privateKey, buffer, {});
+        return {
+            'x-public-key': this.privateKey.n,
+            'x-nonce': nonce,
+            'x-signature': (0, base64_js_1.toB64Url)(Buffer.from(signature)),
+        };
     }
 }
 exports.TurboWebArweaveSigner = TurboWebArweaveSigner;

package/lib/esm/common/factory.js

@@ -3,8 +3,12 @@ import { TurboUnauthenticatedClient } from './turbo.js';
 import { TurboUnauthenticatedUploadService } from './upload.js';
 export class TurboBaseFactory {
     static unauthenticated({ paymentServiceConfig = {}, uploadServiceConfig = {}, } = {}) {
-        const paymentService = new TurboUnauthenticatedPaymentService(Object.assign({}, paymentServiceConfig));
-        const uploadService = new TurboUnauthenticatedUploadService(Object.assign({}, uploadServiceConfig));
+        const paymentService = new TurboUnauthenticatedPaymentService({
+            ...paymentServiceConfig,
+        });
+        const uploadService = new TurboUnauthenticatedUploadService({
+            ...uploadServiceConfig,
+        });
         return new TurboUnauthenticatedClient({
             uploadService,
             paymentService,

package/lib/esm/common/http.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { createAxiosInstance } from '../utils/axiosClient.js';
 import { FailedRequestError } from '../utils/errors.js';
 export class TurboHTTPService {
@@ -18,28 +9,24 @@ export class TurboHTTPService {
             retryConfig,
         });
     }
-    get({ endpoint, signal, allowedStatuses = [200, 202], headers, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { status, statusText, data } = yield this.axios.get(endpoint, {
-                headers,
-                signal,
-            });
-            if (!allowedStatuses.includes(status)) {
-                throw new FailedRequestError(status, statusText);
-            }
-            return data;
+    async get({ endpoint, signal, allowedStatuses = [200, 202], headers, }) {
+        const { status, statusText, data } = await this.axios.get(endpoint, {
+            headers,
+            signal,
         });
+        if (!allowedStatuses.includes(status)) {
+            throw new FailedRequestError(status, statusText);
+        }
+        return data;
     }
-    post({ endpoint, signal, allowedStatuses = [200, 202], headers, data, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { status, statusText, data: response, } = yield this.axios.post(endpoint, data, {
-                headers,
-                signal,
-            });
-            if (!allowedStatuses.includes(status)) {
-                throw new FailedRequestError(status, statusText);
-            }
-            return response;
+    async post({ endpoint, signal, allowedStatuses = [200, 202], headers, data, }) {
+        const { status, statusText, data: response, } = await this.axios.post(endpoint, data, {
+            headers,
+            signal,
         });
+        if (!allowedStatuses.includes(status)) {
+            throw new FailedRequestError(status, statusText);
+        }
+        return response;
     }
 }

package/lib/esm/common/payment.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { TurboHTTPService } from './http.js';
 export class TurboUnauthenticatedPaymentService {
     constructor({ url = 'https://payment.ardrive.dev', retryConfig, }) {
@@ -15,48 +6,36 @@ export class TurboUnauthenticatedPaymentService {
             retryConfig,
         });
     }
-    getFiatRates() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.httpService.get({
-                endpoint: '/rates',
-            });
+    async getFiatRates() {
+        return this.httpService.get({
+            endpoint: '/rates',
         });
     }
-    getFiatToAR({ currency, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.httpService.get({
-                endpoint: `/rates/${currency}`,
-            });
+    async getFiatToAR({ currency, }) {
+        return this.httpService.get({
+            endpoint: `/rates/${currency}`,
         });
     }
-    getSupportedCountries() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.httpService.get({
-                endpoint: '/countries',
-            });
+    async getSupportedCountries() {
+        return this.httpService.get({
+            endpoint: '/countries',
         });
     }
-    getSupportedCurrencies() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.httpService.get({
-                endpoint: '/currencies',
-            });
+    async getSupportedCurrencies() {
+        return this.httpService.get({
+            endpoint: '/currencies',
         });
     }
-    getUploadCosts({ bytes, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fetchPricePromises = bytes.map((byteCount) => this.httpService.get({
-                endpoint: `/price/bytes/${byteCount}`,
-            }));
-            const wincCostsForBytes = yield Promise.all(fetchPricePromises);
-            return wincCostsForBytes;
-        });
+    async getUploadCosts({ bytes, }) {
+        const fetchPricePromises = bytes.map((byteCount) => this.httpService.get({
+            endpoint: `/price/bytes/${byteCount}`,
+        }));
+        const wincCostsForBytes = await Promise.all(fetchPricePromises);
+        return wincCostsForBytes;
     }
-    getWincForFiat({ amount, currency }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.httpService.get({
-                endpoint: `/price/${currency}/${amount}`,
-            });
+    async getWincForFiat({ amount, currency }) {
+        return this.httpService.get({
+            endpoint: `/price/${currency}/${amount}`,
         });
     }
 }
@@ -66,16 +45,14 @@ export class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymen
         super({ url, retryConfig });
         this.signer = signer;
     }
-    getBalance() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const headers = yield this.signer.generateSignedRequestHeaders();
-            const balance = yield this.httpService.get({
-                endpoint: '/balance',
-                headers,
-                allowedStatuses: [200, 404],
-            });
-            // 404's don't return a balance, so default to 0
-            return balance.winc ? balance : { winc: '0' };
+    async getBalance() {
+        const headers = await this.signer.generateSignedRequestHeaders();
+        const balance = await this.httpService.get({
+            endpoint: '/balance',
+            headers,
+            allowedStatuses: [200, 404],
         });
+        // 404's don't return a balance, so default to 0
+        return balance.winc ? balance : { winc: '0' };
     }
 }

package/lib/esm/common/turbo.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { TurboUnauthenticatedPaymentService } from './payment.js';
 import { TurboUnauthenticatedUploadService } from './upload.js';
 export class TurboUnauthenticatedClient {
@@ -17,10 +8,8 @@ export class TurboUnauthenticatedClient {
     /**
      * Returns the supported fiat currency conversion rate for 1AR based on current market prices.
      */
-    getFiatToAR({ currency, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.paymentService.getFiatToAR({ currency });
-        });
+    async getFiatToAR({ currency, }) {
+        return this.paymentService.getFiatToAR({ currency });
     }
     /**
      * Returns the latest conversion rates to purchase 1GiB of data for all supported currencies, including all adjustments and fees.
@@ -28,52 +17,41 @@ export class TurboUnauthenticatedClient {
      * Note: this does not take into account varying adjustments and promotions for different sizes of data. If you want to calculate the total
      * cost in 'winc' for a given number of bytes, use getUploadCosts.
      */
-    getFiatRates() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.paymentService.getFiatRates();
-        });
+    async getFiatRates() {
+        return this.paymentService.getFiatRates();
     }
     /**
      * Returns a comprehensive list of supported countries that can purchase credits through the Turbo Payment Service.
      */
-    getSupportedCountries() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.paymentService.getSupportedCountries();
-        });
+    async getSupportedCountries() {
+        return this.paymentService.getSupportedCountries();
     }
     /**
      * Returns a list of all supported fiat currencies.
      */
-    getSupportedCurrencies() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.paymentService.getSupportedCurrencies();
-        });
+    async getSupportedCurrencies() {
+        return this.paymentService.getSupportedCurrencies();
     }
     /**
      * Determines the price in 'winc' to upload one data item of a specific size in bytes, including all Turbo cost adjustments and fees.
      */
-    getUploadCosts({ bytes, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.paymentService.getUploadCosts({ bytes });
-        });
+    async getUploadCosts({ bytes, }) {
+        return this.paymentService.getUploadCosts({ bytes });
     }
     /**
      * Determines the amount of 'winc' that would be returned for a given currency and amount, including all Turbo cost adjustments and fees.
      */
-    getWincForFiat({ amount, currency, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.paymentService.getWincForFiat({ amount, currency });
-        });
+    async getWincForFiat({ amount, currency, }) {
+        return this.paymentService.getWincForFiat({ amount, currency });
     }
     /**
      * Uploads a signed data item to the Turbo Upload Service.
      */
-    uploadSignedDataItem({ dataItemStreamFactory, signal, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.uploadService.uploadSignedDataItem({
-                dataItemStreamFactory,
-                signal,
-            });
+    async uploadSignedDataItem({ dataItemStreamFactory, dataItemSizeFactory, signal, }) {
+        return this.uploadService.uploadSignedDataItem({
+            dataItemStreamFactory,
+            dataItemSizeFactory,
+            signal,
         });
     }
 }
@@ -84,17 +62,17 @@ export class TurboAuthenticatedClient extends TurboUnauthenticatedClient {
     /**
      * Returns the current balance of the user's wallet in 'winc'.
      */
-    getBalance() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.paymentService.getBalance();
-        });
+    async getBalance() {
+        return this.paymentService.getBalance();
     }
     /**
      * Signs and uploads raw data to the Turbo Upload Service.
      */
-    uploadFile({ fileStreamFactory, signal, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.uploadService.uploadFile({ fileStreamFactory, signal });
+    async uploadFile({ fileStreamFactory, fileSizeFactory, signal, }) {
+        return this.uploadService.uploadFile({
+            fileStreamFactory,
+            fileSizeFactory,
+            signal,
         });
     }
 }