@dynamic-labs/wallet-connector-core 3.0.0-alpha.64 → 3.0.0-alpha.65

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+## [3.0.0-alpha.65](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.64...v3.0.0-alpha.65) (2024-09-11)
+
+
+### Bug Fixes
+
+* gracefully handle errors when trying to find solana tx destination ([#6847](https://github.com/dynamic-labs/DynamicAuth/issues/6847)) ([19359ad](https://github.com/dynamic-labs/DynamicAuth/commit/19359ad40b16af0edb822d1fc6643fecdbc89adf))
+
 ## [3.0.0-alpha.64](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.63...v3.0.0-alpha.64) (2024-09-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/wallet-connector-core",
-  "version": "3.0.0-alpha.64",
+  "version": "3.0.0-alpha.65",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -29,11 +29,11 @@
     "@dynamic-labs/sdk-api-core": "0.0.526"
   },
   "peerDependencies": {
-    "@dynamic-labs/logger": "3.0.0-alpha.64",
-    "@dynamic-labs/rpc-providers": "3.0.0-alpha.64",
-    "@dynamic-labs/types": "3.0.0-alpha.64",
-    "@dynamic-labs/utils": "3.0.0-alpha.64",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.64",
+    "@dynamic-labs/logger": "3.0.0-alpha.65",
+    "@dynamic-labs/rpc-providers": "3.0.0-alpha.65",
+    "@dynamic-labs/types": "3.0.0-alpha.65",
+    "@dynamic-labs/utils": "3.0.0-alpha.65",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.65",
     "eventemitter3": "5.0.1"
   }
 }

package/src/lib/IBitcoinWalletConnector.d.ts

@@ -24,6 +24,5 @@ export interface IBitcoinWalletConnector extends WalletConnectorBase {
     isHardwareWalletEnabled: boolean;
     isLedgerAddress(address: string): boolean;
     clearConnectedAccounts(): Promise<void>;
-    signMessageWithAddress(messageToSign: string, address: string): Promise<string | undefined>;
 }
 export {};

package/src/lib/WalletConnector.cjs

@@ -241,8 +241,6 @@ class WalletConnectorBase extends EventEmitter__default["default"] {
      * Get the address silently
      *
      * @param options - GetConnectedAccountsOpts
-     * forceFetch - if true it will fetch the address again even if wallet
-     * has getConnectedAccounts limitation in wallet-book
      * chooseAccounts - if true will prompt for the user to choose accounts to connect (if supported)
      * @default Promise<[]>
      */
@@ -338,7 +336,7 @@ class WalletConnectorBase extends EventEmitter__default["default"] {
      *
      * @default Promise<undefined>
      */
-    signMessage(messageToSign) {
+    signMessage(messageToSign, withAddress) {
         return Promise.resolve(undefined);
     }
     /**
@@ -374,6 +372,37 @@ class WalletConnectorBase extends EventEmitter__default["default"] {
     canGetChainAddress() {
         return true;
     }
+    /**
+     * Prompts the user to make expected wallet active
+     *
+     * @throws {WalletAddressMismatchError} If the active address does not match the expected address.
+     * @returns {Promise<void>} A promise that resolves when the active address matches the expected address,
+     * otherwise rejects with an error.
+     */
+    handleWalletNotActive(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ activeAddress, expectedAddress, reconnectedAddress, }) {
+            logger.logger.debug('validateActiveWallet - wallet is not active', {
+                activeAddress,
+                expectedAddress,
+                reconnectedAddress,
+            });
+            const currentActiveAddress = activeAddress || reconnectedAddress || '';
+            const walletUiUtils = this.constructorProps
+                .walletUiUtils;
+            if (!walletUiUtils) {
+                throw new utils.WalletAddressMismatchError(`Wallet ${expectedAddress !== null && expectedAddress !== void 0 ? expectedAddress : ''} is not currently active in ${this.name || this.key}.`, {
+                    activeAddress: currentActiveAddress,
+                    expectedAddress,
+                    walletName: this.name || this.key,
+                });
+            }
+            return walletUiUtils.syncWallet({
+                activeAddress: currentActiveAddress,
+                expectedAddress,
+                walletConnector: this,
+            });
+        });
+    }
     /**
      * Validates if the address is connected and active in the wallet app
      *
@@ -383,19 +412,16 @@ class WalletConnectorBase extends EventEmitter__default["default"] {
      */
     validateActiveWallet(expectedAddress) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
             logger.logger.debug('validateActiveWallet - validating wallet', expectedAddress);
             const canFetchConnectedAccounts = isConnectorMethodSupported.isConnectorMethodSupported(this, 'getConnectedAccounts', 'browserExtension');
             logger.logger.debug('validateActiveWallet - getting connected accounts', {
                 canFetchConnectedAccounts,
             });
             const [activeAddress] = canFetchConnectedAccounts
