@ardrive/turbo-sdk 1.32.1-alpha.1 → 1.32.1-alpha.2

package/bundles/web.bundle.min.js

@@ -222423,7 +222423,7 @@ var import_winston = __toESM(require_winston(), 1);
 init_dirname();
 init_buffer2();
 init_process2();
-var version21 = "1.32.0";
+var version21 = "1.32.1-alpha.1";
 
 // src/common/logger.ts
 var TurboWinstonLogger = class _TurboWinstonLogger {
@@ -275788,6 +275788,21 @@ var TurboBaseFactory = class {
     }
     token ??= "arweave";
     if (walletAdapter) {
+      if (isSolanaWalletAdapter(walletAdapter)) {
+        const signMessage = walletAdapter.signMessage.bind(walletAdapter);
+        walletAdapter.signMessage = async (message2) => {
+          const signed2 = await signMessage(message2);
+          if ("signature" in signed2) {
+            return signed2.signature;
+          }
+          return signed2;
+        };
+        if (!("toString" in walletAdapter.publicKey)) {
+          walletAdapter.publicKey.toString = function() {
+            return this.toBuffer().toString("base64");
+          };
+        }
+      }
       providedSigner = this.signerFromAdapter(walletAdapter, token);
     }
     const turboSigner = this.getSigner({
@@ -275933,8 +275948,7 @@ var TurboDataItemAbstractSigner = class {
       if (isSolanaWalletAdapter(this.walletAdapter)) {
         const connection = new Connection(gatewayUrl, "confirmed");
         const publicKey2 = new PublicKey(
-          this.walletAdapter.publicKey?.toString?.() || // For backwards compatibility with umi uploader
-          this.walletAdapter.publicKey?.toBuffer?.() || "<unknown>"
+          this.walletAdapter.publicKey.toString()
         );
         const tx2 = new Transaction2({
           feePayer: publicKey2,

package/lib/cjs/common/factory.js

@@ -77,6 +77,23 @@ class TurboBaseFactory {
         }
         token ??= 'arweave'; // default to arweave if token is not provided
         if (walletAdapter) {
+            if ((0, types_js_1.isSolanaWalletAdapter)(walletAdapter)) {
+                const signMessage = walletAdapter.signMessage.bind(walletAdapter);
+                walletAdapter.signMessage = async (message) => {
+                    const signed = await signMessage(message);
+                    if ('signature' in signed) {
+                        return signed.signature;
+                    }
+                    return signed;
+                };
+                if (!('toString' in walletAdapter.publicKey)) {
+                    // Umi uploader compatibility
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    walletAdapter.publicKey.toString = function () {
+                        return this.toBuffer().toString('base64');
+                    };
+                }
+            }
             providedSigner = this.signerFromAdapter(walletAdapter, token);
         }
         const turboSigner = this.getSigner({

package/lib/cjs/common/signer.js

@@ -85,10 +85,7 @@ class TurboDataItemAbstractSigner {
         if (this.walletAdapter) {
             if ((0, types_js_1.isSolanaWalletAdapter)(this.walletAdapter)) {
                 const connection = new web3_js_1.Connection(gatewayUrl, 'confirmed');
-                const publicKey = new web3_js_1.PublicKey(this.walletAdapter.publicKey?.toString?.() ||
-                    // For backwards compatibility with umi uploader
-                    this.walletAdapter.publicKey?.toBuffer?.() ||
-                    '<unknown>');
+                const publicKey = new web3_js_1.PublicKey(this.walletAdapter.publicKey.toString());
                 const tx = new web3_js_1.Transaction({
                     feePayer: publicKey,
                     ...(await connection.getLatestBlockhash()),

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.32.1-alpha.1';
+exports.version = '1.32.1-alpha.2';

package/lib/esm/common/factory.js

@@ -74,6 +74,23 @@ export class TurboBaseFactory {
         }
         token ??= 'arweave'; // default to arweave if token is not provided
         if (walletAdapter) {
+            if (isSolanaWalletAdapter(walletAdapter)) {
+                const signMessage = walletAdapter.signMessage.bind(walletAdapter);
+                walletAdapter.signMessage = async (message) => {
+                    const signed = await signMessage(message);
+                    if ('signature' in signed) {
+                        return signed.signature;
+                    }
+                    return signed;
+                };
+                if (!('toString' in walletAdapter.publicKey)) {
+                    // Umi uploader compatibility
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    walletAdapter.publicKey.toString = function () {
+                        return this.toBuffer().toString('base64');
+                    };
+                }
+            }
             providedSigner = this.signerFromAdapter(walletAdapter, token);
         }
         const turboSigner = this.getSigner({

package/lib/esm/common/signer.js

@@ -79,10 +79,7 @@ export class TurboDataItemAbstractSigner {
         if (this.walletAdapter) {
             if (isSolanaWalletAdapter(this.walletAdapter)) {
                 const connection = new Connection(gatewayUrl, 'confirmed');
-                const publicKey = new PublicKey(this.walletAdapter.publicKey?.toString?.() ||
-                    // For backwards compatibility with umi uploader
-                    this.walletAdapter.publicKey?.toBuffer?.() ||
-                    '<unknown>');
+                const publicKey = new PublicKey(this.walletAdapter.publicKey.toString());
                 const tx = new Transaction({
                     feePayer: publicKey,
                     ...(await connection.getLatestBlockhash()),

package/lib/esm/version.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/common/factory.ts"],"names":[],"mappings":"AAqBA,OAAO,EACL,oBAAoB,EAEpB,+BAA+B,EAC/B,4CAA4C,EAC5C,wCAAwC,EACxC,iCAAiC,EAIlC,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EACL,gCAAgC,EAEjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AAGpB,8BAAsB,gBAAgB;IACpC,SAAS,CAAC,MAAM,CAAC,MAAM,qBAA8B;IAGrD,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM;IAKhC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM;IAIlC,MAAM,CAAC,eAAe,CAAC,EACrB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,GACN,GAAE,iCAAsC;IAqBzC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAC3B,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,KAAK,GACN,EAAE,oBAAoB,GAAG,2BAA2B;IAErD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,CAC9C,MAAM,EAAE,4CAA4C,GAAG;QACrD,cAAc,EAAE,gCAAgC,CAAC;KAClD,GACA,wCAAwC;IAE3C,SAAS,CAAC,qBAAqB,CAAC,EAC9B,UAAU,EACV,MAAM,EAAE,cAAc,EACtB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,UAAU,EACV,MAAM,EACN,aAAa,EACb,SAAS,EACT,KAAK,GACN,EAAE,+BAA+B,GAAG;QAAE,MAAM,EAAE,kBAAkB,CAAA;KAAE;IA6EnE,OAAO,CAAC,iBAAiB;CAuB1B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/common/factory.ts"],"names":[],"mappings":"AAqBA,OAAO,EACL,oBAAoB,EAEpB,+BAA+B,EAC/B,4CAA4C,EAC5C,wCAAwC,EACxC,iCAAiC,EAIlC,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EACL,gCAAgC,EAEjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AAGpB,8BAAsB,gBAAgB;IACpC,SAAS,CAAC,MAAM,CAAC,MAAM,qBAA8B;IAGrD,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM;IAKhC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM;IAIlC,MAAM,CAAC,eAAe,CAAC,EACrB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,GACN,GAAE,iCAAsC;IAqBzC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAC3B,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,KAAK,GACN,EAAE,oBAAoB,GAAG,2BAA2B;IAErD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,CAC9C,MAAM,EAAE,4CAA4C,GAAG;QACrD,cAAc,EAAE,gCAAgC,CAAC;KAClD,GACA,wCAAwC;IAE3C,SAAS,CAAC,qBAAqB,CAAC,EAC9B,UAAU,EACV,MAAM,EAAE,cAAc,EACtB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,UAAU,EACV,MAAM,EACN,aAAa,EACb,SAAS,EACT,KAAK,GACN,EAAE,+BAA+B,GAAG;QAAE,MAAM,EAAE,kBAAkB,CAAA;KAAE;IAgGnE,OAAO,CAAC,iBAAiB;CAuB1B"}

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

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../../src/common/signer.ts"],"names":[],"mappings":"AAiCA,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,SAAS,EACT,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,EAChB,WAAW,EACX,0BAA0B,EAC1B,WAAW,EACX,aAAa,EAGd,MAAM,aAAa,CAAC;AAQrB;;GAEG;AACH,8BAAsB,2BACpB,YAAW,mBAAmB;IAEvB,MAAM,EAAE,WAAW,CAAC;IAE3B,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;IAC9B,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC;IAC3B,SAAS,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;gBAEvC,EACV,MAAM,EACN,MAAmC,EACnC,KAAK,EACL,aAAa,GACd,EAAE,yBAAyB;IAO5B,QAAQ,CAAC,YAAY,CAAC,EACpB,iBAAiB,EACjB,eAAe,EACf,YAAY,EACZ,OAAO,GACR,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAE5E,OAAO,CAAC,oBAAoB;IA4Bf,4BAA4B;;;;;IAY5B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC;IAOvD,gGAAgG;IACnF,eAAe,CAAC,EAC3B,MAAM,EACN,MAAM,EACN,UAAU,GACX,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC;IAsE9B,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;CAgBnE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../../src/common/signer.ts"],"names":[],"mappings":"AAiCA,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,SAAS,EACT,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,EAChB,WAAW,EACX,0BAA0B,EAC1B,WAAW,EACX,aAAa,EAGd,MAAM,aAAa,CAAC;AAQrB;;GAEG;AACH,8BAAsB,2BACpB,YAAW,mBAAmB;IAEvB,MAAM,EAAE,WAAW,CAAC;IAE3B,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;IAC9B,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC;IAC3B,SAAS,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;gBAEvC,EACV,MAAM,EACN,MAAmC,EACnC,KAAK,EACL,aAAa,GACd,EAAE,yBAAyB;IAO5B,QAAQ,CAAC,YAAY,CAAC,EACpB,iBAAiB,EACjB,eAAe,EACf,YAAY,EACZ,OAAO,GACR,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAE5E,OAAO,CAAC,oBAAoB;IA4Bf,4BAA4B;;;;;IAY5B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC;IAOvD,gGAAgG;IACnF,eAAe,CAAC,EAC3B,MAAM,EACN,MAAM,EACN,UAAU,GACX,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC;IAmE9B,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;CAgBnE"}

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.32.0";
+export declare const version = "1.32.1-alpha.1";
 //# 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,WAAW,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,eAAO,MAAM,OAAO,mBAAmB,CAAC"}

package/package.json

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