@ardrive/turbo-sdk 1.31.0-alpha.3 → 1.31.1-alpha.1

package/lib/cjs/common/chunked.js

@@ -215,17 +215,17 @@ class ChunkedUploader {
     async finalizeUpload(uploadId, dataItemByteCount, paidBy, signal) {
         // Wait up to 1 minute per GiB of data for the upload to finalize
         const fileSizeInGiB = Math.ceil(this.toGiB(dataItemByteCount));
-        const defaultMaxWaitTimeMins = fileSizeInGiB;
-        const maxWaitTimeMs = this.maxFinalizeMs ?? defaultMaxWaitTimeMins * 60 * 1000;
+        const defaultMaxWaitTimeMins = fileSizeInGiB * 2.5;
+        const maxWaitTimeMs = this.maxFinalizeMs ?? Math.floor(defaultMaxWaitTimeMins * 60 * 1000);
         const minimumWaitPerStepMs = 
         // Per step, files smaller than 100MB will wait 2 second,
         dataItemByteCount < 1024 * 1024 * 100
             ? 2000
-            : // files smaller than 3 GiB will wait 3 seconds,
+            : // files smaller than 3 GiB will wait 4 seconds,
                 dataItemByteCount < 1024 * 1024 * 1024 * 3
-                    ? 3000
-                    : // and larger files will wait 1 second per GiB with max of 10 seconds
-                        Math.max(1000 * fileSizeInGiB, 10000);
+                    ? 4000
+                    : // and larger files will wait 1.5 second per GiB with max of 15 seconds
+                        Math.max(1500 * fileSizeInGiB, 15000);
         const paidByHeader = {};
         if (paidBy !== undefined) {
             paidByHeader['x-paid-by'] = Array.isArray(paidBy)
@@ -242,7 +242,7 @@ class ChunkedUploader {
             },
             signal,
         });
-        this.logger.debug(`Confirming upload to Turbo with uploadId ${uploadId} for up to ${defaultMaxWaitTimeMins} minutes.`);
+        this.logger.debug(`Confirming upload to Turbo with uploadId ${uploadId} for up to ${maxWaitTimeMs / 1000 / 60} minutes.`);
         const startTime = Date.now();
         const cutoffTime = startTime + maxWaitTimeMs;
         let attempts = 0;

package/lib/cjs/common/factory.js

@@ -123,7 +123,8 @@ class TurboBaseFactory {
             }
             return new arbundles_1.HexInjectedSolanaSigner(walletAdapter);
         }
