@dynamic-labs/ethereum 0.19.0-alpha.7 → 0.19.0-alpha.9

package/src/walletConnect/walletConnect.js

@@ -58,7 +58,7 @@ class WalletConnect extends EthWalletConnector {
     }
     fetchPublicAddress(opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            return fetchWalletConnectEVMPublicAddress(getWalletBookWallet(this.walletBook, this.name), this.getClient(), this.deepLinkPreference, Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
+            return fetchWalletConnectEVMPublicAddress(getWalletBookWallet(this.walletBook, this.key), this.getClient(), this.deepLinkPreference, Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
                     var _a;
                     (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
                     this.connectedChain = payload.params[0].chainId ? 'EVM' : 'SOL';
@@ -67,7 +67,7 @@ class WalletConnect extends EthWalletConnector {
     }
     getDeepLink() {
         var _a;
-        const wallet = getWalletBookWallet(this.walletBook, this.name);
+        const wallet = getWalletBookWallet(this.walletBook, this.key);
         if (!isMobile() && !((_a = wallet.desktop) === null || _a === void 0 ? void 0 : _a.native)) {
             return undefined;
         }
@@ -80,7 +80,7 @@ class WalletConnect extends EthWalletConnector {
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            return signWalletConnectPersonalMessage(messageToSign, getWalletBookWallet(this.walletBook, this.name), this.getClient(), this.deepLinkPreference, 
+            return signWalletConnectPersonalMessage(messageToSign, getWalletBookWallet(this.walletBook, this.key), this.getClient(), this.deepLinkPreference, 
             // don't call getRpcProvider until we really need to
             () => __awaiter(this, void 0, void 0, function* () { return this.getRpcProvider(); }));
         });
@@ -112,7 +112,7 @@ class WalletConnect extends EthWalletConnector {
             }
             if (isMobile()) {
                 const deepLink = getDeepLink({
-                    metadata: getWalletBookWallet(this.walletBook, this.name),
+                    metadata: getWalletBookWallet(this.walletBook, this.key),
                     mode: 'regular',
                     preference: this.deepLinkPreference,
                     uri: client.uri,

package/src/walletConnect/walletConnectV2.cjs

@@ -32,8 +32,15 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         this.projectId = opts.projectId;
         this.deepLinkPreference = opts.deepLinkPreference || 'native';
     }
+    getDefaultChainId() {
+        var _a, _b;
+        const etheriumMainnetNetwork = (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => network.chainId === 1);
+        if (!etheriumMainnetNetwork && ((_b = this.evmNetworks) === null || _b === void 0 ? void 0 : _b.length)) {
+            return this.evmNetworks[0].chainId;
+        }
+        return 1;
+    }
     initConnection() {
-        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const { provider } = WalletConnectV2;
             if (!provider) {
@@ -43,9 +50,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             if (provider === null || provider === void 0 ? void 0 : provider.uri) {
                 return;
             }
-            const defaultChain = ((_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.length)
-                ? this.evmNetworks[0].chainId
-                : 1;
+            const defaultChain = this.getDefaultChainId();
             provider
                 .connect({
                 namespaces: {
@@ -200,7 +205,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                     throw new utils.DynamicError('No provider found');
                 }
             }
-            const metadata = walletBook.getWalletBookWallet(this.walletBook, this.name);
+            const metadata = walletBook.getWalletBookWallet(this.walletBook, this.key);
             walletConnectorCore.performPlatformSpecificConnectionMethod(WalletConnectV2.provider.uri, metadata, {
                 onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
                 onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,
@@ -259,7 +264,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         if (!this.session) {
             return;
         }
-        const metadata = walletBook.getWalletBookWallet(this.walletBook, this.name);
+        const metadata = walletBook.getWalletBookWallet(this.walletBook, this.key);
         const deepLink = walletConnectorCore.getDeepLink({
             metadata,
             mode: 'regular',
@@ -368,9 +373,11 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.initProvider();
-            this.refreshSession();
-            this.isInitialized = true;
+            if (this.isInitialized === false) {
+                yield this.initProvider();
+                this.refreshSession();
+                this.isInitialized = true;
+            }
             if (!this.activeAccount) {
                 return [];
             }

package/src/walletConnect/walletConnectV2.d.ts

@@ -22,6 +22,7 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     private projectId?;
     private deepLinkPreference;
     constructor(opts: WalletConnectorV2Opts);
+    getDefaultChainId(): number;
     private initConnection;
     private createInitProviderPromise;
     private initProvider;

package/src/walletConnect/walletConnectV2.js

@@ -23,8 +23,15 @@ class WalletConnectV2 extends EthWalletConnector {
         this.projectId = opts.projectId;
         this.deepLinkPreference = opts.deepLinkPreference || 'native';
     }
+    getDefaultChainId() {
+        var _a, _b;
+        const etheriumMainnetNetwork = (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => network.chainId === 1);
+        if (!etheriumMainnetNetwork && ((_b = this.evmNetworks) === null || _b === void 0 ? void 0 : _b.length)) {
+            return this.evmNetworks[0].chainId;
+        }
+        return 1;
+    }
     initConnection() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { provider } = WalletConnectV2;
             if (!provider) {
@@ -34,9 +41,7 @@ class WalletConnectV2 extends EthWalletConnector {
             if (provider === null || provider === void 0 ? void 0 : provider.uri) {
                 return;
             }
-            const defaultChain = ((_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.length)
-                ? this.evmNetworks[0].chainId
-                : 1;
+            const defaultChain = this.getDefaultChainId();
             provider
                 .connect({
                 namespaces: {
@@ -191,7 +196,7 @@ class WalletConnectV2 extends EthWalletConnector {
                     throw new DynamicError('No provider found');
                 }
             }
-            const metadata = getWalletBookWallet(this.walletBook, this.name);
+            const metadata = getWalletBookWallet(this.walletBook, this.key);
             performPlatformSpecificConnectionMethod(WalletConnectV2.provider.uri, metadata, {
                 onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
                 onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,
@@ -250,7 +255,7 @@ class WalletConnectV2 extends EthWalletConnector {
         if (!this.session) {
             return;
         }
-        const metadata = getWalletBookWallet(this.walletBook, this.name);
+        const metadata = getWalletBookWallet(this.walletBook, this.key);
         const deepLink = getDeepLink({
             metadata,
             mode: 'regular',
@@ -359,9 +364,11 @@ class WalletConnectV2 extends EthWalletConnector {
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.initProvider();
-            this.refreshSession();
-            this.isInitialized = true;
+            if (this.isInitialized === false) {
+                yield this.initProvider();
+                this.refreshSession();
+                this.isInitialized = true;
+            }
             if (!this.activeAccount) {
                 return [];
             }

package/src/injected/OKX.cjs

@@ -1,15 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
-
-class OKX extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
-        this.name = 'OKX Wallet';
-        this.walletConnectorFallback = true;
-    }
-}
-
-exports.OKX = OKX;

package/src/injected/OKX.d.ts

@@ -1,5 +0,0 @@
-import InjectedWalletBase from './InjectedWalletBase';
-export declare class OKX extends InjectedWalletBase {
-    name: string;
-    walletConnectorFallback: boolean;
-}

package/src/injected/OKX.js

@@ -1,11 +0,0 @@
-import InjectedWalletBase from './InjectedWalletBase.js';
-
-class OKX extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
-        this.name = 'OKX Wallet';
-        this.walletConnectorFallback = true;
-    }
-}
-
-export { OKX };

package/src/injected/UnknownInjectedWallet.cjs

@@ -1,14 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
-
-class UnknownInjectedWallet extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
-        this.name = 'InjectedWallet';
-    }
-}
-
-exports.UnknownInjectedWallet = UnknownInjectedWallet;

package/src/injected/UnknownInjectedWallet.d.ts

@@ -1,4 +0,0 @@
-import InjectedWalletBase from './InjectedWalletBase';
-export declare class UnknownInjectedWallet extends InjectedWalletBase {
-    name: string;
-}

package/src/injected/UnknownInjectedWallet.js

@@ -1,10 +0,0 @@
-import InjectedWalletBase from './InjectedWalletBase.js';
-
-class UnknownInjectedWallet extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
-        this.name = 'InjectedWallet';
-    }
-}
-
-export { UnknownInjectedWallet };

package/src/injected/index.js

@@ -1,49 +0,0 @@
-import { BloctoInjected } from './BloctoInjected.js';
-export { BloctoInjected } from './BloctoInjected.js';
-import { BraveEvm } from './BraveEvm.js';
-export { BraveEvm } from './BraveEvm.js';
-import { Dawn } from './Dawn.js';
-export { Dawn } from './Dawn.js';
-import { ExodusEvm } from './ExodusEvm.js';
-export { ExodusEvm } from './ExodusEvm.js';
-import { Frame } from './Frame.js';
-export { Frame } from './Frame.js';
-import { GameStop } from './GameStop.js';
-export { GameStop } from './GameStop.js';
-import { MetaMask } from './MetaMask.js';
-export { MetaMask } from './MetaMask.js';
-import { Opera } from './Opera.js';
-export { Opera } from './Opera.js';
-import { PhantomEvm } from './PhantomEvm.js';
-export { PhantomEvm } from './PhantomEvm.js';
-import { Trust } from './Trust.js';
-export { Trust } from './Trust.js';
-import { UnknownInjectedWallet } from './UnknownInjectedWallet.js';
-export { UnknownInjectedWallet } from './UnknownInjectedWallet.js';
-import { Zerion } from './Zerion.js';
-export { Zerion } from './Zerion.js';
-import { Superb } from './Superb.js';
-import { Rabby } from './Rabby.js';
-export { Rabby } from './Rabby.js';
-import { OKX } from './OKX.js';
-export { OKX } from './OKX.js';
-
-const injectedWallets = [
-    BloctoInjected,
-    BraveEvm,
-    Dawn,
-    ExodusEvm,
-    Frame,
-    GameStop,
-    MetaMask,
-    Opera,
-    PhantomEvm,
-    Trust,
-    UnknownInjectedWallet,
-    Zerion,
-    Superb,
-    Rabby,
-    OKX,
-];
-
-export { injectedWallets };