@dynamic-labs/multi-wallet 0.17.0-RC.6 → 0.17.0-RC.8

package/src/wallets/ethereum/{meta-mask.d.ts → injected/InjectedWalletBase.d.ts}

@@ -1,16 +1,14 @@
 import { ethers } from 'ethers';
 import { Chain, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
-import { EthProviderHelper } from './ethProviderHelper';
-import { EthWalletConnector } from './EthWalletConnector';
-import { EvmNetwork } from './evm-network';
-declare class MetaMask extends EthWalletConnector {
-    name: string;
+import { EvmNetwork } from '@dynamic-labs/types';
+import { EthWalletConnector } from '../EthWalletConnector';
+declare abstract class InjectedWalletBase extends EthWalletConnector {
     supportedChains: Chain[];
     connectedChain: Chain;
-    ethProviderHelper: EthProviderHelper;
     publicAddress: string | undefined;
-    setupEventListeners(listeners: WalletEventListeners): () => void;
-    teardownEventListeners(): void;
+    walletConnectorFallback: boolean;
+    getMobileOrInstalledWallet(): InjectedWalletBase;
+    setupEventListeners(listeners: WalletEventListeners): void;
     getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     isInstalledOnBrowser(): boolean;
     connect(): Promise<void>;
@@ -23,4 +21,4 @@ declare class MetaMask extends EthWalletConnector {
         provider: ethers.providers.Web3Provider;
     }): Promise<void>;
 }
-export default MetaMask;
+export default InjectedWalletBase;

package/src/wallets/ethereum/injected/InjectedWalletBase.js

@@ -0,0 +1,72 @@
+import { __awaiter } from 'tslib';
+import WalletConnect from '../../walletConnect/walletConnect.js';
+import WalletConnectV2 from '../../walletConnect/walletConnectV2.js';
+import { EthProviderHelper } from '../ethProviderHelper.js';
+import { EthWalletConnector } from '../EthWalletConnector.js';
+
+class InjectedWalletBase extends EthWalletConnector {
+    constructor() {
+        super(...arguments);
+        this.supportedChains = ['ETH', 'EVM'];
+        this.connectedChain = 'EVM';
+        this.walletConnectorFallback = false;
+    }
+    getMobileOrInstalledWallet() {
+        var _a;
+        if (this.walletConnectorFallback && !this.isInstalledOnBrowser()) {
+            if ((_a = this.constructorProps) === null || _a === void 0 ? void 0 : _a.isWalletConnectV2Enabled) {
+                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 this;
+    }
+    setupEventListeners(listeners) {
+        const { tearDownEventListeners } = EthProviderHelper._setupEventListeners(this.name, listeners, this.getWeb3Provider());
+        this.teardownEventListeners = tearDownEventListeners;
+    }
+    getWeb3Provider() {
+        return EthProviderHelper.findProvider(this.name);
+    }
+    isInstalledOnBrowser() {
+        return EthProviderHelper.isInstalledHelper(this.name);
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.fetchPublicAddress();
+        });
+    }
+    fetchPublicAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return EthProviderHelper.fetchPublicAddressWithName(this.name);
+        });
+    }
+    signMessage(messageToSign) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return EthProviderHelper.signMessageWithName(messageToSign, this.name);
+        });
+    }
+    proveOwnership(messageToSign) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.signMessage(messageToSign);
+        });
+    }
+    endSession() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // nothing to do on browser-based metamask
+            return;
+        });
+    }
+    providerSwitchNetwork({ network, provider, }) {
+        const _super = Object.create(null, {
+            providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            return _super.providerSwitchNetwork.call(this, { network, provider });
+        });
+    }
+}
+
+export { InjectedWalletBase as default };

package/src/wallets/ethereum/injected/MetaMask.cjs

@@ -0,0 +1,13 @@
+'use strict';
+
+var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+
+class MetaMask extends InjectedWalletBase {
+    constructor() {
+        super(...arguments);
+        this.name = 'MetaMask';
+        this.walletConnectorFallback = true;
+    }
+}
+
+module.exports = MetaMask;

