@dynamic-labs/ethereum 2.0.0-alpha.26 → 2.0.0-alpha.28

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## [2.0.0-alpha.28](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.27...v2.0.0-alpha.28) (2024-04-10)
+
+
+### Bug Fixes
+
+* improve bridge connect experience on mobile ([#5283](https://github.com/dynamic-labs/DynamicAuth/issues/5283)) ([155e4a9](https://github.com/dynamic-labs/DynamicAuth/commit/155e4a99e2cf5f78a1a5e91e774acbf170d6b083))
+
+## [2.0.0-alpha.27](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.26...v2.0.0-alpha.27) (2024-04-09)
+
+
+### Bug Fixes
+
+* coinbase improvements ([#5268](https://github.com/dynamic-labs/DynamicAuth/issues/5268)) ([c10a6de](https://github.com/dynamic-labs/DynamicAuth/commit/c10a6debcacff6cd97f2436fbde387f85faa5682))
+* show qr code for metamask on desktop when not installed ([#5262](https://github.com/dynamic-labs/DynamicAuth/issues/5262)) ([1dcb4d9](https://github.com/dynamic-labs/DynamicAuth/commit/1dcb4d98de8a95f6b11d7bad90b9059110087385))
+* update title of hardware wallet select screen ([#5270](https://github.com/dynamic-labs/DynamicAuth/issues/5270)) ([6e8fe17](https://github.com/dynamic-labs/DynamicAuth/commit/6e8fe17306677786ccf528b97ab673b9ae6b57b9))
+
 ## [2.0.0-alpha.26](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.25...v2.0.0-alpha.26) (2024-04-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "2.0.0-alpha.26",
+  "version": "2.0.0-alpha.28",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -30,13 +30,13 @@
     "@walletconnect/ethereum-provider": "2.11.2",
     "eventemitter3": "5.0.1",
     "buffer": "6.0.3",
-    "@dynamic-labs/rpc-provider-ethereum": "2.0.0-alpha.26",
-    "@dynamic-labs/turnkey": "2.0.0-alpha.26",
-    "@dynamic-labs/types": "2.0.0-alpha.26",
-    "@dynamic-labs/utils": "2.0.0-alpha.26",
-    "@dynamic-labs/viem-utils": "2.0.0-alpha.26",
-    "@dynamic-labs/wallet-book": "2.0.0-alpha.26",
-    "@dynamic-labs/wallet-connector-core": "2.0.0-alpha.26",
+    "@dynamic-labs/rpc-provider-ethereum": "2.0.0-alpha.28",
+    "@dynamic-labs/turnkey": "2.0.0-alpha.28",
+    "@dynamic-labs/types": "2.0.0-alpha.28",
+    "@dynamic-labs/utils": "2.0.0-alpha.28",
+    "@dynamic-labs/viem-utils": "2.0.0-alpha.28",
+    "@dynamic-labs/wallet-book": "2.0.0-alpha.28",
+    "@dynamic-labs/wallet-connector-core": "2.0.0-alpha.28",
     "stream": "0.0.2"
   },
   "peerDependencies": {

package/src/coinbase/client/client.cjs

@@ -10,11 +10,15 @@ var constants = require('../../constants.cjs');
 
 const jsonRpcUrl = `https://mainnet.infura.io/v3/${constants.INFURA_ID}`;
 const chainId = 1;
+// storing a reference to the coinbase sdk so that we can call getQrUrl on it when we need a fresh qr code
+let coinbaseSdk;
+// storing a reference to the coinbase provider because the provider methods work better when
+// they are called on the same instance
 let coinbaseProvider;
-const getCoinbaseProvider = ({ opts: { appLogoUrl, appName = '', evmNetworks = [] } = {}, }) => {
+const getCoinbaseClient = ({ opts: { appLogoUrl, appName = '', evmNetworks = [] } = {}, }) => {
     var _a, _b;
     if (!coinbaseProvider) {
-        const coinbaseWalletSDK = new walletSdk.CoinbaseWalletSDK({
+        coinbaseSdk = new walletSdk.CoinbaseWalletSDK({
             appLogoUrl,
             appName,
             enableMobileWalletLink: true,
@@ -25,21 +29,17 @@ const getCoinbaseProvider = ({ opts: { appLogoUrl, appName = '', evmNetworks = [
         const rpcUrl = ((_a = network === null || network === void 0 ? void 0 : network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) ||
             ((_b = network === null || network === void 0 ? void 0 : network.rpcUrls) === null || _b === void 0 ? void 0 : _b[0]) ||
             jsonRpcUrl;
-        coinbaseProvider = coinbaseWalletSDK.makeWeb3Provider(rpcUrl, chainId);
+        coinbaseProvider = coinbaseSdk.makeWeb3Provider(rpcUrl, chainId);
     }
-    return coinbaseProvider;
+    return { provider: coinbaseProvider, sdk: coinbaseSdk };
 };
 const killCoinbaseSession = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     yield (coinbaseProvider === null || coinbaseProvider === void 0 ? void 0 : coinbaseProvider.close());
-    coinbaseProvider === null || coinbaseProvider === void 0 ? void 0 : coinbaseProvider.disconnect();
-    // We needed to remove the provider, because after a disconnect the initial settings that
-    // were set in the SDK reset, and they need to be initialized again.
-    coinbaseProvider = undefined;
 });
 const getAddress = (coinbaseProviderOpts, opts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const provider = getCoinbaseProvider({ opts: coinbaseProviderOpts });
-    const { qrUrl } = provider;
+    const { provider, sdk } = getCoinbaseClient({ opts: coinbaseProviderOpts });
+    const qrUrl = sdk.getQrUrl();
     if (!qrUrl) {
         throw new utils.DynamicError('no qr url available');
     }
@@ -50,7 +50,7 @@ const getAddress = (coinbaseProviderOpts, opts) => _tslib.__awaiter(void 0, void
     return address;
 });
 const signMessage = (coinbaseProviderOpts, messageToSign) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    const provider = getCoinbaseProvider({ opts: coinbaseProviderOpts });
+    const { provider } = getCoinbaseClient({ opts: coinbaseProviderOpts });
     const [address] = yield provider.request({
         method: 'eth_requestAccounts',
     });
@@ -67,6 +67,6 @@ const signMessage = (coinbaseProviderOpts, messageToSign) => _tslib.__awaiter(vo
 });
 
 exports.getAddress = getAddress;
-exports.getCoinbaseProvider = getCoinbaseProvider;
+exports.getCoinbaseClient = getCoinbaseClient;
 exports.killCoinbaseSession = killCoinbaseSession;
 exports.signMessage = signMessage;

package/src/coinbase/client/client.d.ts

@@ -1,6 +1,7 @@
 import { GetAddressOpts } from '@dynamic-labs/wallet-connector-core';
-import { GetCoinbaseProvider, GetCoinbaseProviderOpts } from './types';
-export declare const getCoinbaseProvider: GetCoinbaseProvider;
+import { GetCoinbaseClient, GetCoinbaseProviderOpts } from './types';
+export declare const clearClientVariables: () => void;
+export declare const getCoinbaseClient: GetCoinbaseClient;
 export declare const killCoinbaseSession: () => Promise<void>;
 export declare const getAddress: (coinbaseProviderOpts: GetCoinbaseProviderOpts, opts?: GetAddressOpts) => Promise<string | undefined>;
 export declare const signMessage: (coinbaseProviderOpts: GetCoinbaseProviderOpts, messageToSign: string) => Promise<string | undefined>;

package/src/coinbase/client/client.js

@@ -6,11 +6,15 @@ import { INFURA_ID } from '../../constants.js';
 
 const jsonRpcUrl = `https://mainnet.infura.io/v3/${INFURA_ID}`;
 const chainId = 1;
+// storing a reference to the coinbase sdk so that we can call getQrUrl on it when we need a fresh qr code
+let coinbaseSdk;
+// storing a reference to the coinbase provider because the provider methods work better when
+// they are called on the same instance
 let coinbaseProvider;
-const getCoinbaseProvider = ({ opts: { appLogoUrl, appName = '', evmNetworks = [] } = {}, }) => {
+const getCoinbaseClient = ({ opts: { appLogoUrl, appName = '', evmNetworks = [] } = {}, }) => {
     var _a, _b;
     if (!coinbaseProvider) {
-        const coinbaseWalletSDK = new CoinbaseWalletSDK({
+        coinbaseSdk = new CoinbaseWalletSDK({
             appLogoUrl,
             appName,
             enableMobileWalletLink: true,
@@ -21,21 +25,17 @@ const getCoinbaseProvider = ({ opts: { appLogoUrl, appName = '', evmNetworks = [
         const rpcUrl = ((_a = network === null || network === void 0 ? void 0 : network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) ||
             ((_b = network === null || network === void 0 ? void 0 : network.rpcUrls) === null || _b === void 0 ? void 0 : _b[0]) ||
             jsonRpcUrl;
-        coinbaseProvider = coinbaseWalletSDK.makeWeb3Provider(rpcUrl, chainId);
+        coinbaseProvider = coinbaseSdk.makeWeb3Provider(rpcUrl, chainId);
     }
-    return coinbaseProvider;
+    return { provider: coinbaseProvider, sdk: coinbaseSdk };
 };
 const killCoinbaseSession = () => __awaiter(void 0, void 0, void 0, function* () {
     yield (coinbaseProvider === null || coinbaseProvider === void 0 ? void 0 : coinbaseProvider.close());
-    coinbaseProvider === null || coinbaseProvider === void 0 ? void 0 : coinbaseProvider.disconnect();
-    // We needed to remove the provider, because after a disconnect the initial settings that
-    // were set in the SDK reset, and they need to be initialized again.
-    coinbaseProvider = undefined;
 });
 const getAddress = (coinbaseProviderOpts, opts) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const provider = getCoinbaseProvider({ opts: coinbaseProviderOpts });
-    const { qrUrl } = provider;
+    const { provider, sdk } = getCoinbaseClient({ opts: coinbaseProviderOpts });
+    const qrUrl = sdk.getQrUrl();
     if (!qrUrl) {
         throw new DynamicError('no qr url available');
     }
@@ -46,7 +46,7 @@ const getAddress = (coinbaseProviderOpts, opts) => __awaiter(void 0, void 0, voi
     return address;
 });
 const signMessage = (coinbaseProviderOpts, messageToSign) => __awaiter(void 0, void 0, void 0, function* () {
-    const provider = getCoinbaseProvider({ opts: coinbaseProviderOpts });
+    const { provider } = getCoinbaseClient({ opts: coinbaseProviderOpts });
     const [address] = yield provider.request({
         method: 'eth_requestAccounts',
     });
@@ -62,4 +62,4 @@ const signMessage = (coinbaseProviderOpts, messageToSign) => __awaiter(void 0, v
     }
 });
 
-export { getAddress, getCoinbaseProvider, killCoinbaseSession, signMessage };
+export { getAddress, getCoinbaseClient, killCoinbaseSession, signMessage };

package/src/coinbase/client/types.d.ts

@@ -1,4 +1,4 @@
-import { CoinbaseWalletProvider } from '@coinbase/wallet-sdk';
+import CoinbaseWalletSDK, { CoinbaseWalletProvider } from '@coinbase/wallet-sdk';
 import { GenericNetwork } from '@dynamic-labs/types';
 export type GetCoinbaseProviderOpts = {
     appLogoUrl?: string;
@@ -8,7 +8,10 @@ export type GetCoinbaseProviderOpts = {
 export type CoinbaseProviderHandlerOpts = {
     onDisconnect(): Promise<void>;
 };
-export type GetCoinbaseProvider = (args: {
+export type GetCoinbaseClient = (args: {
     handlers?: CoinbaseProviderHandlerOpts;
     opts?: GetCoinbaseProviderOpts;
-}) => CoinbaseWalletProvider;
+}) => {
+    provider: CoinbaseWalletProvider;
+    sdk: CoinbaseWalletSDK;
+};

package/src/coinbase/coinbase.cjs

@@ -50,9 +50,9 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
             return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
         }
         return viem.createWalletClient({
-            transport: viem.custom(client.getCoinbaseProvider({
+            transport: viem.custom(client.getCoinbaseClient({
                 opts: this.coinbaseProviderOpts,
-            })),
+            }).provider),
         });
     }
     isInstalledOnBrowser() {
@@ -85,7 +85,7 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
         });
     }
     setupCoinbaseProviderEventListeners() {
-        const provider = client.getCoinbaseProvider({
+        const { provider } = client.getCoinbaseClient({
             opts: this.coinbaseProviderOpts,
         });
         if (!provider) {

package/src/coinbase/coinbase.js

@@ -4,7 +4,7 @@ import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
 import { EthProviderHelper } from '../ethProviderHelper.js';
 import { EthWalletConnector } from '../EthWalletConnector.js';
-import { getCoinbaseProvider, getAddress, signMessage, killCoinbaseSession } from './client/client.js';
+import { getCoinbaseClient, getAddress, signMessage, killCoinbaseSession } from './client/client.js';
 
 class Coinbase extends EthWalletConnector {
     constructor(_a) {
@@ -46,9 +46,9 @@ class Coinbase extends EthWalletConnector {
             return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
         }
         return createWalletClient({
-            transport: custom(getCoinbaseProvider({
+            transport: custom(getCoinbaseClient({
                 opts: this.coinbaseProviderOpts,
-            })),
+            }).provider),
         });
     }
     isInstalledOnBrowser() {
@@ -81,7 +81,7 @@ class Coinbase extends EthWalletConnector {
         });
     }
     setupCoinbaseProviderEventListeners() {
-        const provider = getCoinbaseProvider({
+        const { provider } = getCoinbaseClient({
             opts: this.coinbaseProviderOpts,
         });
         if (!provider) {

package/src/injected/InjectedWalletBase.cjs

@@ -2,6 +2,7 @@
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var walletBook = require('@dynamic-labs/wallet-book');
+var utils = require('@dynamic-labs/utils');
 var ethProviderHelper = require('../ethProviderHelper.cjs');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
 var walletConnect = require('../walletConnect/walletConnect.cjs');
@@ -33,8 +34,12 @@ class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
         if (this.isInstalledOnBrowser()) {
             return this;
         }
+        // this is to handle the case where the user is in a webview.
+        // when the user is in a webview, customers should set the deepLinkPreference prop to universal,
+        // in which case this condition will be false, and the SDK will use WalletConnect (if available)
         if (((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.inAppBrowser) &&
-            this.constructorProps.deepLinkPreference !== 'universal') {
+            this.constructorProps.deepLinkPreference !== 'universal' &&
+            utils.isMobile()) {
             return this;
         }
         // this is the case where the wallet is not installed on the browser and

package/src/injected/InjectedWalletBase.js

@@ -1,5 +1,6 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { isMobile } from '@dynamic-labs/utils';
 import { EthProviderHelper } from '../ethProviderHelper.js';
 import { EthWalletConnector } from '../EthWalletConnector.js';
 import { WalletConnect } from '../walletConnect/walletConnect.js';
@@ -31,8 +32,12 @@ class InjectedWalletBase extends EthWalletConnector {
         if (this.isInstalledOnBrowser()) {
             return this;
         }
+        // this is to handle the case where the user is in a webview.
+        // when the user is in a webview, customers should set the deepLinkPreference prop to universal,
+        // in which case this condition will be false, and the SDK will use WalletConnect (if available)
         if (((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.inAppBrowser) &&
-            this.constructorProps.deepLinkPreference !== 'universal') {
+            this.constructorProps.deepLinkPreference !== 'universal' &&
+            isMobile()) {
             return this;
         }
         // this is the case where the wallet is not installed on the browser and

package/src/walletConnect/walletConnect.cjs

@@ -271,7 +271,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                     throw new utils.DynamicError('No provider found');
                 }
             }
-            const metadata = walletBook.getWalletBookWallet(this.walletBook, this.key);
+            const metadata = walletBook.getWalletBookWallet(this.walletBook, this.key, this.walletFallback);
             walletConnectorCore.performPlatformSpecificConnectionMethod(WalletConnect.provider.signer.uri, metadata, {
                 onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
                 onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,

package/src/walletConnect/walletConnect.js

@@ -262,7 +262,7 @@ class WalletConnect extends EthWalletConnector {
                     throw new DynamicError('No provider found');
                 }
             }
-            const metadata = getWalletBookWallet(this.walletBook, this.key);
+            const metadata = getWalletBookWallet(this.walletBook, this.key, this.walletFallback);
             performPlatformSpecificConnectionMethod(WalletConnect.provider.signer.uri, metadata, {
                 onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
                 onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,