@dynamic-labs/solana 1.1.0-alpha.14 → 1.1.0-alpha.16

package/CHANGELOG.md

@@ -1,4 +1,31 @@
 
+## [1.1.0-alpha.16](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.15...v1.1.0-alpha.16) (2024-01-30)
+
+
+### Bug Fixes
+
+* add fallback to getWalletBookWallet for customers still passing in name, add deprecation warn ([#4518](https://github.com/dynamic-labs/DynamicAuth/issues/4518)) ([b233ea1](https://github.com/dynamic-labs/DynamicAuth/commit/b233ea1cd640d8d9d94c52ab230787f3d869151a))
+* handle braavos network change to account which doesn not exist ([#4519](https://github.com/dynamic-labs/DynamicAuth/issues/4519)) ([486020f](https://github.com/dynamic-labs/DynamicAuth/commit/486020fb09a274388ba34c8d1b37ac3a1ff3dba6))
+
+## [1.1.0-alpha.15](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.14...v1.1.0-alpha.15) (2024-01-28)
+
+
+### Features
+
+* add wallet group override to wallet book ([#4488](https://github.com/dynamic-labs/DynamicAuth/issues/4488)) ([cb19ad3](https://github.com/dynamic-labs/DynamicAuth/commit/cb19ad3ea82de488752ceceeaf0e1458a388df6e))
+* enable solana embedded wallets ([#4457](https://github.com/dynamic-labs/DynamicAuth/issues/4457)) ([b0c47f4](https://github.com/dynamic-labs/DynamicAuth/commit/b0c47f4475baa12f52076da46ef993c13bd2c243))
+* group ArgentX wallets ([#4495](https://github.com/dynamic-labs/DynamicAuth/issues/4495)) ([b10d79a](https://github.com/dynamic-labs/DynamicAuth/commit/b10d79a668efecedca37ddb358e6adf95319650d))
+
+
+### Bug Fixes
+
+* add support for newest backpack extension ([#4468](https://github.com/dynamic-labs/DynamicAuth/issues/4468)) ([a219f32](https://github.com/dynamic-labs/DynamicAuth/commit/a219f325be672599e50b07f6751234a7fc98286e))
+* bump timeout for slower connections ([#4475](https://github.com/dynamic-labs/DynamicAuth/issues/4475)) ([7a07ff5](https://github.com/dynamic-labs/DynamicAuth/commit/7a07ff589eaaf3b28a94d277df3eedabbca60702))
+* change out getWalletBookWallet for findWalletBookWallet to avoid throwing during lookup ([#4477](https://github.com/dynamic-labs/DynamicAuth/issues/4477)) ([4648040](https://github.com/dynamic-labs/DynamicAuth/commit/4648040c166e73dd2c31b0e27897713339436c2f))
+* connect to wallet with wallet connect even if network is not supported ([#4465](https://github.com/dynamic-labs/DynamicAuth/issues/4465)) ([9dbca3e](https://github.com/dynamic-labs/DynamicAuth/commit/9dbca3eb4d4990ee4be642677c1604170b425dc3))
+* pass id to wagmi chain override ([#4512](https://github.com/dynamic-labs/DynamicAuth/issues/4512)) ([2bf2f04](https://github.com/dynamic-labs/DynamicAuth/commit/2bf2f0487f5b1be936dd279107c11fe5d2b42666))
+* switching wallet in extension caused connected flag to be false temporarily ([#4454](https://github.com/dynamic-labs/DynamicAuth/issues/4454)) ([3650f6e](https://github.com/dynamic-labs/DynamicAuth/commit/3650f6ec471a7c779f4d304ab94c9350dd55055b))
+
 ## [1.1.0-alpha.14](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.13...v1.1.0-alpha.14) (2024-01-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "1.1.0-alpha.14",
+  "version": "1.1.0-alpha.16",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -27,12 +27,13 @@
   },
   "dependencies": {
     "@solana/web3.js": "1.70.1",
-    "@dynamic-labs/sdk-api": "0.0.352",
-    "@dynamic-labs/rpc-providers": "1.1.0-alpha.14",
-    "@dynamic-labs/types": "1.1.0-alpha.14",
-    "@dynamic-labs/utils": "1.1.0-alpha.14",
-    "@dynamic-labs/wallet-book": "1.1.0-alpha.14",
-    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.14",
+    "@dynamic-labs/sdk-api": "0.0.356",
+    "@dynamic-labs/rpc-providers": "1.1.0-alpha.16",
+    "@dynamic-labs/turnkey": "1.1.0-alpha.16",
+    "@dynamic-labs/types": "1.1.0-alpha.16",
+    "@dynamic-labs/utils": "1.1.0-alpha.16",
+    "@dynamic-labs/wallet-book": "1.1.0-alpha.16",
+    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.16",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/CoinbaseSolana.cjs

@@ -5,6 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
 var walletBook = require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/turnkey');
+require('@dynamic-labs/sdk-api');
 var InjectedWalletBase = require('./injected/InjectedWalletBase.cjs');
 require('@solana/web3.js');
 require('@dynamic-labs/wallet-connector-core');

package/src/CoinbaseSolana.js

@@ -1,6 +1,8 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { bufferToBase64 } from '@dynamic-labs/utils';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import '@dynamic-labs/turnkey';
+import '@dynamic-labs/sdk-api';
 import { InjectedWalletBase } from './injected/InjectedWalletBase.js';
 import '@solana/web3.js';
 import '@dynamic-labs/wallet-connector-core';

package/src/index.cjs

@@ -2,6 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var turnkey = require('@dynamic-labs/turnkey');
+var sdkApi = require('@dynamic-labs/sdk-api');
 var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
 var isSignedMessage = require('./utils/isSignedMessage.cjs');
 var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
@@ -10,6 +12,7 @@ var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
 const SolanaWalletConnectors = (props) => [
     ...fetchInjectedWalletConnectors.injectedWalletOverrides,
     ...fetchInjectedWalletConnectors.fetchInjectedWalletConnectors(props),
+    ...turnkey.TurnkeyWalletConnectors(props, sdkApi.ChainEnum.Sol),
 ];
 
 exports.isSignedMessage = isSignedMessage.isSignedMessage;

package/src/index.js

@@ -1,3 +1,5 @@
+import { TurnkeyWalletConnectors } from '@dynamic-labs/turnkey';
+import { ChainEnum } from '@dynamic-labs/sdk-api';
 import { injectedWalletOverrides, fetchInjectedWalletConnectors } from './injected/fetchInjectedWalletConnectors.js';
 export { isSignedMessage } from './utils/isSignedMessage.js';
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner.js';
@@ -6,6 +8,7 @@ export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner.js';
 const SolanaWalletConnectors = (props) => [
     ...injectedWalletOverrides,
     ...fetchInjectedWalletConnectors(props),
+    ...TurnkeyWalletConnectors(props, ChainEnum.Sol),
 ];
 
 export { SolanaWalletConnectors };

package/src/injected/BackpackSol.cjs

@@ -33,6 +33,9 @@ class BackpackSol extends InjectedWalletBase.InjectedWalletBase {
             if (!signedMessage) {
                 return undefined;
             }
+            if (typeof signedMessage === 'object' && 'signature' in signedMessage) {
+                return utils.bufferToBase64(signedMessage.signature);
+            }
             return utils.bufferToBase64(signedMessage);
         });
     }

package/src/injected/BackpackSol.js

@@ -29,6 +29,9 @@ class BackpackSol extends InjectedWalletBase {
             if (!signedMessage) {
                 return undefined;
             }
+            if (typeof signedMessage === 'object' && 'signature' in signedMessage) {
+                return bufferToBase64(signedMessage.signature);
+            }
             return bufferToBase64(signedMessage);
         });
     }

package/src/injected/InjectedWalletBase.cjs

@@ -11,52 +11,59 @@ var SignMessageNotSupportedError = require('../errors/SignMessageNotSupportedErr
 class InjectedWalletBase extends solWalletConnector.SolWalletConnector {
     getSolProviderHelper() {
         if (!this.wallet) {
-            this.wallet = walletBook.getWalletBookWallet(this.walletBook, this.key);
+            this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
         }
-        if (!this.solProviderHelper) {
+        if (this.wallet && !this.solProviderHelper) {
             this.solProviderHelper = new solProviderHelper.SolProviderHelper(this.wallet);
         }
-        // adding the forced typing below to avoid having to null check in other methods
         return this.solProviderHelper;
     }
     setupEventListeners() {
-        this.getSolProviderHelper()._setupEventListeners(this);
+        var _a;
+        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._setupEventListeners(this);
     }
     teardownEventListeners() {
-        this.getSolProviderHelper()._teardownEventListeners();
+        var _a;
+        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._teardownEventListeners();
     }
     connect() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.getSolProviderHelper().connect();
+            yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect());
         });
     }
     getSigner() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.getSolProviderHelper().connect();
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     isInstalledOnBrowser() {
-        return this.getSolProviderHelper().isInstalledHelper();
+        var _a;
+        return Boolean((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.isInstalledHelper());
     }
     fetchPublicAddress() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             if (!this.isInstalledOnBrowser())
                 return;
-            return this.getSolProviderHelper().fetchPublicAddress();
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress();
         });
     }
     signMessage(messageToSign) {
+        var _a, _b;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const walletAddress = yield this.getSolProviderHelper().fetchPublicAddress();
+            const walletAddress = yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress());
             if (walletAddress && this.isLedgerAddress(walletAddress)) {
                 throw new SignMessageNotSupportedError.SignMessageNotSupportedError(this.name);
             }
-            return this.getSolProviderHelper().signMessage(messageToSign);
+            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.signMessage(messageToSign);
         });
     }
     getConnectedAccounts() {
+        var _a, _b;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.getSolProviderHelper().getConnectedAccounts();
+            return (_b = (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()) !== null && _b !== void 0 ? _b : [];
         });
     }
 }

package/src/injected/InjectedWalletBase.d.ts

@@ -5,7 +5,7 @@ import { SolWalletConnector } from '../solWalletConnector';
 export declare abstract class InjectedWalletBase extends SolWalletConnector {
     solProviderHelper: SolProviderHelper | undefined;
     wallet: WalletSchema | undefined;
-    getSolProviderHelper(): SolProviderHelper;
+    getSolProviderHelper(): SolProviderHelper | undefined;
     setupEventListeners(): void;
     teardownEventListeners(): void;
     connect(): Promise<void>;

package/src/injected/InjectedWalletBase.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
-import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { SolProviderHelper } from '../solProviderHelper.js';
 import { SolWalletConnector } from '../solWalletConnector.js';
 import { SignMessageNotSupportedError } from '../errors/SignMessageNotSupportedError.js';
@@ -7,52 +7,59 @@ import { SignMessageNotSupportedError } from '../errors/SignMessageNotSupportedE
 class InjectedWalletBase extends SolWalletConnector {
     getSolProviderHelper() {
         if (!this.wallet) {
-            this.wallet = getWalletBookWallet(this.walletBook, this.key);
+            this.wallet = findWalletBookWallet(this.walletBook, this.key);
         }
-        if (!this.solProviderHelper) {
+        if (this.wallet && !this.solProviderHelper) {
             this.solProviderHelper = new SolProviderHelper(this.wallet);
         }
-        // adding the forced typing below to avoid having to null check in other methods
         return this.solProviderHelper;
     }
     setupEventListeners() {
-        this.getSolProviderHelper()._setupEventListeners(this);
+        var _a;
+        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._setupEventListeners(this);
     }
     teardownEventListeners() {
-        this.getSolProviderHelper()._teardownEventListeners();
+        var _a;
+        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._teardownEventListeners();
     }
     connect() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.getSolProviderHelper().connect();
+            yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect());
         });
     }
     getSigner() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.getSolProviderHelper().connect();
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     isInstalledOnBrowser() {
-        return this.getSolProviderHelper().isInstalledHelper();
+        var _a;
+        return Boolean((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.isInstalledHelper());
     }
     fetchPublicAddress() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isInstalledOnBrowser())
                 return;
-            return this.getSolProviderHelper().fetchPublicAddress();
+            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress();
         });
     }
     signMessage(messageToSign) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const walletAddress = yield this.getSolProviderHelper().fetchPublicAddress();
+            const walletAddress = yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress());
             if (walletAddress && this.isLedgerAddress(walletAddress)) {
                 throw new SignMessageNotSupportedError(this.name);
             }
-            return this.getSolProviderHelper().signMessage(messageToSign);
+            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.signMessage(messageToSign);
         });
     }
     getConnectedAccounts() {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.getSolProviderHelper().getConnectedAccounts();
+            return (_b = (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()) !== null && _b !== void 0 ? _b : [];
         });
     }
 }