package/src/wallets/ethereum/injected/MetaMask.d.ts

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

package/src/wallets/ethereum/injected/MetaMask.js

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

package/src/wallets/ethereum/injected/Opera.cjs

@@ -1,12 +1,11 @@
 'use strict';
 
-var metaMask = require('../meta-mask.cjs');
+var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
-class Opera extends metaMask {
+class Opera extends InjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'Opera';
-        this.canConnectViaQrCode = false;
     }
 }
 

package/src/wallets/ethereum/injected/Opera.d.ts

@@ -1,6 +1,5 @@
-import MetaMask from '../meta-mask';
-declare class Opera extends MetaMask {
+import InjectedWalletBase from './InjectedWalletBase';
+declare class Opera extends InjectedWalletBase {
     name: string;
-    canConnectViaQrCode: boolean;
 }
 export default Opera;

package/src/wallets/ethereum/injected/Opera.js

@@ -1,10 +1,9 @@
-import MetaMask from '../meta-mask.js';
+import InjectedWalletBase from './InjectedWalletBase.js';
 
-class Opera extends MetaMask {
+class Opera extends InjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'Opera';
-        this.canConnectViaQrCode = false;
     }
 }
 

package/src/wallets/ethereum/injected/PhantomEvm.cjs

@@ -2,13 +2,12 @@
 
 var tslib = require('tslib');
 var isMobile = require('../../../utils/isMobile.cjs');
