@dynamic-labs/multi-wallet 0.17.0-RC.0 → 0.17.0-RC.1

package/src/wallets/ethereum/{ethProvider.js → EthWalletConnector.js}

@@ -1,13 +1,11 @@
 import { __awaiter } from 'tslib';
 import { ethers } from 'ethers';
+import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '../../errors.js';
 import { getEvmDefaultRpcProvider, getEvmRpcProviderByChainId } from '../../rpcProviders.js';
 import { findEvmNetwork } from './evm-network.js';
 
-class EthProvider {
-    getDeepLink() {
-        return undefined;
-    }
+class EthWalletConnector extends WalletConnectorBase {
     getRpcProvider() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
@@ -28,19 +26,7 @@ class EthProvider {
         });
     }
     constructor({ evmNetworks }) {
-        this.canConnectViaSocial = false;
-        this.getBalance = () => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            // This is equivalent to getSigner().getAddress() but does not crash
-            // if the signer is not available
-            const [address] = yield this.getConnectedAccounts();
-            if (!address)
-                return;
-            const result = yield ((_a = this.getWeb3Provider()) === null || _a === void 0 ? void 0 : _a.getBalance(address));
-            if (!result)
-                return;
-            return ethers.utils.formatEther(result);
-        });
+        super();
         this.evmNetworkRpcMap = () => this.evmNetworks.reduce((acc, network) => {
             var _a;
             [acc[network.chainId]] = ((_a = network === null || network === void 0 ? void 0 : network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a.length)
@@ -62,12 +48,46 @@ class EthProvider {
             return Promise.resolve(network === null || network === void 0 ? void 0 : network.chainId);
         });
     }
+    getNameService() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [[address], provider] = yield Promise.all([
+                this.getConnectedAccounts(),
+                this.getRpcProvider(),
+            ]);
+            if (!address || !provider || !('lookupAddress' in provider)) {
+                return;
+            }
+            const [ensName, ensAvatar] = yield Promise.all([
+                provider.lookupAddress(address),
+                provider.getAvatar(address),
+            ]);
+            const ensData = {
+                avatar: ensAvatar !== null && ensAvatar !== void 0 ? ensAvatar : undefined,
+                name: ensName !== null && ensName !== void 0 ? ensName : undefined,
+            };
+            return ensData;
+        });
+    }
     getSigner() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             return (_a = this.getWeb3Provider()) === null || _a === void 0 ? void 0 : _a.getSigner();
         });
     }
+    getBalance() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            // This is equivalent to getSigner().getAddress() but does not crash
+            // if the signer is not available
+            const [address] = yield this.getConnectedAccounts();
+            if (!address)
+                return;
+            const result = yield ((_a = this.getWeb3Provider()) === null || _a === void 0 ? void 0 : _a.getBalance(address));
+            if (!result)
+                return;
+            return ethers.utils.formatEther(result);
+        });
+    }
     supportsNetworkSwitching() {
         return true;
     }
@@ -164,4 +184,4 @@ class EthProvider {
     }
 }
 
-export { EthProvider };
+export { EthWalletConnector };

package/src/wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.cjs