package/src/solProviderHelper.d.ts

@@ -18,7 +18,7 @@ export declare class SolProviderHelper {
         windowLocations?: string[] | undefined;
     } | undefined;
     getInstalledProvider(): ISolana | undefined;
-    installedProviders(): (import("./types").ISolanaSigner | import("./types").ICoinbaseSolanaSigner)[];
+    installedProviders(): (import("./types").ISolanaSigner | import("./types").IBackpackSolanaSigner | import("./types").ICoinbaseSolanaSigner)[];
     installedProviderLookup(providerFlags: Array<ProviderCondition<ProviderFlag>>): ISolana | undefined;
     findProvider(): ISolana | undefined;
     isInstalledHelper(): boolean;

package/src/types.d.ts

@@ -55,8 +55,11 @@ export type ISolanaSigner = {
     }) => Promise<ConnectionResult>;
     disconnect(): Promise<void>;
 };
+type BackpackSolanaSignerResponse = {
+    signature: Uint8Array;
+};
 export type IBackpackSolanaSigner = Omit<ISolanaSigner, 'signMessage'> & {
-    signMessage: (message: Uint8Array, encoding?: string) => Promise<void | Uint8Array>;
+    signMessage: (message: Uint8Array, encoding?: string) => Promise<void | BackpackSolanaSignerResponse | Uint8Array>;
     send: (transaction: Transaction, signers?: Signer[], options?: SendOptions, connection?: Connection, publicKey?: PublicKey) => Promise<TransactionSignature>;
 };
 export type ICoinbaseSolanaSigner = Omit<ISolanaSigner, 'signMessage'> & {