-                ? yield this.getConnectedAccounts({ forceFetch: true })
+                ? yield this.getConnectedAccounts()
                 : [];
             const isWalletActive = activeAddress &&
                 isSameAddress.isSameAddress(activeAddress, expectedAddress, this.connectedChain);
-            const walletUiUtils = this.constructorProps
-                .walletUiUtils;
             if (isWalletActive) {
                 logger.logger.debug('validateActiveWallet - wallet is active');
                 return;
@@ -417,24 +443,11 @@ class WalletConnectorBase extends EventEmitter__default["default"] {
                 logger.logger.debug('validateActiveWallet - wallet reconnected successfuly');
                 return;
             }
-            logger.logger.debug('validateActiveWallet - wallet is not active', {
+            return this.handleWalletNotActive({
                 activeAddress,
                 expectedAddress,
                 reconnectedAddress,
             });
-            const currentActiveAddress = activeAddress || reconnectedAddress || '';
-            if (!walletUiUtils) {
-                throw new utils.WalletAddressMismatchError(`Wallet ${expectedAddress !== null && expectedAddress !== void 0 ? expectedAddress : ''} is not currently active in ${(_a = this.name) !== null && _a !== void 0 ? _a : this.key}.`, {
-                    activeAddress: currentActiveAddress,
-                    expectedAddress,
-                    walletName: (_b = this.name) !== null && _b !== void 0 ? _b : this.key,
-                });
-            }
-            return walletUiUtils.syncWallet({
-                activeAddress: currentActiveAddress,
-                expectedAddress,
-                walletConnector: this,
-            });
         });
     }
 }

package/src/lib/WalletConnector.d.ts

@@ -25,7 +25,6 @@ export type GetAddressOpts = {
     onDisplayUri?(uri: string): void;
 };
 export type GetConnectedAccountsOpts = {
-    forceFetch?: boolean;
     chooseAccounts?: boolean;
 };
 export type NameServiceData = {
@@ -168,8 +167,6 @@ export declare abstract class WalletConnectorBase<C extends WalletConstructor<an
      * Get the address silently
      *
      * @param options - GetConnectedAccountsOpts
-     * forceFetch - if true it will fetch the address again even if wallet
-     * has getConnectedAccounts limitation in wallet-book
      * chooseAccounts - if true will prompt for the user to choose accounts to connect (if supported)
      * @default Promise<[]>
      */
@@ -292,7 +289,7 @@ export declare abstract class WalletConnectorBase<C extends WalletConstructor<an
      *
      * @default Promise<undefined>
      */
-    signMessage(messageToSign: string): Promise<string | undefined>;
+    signMessage(messageToSign: string, withAddress?: string): Promise<string | undefined>;
     /**
      * List of supported chains for this wallet
      */
@@ -337,6 +334,18 @@ export declare abstract class WalletConnectorBase<C extends WalletConstructor<an
      * @default true
      */
     canGetChainAddress(): boolean;
+    /**
+     * Prompts the user to make expected wallet active
+     *
+     * @throws {WalletAddressMismatchError} If the active address does not match the expected address.
+     * @returns {Promise<void>} A promise that resolves when the active address matches the expected address,
+     * otherwise rejects with an error.
+     */
+    handleWalletNotActive({ activeAddress, expectedAddress, reconnectedAddress, }: {
+        expectedAddress: string;
+        activeAddress?: string;
+        reconnectedAddress?: string;
+    }): Promise<void>;
     /**
      * Validates if the address is connected and active in the wallet app
      *

package/src/lib/WalletConnector.js

@@ -233,8 +233,6 @@ class WalletConnectorBase extends EventEmitter {
      * Get the address silently
      *
      * @param options - GetConnectedAccountsOpts
-     * forceFetch - if true it will fetch the address again even if wallet
-     * has getConnectedAccounts limitation in wallet-book
      * chooseAccounts - if true will prompt for the user to choose accounts to connect (if supported)
      * @default Promise<[]>
      */
@@ -330,7 +328,7 @@ class WalletConnectorBase extends EventEmitter {
      *
      * @default Promise<undefined>
      */
-    signMessage(messageToSign) {
+    signMessage(messageToSign, withAddress) {
         return Promise.resolve(undefined);
     }
     /**
@@ -366,6 +364,37 @@ class WalletConnectorBase extends EventEmitter {
     canGetChainAddress() {
         return true;
     }
+    /**
+     * Prompts the user to make expected wallet active
+     *
+     * @throws {WalletAddressMismatchError} If the active address does not match the expected address.
+     * @returns {Promise<void>} A promise that resolves when the active address matches the expected address,
+     * otherwise rejects with an error.
+     */
+    handleWalletNotActive(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ activeAddress, expectedAddress, reconnectedAddress, }) {
+            logger.debug('validateActiveWallet - wallet is not active', {
+                activeAddress,
+                expectedAddress,
+                reconnectedAddress,
+            });
+            const currentActiveAddress = activeAddress || reconnectedAddress || '';
+            const walletUiUtils = this.constructorProps
+                .walletUiUtils;
+            if (!walletUiUtils) {
+                throw new WalletAddressMismatchError(`Wallet ${expectedAddress !== null && expectedAddress !== void 0 ? expectedAddress : ''} is not currently active in ${this.name || this.key}.`, {
+                    activeAddress: currentActiveAddress,
+                    expectedAddress,
+                    walletName: this.name || this.key,
+                });
+            }
+            return walletUiUtils.syncWallet({
+                activeAddress: currentActiveAddress,
+                expectedAddress,
+                walletConnector: this,
+            });
+        });
+    }
     /**
      * Validates if the address is connected and active in the wallet app
      *
@@ -375,19 +404,16 @@ class WalletConnectorBase extends EventEmitter {
      */
     validateActiveWallet(expectedAddress) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
             logger.debug('validateActiveWallet - validating wallet', expectedAddress);
             const canFetchConnectedAccounts = isConnectorMethodSupported(this, 'getConnectedAccounts', 'browserExtension');
             logger.debug('validateActiveWallet - getting connected accounts', {
                 canFetchConnectedAccounts,
             });
             const [activeAddress] = canFetchConnectedAccounts