-var metaMask = require('../meta-mask.cjs');
+var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
-class PhantomEvm extends metaMask {
+class PhantomEvm extends InjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'PhantomEvm';
-        this.canConnectViaQrCode = false;
     }
     fetchPublicAddress() {
         const _super = Object.create(null, {

package/src/wallets/ethereum/injected/PhantomEvm.d.ts

@@ -1,7 +1,6 @@
-import MetaMask from '../meta-mask';
-declare class PhantomEvm extends MetaMask {
+import InjectedWalletBase from './InjectedWalletBase';
+declare class PhantomEvm extends InjectedWalletBase {
     name: string;
-    canConnectViaQrCode: boolean;
     fetchPublicAddress(): Promise<string | undefined>;
 }
 export default PhantomEvm;

package/src/wallets/ethereum/injected/PhantomEvm.js

@@ -1,12 +1,11 @@
 import { __awaiter } from 'tslib';
 import { isMobile, isSamsungBrowser } from '../../../utils/isMobile.js';
-import MetaMask from '../meta-mask.js';
+import InjectedWalletBase from './InjectedWalletBase.js';
 
-class PhantomEvm extends MetaMask {
+class PhantomEvm extends InjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'PhantomEvm';
-        this.canConnectViaQrCode = false;
     }
     fetchPublicAddress() {
         const _super = Object.create(null, {

package/src/wallets/ethereum/injected/Trust.cjs

@@ -1,12 +1,12 @@
 'use strict';
 
-var metaMask = require('../meta-mask.cjs');
+var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
-class Trust extends metaMask {
+class Trust extends InjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'Trust';
-        this.canConnectViaQrCode = false;
+        this.walletConnectorFallback = true;
     }
 }
 

package/src/wallets/ethereum/injected/Trust.d.ts

@@ -1,6 +1,6 @@
-import MetaMask from '../meta-mask';
-declare class Trust extends MetaMask {
+import InjectedWalletBase from './InjectedWalletBase';
+declare class Trust extends InjectedWalletBase {
     name: string;
-    canConnectViaQrCode: boolean;
+    walletConnectorFallback: boolean;
 }
 export default Trust;

package/src/wallets/ethereum/injected/Trust.js

@@ -1,10 +1,10 @@
-import MetaMask from '../meta-mask.js';
+import InjectedWalletBase from './InjectedWalletBase.js';
 
-class Trust extends MetaMask {
+class Trust extends InjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'Trust';
-        this.canConnectViaQrCode = false;
+        this.walletConnectorFallback = true;
     }
 }
 

package/src/wallets/ethereum/injected/UnknownInjectedWallet.cjs

@@ -1,12 +1,11 @@
 'use strict';
 
-var metaMask = require('../meta-mask.cjs');
+var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
-class UnknownInjectedWallet extends metaMask {
+class UnknownInjectedWallet extends InjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'InjectedWallet';
-        this.canConnectViaQrCode = false;
     }
 }
 

package/src/wallets/ethereum/injected/UnknownInjectedWallet.d.ts

@@ -1,6 +1,5 @@
-import MetaMask from '../meta-mask';
-declare class UnknownInjectedWallet extends MetaMask {
+import InjectedWalletBase from './InjectedWalletBase';
+declare class UnknownInjectedWallet extends InjectedWalletBase {
     name: string;
-    canConnectViaQrCode: boolean;
 }
 export default UnknownInjectedWallet;

package/src/wallets/ethereum/injected/UnknownInjectedWallet.js

@@ -1,10 +1,9 @@
-import MetaMask from '../meta-mask.js';
+import InjectedWalletBase from './InjectedWalletBase.js';
 
-class UnknownInjectedWallet extends MetaMask {
+class UnknownInjectedWallet extends InjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'InjectedWallet';
-        this.canConnectViaQrCode = false;
     }
 }
 

package/src/wallets/ethereum/injected/Zerion.cjs

@@ -1,12 +1,12 @@
 'use strict';
 
-var metaMask = require('../meta-mask.cjs');
+var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
-class Zerion extends metaMask {
+class Zerion extends InjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'Zerion';
-        this.canConnectViaQrCode = false;
+        this.walletConnectorFallback = true;
     }
 }
 

package/src/wallets/ethereum/injected/Zerion.d.ts

@@ -1,6 +1,6 @@
-import MetaMask from '../meta-mask';
-declare class Zerion extends MetaMask {
+import InjectedWalletBase from './InjectedWalletBase';
+declare class Zerion extends InjectedWalletBase {
     name: string;
-    canConnectViaQrCode: boolean;
+    walletConnectorFallback: boolean;
 }
 export default Zerion;

package/src/wallets/ethereum/injected/Zerion.js

@@ -1,10 +1,10 @@
-import MetaMask from '../meta-mask.js';
+import InjectedWalletBase from './InjectedWalletBase.js';
 
-class Zerion extends MetaMask {
+class Zerion extends InjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'Zerion';
-        this.canConnectViaQrCode = false;
+        this.walletConnectorFallback = true;
     }
 }
 

package/src/wallets/flow/FlowWalletConnector.cjs

@@ -5,8 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var fcl = require('@onflow/fcl');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var errors = require('../../errors.cjs');
-var logger = require('../../utils/logger.cjs');
+var utils = require('@dynamic-labs/utils');
 
 const get = (key) => {
     if (typeof window === 'undefined') {
@@ -19,7 +18,7 @@ const get = (key) => {
         }
     }
     catch (e) {
-        logger.logger.error(e);
+        walletConnectorCore.logger.error(e);
     }
     return undefined;
 };
@@ -73,7 +72,7 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 return user.addr;
             }
             catch (error) {
-                logger.logger.error(error);
+                walletConnectorCore.logger.error(error);
                 return undefined;
             }
         });
@@ -94,7 +93,7 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 return JSON.stringify(data);
             }
             catch (error) {
-                logger.logger.error(error);
+                walletConnectorCore.logger.error(error);
                 return undefined;
             }
         });
@@ -104,7 +103,7 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
             const message = Buffer.from(messageToSign).toString('hex');
             const signedMessage = yield fcl.currentUser().signUserMessage(message);
             if (signedMessage.includes('Declined')) {
-                throw new errors.DynamicError('User declined the signature');
+                throw new utils.DynamicError('User declined the signature');
             }
             return JSON.stringify(signedMessage);
         });