-        if (token === 'ethereum') {
+        const ethTokens = new Set(['ethereum', 'base-eth']);
+        if (ethTokens.has(token)) {
             if (!(0, types_js_1.isEthereumWalletAdapter)(walletAdapter)) {
                 throw new Error('Unsupported wallet adapter -- must implement getSigner');
             }

package/lib/cjs/utils/common.js

@@ -26,6 +26,9 @@ const amino_1 = require("@cosmjs/amino");
 const crypto_1 = require("@cosmjs/crypto");
 const encoding_1 = require("@cosmjs/encoding");
 const arbundles_1 = require("@dha-team/arbundles");
+const bytes_1 = require("@ethersproject/bytes");
+const signing_key_1 = require("@ethersproject/signing-key");
+const ethers_1 = require("ethers");
 const types_js_1 = require("../types.js");
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
@@ -67,6 +70,16 @@ exports.defaultProdAoConfigs = {
 };
 function createTurboSigner({ signer: clientProvidedSigner, privateKey: clientProvidedPrivateKey, token = 'arweave', }) {
     if (clientProvidedSigner !== undefined) {
+        if (clientProvidedSigner instanceof arbundles_1.InjectedEthereumSigner) {
+            // Override the setPublicKey method to resolve a generic string to sign
+            clientProvidedSigner.setPublicKey = async () => {
+                const message = 'sign this message to connect to your account';
+                const signedMsg = await clientProvidedSigner['signer'].signMessage(message);
+                const hash = (0, ethers_1.hashMessage)(message);
+                const recoveredKey = (0, signing_key_1.recoverPublicKey)((0, bytes_1.arrayify)(hash), signedMsg);
+                this.publicKey = Buffer.from((0, bytes_1.arrayify)(recoveredKey));
+            };
+        }
         return clientProvidedSigner;
     }
     if (clientProvidedPrivateKey === undefined) {

package/lib/cjs/version.js

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

package/lib/esm/common/chunked.js

@@ -209,17 +209,17 @@ export class ChunkedUploader {
     async finalizeUpload(uploadId, dataItemByteCount, paidBy, signal) {
         // Wait up to 1 minute per GiB of data for the upload to finalize
         const fileSizeInGiB = Math.ceil(this.toGiB(dataItemByteCount));
-        const defaultMaxWaitTimeMins = fileSizeInGiB;
-        const maxWaitTimeMs = this.maxFinalizeMs ?? defaultMaxWaitTimeMins * 60 * 1000;
+        const defaultMaxWaitTimeMins = fileSizeInGiB * 2.5;
+        const maxWaitTimeMs = this.maxFinalizeMs ?? Math.floor(defaultMaxWaitTimeMins * 60 * 1000);
         const minimumWaitPerStepMs = 
         // Per step, files smaller than 100MB will wait 2 second,
         dataItemByteCount < 1024 * 1024 * 100
             ? 2000
-            : // files smaller than 3 GiB will wait 3 seconds,
+            : // files smaller than 3 GiB will wait 4 seconds,
                 dataItemByteCount < 1024 * 1024 * 1024 * 3
-                    ? 3000
-                    : // and larger files will wait 1 second per GiB with max of 10 seconds
-                        Math.max(1000 * fileSizeInGiB, 10000);
+                    ? 4000
+                    : // and larger files will wait 1.5 second per GiB with max of 15 seconds
+                        Math.max(1500 * fileSizeInGiB, 15000);
         const paidByHeader = {};
         if (paidBy !== undefined) {
             paidByHeader['x-paid-by'] = Array.isArray(paidBy)
@@ -236,7 +236,7 @@ export class ChunkedUploader {
             },
             signal,
         });
-        this.logger.debug(`Confirming upload to Turbo with uploadId ${uploadId} for up to ${defaultMaxWaitTimeMins} minutes.`);
+        this.logger.debug(`Confirming upload to Turbo with uploadId ${uploadId} for up to ${maxWaitTimeMs / 1000 / 60} minutes.`);
         const startTime = Date.now();
         const cutoffTime = startTime + maxWaitTimeMs;
         let attempts = 0;

package/lib/esm/common/factory.js

@@ -120,7 +120,8 @@ export class TurboBaseFactory {
             }
             return new HexInjectedSolanaSigner(walletAdapter);
         }
-        if (token === 'ethereum') {
+        const ethTokens = new Set(['ethereum', 'base-eth']);
+        if (ethTokens.has(token)) {
             if (!isEthereumWalletAdapter(walletAdapter)) {
                 throw new Error('Unsupported wallet adapter -- must implement getSigner');
             }

package/lib/esm/utils/common.js

@@ -16,7 +16,10 @@
 import { Secp256k1HdWallet, makeCosmoshubPath } from '@cosmjs/amino';
 import { Slip10, Slip10Curve } from '@cosmjs/crypto';
 import { toHex } from '@cosmjs/encoding';
-import { ArweaveSigner, EthereumSigner, HexSolanaSigner, } from '@dha-team/arbundles';
+import { ArweaveSigner, EthereumSigner, HexSolanaSigner, InjectedEthereumSigner, } from '@dha-team/arbundles';
+import { arrayify } from '@ethersproject/bytes';
+import { recoverPublicKey } from '@ethersproject/signing-key';
+import { hashMessage } from 'ethers';
 import { isEthPrivateKey, isJWK, isKyvePrivateKey, } from '../types.js';
 export function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
@@ -58,6 +61,16 @@ export const defaultProdAoConfigs = {
 };
 export function createTurboSigner({ signer: clientProvidedSigner, privateKey: clientProvidedPrivateKey, token = 'arweave', }) {
     if (clientProvidedSigner !== undefined) {
+        if (clientProvidedSigner instanceof InjectedEthereumSigner) {
+            // Override the setPublicKey method to resolve a generic string to sign
+            clientProvidedSigner.setPublicKey = async () => {
+                const message = 'sign this message to connect to your account';
+                const signedMsg = await clientProvidedSigner['signer'].signMessage(message);
+                const hash = hashMessage(message);
+                const recoveredKey = recoverPublicKey(arrayify(hash), signedMsg);
+                this.publicKey = Buffer.from(arrayify(recoveredKey));
+            };
+        }
         return clientProvidedSigner;
     }
     if (clientProvidedPrivateKey === undefined) {

package/lib/esm/version.js

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-export const version = '1.31.0-alpha.3';
+export const version = '1.31.1-alpha.1';

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

@@ -1 +1 @@
-{"version":3,"file":"chunked.d.ts","sourceRoot":"","sources":["../../../src/common/chunked.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EACL,SAAS,EAET,iBAAiB,EACjB,WAAW,EAEX,2BAA2B,EAC3B,0BAA0B,EAG3B,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAK7C,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAK5C,eAAO,MAAM,iBAAiB,QAAiB,CAAC;AAChD,eAAO,MAAM,iBAAiB,QAAU,CAAC;AACzC,eAAO,MAAM,qBAAqB,QAAoB,CAAC;AAKvD;;;GAGG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmB;IACxC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IAErC,SAAgB,sBAAsB,EAAE,OAAO,CAAC;IAChD,OAAO,CAAC,eAAe,CAAS;gBAEpB,EACV,IAAI,EACJ,KAAK,EACL,mBAAgD,EAChD,aAAa,EACb,cAAsC,EACtC,MAAmC,EACnC,YAAqB,EACrB,iBAAiB,GAClB,EAAE;QACD,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,IAAI,EAAE,gBAAgB,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,WAAW,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,YAAY,CAAC,EAAE,iBAAiB,CAAC;QACjC,iBAAiB,EAAE,SAAS,CAAC;KAC9B;IAqBD,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,iBAAiB;IAwDzB;;OAEG;YACW,UAAU;IAqBX,MAAM,CAAC,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,YAAY,EACZ,MAAM,EACN,MAAM,GACP,EAAE,0BAA0B,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAwHpE,OAAO,CAAC,KAAK;YAIC,cAAc;CAkG7B;AAED;;;GAGG;AACH,wBAAuB,eAAe,CACpC,MAAM,EAAE,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,EAC7C,cAAc,EAAE,MAAM,GACrB,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAMvC;AACD,wBAAuB,uBAAuB,CAC5C,MAAM,EAAE,QAAQ,EAChB,cAAc,EAAE,MAAM,GACrB,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAkDvC;AAED,wBAAuB,6BAA6B,CAClD,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,cAAc,EAAE,MAAM,GACrB,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAyDvC"}
+{"version":3,"file":"chunked.d.ts","sourceRoot":"","sources":["../../../src/common/chunked.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EACL,SAAS,EAET,iBAAiB,EACjB,WAAW,EAEX,2BAA2B,EAC3B,0BAA0B,EAG3B,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAK7C,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAK5C,eAAO,MAAM,iBAAiB,QAAiB,CAAC;AAChD,eAAO,MAAM,iBAAiB,QAAU,CAAC;AACzC,eAAO,MAAM,qBAAqB,QAAoB,CAAC;AAKvD;;;GAGG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmB;IACxC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IAErC,SAAgB,sBAAsB,EAAE,OAAO,CAAC;IAChD,OAAO,CAAC,eAAe,CAAS;gBAEpB,EACV,IAAI,EACJ,KAAK,EACL,mBAAgD,EAChD,aAAa,EACb,cAAsC,EACtC,MAAmC,EACnC,YAAqB,EACrB,iBAAiB,GAClB,EAAE;QACD,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,IAAI,EAAE,gBAAgB,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,WAAW,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,YAAY,CAAC,EAAE,iBAAiB,CAAC;QACjC,iBAAiB,EAAE,SAAS,CAAC;KAC9B;IAqBD,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,iBAAiB;IAwDzB;;OAEG;YACW,UAAU;IAqBX,MAAM,CAAC,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,YAAY,EACZ,MAAM,EACN,MAAM,GACP,EAAE,0BAA0B,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAwHpE,OAAO,CAAC,KAAK;YAIC,cAAc;CAoG7B;AAED;;;GAGG;AACH,wBAAuB,eAAe,CACpC,MAAM,EAAE,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,EAC7C,cAAc,EAAE,MAAM,GACrB,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAMvC;AACD,wBAAuB,uBAAuB,CAC5C,MAAM,EAAE,QAAQ,EAChB,cAAc,EAAE,MAAM,GACrB,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAkDvC;AAED,wBAAuB,6BAA6B,CAClD,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,cAAc,EAAE,MAAM,GACrB,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAyDvC"}

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

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":"AAwBA,OAAO,EACL,SAAS,EACT,WAAW,EACX,WAAW,EAIZ,MAAM,aAAa,CAAC;AAErB,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED,wBAAgB,KAAK,YAEpB;AAED,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAS1D,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE;IAClC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAM5C,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAS5D,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE;IACjC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAM5C,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,EAAE,wBAAwB,EACpC,KAAiB,GAClB,EAAE;IACD,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,SAAS,CAAC;CAClB,GAAG,WAAW,CAoCd;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAGxE;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CActB;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,IAAI,CAEhD"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":"AA4BA,OAAO,EACL,SAAS,EACT,WAAW,EACX,WAAW,EAIZ,MAAM,aAAa,CAAC;AAErB,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED,wBAAgB,KAAK,YAEpB;AAED,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAS1D,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE;IAClC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAM5C,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAS5D,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE;IACjC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAM5C,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,EAAE,wBAAwB,EACpC,KAAiB,GAClB,EAAE;IACD,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,SAAS,CAAC;CAClB,GAAG,WAAW,CA+Cd;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAGxE;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CActB;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,IAAI,CAEhD"}

package/lib/types/version.d.ts

@@ -13,5 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export declare const version = "1.31.0-alpha.2";
+export declare const version = "1.31.0";
 //# sourceMappingURL=version.d.ts.map

package/lib/types/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,eAAO,MAAM,OAAO,mBAAmB,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,eAAO,MAAM,OAAO,WAAW,CAAC"}

package/package.json

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