-                ? yield this.getConnectedAccounts({ forceFetch: true })
+                ? yield this.getConnectedAccounts()
                 : [];
             const isWalletActive = activeAddress &&
                 isSameAddress(activeAddress, expectedAddress, this.connectedChain);
-            const walletUiUtils = this.constructorProps
-                .walletUiUtils;
             if (isWalletActive) {
                 logger.debug('validateActiveWallet - wallet is active');
                 return;
@@ -409,24 +435,11 @@ class WalletConnectorBase extends EventEmitter {
                 logger.debug('validateActiveWallet - wallet reconnected successfuly');
                 return;
             }
-            logger.debug('validateActiveWallet - wallet is not active', {
+            return this.handleWalletNotActive({
                 activeAddress,
                 expectedAddress,
                 reconnectedAddress,
             });
-            const currentActiveAddress = activeAddress || reconnectedAddress || '';
-            if (!walletUiUtils) {
-                throw new WalletAddressMismatchError(`Wallet ${expectedAddress !== null && expectedAddress !== void 0 ? expectedAddress : ''} is not currently active in ${(_a = this.name) !== null && _a !== void 0 ? _a : this.key}.`, {
-                    activeAddress: currentActiveAddress,
-                    expectedAddress,
-                    walletName: (_b = this.name) !== null && _b !== void 0 ? _b : this.key,
-                });
-            }
-            return walletUiUtils.syncWallet({
-                activeAddress: currentActiveAddress,
-                expectedAddress,
-                walletConnector: this,
-            });
         });
     }
 }

package/src/lib/wallets/Wallet/Wallet.cjs

@@ -90,7 +90,7 @@ class Wallet extends types.BaseWallet {
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             yield this.sync();
-            return this._connector.signMessage(messageToSign);
+            return this._connector.signMessage(messageToSign, this.address);
         });
     }
     /**

package/src/lib/wallets/Wallet/Wallet.js

@@ -86,7 +86,7 @@ class Wallet extends BaseWallet {
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.sync();
-            return this._connector.signMessage(messageToSign);
+            return this._connector.signMessage(messageToSign, this.address);
         });
     }
     /**