@@ -124,7 +123,7 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
                     return yield fcl.send([fcl.script(code)]).then(fcl.decode);
                 }
                 catch (error) {
-                    logger.logger.error(error);
+                    walletConnectorCore.logger.error(error);
                     return undefined;
                 }
             }
@@ -140,7 +139,7 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     switchNetwork() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            throw new errors.DynamicError('Not supported');
+            throw new utils.DynamicError('Not supported');
         });
     }
     getConnectedAccounts() {

package/src/wallets/flow/FlowWalletConnector.js

@@ -1,8 +1,7 @@
 import { __awaiter } from 'tslib';
 import { currentUser, config, send, script, decode } from '@onflow/fcl';
-import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { DynamicError } from '../../errors.js';
-import { logger } from '../../utils/logger.js';
+import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
+import { DynamicError } from '@dynamic-labs/utils';
 
 const get = (key) => {
     if (typeof window === 'undefined') {

package/src/wallets/getWalletConnectConnector.cjs

@@ -2,18 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var walletConnect = require('./walletConnect/walletConnect.cjs');
 var walletConnectV2 = require('./walletConnect/walletConnectV2.cjs');
 
-const getWalletConnectConnector = ({ evmNetworks, isWalletConnectV2Enabled, projectId, }) => isWalletConnectV2Enabled
-    ? new walletConnectV2({
-        evmNetworks,
-        projectId,
-        walletName: 'WalletConnect',
-    })
-    : new walletConnect({
-        evmNetworks,
-        walletName: 'WalletConnect',
-    });
+const getWalletConnectConnector = (_a) => {
+    var { isWalletConnectV2Enabled } = _a, props = tslib.__rest(_a, ["isWalletConnectV2Enabled"]);
+    return isWalletConnectV2Enabled
+        ? new walletConnectV2(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }))
+        : new walletConnect(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
+};
 
 exports.getWalletConnectConnector = getWalletConnectConnector;

package/src/wallets/getWalletConnectConnector.d.ts

@@ -1,8 +1,5 @@
-import { EvmNetwork } from './ethereum/evm-network';
 import WalletConnect from './walletConnect';
-import WalletConnectV2 from './walletConnect/walletConnectV2';
-export declare const getWalletConnectConnector: ({ evmNetworks, isWalletConnectV2Enabled, projectId, }: {
-    evmNetworks: EvmNetwork[];
+import WalletConnectV2, { WalletConnectorV2Opts } from './walletConnect/walletConnectV2';
+export declare const getWalletConnectConnector: ({ isWalletConnectV2Enabled, ...props }: Omit<WalletConnectorV2Opts, "walletName"> & {
     isWalletConnectV2Enabled: boolean;
-    projectId?: string | undefined;
 }) => WalletConnectV2 | WalletConnect;

package/src/wallets/getWalletConnectConnector.js

@@ -1,15 +1,12 @@
+import { __rest } from 'tslib';
 import WalletConnect from './walletConnect/walletConnect.js';
 import WalletConnectV2 from './walletConnect/walletConnectV2.js';
 
-const getWalletConnectConnector = ({ evmNetworks, isWalletConnectV2Enabled, projectId, }) => isWalletConnectV2Enabled
-    ? new WalletConnectV2({
-        evmNetworks,
-        projectId,
-        walletName: 'WalletConnect',
-    })
-    : new WalletConnect({
-        evmNetworks,
-        walletName: 'WalletConnect',
-    });
+const getWalletConnectConnector = (_a) => {
+    var { isWalletConnectV2Enabled } = _a, props = __rest(_a, ["isWalletConnectV2Enabled"]);
+    return isWalletConnectV2Enabled
+        ? new WalletConnectV2(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }))
+        : new WalletConnect(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
+};
 
 export { getWalletConnectConnector };

package/src/wallets/solana/CoinbaseSolana.cjs

@@ -8,45 +8,42 @@ class CoinbaseSolana extends solWalletConnector.SolWalletConnector {
     constructor() {
         super(...arguments);
         this.name = 'CoinbaseSolana';
-        this.solProviderHelper = new solProviderHelper.SolProviderHelper();
     }
     setupEventListeners(listeners) {
-        return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper._setupEventListeners(listeners, this.solProviderHelper.findProvider(this.name));
-        });
+        solProviderHelper.SolProviderHelper._setupEventListeners(listeners, solProviderHelper.SolProviderHelper.findProvider(this.name));
     }
     teardownEventListeners() {
-        this.solProviderHelper._teardownEventListeners(this.name);
+        solProviderHelper.SolProviderHelper._teardownEventListeners(this.name);
     }
     connect() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.solProviderHelper.connectWithName(this.name);
+            yield solProviderHelper.SolProviderHelper.connectWithName(this.name);
         });
     }
     getSigner() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.connectWithName(this.name);
