@dynamic-labs/ethereum 2.0.0-alpha.1 → 2.0.0-alpha.10

package/src/injected/InjectedWalletBase.cjs

@@ -4,7 +4,6 @@ var _tslib = require('../../_virtual/_tslib.cjs');
 var walletBook = require('@dynamic-labs/wallet-book');
 var ethProviderHelper = require('../ethProviderHelper.cjs');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
-var walletConnectV2 = require('../walletConnect/walletConnectV2.cjs');
 var walletConnect = require('../walletConnect/walletConnect.cjs');
 
 class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
@@ -27,17 +26,10 @@ class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
         return this.ethProviderHelper;
     }
     getMobileOrInstalledWallet() {
-        var _a, _b, _c, _d;
         if (this.walletConnectorFallback && !this.isInstalledOnBrowser()) {
             if (!this.wallet)
                 this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-            if (((_a = this.constructorProps) === null || _a === void 0 ? void 0 : _a.isWalletConnectV2Enabled) &&
-                ((_d = (_c = (_b = this.wallet) === null || _b === void 0 ? void 0 : _b.walletConnect) === null || _c === void 0 ? void 0 : _c.sdks) === null || _d === void 0 ? void 0 : _d.includes('sign_v2'))) {
-                return new walletConnectV2.WalletConnectV2(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
-            else {
-                return new walletConnect.WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
+            return new walletConnect.WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
         }
         return this;
     }

package/src/injected/InjectedWalletBase.js

@@ -2,7 +2,6 @@ import { __awaiter } from '../../_virtual/_tslib.js';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { EthProviderHelper } from '../ethProviderHelper.js';
 import { EthWalletConnector } from '../EthWalletConnector.js';
-import { WalletConnectV2 } from '../walletConnect/walletConnectV2.js';
 import { WalletConnect } from '../walletConnect/walletConnect.js';
 
 class InjectedWalletBase extends EthWalletConnector {
@@ -25,17 +24,10 @@ class InjectedWalletBase extends EthWalletConnector {
         return this.ethProviderHelper;
     }
     getMobileOrInstalledWallet() {
-        var _a, _b, _c, _d;
         if (this.walletConnectorFallback && !this.isInstalledOnBrowser()) {
             if (!this.wallet)
                 this.wallet = findWalletBookWallet(this.walletBook, this.key);
-            if (((_a = this.constructorProps) === null || _a === void 0 ? void 0 : _a.isWalletConnectV2Enabled) &&
-                ((_d = (_c = (_b = this.wallet) === null || _b === void 0 ? void 0 : _b.walletConnect) === null || _c === void 0 ? void 0 : _c.sdks) === null || _d === void 0 ? void 0 : _d.includes('sign_v2'))) {
-                return new WalletConnectV2(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
-            else {
-                return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
+            return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
         }
         return this;
     }

package/src/injected/PhantomEvm.cjs

@@ -11,6 +11,7 @@ class PhantomEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'PhantomEvm';
+        this.overrideKey = 'phantomevm';
         this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     fetchPublicAddress() {

package/src/injected/PhantomEvm.d.ts

@@ -2,6 +2,7 @@ import { EthWalletConnectorOpts } from '..';
 import InjectedWalletBase from './InjectedWalletBase';
 export declare class PhantomEvm extends InjectedWalletBase {
     name: string;
+    overrideKey: string;
     constructor(props: EthWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
 }

package/src/injected/PhantomEvm.js

@@ -7,6 +7,7 @@ class PhantomEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'PhantomEvm';
+        this.overrideKey = 'phantomevm';
         this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     fetchPublicAddress() {

package/src/injected/fetchInjectedWalletConnectors.d.ts

@@ -2,6 +2,5 @@ import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core'
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 export declare const injectedWalletOverrides: WalletConnectorConstructor[];
 export declare const fetchInjectedWalletConnector: ({ walletBook, }: {
-    isWalletConnectV2Enabled: boolean;
     walletBook: WalletBookSchema;
 }) => WalletConnectorConstructor[];

package/src/walletConnect/fetchWalletConnectWallets.cjs

@@ -2,47 +2,28 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var walletConnectV2 = require('./walletConnectV2.cjs');
 var walletConnect = require('./walletConnect.cjs');
 
-const fetchWalletConnectWallets = ({ isWalletConnectV2Enabled, walletBook, }) => {
+const fetchWalletConnectWallets = ({ walletBook, }) => {
     var _a;
-    return Object.values((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter((wallet) => wallet.walletConnect && !wallet.filterFromWalletConnect)
-        .map((wallet) => {
-        var _a;
+    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+        .filter(([, wallet]) => wallet.walletConnect && !wallet.filterFromWalletConnect)
+        .map(([key, wallet]) => {
         const { shortName } = wallet;
         const name = shortName || wallet.name;
-        // justification: we filtered out null/undefined above
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        if (isWalletConnectV2Enabled &&
-            ((_a = wallet.walletConnect.sdks) === null || _a === void 0 ? void 0 : _a.includes('sign_v2'))) {
-            return class extends walletConnectV2.WalletConnectV2 {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { walletName: name }));
-                }
-            };
-        }
-        else {
-            return class extends walletConnect.WalletConnect {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { walletName: name }));
-                }
-            };
-        }
+        return class extends walletConnect.WalletConnect {
+            constructor(props) {
+                super(Object.assign(Object.assign({}, props), { walletName: name }));
+                this.overrideKey = key;
+            }
+        };
     });
 };
-const getWalletConnectConnector = ({ isWalletConnectV2Enabled, }) => isWalletConnectV2Enabled
-    ? class extends walletConnectV2.WalletConnectV2 {
-        constructor(props) {
-            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
-        }
+const getWalletConnectConnector = () => class extends walletConnect.WalletConnect {
+    constructor(props) {
+        super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
     }
-    : class extends walletConnect.WalletConnect {
-        constructor(props) {
-            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
-        }
-    };
+};
 
 exports.fetchWalletConnectWallets = fetchWalletConnectWallets;
 exports.getWalletConnectConnector = getWalletConnectConnector;

package/src/walletConnect/fetchWalletConnectWallets.d.ts

@@ -1,9 +1,6 @@
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
-export declare const fetchWalletConnectWallets: ({ isWalletConnectV2Enabled, walletBook, }: {
-    isWalletConnectV2Enabled: boolean;
+export declare const fetchWalletConnectWallets: ({ walletBook, }: {
     walletBook: WalletBookSchema;
 }) => Array<WalletConnectorConstructor>;
-export declare const getWalletConnectConnector: ({ isWalletConnectV2Enabled, }: {
-    isWalletConnectV2Enabled: boolean;
-}) => WalletConnectorConstructor;
+export declare const getWalletConnectConnector: () => WalletConnectorConstructor;

package/src/walletConnect/fetchWalletConnectWallets.js

@@ -1,43 +1,24 @@
-import { WalletConnectV2 } from './walletConnectV2.js';
 import { WalletConnect } from './walletConnect.js';
 
-const fetchWalletConnectWallets = ({ isWalletConnectV2Enabled, walletBook, }) => {
+const fetchWalletConnectWallets = ({ walletBook, }) => {
     var _a;
-    return Object.values((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter((wallet) => wallet.walletConnect && !wallet.filterFromWalletConnect)
-        .map((wallet) => {
-        var _a;
+    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+        .filter(([, wallet]) => wallet.walletConnect && !wallet.filterFromWalletConnect)
+        .map(([key, wallet]) => {
         const { shortName } = wallet;
         const name = shortName || wallet.name;
-        // justification: we filtered out null/undefined above
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        if (isWalletConnectV2Enabled &&
-            ((_a = wallet.walletConnect.sdks) === null || _a === void 0 ? void 0 : _a.includes('sign_v2'))) {
-            return class extends WalletConnectV2 {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { walletName: name }));
-                }
-            };
-        }
-        else {
-            return class extends WalletConnect {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { walletName: name }));
-                }
-            };
-        }
+        return class extends WalletConnect {
+            constructor(props) {
+                super(Object.assign(Object.assign({}, props), { walletName: name }));
+                this.overrideKey = key;
+            }
+        };
     });
 };
-const getWalletConnectConnector = ({ isWalletConnectV2Enabled, }) => isWalletConnectV2Enabled
-    ? class extends WalletConnectV2 {
-        constructor(props) {
-            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
-        }
+const getWalletConnectConnector = () => class extends WalletConnect {
+    constructor(props) {
+        super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
     }
-    : class extends WalletConnect {
-        constructor(props) {
-            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
-        }
-    };
+};
 
 export { fetchWalletConnectWallets, getWalletConnectConnector };

package/src/walletConnect/index.d.ts

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