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

package/src/wallets/walletConnect/walletConnectV2.cjs

@@ -3,12 +3,12 @@
 var tslib = require('tslib');
 var Provider = require('@walletconnect/universal-provider');
 var ethers = require('ethers');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletBook = require('@dynamic-labs/wallet-book');
+var utils = require('@dynamic-labs/utils');
 var EthWalletConnector = require('../ethereum/EthWalletConnector.cjs');
 var isMobile = require('../../utils/isMobile.cjs');
 var walletConnect = require('../clients/walletConnect/walletConnect.cjs');
-var errors = require('../../errors.cjs');
-var logger = require('../../utils/logger.cjs');
 var encoding = require('../../utils/encoding.cjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -32,7 +32,7 @@ const performPlatformSpecificConnectionMethod = (uri, metadata, opts) => {
 const sessionTopicKey = (walletName) => `dynamic-wc2-session-topic-${walletName}`;
 class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     constructor(opts) {
-        super({ evmNetworks: opts.evmNetworks });
+        super(opts);
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = true;
@@ -95,20 +95,20 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         WalletConnectV2.provider.client.on('session_event', ({ params }) => {
             var _a, _b;
             if (!params || !params.event) {
-                logger.logger.debug('session_event was called without params or params.event');
+                walletConnectorCore.logger.debug('session_event was called without params or params.event');
                 return;
             }
             const { name, data } = params.event;
             if (name === 'chainChanged') {
                 if (typeof data !== 'string') {
-                    logger.logger.debug(`received unexpected data for chainChanged: ${data} with type ${typeof data}}`);
+                    walletConnectorCore.logger.debug(`received unexpected data for chainChanged: ${data} with type ${typeof data}}`);
                     return;
                 }
                 (_a = listeners.onChainChange) === null || _a === void 0 ? void 0 : _a.call(listeners, data);
             }
             else if (name === 'accountsChanged') {
                 if (typeof data !== 'string' || !Array.isArray(data)) {
-                    logger.logger.debug(`received unexpected data for accountsChanged: ${data} with type ${typeof data}}`);
+                    walletConnectorCore.logger.debug(`received unexpected data for accountsChanged: ${data} with type ${typeof data}}`);
                     return;
                 }
                 (_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, data);
@@ -150,10 +150,10 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             }
             const metadata = walletBook.getWalletBookWallet(this.name);
             if (!WalletConnectV2.provider) {
-                throw new errors.DynamicError('No provider found');
+                throw new utils.DynamicError('No provider found');
             }
             if (!WalletConnectV2.provider.uri || !WalletConnectV2.createSession) {
-                throw new errors.DynamicError('No uri or approval found');
+                throw new utils.DynamicError('No uri or approval found');
             }
             performPlatformSpecificConnectionMethod(WalletConnectV2.provider.uri, metadata, {
                 onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
@@ -196,10 +196,10 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     signMessage(messageToSign) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             if (!this.session) {
-                throw new errors.DynamicError('no session');
+                throw new utils.DynamicError('no session');
             }
             if (!WalletConnectV2.provider) {
-                throw new errors.DynamicError('No WalletConnect provider found to handle signing');
+                throw new utils.DynamicError('No WalletConnect provider found to handle signing');
             }
             const metadata = walletBook.getWalletBookWallet(this.name);
             if (isMobile.isMobile()) {
@@ -230,7 +230,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 localStorage.removeItem(this.sessionTopicKey);
             }
             catch (e) {
-                logger.logger.debug(e);
+                walletConnectorCore.logger.debug(e);
             }
         });
     }
@@ -244,13 +244,13 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 return;
             }
             if (this.switchNetworkOnlyFromWallet) {
-                throw new errors.DynamicError('Network switching is only supported through the wallet');
+                throw new utils.DynamicError('Network switching is only supported through the wallet');
             }
             if (!this.supportsNetworkSwitching()) {
-                throw new errors.DynamicError('Network switching not supported');
+                throw new utils.DynamicError('Network switching not supported');
             }
             if (!provider) {
-                throw new errors.DynamicError('Provider not found');
+                throw new utils.DynamicError('Provider not found');
             }
             return _super.providerSwitchNetwork.call(this, { network, provider });
         });

package/src/wallets/walletConnect/walletConnectV2.d.ts