@@ -15,11 +15,16 @@ class EmailMagicWalletConnector extends MagicWalletConnector.MagicWalletConnecto
     }
     setEmail(email) {
         this._email = email;
-        localStorage.setItem('magic-link-email', email);
+        if (!email) {
+            localStorage.removeItem('magic-link-email');
+        }
+        else {
+            localStorage.setItem('magic-link-email', email);
+        }
+        this.cancelPreviousEmail();
     }
     clearEmail() {
-        this._email = '';
-        localStorage.removeItem('magic-link-email');
+        this.setEmail(undefined);
     }
     endSession() {
         const _super = Object.create(null, {
@@ -40,7 +45,7 @@ class EmailMagicWalletConnector extends MagicWalletConnector.MagicWalletConnecto
             const client = this._magicClient.getClient();
             const user = yield this.getUserMetadata();
             if (user && user.publicAddress) {
-                this.setEmail((user === null || user === void 0 ? void 0 : user.email) || '');
+                this.setEmail(user === null || user === void 0 ? void 0 : user.email);
                 return user.publicAddress;
             }
             const { email } = this;

package/src/wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.d.ts

@@ -1,10 +1,10 @@
-import { EmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { IEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { MagicPromiEvent, MagicWalletConnector } from '../MagicWalletConnector';
-export declare class EmailMagicWalletConnector extends MagicWalletConnector implements EmailWalletConnector {
+export declare class EmailMagicWalletConnector extends MagicWalletConnector implements IEmailWalletConnector {
     canConnectViaEmail: boolean;
-    _email: string | undefined;
-    get email(): string | undefined;
-    setEmail(email: string): void;
+    protected _email: string | undefined | null;
+    get email(): string | null | undefined;
+    setEmail(email: EmailMagicWalletConnector['email']): void;
     clearEmail(): void;
     endSession(): Promise<void>;
     cancelPreviousEmail(): void;

package/src/wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.js

@@ -11,11 +11,16 @@ class EmailMagicWalletConnector extends MagicWalletConnector {
     }
     setEmail(email) {
         this._email = email;
-        localStorage.setItem('magic-link-email', email);
+        if (!email) {
+            localStorage.removeItem('magic-link-email');
+        }
+        else {
+            localStorage.setItem('magic-link-email', email);
+        }
+        this.cancelPreviousEmail();
     }
     clearEmail() {
-        this._email = '';
-        localStorage.removeItem('magic-link-email');
+        this.setEmail(undefined);
     }
     endSession() {
         const _super = Object.create(null, {
@@ -36,7 +41,7 @@ class EmailMagicWalletConnector extends MagicWalletConnector {
             const client = this._magicClient.getClient();
             const user = yield this.getUserMetadata();
             if (user && user.publicAddress) {
-                this.setEmail((user === null || user === void 0 ? void 0 : user.email) || '');
+                this.setEmail(user === null || user === void 0 ? void 0 : user.email);
                 return user.publicAddress;
             }
             const { email } = this;

package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.cjs

@@ -37,7 +37,7 @@ class EmailOTPMagicWalletConnector extends EmailMagicWalletConnector.EmailMagicW
             const client = this._magicClient.getClient();
             const user = yield this.getUserMetadata();
             if (user && user.publicAddress) {
-                this.setEmail((user === null || user === void 0 ? void 0 : user.email) || '');
+                this.setEmail(user === null || user === void 0 ? void 0 : user.email);
                 return user.publicAddress;
             }
             const { email } = this;

package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.d.ts

@@ -1,9 +1,9 @@
 import { Magic } from 'magic-sdk';
-import { EmailOTPWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { IEmailOTPWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { EmailMagicWalletConnector } from '../EmailMagicWalletConnector';
 import { MagicPromiEvent } from '../MagicWalletConnector';
 type LoginWithEmailOTPPromiEvent = ReturnType<Magic['auth']['loginWithEmailOTP']>;
-export declare class EmailOTPMagicWalletConnector extends EmailMagicWalletConnector implements EmailOTPWalletConnector {
+export declare class EmailOTPMagicWalletConnector extends EmailMagicWalletConnector implements IEmailOTPWalletConnector {
     _handle: LoginWithEmailOTPPromiEvent | undefined;
     verifyOneTimePassword(otp: string): Promise<boolean>;
     loginWithMagic(): Promise<MagicPromiEvent | undefined>;

package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js

@@ -33,7 +33,7 @@ class EmailOTPMagicWalletConnector extends EmailMagicWalletConnector {
             const client = this._magicClient.getClient();
             const user = yield this.getUserMetadata();
             if (user && user.publicAddress) {
-                this.setEmail((user === null || user === void 0 ? void 0 : user.email) || '');
+                this.setEmail(user === null || user === void 0 ? void 0 : user.email);
                 return user.publicAddress;
             }
             const { email } = this;

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.cjs

@@ -17,12 +17,11 @@ const chainNameToChainIdMap = {
     sepolia: 11155111,
 };
 class MagicClientNetworkHandler {
-    constructor({ apiKey, createClient, evmNetworks, config, }) {
+    constructor({ createClient, evmNetworks, config, }) {
         var _a, _b;
         this._clients = {};
         this.evmNetworks = [];
         this._config = config;
-        this._apiKey = apiKey;
         this.evmNetworks = evmNetworks;
         this._networkId =
             typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.d.ts

@@ -6,11 +6,10 @@ export type MagicLinkConfig = Pick<MagicSDKAdditionalConfiguration<string, Magic
     redirectURI?: string;
 };
 type ConfigForNetwork = MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>> | undefined;
-export type MagicClientNetworkHandlerProps<TClient> = Pick<MagicConnectorProps, 'apiKey' | 'config' | 'evmNetworks'> & {
+export type MagicClientNetworkHandlerProps<TClient> = Pick<MagicConnectorProps, 'config' | 'evmNetworks'> & {
     createClient: (config: ConfigForNetwork) => TClient;
 };
 export declare class MagicClientNetworkHandler<TClient = unknown> {
-    protected _apiKey: string;
     protected _clients: {
         [chainId: number]: TClient;
     };
@@ -19,7 +18,7 @@ export declare class MagicClientNetworkHandler<TClient = unknown> {
     protected _listeners: WalletEventListeners | undefined;
     evmNetworks: EvmNetwork[];
     protected _createClient: MagicClientNetworkHandlerProps<TClient>['createClient'];
-    constructor({ apiKey, createClient, evmNetworks, config, }: MagicClientNetworkHandlerProps<TClient>);
+    constructor({ createClient, evmNetworks, config, }: MagicClientNetworkHandlerProps<TClient>);
     setListeners(listeners: WalletEventListeners | undefined): void;
     onChainChanged(networkChainId: number): void;
     selectNetwork(networkChainId: number): Promise<void>;

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js

@@ -13,12 +13,11 @@ const chainNameToChainIdMap = {
     sepolia: 11155111,
 };
 class MagicClientNetworkHandler {
-    constructor({ apiKey, createClient, evmNetworks, config, }) {
+    constructor({ createClient, evmNetworks, config, }) {
         var _a, _b;
         this._clients = {};
         this.evmNetworks = [];
         this._config = config;
-        this._apiKey = apiKey;
         this.evmNetworks = evmNetworks;
         this._networkId =
             typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'

package/src/wallets/ethereum/MagicConnector/MagicSocialWalletConnector/MagicSocialWalletConnector.cjs

@@ -14,7 +14,6 @@ class MagicSocialWalletConnector extends MagicWalletConnector.MagicWalletConnect
         super(opts);
         this.canConnectViaSocial = true;
         this._magicClient = new MagicClientNetworkHandler.MagicClientNetworkHandler({
-            apiKey: opts.apiKey,
             config: opts.config,
             createClient: (config) => new magicSdk.Magic(opts.apiKey, Object.assign(Object.assign({}, config), { extensions: [new oauth.OAuthExtension()] })),
             evmNetworks: opts.evmNetworks,

package/src/wallets/ethereum/MagicConnector/MagicSocialWalletConnector/MagicSocialWalletConnector.js

@@ -10,7 +10,6 @@ class MagicSocialWalletConnector extends MagicWalletConnector {
         super(opts);
         this.canConnectViaSocial = true;
         this._magicClient = new MagicClientNetworkHandler({
-            apiKey: opts.apiKey,
             config: opts.config,
             createClient: (config) => new Magic(opts.apiKey, Object.assign(Object.assign({}, config), { extensions: [new OAuthExtension()] })),
             evmNetworks: opts.evmNetworks,

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var magicSdk = require('magic-sdk');
 var ethers = require('ethers');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var errors = require('../../../../errors.cjs');
 var logger = require('../../../../utils/logger.cjs');
 var assignConfirmationScreenToProvider = require('../../../../utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.cjs');
@@ -12,19 +13,17 @@ var CancellablePromise = require('../../../../utils/CancellablePromise/Cancellab
 var MagicClientNetworkHandler = require('../MagicClientNetworkHandler/MagicClientNetworkHandler.cjs');
 
 const storedAddressKey = 'dynamic_magic_address';
-class MagicWalletConnector {
+class MagicWalletConnector extends walletConnectorCore.WalletConnectorBase {
+    get key() {
+        return 'magiclink';
+    }
     constructor({ apiKey, walletUiUtils, evmNetworks, config, }) {
-        this.key = 'magiclink';
+        super();
         this.canConnectViaCustodialService = true;
-        this.canConnectViaQrCode = false;
-        this.canConnectViaSocial = false;
         this.connectedChain = 'EVM';
         this.supportedChains = ['ETH', 'EVM'];
-        this.isWalletConnect = false;
         this.name = 'Magic Link';
-        this.providerResources = undefined;
         this._magicClient = new MagicClientNetworkHandler.MagicClientNetworkHandler({
-            apiKey,
             config,
             createClient: (config) => new magicSdk.Magic(apiKey, config),
             evmNetworks,
@@ -128,12 +127,6 @@ class MagicWalletConnector {
             return provider;
         });
     }
-    isInstalledOnBrowser() {
-        return false;
-    }
-    proveOwnership(messageToSign) {
-        return this.signMessage(messageToSign);
-    }
     setupEventListeners(listeners) {
         this._listeners = listeners;
         this._magicClient.setListeners(listeners);

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.d.ts

@@ -1,7 +1,7 @@
 import { LoginWithMagicLinkEvents, Magic, MagicUserMetadata, PromiEvent } from 'magic-sdk';
 import { ethers } from 'ethers';
 import { OAuthExtension, OAuthProvider } from '@magic-ext/oauth';
-import { Chain, WalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+import { Chain, WalletConnectorBase, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { WalletUiUtils } from '../../../../types';
 import { CancellablePromise } from '../../../../utils/CancellablePromise';
 import { MagicLinkConfig, MagicClientNetworkHandler } from '../MagicClientNetworkHandler';
@@ -17,17 +17,12 @@ export type MagicPromiEvent = PromiEvent<string | null, LoginWithMagicLinkEvents
     error: (reason: any) => void;
     settled: () => void;
 }>;
-export declare abstract class MagicWalletConnector implements WalletConnector {
-    key: string;
+export declare abstract class MagicWalletConnector extends WalletConnectorBase {
+    get key(): string;
     canConnectViaCustodialService: boolean;
-    canConnectViaQrCode: boolean;
-    canConnectViaSocial: boolean;
     connectedChain: Chain;
     supportedChains: Chain[];
-    isWalletConnect: boolean;
     name: string;
-    switchNetworkOnlyFromWallet?: boolean;
-    providerResources?: string[];
     evmNetworks: EvmNetwork[];
     _walletUiUtils: WalletUiUtils;
     _listeners: WalletEventListeners | undefined;
@@ -46,8 +41,6 @@ export declare abstract class MagicWalletConnector implements WalletConnector {
     getRpcProvider(): Promise<void | ethers.providers.JsonRpcProvider | undefined>;
     getSigner(): Promise<ethers.providers.JsonRpcSigner | undefined>;
     getWeb3Provider(): Promise<ethers.providers.Web3Provider>;
-    isInstalledOnBrowser(): boolean;
-    proveOwnership(messageToSign: string): Promise<string | undefined>;
     setupEventListeners(listeners: WalletEventListeners): void;
     signMessage(messageToSign: string): Promise<string | undefined>;
     supportsNetworkSwitching(): boolean;

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.js

@@ -1,6 +1,7 @@
 import { __awaiter } from 'tslib';
 import { Magic } from 'magic-sdk';
 import { ethers } from 'ethers';
+import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '../../../../errors.js';
 import { logger } from '../../../../utils/logger.js';
 import { assignConfirmationScreenToProvider } from '../../../../utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.js';
@@ -8,19 +9,17 @@ import { CancellablePromise } from '../../../../utils/CancellablePromise/Cancell
 import { MagicClientNetworkHandler } from '../MagicClientNetworkHandler/MagicClientNetworkHandler.js';
 
 const storedAddressKey = 'dynamic_magic_address';
-class MagicWalletConnector {
+class MagicWalletConnector extends WalletConnectorBase {
+    get key() {
+        return 'magiclink';
+    }
     constructor({ apiKey, walletUiUtils, evmNetworks, config, }) {
-        this.key = 'magiclink';
+        super();
         this.canConnectViaCustodialService = true;
-        this.canConnectViaQrCode = false;
-        this.canConnectViaSocial = false;
         this.connectedChain = 'EVM';
         this.supportedChains = ['ETH', 'EVM'];
-        this.isWalletConnect = false;
         this.name = 'Magic Link';
-        this.providerResources = undefined;
         this._magicClient = new MagicClientNetworkHandler({
-            apiKey,
             config,
             createClient: (config) => new Magic(apiKey, config),
             evmNetworks,
@@ -124,12 +123,6 @@ class MagicWalletConnector {
             return provider;
         });
     }
-    isInstalledOnBrowser() {
-        return false;
-    }
-    proveOwnership(messageToSign) {
-        return this.signMessage(messageToSign);
-    }
     setupEventListeners(listeners) {
         this._listeners = listeners;
         this._magicClient.setListeners(listeners);

package/src/wallets/ethereum/coinbase.cjs

@@ -3,19 +3,16 @@
 var tslib = require('tslib');
 var ethers = require('ethers');
 var coinbase = require('../clients/coinbase/coinbase.cjs');
-var normalizeWalletName = require('../../utils/normalizeWalletName/normalizeWalletName.cjs');
 var ethProviderHelper = require('./ethProviderHelper.cjs');
-var ethProvider = require('./ethProvider.cjs');
+var EthWalletConnector = require('./EthWalletConnector.cjs');
 
-class Coinbase extends ethProvider.EthProvider {
+class Coinbase extends EthWalletConnector.EthWalletConnector {
     constructor({ appName, appLogoUrl, evmNetworks, }) {
         super({ evmNetworks });
         this.name = 'Coinbase';
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = true;
-        this.canConnectViaCustodialService = false;
-        this.isWalletConnect = false;
         this.ethProviderHelper = new ethProviderHelper.EthProviderHelper();
         this.coinbaseProviderOpts = {
             appLogoUrl: appLogoUrl,
@@ -23,9 +20,6 @@ class Coinbase extends ethProvider.EthProvider {
             evmNetworks: evmNetworks,
         };
     }
-    get key() {
-        return normalizeWalletName.normalizeWalletName(this.name);
-    }
     setupEventListeners(listeners) {
         return this.ethProviderHelper._setupEventListeners(listeners, this.getWeb3Provider());
     }
@@ -43,11 +37,6 @@ class Coinbase extends ethProvider.EthProvider {
     isInstalledOnBrowser() {
         return this.ethProviderHelper.isInstalledHelper(this.name);
     }
-    connect() {
-        return tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.fetchPublicAddress();
-        });
-    }
     fetchPublicAddress(opts) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
@@ -64,11 +53,6 @@ class Coinbase extends ethProvider.EthProvider {
             return coinbase.signMessage(this.coinbaseProviderOpts, messageToSign);
         });
     }
-    proveOwnership(messageToSign) {
-        return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.signMessage(messageToSign);
-        });
-    }
     endSession() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser())

package/src/wallets/ethereum/coinbase.d.ts

@@ -1,15 +1,13 @@
 import { ethers } from 'ethers';
-import { Chain, FetchPublicAddressOpts, WalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+import { Chain, FetchPublicAddressOpts, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { EthProviderHelper } from './ethProviderHelper';
-import { EthProvider } from './ethProvider';
+import { EthWalletConnector } from './EthWalletConnector';
 import { EvmNetwork } from './evm-network';
-declare class Coinbase extends EthProvider implements WalletConnector {
+declare class Coinbase extends EthWalletConnector {
     name: string;
     supportedChains: Chain[];
     connectedChain: Chain;
     canConnectViaQrCode: boolean;
-    canConnectViaCustodialService: boolean;
-    isWalletConnect: boolean;
     ethProviderHelper: EthProviderHelper;
     private coinbaseProviderOpts;
     constructor({ appName, appLogoUrl, evmNetworks, }: {
@@ -17,15 +15,12 @@ declare class Coinbase extends EthProvider implements WalletConnector {
         appName?: string;
         evmNetworks: EvmNetwork[];
     });
-    get key(): string;
     setupEventListeners(listeners: WalletEventListeners): () => void;
     teardownEventListeners(): void;
     getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     isInstalledOnBrowser(): boolean;
-    connect(): Promise<void>;
     fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
-    proveOwnership(messageToSign: string): Promise<string | undefined>;
     endSession(): Promise<void>;
 }
 export default Coinbase;

package/src/wallets/ethereum/coinbase.js

@@ -1,19 +1,16 @@
 import { __awaiter } from 'tslib';
 import { ethers } from 'ethers';
 import { getCoinbaseProvider, fetchPublicAddress, signMessage, killCoinbaseSession } from '../clients/coinbase/coinbase.js';
-import { normalizeWalletName } from '../../utils/normalizeWalletName/normalizeWalletName.js';
 import { EthProviderHelper } from './ethProviderHelper.js';
-import { EthProvider } from './ethProvider.js';
+import { EthWalletConnector } from './EthWalletConnector.js';
 
-class Coinbase extends EthProvider {
+class Coinbase extends EthWalletConnector {
     constructor({ appName, appLogoUrl, evmNetworks, }) {
         super({ evmNetworks });
         this.name = 'Coinbase';
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = true;
-        this.canConnectViaCustodialService = false;
-        this.isWalletConnect = false;
         this.ethProviderHelper = new EthProviderHelper();
         this.coinbaseProviderOpts = {
             appLogoUrl: appLogoUrl,
@@ -21,9 +18,6 @@ class Coinbase extends EthProvider {
             evmNetworks: evmNetworks,
         };
     }
-    get key() {
-        return normalizeWalletName(this.name);
-    }
     setupEventListeners(listeners) {
         return this.ethProviderHelper._setupEventListeners(listeners, this.getWeb3Provider());
     }
@@ -41,11 +35,6 @@ class Coinbase extends EthProvider {
     isInstalledOnBrowser() {
         return this.ethProviderHelper.isInstalledHelper(this.name);
     }
-    connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.fetchPublicAddress();
-        });
-    }
     fetchPublicAddress(opts) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
@@ -62,11 +51,6 @@ class Coinbase extends EthProvider {
             return signMessage(this.coinbaseProviderOpts, messageToSign);
         });
     }
-    proveOwnership(messageToSign) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.signMessage(messageToSign);
-        });
-    }
     endSession() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser())

package/src/wallets/ethereum/ethProviderHelper.cjs

@@ -150,7 +150,7 @@ class EthProviderHelper {
                 // nothing to teardown
             };
         }
-        const provider = web3Provider.provider;
+        const externalProvider = web3Provider.provider;
         this.handleAccountChange = (accounts) => tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (accounts.length === 0) {
@@ -171,19 +171,26 @@ class EthProviderHelper {
             }
             yield ((_d = listeners.onDisconnect) === null || _d === void 0 ? void 0 : _d.call(listeners));
         });
-        provider.on('accountsChanged', this.handleAccountChange);
-        provider.on('chainChanged', this.handleChainChange);
-        provider.on('disconnect', this.handleDisconnect);
+        externalProvider.on('accountsChanged', this.handleAccountChange);
+        externalProvider.on('chainChanged', this.handleChainChange);
+        externalProvider.on('disconnect', this.handleDisconnect);
         return () => { };
     }
     _teardownEventListeners(name) {
         const web3Provider = this.findProvider(name);
-        if (!web3Provider) {
-            return;
+        if (!web3Provider || !(web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.provider)) {
+            throw new Error(`Could not find provider for ${name}`);
+        }
+        const externalProvider = web3Provider.provider;
+        if (this.handleAccountChange) {
+            externalProvider.removeListener('accountsChanged', this.handleAccountChange);
+        }
+        if (this.handleChainChange) {
+            externalProvider.removeListener('chainChanged', this.handleChainChange);
+        }
+        if (this.handleDisconnect) {
+            externalProvider.removeListener('disconnect', this.handleDisconnect);
         }
-        web3Provider.off('accountsChanged', this.handleAccountChange);
-        web3Provider.off('chainChangedm', this.handleChainChange);
-        web3Provider.off('disconnect', this.handleDisconnect);
     }
 }
 

package/src/wallets/ethereum/ethProviderHelper.js

@@ -146,7 +146,7 @@ class EthProviderHelper {
                 // nothing to teardown
             };
         }
-        const provider = web3Provider.provider;
+        const externalProvider = web3Provider.provider;
         this.handleAccountChange = (accounts) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (accounts.length === 0) {
@@ -167,19 +167,26 @@ class EthProviderHelper {
             }
             yield ((_d = listeners.onDisconnect) === null || _d === void 0 ? void 0 : _d.call(listeners));
         });
-        provider.on('accountsChanged', this.handleAccountChange);
-        provider.on('chainChanged', this.handleChainChange);
-        provider.on('disconnect', this.handleDisconnect);
+        externalProvider.on('accountsChanged', this.handleAccountChange);
+        externalProvider.on('chainChanged', this.handleChainChange);
+        externalProvider.on('disconnect', this.handleDisconnect);
         return () => { };
     }
     _teardownEventListeners(name) {
         const web3Provider = this.findProvider(name);
-        if (!web3Provider) {
-            return;
+        if (!web3Provider || !(web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.provider)) {
+            throw new Error(`Could not find provider for ${name}`);
+        }
+        const externalProvider = web3Provider.provider;
+        if (this.handleAccountChange) {
+            externalProvider.removeListener('accountsChanged', this.handleAccountChange);
+        }
+        if (this.handleChainChange) {
+            externalProvider.removeListener('chainChanged', this.handleChainChange);
+        }
+        if (this.handleDisconnect) {
+            externalProvider.removeListener('disconnect', this.handleDisconnect);
         }
-        web3Provider.off('accountsChanged', this.handleAccountChange);
-        web3Provider.off('chainChangedm', this.handleChainChange);
-        web3Provider.off('disconnect', this.handleDisconnect);
     }
 }