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

package/lib/cjs/common/factory.js

@@ -6,8 +6,12 @@ const turbo_js_1 = require("./turbo.js");
 const upload_js_1 = require("./upload.js");
 class TurboBaseFactory {
     static unauthenticated({ paymentServiceConfig = {}, uploadServiceConfig = {}, } = {}) {
-        const paymentService = new payment_js_1.TurboUnauthenticatedPaymentService(Object.assign({}, paymentServiceConfig));
-        const uploadService = new upload_js_1.TurboUnauthenticatedUploadService(Object.assign({}, uploadServiceConfig));
+        const paymentService = new payment_js_1.TurboUnauthenticatedPaymentService({
+            ...paymentServiceConfig,
+        });
+        const uploadService = new upload_js_1.TurboUnauthenticatedUploadService({
+            ...uploadServiceConfig,
+        });
         return new turbo_js_1.TurboUnauthenticatedClient({
             uploadService,
             paymentService,

package/lib/cjs/common/http.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.TurboHTTPService = void 0;
 const axiosClient_js_1 = require("../utils/axiosClient.js");
@@ -21,29 +12,25 @@ 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 errors_js_1.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 errors_js_1.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 errors_js_1.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 errors_js_1.FailedRequestError(status, statusText);
+        }
+        return response;
     }
 }
 exports.TurboHTTPService = TurboHTTPService;

package/lib/cjs/common/payment.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.TurboAuthenticatedPaymentService = exports.TurboUnauthenticatedPaymentService = void 0;
 const http_js_1 = require("./http.js");
@@ -18,48 +9,36 @@ 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}`,
         });
     }
 }
@@ -70,17 +49,15 @@ class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentServic
         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' };
     }
 }
 exports.TurboAuthenticatedPaymentService = TurboAuthenticatedPaymentService;

package/lib/cjs/common/turbo.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.TurboAuthenticatedClient = exports.TurboUnauthenticatedClient = void 0;
 const payment_js_1 = require("./payment.js");
@@ -20,10 +11,8 @@ 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.
@@ -31,52 +20,40 @@ 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, signal, }) {
+        return this.uploadService.uploadSignedDataItem({
+            dataItemStreamFactory,
+            signal,
         });
     }
 }
@@ -88,18 +65,14 @@ 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, signal, }) {
+        return this.uploadService.uploadFile({ fileStreamFactory, signal });
     }
 }
 exports.TurboAuthenticatedClient = TurboAuthenticatedClient;

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,15 @@ 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, signal, }) {
+        // 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',
+            },
         });
     }
 }
@@ -39,20 +28,18 @@ 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, signal, }) {
+        const signedDataItem = await 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',
+            },
         });
     }
 }

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 };
 };
@@ -45,17 +36,15 @@ class TurboNodeArweaveSigner {
         return (0, arbundles_1.streamSigner)(stream1, stream2, this.signer);
     }
     // 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)),
+        };
     }
 }
 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,17 @@
 "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, }) {
+    const reader = stream.getReader();
+    const chunks = [];
+    let done = false;
+    while (!done) {
+        const { done: streamDone, value } = await reader.read();
+        done = streamDone;
+        if (!done) {
+            chunks.push(value);
         }
-        return Buffer.concat(chunks);
-    });
+    }
+    return Buffer.concat(chunks);
 }
 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,28 @@ 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, }) {
+        // 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(),
+            // TODO: add payload size to get performance improvements
         });
+        const signedDataItem = (0, arbundles_1.createData)(buffer, this.signer);
+        await signedDataItem.sign(this.signer);
+        return signedDataItem.getRaw();
     }
     // 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,40 @@ 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, signal, }) {
+        return this.uploadService.uploadSignedDataItem({
+            dataItemStreamFactory,
+            signal,
         });
     }
 }
@@ -84,17 +61,13 @@ 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, signal, }) {
+        return this.uploadService.uploadFile({ fileStreamFactory, signal });
     }
 }

package/lib/esm/common/upload.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 TurboUnauthenticatedUploadService {
     constructor({ url = 'https://upload.ardrive.dev', retryConfig, }) {
@@ -15,17 +6,15 @@ export 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, signal, }) {
+        // 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',
+            },
         });
     }
 }
@@ -35,20 +24,18 @@ export class TurboAuthenticatedUploadService extends TurboUnauthenticatedUploadS
         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, signal, }) {
+        const signedDataItem = await 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',
+            },
         });
     }
 }

package/lib/esm/node/factory.js

@@ -20,8 +20,14 @@ import { TurboNodeArweaveSigner } from './signer.js';
 export class TurboFactory extends TurboBaseFactory {
     static authenticated({ privateKey, paymentServiceConfig = {}, uploadServiceConfig = {}, }) {
         const signer = new TurboNodeArweaveSigner({ privateKey });
-        const paymentService = new TurboAuthenticatedPaymentService(Object.assign(Object.assign({}, paymentServiceConfig), { signer }));
-        const uploadService = new TurboAuthenticatedUploadService(Object.assign(Object.assign({}, uploadServiceConfig), { signer }));
+        const paymentService = new TurboAuthenticatedPaymentService({
+            ...paymentServiceConfig,
+            signer,
+        });
+        const uploadService = new TurboAuthenticatedUploadService({
+            ...uploadServiceConfig,
+            signer,
+        });
         return new TurboAuthenticatedClient({
             uploadService,
             paymentService,

package/lib/esm/node/signer.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());
-    });
-};
 /**
  * Copyright (C) 2022-2023 Permanent Data Solutions, Inc. All Rights Reserved.
  *
@@ -39,16 +30,14 @@ export class TurboNodeArweaveSigner {
         return streamSigner(stream1, stream2, this.signer);
     }
     // 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 = 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': toB64Url(Buffer.from(signature)),
-            };
-        });
+    async generateSignedRequestHeaders() {
+        const nonce = 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': toB64Url(Buffer.from(signature)),
+        };
     }
 }

package/lib/esm/utils/axiosClient.js

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

package/lib/esm/utils/readableStream.js

@@ -1,24 +1,13 @@
-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());
-    });
-};
-export 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);
-            }
+export async function readableStreamToBuffer({ stream, }) {
+    const reader = stream.getReader();
+    const chunks = [];
+    let done = false;
+    while (!done) {
+        const { done: streamDone, value } = await reader.read();
+        done = streamDone;
+        if (!done) {
+            chunks.push(value);
         }
-        return Buffer.concat(chunks);
-    });
+    }
+    return Buffer.concat(chunks);
 }

package/lib/esm/web/factory.js

@@ -20,8 +20,14 @@ import { TurboWebArweaveSigner } from './signer.js';
 export class TurboFactory extends TurboBaseFactory {
     static authenticated({ privateKey, paymentServiceConfig = {}, uploadServiceConfig = {}, }) {
         const signer = new TurboWebArweaveSigner({ privateKey });
-        const paymentService = new TurboAuthenticatedPaymentService(Object.assign(Object.assign({}, paymentServiceConfig), { signer }));
-        const uploadService = new TurboAuthenticatedUploadService(Object.assign(Object.assign({}, uploadServiceConfig), { signer }));
+        const paymentService = new TurboAuthenticatedPaymentService({
+            ...paymentServiceConfig,
+            signer,
+        });
+        const uploadService = new TurboAuthenticatedUploadService({
+            ...uploadServiceConfig,
+            signer,
+        });
         return new TurboAuthenticatedClient({
             uploadService,
             paymentService,

package/lib/esm/web/signer.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());
-    });
-};
 /**
  * Copyright (C) 2022-2023 Permanent Data Solutions, Inc. All Rights Reserved.
  *
@@ -33,32 +24,27 @@ export class TurboWebArweaveSigner {
         this.privateKey = privateKey;
         this.signer = new 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 readableStreamToBuffer({
-                stream: fileStreamFactory(),
-                // TODO: add payload size to get performance improvements
-            });
-            const signedDataItem = createData(buffer, this.signer);
-            yield signedDataItem.sign(this.signer);
-            return signedDataItem.getRaw();
+    async signDataItem({ fileStreamFactory, }) {
+        // TODO: converts the readable stream to a buffer bc incrementally signing ReadableStreams is not trivial
+        const buffer = await readableStreamToBuffer({
+            stream: fileStreamFactory(),
+            // TODO: add payload size to get performance improvements
         });
+        const signedDataItem = createData(buffer, this.signer);
+        await signedDataItem.sign(this.signer);
+        return signedDataItem.getRaw();
     }
     // 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.default) !== null && _a !== void 0 ? _a : Arweave;
-            const nonce = 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': toB64Url(Buffer.from(signature)),
-            };
-        });
+    async generateSignedRequestHeaders() {
+        // a bit hacky - but arweave exports cause issues in tests vs. browser
+        const arweave = Arweave.default ?? Arweave;
+        const nonce = 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': toB64Url(Buffer.from(signature)),
+        };
     }
 }

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

@@ -34,7 +34,6 @@ export declare class TurboUnauthenticatedPaymentService implements TurboUnauthen
     }): Promise<TurboPriceResponse>;
 }
 export declare class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentService implements TurboAuthenticatedPaymentServiceInterface {
-    protected readonly httpService: TurboHTTPService;
     protected readonly signer: TurboWalletSigner;
     constructor({ url, retryConfig, signer, }: TurboAuthenticatedPaymentServiceInterfaceConfiguration);
     getBalance(): Promise<TurboBalanceResponse>;

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

@@ -1 +1 @@
-{"version":3,"file":"payment.d.ts","sourceRoot":"","sources":["../../../src/common/payment.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EACL,QAAQ,EACR,yCAAyC,EACzC,sDAAsD,EACtD,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,2CAA2C,EAC3C,wDAAwD,EACxD,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,qBAAa,kCACX,YAAW,2CAA2C;IAEtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;gBAErC,EACV,GAAmC,EACnC,WAAW,GACZ,EAAE,wDAAwD;IAOrD,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAM3C,WAAW,CAAC,EAChB,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,QAAQ,CAAC;KACpB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAM5B,qBAAqB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAMxD,sBAAsB,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAM1D,cAAc,CAAC,EACnB,KAAK,GACN,EAAE;QACD,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAW3B,cAAc,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE;;;KAAA,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAKxE;AAGD,qBAAa,gCACX,SAAQ,kCACR,YAAW,yCAAyC;IAEpD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBAEjC,EACV,GAAmC,EACnC,WAAW,EACX,MAAM,GACP,EAAE,sDAAsD;IAKnD,UAAU,IAAI,OAAO,CAAC,oBAAoB,CAAC;CAWlD"}
+{"version":3,"file":"payment.d.ts","sourceRoot":"","sources":["../../../src/common/payment.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EACL,QAAQ,EACR,yCAAyC,EACzC,sDAAsD,EACtD,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,2CAA2C,EAC3C,wDAAwD,EACxD,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,qBAAa,kCACX,YAAW,2CAA2C;IAEtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;gBAErC,EACV,GAAmC,EACnC,WAAW,GACZ,EAAE,wDAAwD;IAOrD,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAM3C,WAAW,CAAC,EAChB,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,QAAQ,CAAC;KACpB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAM5B,qBAAqB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAMxD,sBAAsB,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAM1D,cAAc,CAAC,EACnB,KAAK,GACN,EAAE;QACD,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAW3B,cAAc,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE;;;KAAA,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAKxE;AAGD,qBAAa,gCACX,SAAQ,kCACR,YAAW,yCAAyC;IAEpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBAEjC,EACV,GAAmC,EACnC,WAAW,EACX,MAAM,GACP,EAAE,sDAAsD;IAKnD,UAAU,IAAI,OAAO,CAAC,oBAAoB,CAAC;CAWlD"}

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

@@ -16,8 +16,8 @@
  */
 import { Currency, TurboAbortSignal, TurboAuthenticatedClientInterface, TurboAuthenticatedPaymentServiceInterface, TurboAuthenticatedUploadServiceInterface, TurboBalanceResponse, TurboCountriesResponse, TurboCurrenciesResponse, TurboFiatToArResponse, TurboFileFactory, TurboPriceResponse, TurboPrivateClientConfiguration, TurboPublicClientConfiguration, TurboRatesResponse, TurboSignedDataItemFactory, TurboUnauthenticatedClientInterface, TurboUnauthenticatedPaymentServiceInterface, TurboUnauthenticatedUploadServiceInterface, TurboUploadDataItemResponse } from '../types.js';
 export declare class TurboUnauthenticatedClient implements TurboUnauthenticatedClientInterface {
-    protected readonly paymentService: TurboUnauthenticatedPaymentServiceInterface;
-    protected readonly uploadService: TurboUnauthenticatedUploadServiceInterface;
+    protected paymentService: TurboUnauthenticatedPaymentServiceInterface;
+    protected uploadService: TurboUnauthenticatedUploadServiceInterface;
     constructor({ uploadService, paymentService, }: TurboPublicClientConfiguration);
     /**
      * Returns the supported fiat currency conversion rate for 1AR based on current market prices.
@@ -59,8 +59,8 @@ export declare class TurboUnauthenticatedClient implements TurboUnauthenticatedC
     uploadSignedDataItem({ dataItemStreamFactory, signal, }: TurboSignedDataItemFactory & TurboAbortSignal): Promise<TurboUploadDataItemResponse>;
 }
 export declare class TurboAuthenticatedClient extends TurboUnauthenticatedClient implements TurboAuthenticatedClientInterface {
-    protected readonly paymentService: TurboAuthenticatedPaymentServiceInterface;
-    protected readonly uploadService: TurboAuthenticatedUploadServiceInterface;
+    protected paymentService: TurboAuthenticatedPaymentServiceInterface;
+    protected uploadService: TurboAuthenticatedUploadServiceInterface;
     constructor({ paymentService, uploadService, }: TurboPrivateClientConfiguration);
     /**
      * Returns the current balance of the user's wallet in 'winc'.

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

@@ -1 +1 @@
-{"version":3,"file":"turbo.d.ts","sourceRoot":"","sources":["../../../src/common/turbo.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,iCAAiC,EACjC,yCAAyC,EACzC,wCAAwC,EACxC,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,EAClB,+BAA+B,EAC/B,8BAA8B,EAC9B,kBAAkB,EAClB,0BAA0B,EAC1B,mCAAmC,EACnC,2CAA2C,EAC3C,0CAA0C,EAC1C,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AAIrB,qBAAa,0BACX,YAAW,mCAAmC;IAE9C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,2CAA2C,CAAC;IAC/E,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,0CAA0C,CAAC;gBAEjE,EACV,aAAyD,EACzD,cAA2D,GAC5D,EAAE,8BAA8B;IAKjC;;OAEG;IACG,WAAW,CAAC,EAChB,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,QAAQ,CAAC;KACpB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIlC;;;;;OAKG;IACG,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAIjD;;OAEG;IACG,qBAAqB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAI9D;;OAEG;IACG,sBAAsB,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAIhE;;OAEG;IACG,cAAc,CAAC,EACnB,KAAK,GACN,EAAE;QACD,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAIjC;;OAEG;IACG,cAAc,CAAC,EACnB,MAAM,EACN,QAAQ,GACT,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,QAAQ,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;IAIpD;;OAEG;IACG,oBAAoB,CAAC,EACzB,qBAAqB,EACrB,MAAM,GACP,EAAE,0BAA0B,GAC3B,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAM1D;AAED,qBAAa,wBACX,SAAQ,0BACR,YAAW,iCAAiC;IAE5C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,yCAAyC,CAAC;IAC7E,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,wCAAwC,CAAC;gBAE/D,EACV,cAAc,EACd,aAAa,GACd,EAAE,+BAA+B;IAIlC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAIjD;;OAEG;IACG,UAAU,CAAC,EACf,iBAAiB,EACjB,MAAM,GACP,EAAE,gBAAgB,GACjB,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAG1D"}
+{"version":3,"file":"turbo.d.ts","sourceRoot":"","sources":["../../../src/common/turbo.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,iCAAiC,EACjC,yCAAyC,EACzC,wCAAwC,EACxC,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,EAClB,+BAA+B,EAC/B,8BAA8B,EAC9B,kBAAkB,EAClB,0BAA0B,EAC1B,mCAAmC,EACnC,2CAA2C,EAC3C,0CAA0C,EAC1C,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AAIrB,qBAAa,0BACX,YAAW,mCAAmC;IAE9C,SAAS,CAAC,cAAc,EAAE,2CAA2C,CAAC;IACtE,SAAS,CAAC,aAAa,EAAE,0CAA0C,CAAC;gBAExD,EACV,aAAyD,EACzD,cAA2D,GAC5D,EAAE,8BAA8B;IAKjC;;OAEG;IACG,WAAW,CAAC,EAChB,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,QAAQ,CAAC;KACpB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIlC;;;;;OAKG;IACG,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAIjD;;OAEG;IACG,qBAAqB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAI9D;;OAEG;IACG,sBAAsB,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAIhE;;OAEG;IACG,cAAc,CAAC,EACnB,KAAK,GACN,EAAE;QACD,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAIjC;;OAEG;IACG,cAAc,CAAC,EACnB,MAAM,EACN,QAAQ,GACT,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,QAAQ,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;IAIpD;;OAEG;IACG,oBAAoB,CAAC,EACzB,qBAAqB,EACrB,MAAM,GACP,EAAE,0BAA0B,GAC3B,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAM1D;AAED,qBAAa,wBACX,SAAQ,0BACR,YAAW,iCAAiC;IAG5C,SAAS,CAAC,cAAc,EAAE,yCAAyC,CAAC;IACpE,SAAS,CAAC,aAAa,EAAE,wCAAwC,CAAC;gBAEtD,EACV,cAAc,EACd,aAAa,GACd,EAAE,+BAA+B;IAIlC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAIjD;;OAEG;IACG,UAAU,CAAC,EACf,iBAAiB,EACjB,MAAM,GACP,EAAE,gBAAgB,GACjB,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAG1D"}

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

@@ -22,7 +22,6 @@ export declare class TurboUnauthenticatedUploadService implements TurboUnauthent
     uploadSignedDataItem({ dataItemStreamFactory, signal, }: TurboSignedDataItemFactory & TurboAbortSignal): Promise<TurboUploadDataItemResponse>;
 }
 export declare class TurboAuthenticatedUploadService extends TurboUnauthenticatedUploadService implements TurboAuthenticatedUploadServiceInterface {
-    protected httpService: TurboHTTPService;
     protected signer: TurboWalletSigner;
     constructor({ url, retryConfig, signer, }: TurboAuthenticatedUploadServiceConfiguration);
     uploadFile({ fileStreamFactory, signal, }: TurboFileFactory & TurboAbortSignal): Promise<TurboUploadDataItemResponse>;

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

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../src/common/upload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EACL,gBAAgB,EAChB,4CAA4C,EAC5C,wCAAwC,EACxC,gBAAgB,EAChB,0BAA0B,EAC1B,0CAA0C,EAC1C,uDAAuD,EACvD,2BAA2B,EAC3B,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,qBAAa,iCACX,YAAW,0CAA0C;IAErD,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAAC;gBAE5B,EACV,GAAkC,EAClC,WAAW,GACZ,EAAE,uDAAuD;IAOpD,oBAAoB,CAAC,EACzB,qBAAqB,EACrB,MAAM,GACP,EAAE,0BAA0B,GAC3B,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAW1D;AAGD,qBAAa,+BACX,SAAQ,iCACR,YAAW,wCAAwC;IAEnD,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACxC,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBAExB,EACV,GAAkC,EAClC,WAAW,EACX,MAAM,GACP,EAAE,4CAA4C;IAKzC,UAAU,CAAC,EACf,iBAAiB,EACjB,MAAM,GACP,EAAE,gBAAgB,GACjB,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAc1D"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../src/common/upload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EACL,gBAAgB,EAChB,4CAA4C,EAC5C,wCAAwC,EACxC,gBAAgB,EAChB,0BAA0B,EAC1B,0CAA0C,EAC1C,uDAAuD,EACvD,2BAA2B,EAC3B,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,qBAAa,iCACX,YAAW,0CAA0C;IAErD,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAAC;gBAE5B,EACV,GAAkC,EAClC,WAAW,GACZ,EAAE,uDAAuD;IAOpD,oBAAoB,CAAC,EACzB,qBAAqB,EACrB,MAAM,GACP,EAAE,0BAA0B,GAC3B,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAW1D;AAGD,qBAAa,+BACX,SAAQ,iCACR,YAAW,wCAAwC;IAEnD,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC;gBAExB,EACV,GAAkC,EAClC,WAAW,EACX,MAAM,GACP,EAAE,4CAA4C;IAKzC,UAAU,CAAC,EACf,iBAAiB,EACjB,MAAM,GACP,EAAE,gBAAgB,GACjB,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAc1D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ardrive/turbo-sdk",
-  "version": "1.0.0-alpha.20",
+  "version": "1.0.0-alpha.21",
   "main": "./lib/cjs/node/index.js",
   "types": "./lib/types/node/index.d.ts",
   "module": "./lib/esm/node/index.js",