@dynamic-labs/ethereum-core 3.0.0-alpha.57 → 3.0.0-alpha.59

package/CHANGELOG.md

@@ -1,4 +1,22 @@
 
+## [3.0.0-alpha.59](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.58...v3.0.0-alpha.59) (2024-09-05)
+
+
+### Features
+
+* global wallet mobile scanner ([#6801](https://github.com/dynamic-labs/DynamicAuth/issues/6801)) ([8d10661](https://github.com/dynamic-labs/DynamicAuth/commit/8d106615105988f4019f7a320961e94fbe35f6dc))
+
+## [3.0.0-alpha.58](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.57...v3.0.0-alpha.58) (2024-09-05)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove headless prop from DynamicContextProvider ([#6806](https://github.com/dynamic-labs/DynamicAuth/issues/6806)) ([1ab55a1](https://github.com/dynamic-labs/DynamicAuth/commit/1ab55a1cf5d143316617aa88a487bb59446f6f28))
+
+### Features
+
+* allow selecting which MetaMask account to connect with when linking new wallet ([#6796](https://github.com/dynamic-labs/DynamicAuth/issues/6796)) ([83e270f](https://github.com/dynamic-labs/DynamicAuth/commit/83e270ffd53d5f6c95464cf570663e1008ffa6fb))
+
 ## [3.0.0-alpha.57](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.56...v3.0.0-alpha.57) (2024-09-05)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-core",
-  "version": "3.0.0-alpha.57",
+  "version": "3.0.0-alpha.59",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -30,11 +30,11 @@
   },
   "peerDependencies": {
     "viem": "^2.7.6",
-    "@dynamic-labs/logger": "3.0.0-alpha.57",
-    "@dynamic-labs/rpc-providers": "3.0.0-alpha.57",
-    "@dynamic-labs/types": "3.0.0-alpha.57",
-    "@dynamic-labs/utils": "3.0.0-alpha.57",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.57",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.57"
+    "@dynamic-labs/logger": "3.0.0-alpha.59",
+    "@dynamic-labs/rpc-providers": "3.0.0-alpha.59",
+    "@dynamic-labs/types": "3.0.0-alpha.59",
+    "@dynamic-labs/utils": "3.0.0-alpha.59",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.59",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.59"
   }
 }

package/src/connector/EthWalletConnector.cjs

@@ -137,15 +137,44 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
             return this.providerSwitchNetwork({ network, provider });
         });
     }
-    getConnectedAccounts() {
+    chooseAccountsToConnect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             const provider = this.getWalletClient();
             if (!provider)
                 return [];
-            const addresses = yield utils.retryableFn(provider.getAddresses, {
-                fallbackValue: [],
-                timeoutMs: 500,
-            });
+            const result = yield provider.requestPermissions({ eth_accounts: {} });
+            walletConnectorCore.logger.debug('chooseAccountsToConnect - requestPermissions result', result);
+            // this should return the connected addresses for MM
+            const addresses = (_c = (_b = (_a = result === null || result === void 0 ? void 0 : result.find((r) => r.parentCapability === 'eth_accounts')) === null || _a === void 0 ? void 0 : _a.caveats) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.value;
+            if (typeof addresses === 'string') {
+                return [addresses];
+            }
+            if (Array.isArray(addresses)) {
+                return addresses;
+            }
+            return [];
+        });
+    }
+    getConnectedAccounts(options) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = this.getWalletClient();
+            if (!provider)
+                return [];
+            let addresses = [];
+            // some wallets like MM and Phantom won't return the selected account if
+            // it's not connected to the dapp, and the only way we can prompt for a connection in MM
+            // is by calling requestPermissions, which wil allow the user to choose the accounts to connect
+            if (options === null || options === void 0 ? void 0 : options.chooseAccounts) {
+                addresses = yield this.chooseAccountsToConnect();
+                walletConnectorCore.logger.debug('getConnectedAccounts - Chosen addresses', addresses);
+            }
+            if (!addresses.length) {
+                addresses = yield utils.retryableFn(provider.getAddresses, {
+                    fallbackValue: [],
+                    timeoutMs: 500,
+                });
+            }
             if (addresses.length) {
                 this.setActiveAccount(addresses[0]);
             }

package/src/connector/EthWalletConnector.d.ts

@@ -1,7 +1,7 @@
 import { Account, Hex, PublicClient, Transport, Chain as ViemChain, WalletClient } from 'viem';
 import { EvmNetwork, GenericNetwork, IUITransaction, TransactionReceipt } from '@dynamic-labs/types';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
-import { ISendBalanceWalletConnector, NameServiceData, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { ISendBalanceWalletConnector, NameServiceData, WalletConnectorBase, GetConnectedAccountsOpts } from '@dynamic-labs/wallet-connector-core';
 import { IChainRpcProviders } from '../rpc';
 import { EthereumWallet } from '../wallet';
 export type SwitchNetworkOps = {
@@ -3069,7 +3069,8 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase<typ
     getBalance(address: string): Promise<string | undefined>;
     supportsNetworkSwitching(): boolean;
     switchNetwork({ networkName, networkChainId, }: SwitchNetworkOps): Promise<void>;
-    getConnectedAccounts(): Promise<string[]>;
+    chooseAccountsToConnect(): Promise<string[]>;
+    getConnectedAccounts(options?: GetConnectedAccountsOpts): Promise<string[]>;
     providerSwitchNetwork({ network, provider, }: {
         network: EvmNetwork;
         provider: WalletClient;

package/src/connector/EthWalletConnector.js

@@ -133,15 +133,44 @@ class EthWalletConnector extends WalletConnectorBase {
             return this.providerSwitchNetwork({ network, provider });
         });
     }
-    getConnectedAccounts() {
+    chooseAccountsToConnect() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             const provider = this.getWalletClient();
             if (!provider)
                 return [];
-            const addresses = yield retryableFn(provider.getAddresses, {
-                fallbackValue: [],
-                timeoutMs: 500,
-            });
+            const result = yield provider.requestPermissions({ eth_accounts: {} });
+            logger.debug('chooseAccountsToConnect - requestPermissions result', result);
+            // this should return the connected addresses for MM
+            const addresses = (_c = (_b = (_a = result === null || result === void 0 ? void 0 : result.find((r) => r.parentCapability === 'eth_accounts')) === null || _a === void 0 ? void 0 : _a.caveats) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.value;
+            if (typeof addresses === 'string') {
+                return [addresses];
+            }
+            if (Array.isArray(addresses)) {
+                return addresses;
+            }
+            return [];
+        });
+    }
+    getConnectedAccounts(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = this.getWalletClient();
+            if (!provider)
+                return [];
+            let addresses = [];
+            // some wallets like MM and Phantom won't return the selected account if
+            // it's not connected to the dapp, and the only way we can prompt for a connection in MM
+            // is by calling requestPermissions, which wil allow the user to choose the accounts to connect
+            if (options === null || options === void 0 ? void 0 : options.chooseAccounts) {
+                addresses = yield this.chooseAccountsToConnect();
+                logger.debug('getConnectedAccounts - Chosen addresses', addresses);
+            }
+            if (!addresses.length) {
+                addresses = yield retryableFn(provider.getAddresses, {
+                    fallbackValue: [],
+                    timeoutMs: 500,
+                });
+            }
             if (addresses.length) {
                 this.setActiveAccount(addresses[0]);
             }