@dynamic-labs/ethereum 2.0.0-alpha.8 → 2.0.0

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';
@@ -18,18 +19,34 @@ class InjectedWalletBase extends EthWalletConnector {
             this.wallet = findWalletBookWallet(this.walletBook, this.key);
         }
         if (this.wallet && !this.ethProviderHelper) {
-            this.ethProviderHelper = new EthProviderHelper(this.wallet);
+            this.ethProviderHelper = new EthProviderHelper(this.wallet, this);
         }
         // this.ethProviderHelper is undefined if the wallet is not installed or found in walletbook
         return this.ethProviderHelper;
     }
     getMobileOrInstalledWallet() {
-        if (this.walletConnectorFallback && !this.isInstalledOnBrowser()) {
-            if (!this.wallet)
-                this.wallet = findWalletBookWallet(this.walletBook, this.key);
-            return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
+        var _a, _b;
+        if (!this.wallet) {
+            this.wallet = findWalletBookWallet(this.walletBook, this.key);
+        }
+        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' &&
+            isMobile()) {
+            return this;
+        }
+        // this is the case where the wallet is not installed on the browser and
+        // it does not support WalletConnect. in this case, the SDK will instruct
+        // the user to download the wallet extension
+        if (!this.walletConnectorFallback) {
+            return this;
         }
-        return this;
+        return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
     }
     setupEventListeners() {
         const provider = this.getWalletClient();
@@ -41,23 +58,23 @@ class InjectedWalletBase extends EthWalletConnector {
         const { tearDownEventListeners } = ethProviderHelper._setupEventListeners(this);
         this.teardownEventListeners = tearDownEventListeners;
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         var _a;
-        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient();
+        return (_a = this.getEthProviderHelper()) === 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;
     }
-    fetchPublicAddress() {
+    getAddress() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress();
+            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.fetchPublicAddress();
+            yield this.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/injected/PhantomEvm.cjs

@@ -14,13 +14,13 @@ class PhantomEvm extends InjectedWalletBase {
         this.overrideKey = 'phantomevm';
         this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
-    fetchPublicAddress() {
+    getAddress() {
         const _super = Object.create(null, {
-            fetchPublicAddress: { get: () => super.fetchPublicAddress }
+            getAddress: { get: () => super.getAddress }
         });
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return _super.fetchPublicAddress.call(this);
+                return _super.getAddress.call(this);
             }
             if (utils.isMobile()) {
                 utils.handleMobileWalletRedirect({

package/src/injected/PhantomEvm.d.ts

@@ -4,5 +4,5 @@ export declare class PhantomEvm extends InjectedWalletBase {
     name: string;
     overrideKey: string;
     constructor(props: EthWalletConnectorOpts);
-    fetchPublicAddress(): Promise<string | undefined>;
+    getAddress(): Promise<string | undefined>;
 }

package/src/injected/PhantomEvm.js

@@ -10,13 +10,13 @@ class PhantomEvm extends InjectedWalletBase {
         this.overrideKey = 'phantomevm';
         this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
-    fetchPublicAddress() {
+    getAddress() {
         const _super = Object.create(null, {
-            fetchPublicAddress: { get: () => super.fetchPublicAddress }
+            getAddress: { get: () => super.getAddress }
         });
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return _super.fetchPublicAddress.call(this);
+                return _super.getAddress.call(this);
             }
             if (isMobile()) {
                 handleMobileWalletRedirect({

package/src/injected/Zerion.cjs

@@ -0,0 +1,38 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+
+// on desktop, we use EIP-6963 to connect to the wallet so the injectedConfig
+// is not needed.
+const zerionWalletBookConfig = {
+    eip6963Config: {
+        rdns: 'io.zerion.wallet',
+    },
+    filterFromWalletConnect: true,
+    injectedConfig: [
+        {
+            chain: 'evm',
+            // adds isMetaMask flag to the wallet connector so that the window provider works
+            // in the zerion in-app browser.
+            extensionLocators: [{ flag: 'isMetaMask', value: true }],
+            windowLocations: ['zerionWallet', 'zerionwallet.ethereum'],
+        },
+    ],
+    name: 'Zerion',
+};
+class Zerion extends InjectedWalletBase {
+    constructor(props) {
+        super(props);
+        this.name = 'Zerion';
+        this.overrideKey = 'zerion';
+        this.wallet = zerionWalletBookConfig;
+    }
+    isInstalledOnBrowser() {
+        var _a;
+        return Boolean(window.zerionWallet || ((_a = window.zerionwallet) === null || _a === void 0 ? void 0 : _a.ethereum));
+    }
+}
+
+exports.Zerion = Zerion;

package/src/injected/Zerion.d.ts

@@ -0,0 +1,10 @@
+import { WalletSchema } from '@dynamic-labs/wallet-book';
+import { EthWalletConnectorOpts } from '../EthWalletConnector';
+import InjectedWalletBase from './InjectedWalletBase';
+export declare class Zerion extends InjectedWalletBase {
+    name: string;
+    overrideKey: string;
+    wallet: WalletSchema;
+    constructor(props: EthWalletConnectorOpts);
+    isInstalledOnBrowser(): boolean;
+}

package/src/injected/Zerion.js

@@ -0,0 +1,34 @@
+import InjectedWalletBase from './InjectedWalletBase.js';
+
+// on desktop, we use EIP-6963 to connect to the wallet so the injectedConfig
+// is not needed.
+const zerionWalletBookConfig = {
+    eip6963Config: {
+        rdns: 'io.zerion.wallet',
+    },
+    filterFromWalletConnect: true,
+    injectedConfig: [
+        {
+            chain: 'evm',
+            // adds isMetaMask flag to the wallet connector so that the window provider works
+            // in the zerion in-app browser.
+            extensionLocators: [{ flag: 'isMetaMask', value: true }],
+            windowLocations: ['zerionWallet', 'zerionwallet.ethereum'],
+        },
+    ],
+    name: 'Zerion',
+};
+class Zerion extends InjectedWalletBase {
+    constructor(props) {
+        super(props);
+        this.name = 'Zerion';
+        this.overrideKey = 'zerion';
+        this.wallet = zerionWalletBookConfig;
+    }
+    isInstalledOnBrowser() {
+        var _a;
+        return Boolean(window.zerionWallet || ((_a = window.zerionwallet) === null || _a === void 0 ? void 0 : _a.ethereum));
+    }
+}
+
+export { Zerion };

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -2,18 +2,23 @@
 
 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 PhantomEvm = require('./PhantomEvm.cjs');
 var ExodusEvm = require('./ExodusEvm.cjs');
+var Zerion = require('./Zerion.cjs');
 
 const injectedWalletOverrides = [
     PhantomEvm.PhantomEvm,
     ExodusEvm.ExodusEvm,
+    Zerion.Zerion,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'phantomevm',
     'coinbase',
     'exodusevm',
+    'zerion',
 ];
 const fetchInjectedWalletConnector = ({ walletBook, }) => {
     var _a;
@@ -36,6 +41,26 @@ const fetchInjectedWalletConnector = ({ walletBook, }) => {
                 // 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 }
+                });
+                var _a;
+                return _tslib.__awaiter(this, void 0, void 0, function* () {
+                    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;
+                    }
+                    const cleanedTargetUrl = window.location.href.replace('https://', '');
+                    window.location.href = `${inAppBrowserBase}/${cleanedTargetUrl}`;
+                    return undefined;
+                });
+            }
         };
     });
 };

package/src/injected/fetchInjectedWalletConnectors.js

@@ -1,15 +1,20 @@
+import { __awaiter } from '../../_virtual/_tslib.js';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import InjectedWalletBase from './InjectedWalletBase.js';
 import { PhantomEvm } from './PhantomEvm.js';
 import { ExodusEvm } from './ExodusEvm.js';
+import { Zerion } from './Zerion.js';
 
 const injectedWalletOverrides = [
     PhantomEvm,
     ExodusEvm,
+    Zerion,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'phantomevm',
     'coinbase',
     'exodusevm',
+    'zerion',
 ];
 const fetchInjectedWalletConnector = ({ walletBook, }) => {
     var _a;
@@ -32,6 +37,26 @@ const fetchInjectedWalletConnector = ({ walletBook, }) => {
                 // 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 }
+                });
+                var _a;
+                return __awaiter(this, void 0, void 0, function* () {
+                    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;
+                    }
+                    const cleanedTargetUrl = window.location.href.replace('https://', '');
+                    window.location.href = `${inAppBrowserBase}/${cleanedTargetUrl}`;
+                    return undefined;
+                });
+            }
         };
     });
 };