@@ -1,8 +1,12 @@
 import { ethers } from 'ethers';
 import type { SessionTypes } from '@walletconnect/types';
 import { Chain, FetchPublicAddressOpts, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
-import { EvmNetwork } from '../ethereum/evm-network';
-import { EthWalletConnector } from '../ethereum/EthWalletConnector';
+import { EvmNetwork } from '@dynamic-labs/types';
+import { EthWalletConnector, EthWalletConnectorOpts } from '../ethereum/EthWalletConnector';
+export type WalletConnectorV2Opts = EthWalletConnectorOpts & {
+    projectId?: string;
+    walletName: string;
+};
 declare class WalletConnectV2 extends EthWalletConnector {
     supportedChains: Chain[];
     connectedChain: Chain;
@@ -13,11 +17,7 @@ declare class WalletConnectV2 extends EthWalletConnector {
     private static provider;
     private static createSession;
     private projectId?;
-    constructor(opts: {
-        evmNetworks: EvmNetwork[];
-        projectId?: string;
-        walletName: string;
-    });
+    constructor(opts: WalletConnectorV2Opts);
     private initProvider;
     init(): Promise<void>;
     get sessionTopicKey(): string;

package/src/wallets/walletConnect/walletConnectV2.js

@@ -1,12 +1,12 @@
 import { __awaiter } from 'tslib';
 import Provider from '@walletconnect/universal-provider';
 import { ethers } from 'ethers';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { DynamicError } from '@dynamic-labs/utils';
 import { EthWalletConnector } from '../ethereum/EthWalletConnector.js';
 import { isMobile } from '../../utils/isMobile.js';
 import { getDeepLink } from '../clients/walletConnect/walletConnect.js';
-import { DynamicError } from '../../errors.js';
-import { logger } from '../../utils/logger.js';
 import { utf8ToHex } from '../../utils/encoding.js';
 
 const performPlatformSpecificConnectionMethod = (uri, metadata, opts) => {
@@ -26,7 +26,7 @@ const performPlatformSpecificConnectionMethod = (uri, metadata, opts) => {
 const sessionTopicKey = (walletName) => `dynamic-wc2-session-topic-${walletName}`;
 class WalletConnectV2 extends EthWalletConnector {
     constructor(opts) {
-        super({ evmNetworks: opts.evmNetworks });
+        super(opts);
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = true;

package/src/wallets/walletConnect/zerion.d.ts

@@ -1,8 +1,6 @@
-import { EvmNetwork } from '../ethereum/evm-network';
+import { EthWalletConnectorOpts } from '../ethereum/EthWalletConnector';
 import WalletConnect from '.';
 declare class TrustWalletConnect extends WalletConnect {
-    constructor({ evmNetworks }: {
-        evmNetworks: EvmNetwork[];
-    });
+    constructor(props: EthWalletConnectorOpts);
 }
 export default TrustWalletConnect;

package/src/errors.cjs

@@ -1,66 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-class DynamicError extends Error {
-}
-class NotSupportedError extends DynamicError {
-}
-class EmailVerificationError extends DynamicError {
-    constructor(code) {
-        super();
-        this.name = 'EmailVerificationError';
-        this.code = code;
-    }
-}
-class NoAccessError extends DynamicError {
-    constructor({ walletPublicKey, email, }) {
-        super('User does not have access');
-        this.name = 'NoAccessError';
-        this.email = email;
-        this.walletPublicKey = walletPublicKey;
-    }
-}
-class ChainalysisError extends DynamicError {
-    constructor(walletPublicKey) {
-        super('This address is not approved for access');
-        this.name = 'ChainalysisError';
-        this.walletPublicKey = walletPublicKey;
-    }
-}
-class EmailAlreadyExistsError extends DynamicError {
-    constructor() {
-        super('Email already exists');
-        this.name = 'EmailAlreadyExistsError';
-    }
-}
-class UsernameAlreadyExistsError extends DynamicError {
-    constructor() {
-        super('Username already exists');
-        this.name = 'UsernameAlreadyExistsError';
-    }
-}
-class WalletNotDeployedError extends DynamicError {
-    constructor() {
-        super('Wallet has not been deployed');
-        this.name = 'WalletNotDeployedError';
-        this.code = 'wallet_not_deployed';
-    }
-}
-class WalletUsedError extends DynamicError {
-    constructor(code) {
-        super();
-        this.name = 'WalletUsedError';
-        this.code = code;
-    }
-}
-
-exports.ChainalysisError = ChainalysisError;
-exports.DynamicError = DynamicError;
-exports.EmailAlreadyExistsError = EmailAlreadyExistsError;
-exports.EmailVerificationError = EmailVerificationError;
-exports.NoAccessError = NoAccessError;
-exports.NotSupportedError = NotSupportedError;
-exports.UsernameAlreadyExistsError = UsernameAlreadyExistsError;
-exports.WalletNotDeployedError = WalletNotDeployedError;
-exports.WalletUsedError = WalletUsedError;

package/src/errors.d.ts

@@ -1,34 +0,0 @@
-export declare class DynamicError extends Error {
-}
-export declare class NotSupportedError extends DynamicError {
-}
-export declare class EmailVerificationError extends DynamicError {
-    code: string | undefined;
-    constructor(code: string);
-}
-export declare class NoAccessError extends DynamicError {
-    walletPublicKey?: string;
-    email?: string;
-    constructor({ walletPublicKey, email, }: {
-        email?: string;
-        walletPublicKey?: string;
-    });
-}
-export declare class ChainalysisError extends DynamicError {
-    walletPublicKey: string | undefined;
-    constructor(walletPublicKey: string);
-}
-export declare class EmailAlreadyExistsError extends DynamicError {
-    constructor();
-}
-export declare class UsernameAlreadyExistsError extends DynamicError {
-    constructor();
-}
-export declare class WalletNotDeployedError extends DynamicError {
-    code: string | undefined;
-    constructor();
-}
-export declare class WalletUsedError extends DynamicError {
-    code: string | undefined;
-    constructor(code: string);
-}

package/src/errors.js

@@ -1,54 +0,0 @@
-class DynamicError extends Error {
-}
-class NotSupportedError extends DynamicError {
-}
-class EmailVerificationError extends DynamicError {
-    constructor(code) {
-        super();
-        this.name = 'EmailVerificationError';
-        this.code = code;
-    }
-}
-class NoAccessError extends DynamicError {
-    constructor({ walletPublicKey, email, }) {
-        super('User does not have access');
-        this.name = 'NoAccessError';
-        this.email = email;
-        this.walletPublicKey = walletPublicKey;
-    }
-}
-class ChainalysisError extends DynamicError {
-    constructor(walletPublicKey) {
-        super('This address is not approved for access');
-        this.name = 'ChainalysisError';
-        this.walletPublicKey = walletPublicKey;
-    }
-}
-class EmailAlreadyExistsError extends DynamicError {
-    constructor() {
-        super('Email already exists');
-        this.name = 'EmailAlreadyExistsError';
-    }
-}
-class UsernameAlreadyExistsError extends DynamicError {
-    constructor() {
-        super('Username already exists');
-        this.name = 'UsernameAlreadyExistsError';
-    }
-}
-class WalletNotDeployedError extends DynamicError {
-    constructor() {
-        super('Wallet has not been deployed');
-        this.name = 'WalletNotDeployedError';
-        this.code = 'wallet_not_deployed';
-    }
-}
-class WalletUsedError extends DynamicError {
-    constructor(code) {
-        super();
-        this.name = 'WalletUsedError';
-        this.code = code;
-    }
-}
-
-export { ChainalysisError, DynamicError, EmailAlreadyExistsError, EmailVerificationError, NoAccessError, NotSupportedError, UsernameAlreadyExistsError, WalletNotDeployedError, WalletUsedError };

package/src/rpcProviders.cjs

@@ -1,76 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var web3_js = require('@solana/web3.js');
-var ethers = require('ethers');
-
-const getRpcProviders = (configurations) => {
-    const rpcProviders = {};
-    if (configurations === null || configurations === void 0 ? void 0 : configurations.evm) {
-        rpcProviders.evm = configurations.evm.map((network) => {
-            var _a;
-            const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-            const provider = new ethers.ethers.providers.JsonRpcProvider(rpcUrl, network.chainId);
-            return {
-                chainId: network.chainId,
-                chainName: network.chainName,
-                provider,
-            };
-        });
-    }
-    if (configurations === null || configurations === void 0 ? void 0 : configurations.solana) {
-        rpcProviders.solana = configurations.solana.map((network) => {
-            var _a;
-            const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-            const provider = new web3_js.Connection(rpcUrl);
-            return {
-                chainId: parseInt(network.chainId),
-                chainName: network.name,
-                provider,
-            };
-        });
-    }
-    if (Object.keys(rpcProviders).length === 0) {
-        return undefined;
-    }
-    return rpcProviders;
-};
-const getEvmDefaultRpcProvider = (configurations) => {
-    const rpcProviders = getRpcProviders(configurations);
-    if (!rpcProviders) {
-        return undefined;
-    }
-    if (!rpcProviders.evm) {
-        return undefined;
-    }
-    const defaultProvider = rpcProviders.evm.find((provider) => provider.chainId === 1);
-    return defaultProvider;
-};
-const getSolanaDefaultRpcProvider = (configurations) => {
-    const rpcProviders = getRpcProviders(configurations);
-    if (!rpcProviders) {
-        return undefined;
-    }
-    if (!rpcProviders.solana) {
-        return undefined;
-    }
-    const defaultProvider = rpcProviders.solana.find((provider) => provider.chainId === 101);
-    return defaultProvider;
-};
-const getEvmRpcProviderByChainId = (configurations, chainId) => {
-    const rpcProviders = getRpcProviders(configurations);
-    if (!rpcProviders) {
-        return undefined;
-    }
-    if (rpcProviders.evm) {
-        const evmRpcProvider = rpcProviders.evm.find((rpcProvider) => rpcProvider.chainId === chainId);
-        return evmRpcProvider;
-    }
-    return undefined;
-};
-
-exports.getEvmDefaultRpcProvider = getEvmDefaultRpcProvider;
-exports.getEvmRpcProviderByChainId = getEvmRpcProviderByChainId;
-exports.getRpcProviders = getRpcProviders;
-exports.getSolanaDefaultRpcProvider = getSolanaDefaultRpcProvider;

package/src/rpcProviders.d.ts

@@ -1,5 +0,0 @@
-import { EvmRpcProvider, NetworkConfigurationMap, RpcProviders, SolanaRpcProvider } from './types';
-export declare const getRpcProviders: (configurations: NetworkConfigurationMap) => RpcProviders | undefined;
-export declare const getEvmDefaultRpcProvider: (configurations: NetworkConfigurationMap) => EvmRpcProvider | undefined;
-export declare const getSolanaDefaultRpcProvider: (configurations: NetworkConfigurationMap) => SolanaRpcProvider | undefined;
-export declare const getEvmRpcProviderByChainId: (configurations: NetworkConfigurationMap, chainId: number) => EvmRpcProvider | undefined;

package/src/rpcProviders.js

@@ -1,69 +0,0 @@
-import { Connection } from '@solana/web3.js';
-import { ethers } from 'ethers';
-
-const getRpcProviders = (configurations) => {
-    const rpcProviders = {};
-    if (configurations === null || configurations === void 0 ? void 0 : configurations.evm) {
-        rpcProviders.evm = configurations.evm.map((network) => {
-            var _a;
-            const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-            const provider = new ethers.providers.JsonRpcProvider(rpcUrl, network.chainId);
-            return {
-                chainId: network.chainId,
-                chainName: network.chainName,
-                provider,
-            };
-        });
-    }
-    if (configurations === null || configurations === void 0 ? void 0 : configurations.solana) {
-        rpcProviders.solana = configurations.solana.map((network) => {
-            var _a;
-            const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-            const provider = new Connection(rpcUrl);
-            return {
-                chainId: parseInt(network.chainId),
-                chainName: network.name,
-                provider,
-            };
-        });
-    }
-    if (Object.keys(rpcProviders).length === 0) {
-        return undefined;
-    }
-    return rpcProviders;
-};
-const getEvmDefaultRpcProvider = (configurations) => {
-    const rpcProviders = getRpcProviders(configurations);
-    if (!rpcProviders) {
-        return undefined;
-    }
-    if (!rpcProviders.evm) {
-        return undefined;
-    }
-    const defaultProvider = rpcProviders.evm.find((provider) => provider.chainId === 1);
-    return defaultProvider;
-};
-const getSolanaDefaultRpcProvider = (configurations) => {
-    const rpcProviders = getRpcProviders(configurations);
-    if (!rpcProviders) {
-        return undefined;
-    }
-    if (!rpcProviders.solana) {
-        return undefined;
-    }
-    const defaultProvider = rpcProviders.solana.find((provider) => provider.chainId === 101);
-    return defaultProvider;
-};
-const getEvmRpcProviderByChainId = (configurations, chainId) => {
-    const rpcProviders = getRpcProviders(configurations);
-    if (!rpcProviders) {
-        return undefined;
-    }
-    if (rpcProviders.evm) {
-        const evmRpcProvider = rpcProviders.evm.find((rpcProvider) => rpcProvider.chainId === chainId);
-        return evmRpcProvider;
-    }
-    return undefined;
-};
-
-export { getEvmDefaultRpcProvider, getEvmRpcProviderByChainId, getRpcProviders, getSolanaDefaultRpcProvider };

package/src/utils/CancellablePromise/CancellablePromise.cjs

@@ -1,33 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-class CancellablePromise extends Promise {
-    constructor(executor) {
-        super((resolve, reject) => {
-            executor((val) => {
-                if (this.isCancelled)
-                    return;
-                resolve(val);
-            }, (err) => {
-                if (this.isCancelled)
-                    return;
-                reject(err);
-            });
-        });
-        this._controller = new AbortController();
-    }
-    get isCancelled() {
-        return this._controller.signal.aborted;
-    }
-    cancel() {
-        this._controller.abort();
-    }
-    static fromPromise(promise) {
-        return new CancellablePromise((resolve, reject) => {
-            promise.then(resolve).catch(reject);
-        });
-    }
-}
-
-exports.CancellablePromise = CancellablePromise;

package/src/utils/CancellablePromise/CancellablePromise.d.ts

@@ -1,9 +0,0 @@
-type Executor<T> = (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: unknown) => void) => void;
-export declare class CancellablePromise<T> extends Promise<T> {
-    _controller: AbortController;
-    constructor(executor: Executor<T>);
-    get isCancelled(): boolean;
-    cancel(): void;
-    static fromPromise<T>(promise: Promise<T>): CancellablePromise<T>;
-}
-export {};

package/src/utils/CancellablePromise/CancellablePromise.js

@@ -1,29 +0,0 @@
-class CancellablePromise extends Promise {
-    constructor(executor) {
-        super((resolve, reject) => {
-            executor((val) => {
-                if (this.isCancelled)
-                    return;
-                resolve(val);
-            }, (err) => {
-                if (this.isCancelled)
-                    return;
-                reject(err);
-            });
-        });
-        this._controller = new AbortController();
-    }
-    get isCancelled() {
-        return this._controller.signal.aborted;
-    }
-    cancel() {
-        this._controller.abort();
-    }
-    static fromPromise(promise) {
-        return new CancellablePromise((resolve, reject) => {
-            promise.then(resolve).catch(reject);
-        });
-    }
-}
-
-export { CancellablePromise };

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

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

package/src/utils/logger.cjs

@@ -1,9 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var logger$1 = require('@dynamic-labs/logger');
-
-const logger = new logger$1.Logger('WalletConnector');
-
-exports.logger = logger;

package/src/utils/logger.d.ts

@@ -1,2 +0,0 @@
-import { Logger } from '@dynamic-labs/logger';
-export declare const logger: Logger;

package/src/utils/logger.js

@@ -1,5 +0,0 @@
-import { Logger } from '@dynamic-labs/logger';
-
-const logger = new Logger('WalletConnector');
-
-export { logger };

package/src/wallets/cosmos/getKeplrConnector.cjs

@@ -1,18 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var KeplrWalletConnector = require('./KeplrWalletConnector.cjs');
-var KeplrWalletConnect = require('./KeplrWalletConnect.cjs');
-
-const getKeplerConnector = ({ evmNetworks, }) => {
-    const keplr = new KeplrWalletConnector.KeplrWalletConnector({ evmNetworks });
-    if (keplr.isInstalledOnBrowser()) {
-        return keplr;
-    }
-    else {
-        return new KeplrWalletConnect({ evmNetworks });
-    }
-};
-
-exports.getKeplerConnector = getKeplerConnector;

package/src/wallets/cosmos/getKeplrConnector.d.ts

@@ -1,6 +0,0 @@
-import { EvmNetwork } from '../ethereum/evm-network';
-import { KeplrWalletConnector } from './KeplrWalletConnector';
-import KeplrWalletConnect from './KeplrWalletConnect';
-export declare const getKeplerConnector: ({ evmNetworks, }: {
-    evmNetworks: EvmNetwork[];
-}) => KeplrWalletConnector | KeplrWalletConnect;

package/src/wallets/cosmos/getKeplrConnector.js

@@ -1,14 +0,0 @@
-import { KeplrWalletConnector } from './KeplrWalletConnector.js';
-import KeplrWalletConnect from './KeplrWalletConnect.js';
-
-const getKeplerConnector = ({ evmNetworks, }) => {
-    const keplr = new KeplrWalletConnector({ evmNetworks });
-    if (keplr.isInstalledOnBrowser()) {
-        return keplr;
-    }
-    else {
-        return new KeplrWalletConnect({ evmNetworks });
-    }
-};
-
-export { getKeplerConnector };