+            return solProviderHelper.SolProviderHelper.connectWithName(this.name);
         });
     }
     isInstalledOnBrowser() {
-        return this.solProviderHelper.isInstalledHelper(this.name);
+        return solProviderHelper.SolProviderHelper.isInstalledHelper(this.name);
     }
     fetchPublicAddress() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return this.solProviderHelper.fetchPublicAddressWithName(this.name);
+                return solProviderHelper.SolProviderHelper.fetchPublicAddressWithName(this.name);
             }
             return;
         });
     }
     signMessage(messageToSign) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.signMessageWithName(messageToSign, this.name);
+            return solProviderHelper.SolProviderHelper.signMessageWithName(messageToSign, this.name);
         });
     }
     getConnectedAccounts() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.getConnectedAccountsWithName(this.name);
+            return solProviderHelper.SolProviderHelper.getConnectedAccountsWithName(this.name);
         });
     }
 }

package/src/wallets/solana/CoinbaseSolana.d.ts

@@ -1,11 +1,9 @@
 import { WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { ISolana } from '../window';
 import { SolWalletConnector } from './solWalletConnector';
-import { SolProviderHelper } from './solProviderHelper';
 declare class CoinbaseSolana extends SolWalletConnector {
     name: string;
-    solProviderHelper: SolProviderHelper;
-    setupEventListeners(listeners: WalletEventListeners): Promise<() => void>;
+    setupEventListeners(listeners: WalletEventListeners): void;
     teardownEventListeners(): void;
     connect(): Promise<void>;
     getSigner(): Promise<ISolana | undefined>;

package/src/wallets/solana/CoinbaseSolana.js

@@ -6,45 +6,42 @@ class CoinbaseSolana extends SolWalletConnector {
     constructor() {
         super(...arguments);
         this.name = 'CoinbaseSolana';
-        this.solProviderHelper = new SolProviderHelper();
     }
     setupEventListeners(listeners) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper._setupEventListeners(listeners, this.solProviderHelper.findProvider(this.name));
-        });
+        SolProviderHelper._setupEventListeners(listeners, SolProviderHelper.findProvider(this.name));
     }
     teardownEventListeners() {
-        this.solProviderHelper._teardownEventListeners(this.name);
+        SolProviderHelper._teardownEventListeners(this.name);
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.solProviderHelper.connectWithName(this.name);
+            yield SolProviderHelper.connectWithName(this.name);
         });
     }
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.connectWithName(this.name);
+            return SolProviderHelper.connectWithName(this.name);
         });
     }
     isInstalledOnBrowser() {
-        return this.solProviderHelper.isInstalledHelper(this.name);
+        return SolProviderHelper.isInstalledHelper(this.name);
     }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return this.solProviderHelper.fetchPublicAddressWithName(this.name);
+                return SolProviderHelper.fetchPublicAddressWithName(this.name);
             }
             return;
         });
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.signMessageWithName(messageToSign, this.name);
+            return SolProviderHelper.signMessageWithName(messageToSign, this.name);
         });
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.getConnectedAccountsWithName(this.name);
+            return SolProviderHelper.getConnectedAccountsWithName(this.name);
         });
     }
 }