package/src/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './isEthWalletConnector';

package/src/utils/isEthWalletConnector/index.d.ts

@@ -0,0 +1 @@
+export { isEthWalletConnector } from './isEthWalletConnector';

package/src/utils/isEthWalletConnector/isEthWalletConnector.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isEthWalletConnector = (connector) => Boolean(connector === null || connector === void 0 ? void 0 : connector.getActiveAccount);
+
+exports.isEthWalletConnector = isEthWalletConnector;

package/src/utils/isEthWalletConnector/isEthWalletConnector.d.ts

@@ -0,0 +1,3 @@
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { EthWalletConnector } from '../..';
+export declare const isEthWalletConnector: (connector: WalletConnector | EthWalletConnector) => connector is EthWalletConnector;

package/src/utils/isEthWalletConnector/isEthWalletConnector.js

@@ -0,0 +1,3 @@
+const isEthWalletConnector = (connector) => Boolean(connector === null || connector === void 0 ? void 0 : connector.getActiveAccount);
+
+export { isEthWalletConnector };

package/src/walletConnect/index.d.ts

@@ -1,2 +1,2 @@
-export { WalletConnect, type WalletConnectOpts } from './walletConnect';
+export { WalletConnect } from './walletConnect';
 export { fetchWalletConnectWallets } from './fetchWalletConnectWallets';