@dynamic-labs/ethereum 4.0.0-alpha.9 → 4.0.0

package/src/injected/InjectedWalletBase.js

@@ -1,42 +1,30 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { isMobile } from '@dynamic-labs/utils';
-import { EthWalletConnector } from '@dynamic-labs/ethereum-core';
+import { EthereumWalletConnector } from '@dynamic-labs/ethereum-core';
 import { EthProviderHelper } from '../ethProviderHelper.js';
 import { WalletConnect } from '../walletConnect/walletConnect.js';
 
-class InjectedWalletBase extends EthWalletConnector {
+class InjectedWalletBase extends EthereumWalletConnector {
     constructor() {
         super(...arguments);
-        this.supportedChains = ['ETH', 'EVM'];
-        this.connectedChain = 'EVM';
         this.walletConnectorFallback = false;
     }
-    getEthProviderHelper() {
-        if (!this.wallet) {
-            // changing this to findWalletBookWallet so it returns undefined if not found which
-            // allows the getEthProviderHelper to return undefined if the wallet is not installed
-            this.wallet = findWalletBookWallet(this.walletBook, this.key);
+    get ethProviderHelper() {
+        if (!this._ethProviderHelper) {
+            this._ethProviderHelper = new EthProviderHelper(this);
         }
-        if (this.wallet && !this.ethProviderHelper) {
-            this.ethProviderHelper = new EthProviderHelper(this.wallet, this);
-        }
-        // this.ethProviderHelper is undefined if the wallet is not installed or found in walletbook
-        return this.ethProviderHelper;
+        return this._ethProviderHelper;
     }
     getMobileOrInstalledWallet() {
-        var _a, _b;
-        if (!this.wallet) {
-            this.wallet = findWalletBookWallet(this.walletBook, this.key);
-        }
+        var _a;
         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) &&
+        if (((_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl) &&
             this.mobileExperience === 'in-app-browser' &&
             isMobile()) {
             return this;
@@ -50,33 +38,30 @@ class InjectedWalletBase extends EthWalletConnector {
         return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
     }
     findProvider() {
-        const ethProviderHelper = this.getEthProviderHelper();
-        if (!ethProviderHelper)
-            return;
-        return ethProviderHelper.getInstalledProvider();
+        var _a;
+        return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.getInstalledProvider();
     }
     setupEventListeners() {
         const provider = this.getWalletClient();
         if (!provider)
             return;
-        const ethProviderHelper = this.getEthProviderHelper();
-        if (!ethProviderHelper)
+        if (!this.ethProviderHelper)
             return;
-        const { tearDownEventListeners } = ethProviderHelper._setupEventListeners(this);
+        const { tearDownEventListeners } = this.ethProviderHelper._setupEventListeners(this);
         this.teardownEventListeners = tearDownEventListeners;
     }
     getWalletClient(chainId) {
         var _a;
-        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
+        return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
     }
     isInstalledOnBrowser() {
         var _a;
-        return ((_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
+        return ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress();
+            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     connect() {
@@ -87,7 +72,7 @@ class InjectedWalletBase extends EthWalletConnector {
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
+            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
         });
     }
     proveOwnership(address, messageToSign) {
@@ -112,4 +97,4 @@ class InjectedWalletBase extends EthWalletConnector {
     }
 }
 
-export { InjectedWalletBase as default };
+export { InjectedWalletBase };

package/src/injected/PhantomEvm.cjs

@@ -5,15 +5,13 @@ 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');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
-class PhantomEvm extends InjectedWalletBase {
-    constructor(props) {
-        super(props);
+class PhantomEvm extends InjectedWalletBase.InjectedWalletBase {
+    constructor() {
+        super(...arguments);
         this.name = 'Phantom';
         this.overrideKey = 'phantomevm';
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     getAddress() {
         const _super = Object.create(null, {
@@ -34,7 +32,7 @@ class PhantomEvm extends InjectedWalletBase {
     }
     canGetChainAddress() {
         var _a, _b;
-        return Boolean((_b = (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.selectedAddress);
+        return Boolean((_b = (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.selectedAddress);
     }
 }
 

package/src/injected/PhantomEvm.d.ts

@@ -1,9 +1,7 @@
-import { EthWalletConnectorOpts } from '@dynamic-labs/ethereum-core';
-import InjectedWalletBase from './InjectedWalletBase';
+import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class PhantomEvm extends InjectedWalletBase {
     name: string;
     overrideKey: string;
-    constructor(props: EthWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     canGetChainAddress(): boolean;
 }

package/src/injected/PhantomEvm.js

@@ -1,15 +1,13 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { isMobile, handleMobileWalletRedirect } from '@dynamic-labs/utils';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import InjectedWalletBase from './InjectedWalletBase.js';
+import { InjectedWalletBase } from './InjectedWalletBase.js';
 
 class PhantomEvm extends InjectedWalletBase {
-    constructor(props) {
-        super(props);
+    constructor() {
+        super(...arguments);
         this.name = 'Phantom';
         this.overrideKey = 'phantomevm';
-        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     getAddress() {
         const _super = Object.create(null, {
@@ -30,7 +28,7 @@ class PhantomEvm extends InjectedWalletBase {
     }
     canGetChainAddress() {
         var _a, _b;
-        return Boolean((_b = (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.selectedAddress);
+        return Boolean((_b = (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.selectedAddress);
     }
 }
 

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -3,9 +3,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../_virtual/_tslib.cjs');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var utils = require('@dynamic-labs/utils');
+var getConnectorConstructorForEip6963Wallet = require('../utils/getConnectorConstructorForEip6963Wallet/getConnectorConstructorForEip6963Wallet.cjs');
+var getConnectorConstructorInjectedWallet = require('../utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.cjs');
 var PhantomEvm = require('./PhantomEvm.cjs');
 var ExodusEvm = require('./ExodusEvm.cjs');
 
@@ -13,53 +14,61 @@ const injectedWalletOverrides = [
     PhantomEvm.PhantomEvm,
     ExodusEvm.ExodusEvm,
 ];
-const filteredInjectedWalletKeysOverrides = [
+const walletsWithCustomConnectors = [
     'phantomevm',
     'coinbase',
     'exodusevm',
+    'abstract',
+    'metamask',
+    'edenonline',
+    'intersend',
 ];
+let removeEip6963EventsListener;
+// should add eip6963 connector only if not in wallet-book, to avoid adding duplicate connectors
+const shouldAddEip6963Connector = (eip6963ProviderInfo, walletBook) => {
+    var _a;
+    const { rdns, name } = eip6963ProviderInfo;
+    const chain = 'evm';
+    const connectorKey = `${utils.sanitizeName(name)}${chain}`;
+    walletConnectorCore.logger.logVerboseTroubleshootingMessage('[ETH shouldAddEip6963Connector]', rdns, name, chain, connectorKey);
+    const existingWallet = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).find(([key, wallet]) => {
+        var _a, _b;
+        return ((_a = wallet.eip6963Config) === null || _a === void 0 ? void 0 : _a.rdns) === rdns ||
+            key === connectorKey ||
+            walletsWithCustomConnectors.includes(connectorKey) ||
+            (wallet.name === name && ((_b = wallet.injectedConfig) === null || _b === void 0 ? void 0 : _b[0].chain) === chain);
+    });
+    walletConnectorCore.logger.logVerboseTroubleshootingMessage('[ETH shouldAddEip6963Connector]', existingWallet);
+    return !existingWallet;
+};
+const addEip6963Listener = (walletBook) => {
+    removeEip6963EventsListener === null || removeEip6963EventsListener === void 0 ? void 0 : removeEip6963EventsListener();
+    removeEip6963EventsListener = utils.listenToEip6963Events((event) => {
+        if (!shouldAddEip6963Connector(event.detail.info, walletBook)) {
+            return;
+        }
+        walletConnectorCore.logger.logVerboseTroubleshootingMessage('[ETH fetchInjectedWalletConnectors] listenToEip6963Events', event.detail);
+        walletConnectorCore.walletConnectorEvents.emit('providerInjected', {
+            injectedConnectorConstructor: getConnectorConstructorForEip6963Wallet.getConnectorConstructorForEip6963Wallet(event.detail),
+        });
+    });
+};
 const fetchInjectedWalletConnector = ({ walletBook, }) => {
     var _a;
-    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+    addEip6963Listener(walletBook);
+    const walletBookConnectors = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
         .filter(([key, wallet]) => {
         var _a;
         return ((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'evm')) &&
-            !filteredInjectedWalletKeysOverrides.includes(key);
+            !walletsWithCustomConnectors.includes(key);
     })
-        .map(([key, wallet]) => {
-        const { shortName } = wallet;
-        const name = shortName || wallet.name;
-        const walletConnectorFallback = Boolean(wallet.walletConnect);
-        return class extends InjectedWalletBase {
-            constructor(props) {
-                super(Object.assign({}, props));
-                this.name = name;
-                this.wallet = wallet;
-                this.walletConnectorFallback = walletConnectorFallback;
-                // this is the key from the wallet book entry so that we don't purely rely on the normalized name
-                this.overrideKey = key;
-            }
-            getAddress() {
-                const _super = Object.create(null, {
-                    getAddress: { get: () => super.getAddress }
-                });
-                return _tslib.__awaiter(this, void 0, void 0, function* () {
-                    var _a;
-                    if (this.isInstalledOnBrowser()) {
-                        return _super.getAddress.call(this);
-                    }
-                    const inAppBrowserBase = (_a = this.wallet.mobile) === null || _a === void 0 ? void 0 : _a.inAppBrowser;
-                    if (!inAppBrowserBase) {
-                        const error = new Error(`No inAppBrowserBase found for ${this.name}.`);
-                        walletConnectorCore.logger.error(error.message);
-                        throw error;
-                    }
-                    window.location.href = `${inAppBrowserBase}/${window.location.href}`;
-                    return undefined;
-                });
-            }
-        };
-    });
+        .map(([key, wallet]) => getConnectorConstructorInjectedWallet.getConnectorConstructorInjectedWallet(key, wallet));
+    const { providers } = utils.Eip6963ProviderSingleton.get();
+    const eip6963Connectors = providers
+        .filter((provider) => shouldAddEip6963Connector(provider.info, walletBook))
+        .map((provider) => getConnectorConstructorForEip6963Wallet.getConnectorConstructorForEip6963Wallet(provider));
+    walletConnectorCore.logger.logVerboseTroubleshootingMessage('[ETH fetchInjectedWalletConnectors] eip6963Connectors', eip6963Connectors);
+    return [...walletBookConnectors, ...eip6963Connectors];
 };
 
 exports.fetchInjectedWalletConnector = fetchInjectedWalletConnector;

package/src/injected/fetchInjectedWalletConnectors.js

@@ -1,7 +1,8 @@
 'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
-import { logger } from '@dynamic-labs/wallet-connector-core';
-import InjectedWalletBase from './InjectedWalletBase.js';
+import { logger, walletConnectorEvents } from '@dynamic-labs/wallet-connector-core';
+import { Eip6963ProviderSingleton, sanitizeName, listenToEip6963Events } from '@dynamic-labs/utils';
+import { getConnectorConstructorForEip6963Wallet } from '../utils/getConnectorConstructorForEip6963Wallet/getConnectorConstructorForEip6963Wallet.js';
+import { getConnectorConstructorInjectedWallet } from '../utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.js';
 import { PhantomEvm } from './PhantomEvm.js';
 import { ExodusEvm } from './ExodusEvm.js';
 
@@ -9,53 +10,61 @@ const injectedWalletOverrides = [
     PhantomEvm,
     ExodusEvm,
 ];
-const filteredInjectedWalletKeysOverrides = [
+const walletsWithCustomConnectors = [
     'phantomevm',
     'coinbase',
     'exodusevm',
+    'abstract',
+    'metamask',
+    'edenonline',
+    'intersend',
 ];
+let removeEip6963EventsListener;
+// should add eip6963 connector only if not in wallet-book, to avoid adding duplicate connectors
+const shouldAddEip6963Connector = (eip6963ProviderInfo, walletBook) => {
+    var _a;
+    const { rdns, name } = eip6963ProviderInfo;
+    const chain = 'evm';
+    const connectorKey = `${sanitizeName(name)}${chain}`;
+    logger.logVerboseTroubleshootingMessage('[ETH shouldAddEip6963Connector]', rdns, name, chain, connectorKey);
+    const existingWallet = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).find(([key, wallet]) => {
+        var _a, _b;
+        return ((_a = wallet.eip6963Config) === null || _a === void 0 ? void 0 : _a.rdns) === rdns ||
+            key === connectorKey ||
+            walletsWithCustomConnectors.includes(connectorKey) ||
+            (wallet.name === name && ((_b = wallet.injectedConfig) === null || _b === void 0 ? void 0 : _b[0].chain) === chain);
+    });
+    logger.logVerboseTroubleshootingMessage('[ETH shouldAddEip6963Connector]', existingWallet);
+    return !existingWallet;
+};
+const addEip6963Listener = (walletBook) => {
+    removeEip6963EventsListener === null || removeEip6963EventsListener === void 0 ? void 0 : removeEip6963EventsListener();
+    removeEip6963EventsListener = listenToEip6963Events((event) => {
+        if (!shouldAddEip6963Connector(event.detail.info, walletBook)) {
+            return;
+        }
+        logger.logVerboseTroubleshootingMessage('[ETH fetchInjectedWalletConnectors] listenToEip6963Events', event.detail);
+        walletConnectorEvents.emit('providerInjected', {
+            injectedConnectorConstructor: getConnectorConstructorForEip6963Wallet(event.detail),
+        });
+    });
+};
 const fetchInjectedWalletConnector = ({ walletBook, }) => {
     var _a;
-    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+    addEip6963Listener(walletBook);
+    const walletBookConnectors = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
         .filter(([key, wallet]) => {
         var _a;
         return ((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'evm')) &&
-            !filteredInjectedWalletKeysOverrides.includes(key);
+            !walletsWithCustomConnectors.includes(key);
     })
-        .map(([key, wallet]) => {
-        const { shortName } = wallet;
-        const name = shortName || wallet.name;
-        const walletConnectorFallback = Boolean(wallet.walletConnect);
-        return class extends InjectedWalletBase {
-            constructor(props) {
-                super(Object.assign({}, props));
-                this.name = name;
-                this.wallet = wallet;
-                this.walletConnectorFallback = walletConnectorFallback;
-                // this is the key from the wallet book entry so that we don't purely rely on the normalized name
-                this.overrideKey = key;
-            }
-            getAddress() {
-                const _super = Object.create(null, {
-                    getAddress: { get: () => super.getAddress }
-                });
-                return __awaiter(this, void 0, void 0, function* () {
-                    var _a;
-                    if (this.isInstalledOnBrowser()) {
-                        return _super.getAddress.call(this);
-                    }
-                    const inAppBrowserBase = (_a = this.wallet.mobile) === null || _a === void 0 ? void 0 : _a.inAppBrowser;
-                    if (!inAppBrowserBase) {
-                        const error = new Error(`No inAppBrowserBase found for ${this.name}.`);
-                        logger.error(error.message);
-                        throw error;
-                    }
-                    window.location.href = `${inAppBrowserBase}/${window.location.href}`;
-                    return undefined;
-                });
-            }
-        };
-    });
+        .map(([key, wallet]) => getConnectorConstructorInjectedWallet(key, wallet));
+    const { providers } = Eip6963ProviderSingleton.get();
+    const eip6963Connectors = providers
+        .filter((provider) => shouldAddEip6963Connector(provider.info, walletBook))
+        .map((provider) => getConnectorConstructorForEip6963Wallet(provider));
+    logger.logVerboseTroubleshootingMessage('[ETH fetchInjectedWalletConnectors] eip6963Connectors', eip6963Connectors);
+    return [...walletBookConnectors, ...eip6963Connectors];
 };
 
 export { fetchInjectedWalletConnector, injectedWalletOverrides };

package/src/injected/index.d.ts

@@ -1,5 +1,5 @@
 export * from './PhantomEvm';
 export * from './ExodusEvm';
-export * from './UnknownInjected';
 export * from './FallbackEvmConnector';
 export * from './fetchInjectedWalletConnectors';
+export { InjectedWalletBase as EthereumInjectedConnector } from './InjectedWalletBase';