@ardrive/turbo-sdk 1.31.0 → 1.31.1-alpha.2

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);
+                clientProvidedSigner.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';
+exports.version = '1.31.1-alpha.2';

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);
+                clientProvidedSigner.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';
+export const version = '1.31.1-alpha.2';

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.3";
+export declare const version = "1.31.1-alpha.1";
 //# sourceMappingURL=version.d.ts.map

package/package.json

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