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

package/src/wallets/ethereum/BloctoEvm.js

@@ -1,28 +1,26 @@
 import { __awaiter } from 'tslib';
 import BloctoSDK from '@blocto/sdk';
 import { ethers } from 'ethers';
-import { logger } from '../../utils/logger.js';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { EthWalletConnector } from './EthWalletConnector.js';
-import { EthProviderHelper } from './ethProviderHelper.js';
 
 class BloctoEvm extends EthWalletConnector {
-    constructor({ evmNetworks }) {
+    constructor(props) {
         var _a, _b;
-        // Taken from : https://docs.blocto.app/blocto-sdk/javascript-sdk/evm-sdk/provider
-        const BLOCTO_SUPPORTED_CHAIN_IDS = [1, 4, 56, 97, 137, 80001, 43114, 43113];
-        const bloctoSupportedNetworks = evmNetworks.filter((n) => BLOCTO_SUPPORTED_CHAIN_IDS.includes(n.chainId));
-        super({ evmNetworks: bloctoSupportedNetworks });
+        super(props);
         this.LOCAL_STORAGE_KEY = 'dynamic_blocto_evm_chain_id';
         this.name = 'bloctoevm';
         this.canConnectViaCustodialService = true;
         this.connectedChain = 'EVM';
         this.supportedChains = ['EVM', 'ETH'];
-        this.ethProviderHelper = new EthProviderHelper();
         this.supportsNetworkSwitching = () => false;
+        // Taken from : https://docs.blocto.app/blocto-sdk/javascript-sdk/evm-sdk/provider
+        const BLOCTO_SUPPORTED_CHAIN_IDS = [1, 4, 56, 97, 137, 80001, 43114, 43113];
+        this.evmNetworks = this.evmNetworks.filter((n) => BLOCTO_SUPPORTED_CHAIN_IDS.includes(n.chainId));
         this.chainId =
             Number(localStorage.getItem(this.LOCAL_STORAGE_KEY)) ||
-                ((_a = bloctoSupportedNetworks.find((n) => n.chainId === 137)) === null || _a === void 0 ? void 0 : _a.chainId) ||
-                ((_b = bloctoSupportedNetworks[0]) === null || _b === void 0 ? void 0 : _b.chainId);
+                ((_a = this.evmNetworks.find((n) => n.chainId === 137)) === null || _a === void 0 ? void 0 : _a.chainId) ||
+                ((_b = this.evmNetworks[0]) === null || _b === void 0 ? void 0 : _b.chainId);
     }
     getClient() {
         if (!this.client) {

package/src/wallets/ethereum/EthWalletConnector.cjs

@@ -5,15 +5,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var ethers = require('ethers');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var errors = require('../../errors.cjs');
-var rpcProviders = require('../../rpcProviders.cjs');
+var utils = require('@dynamic-labs/utils');
+var rpcProviders = require('@dynamic-labs/rpc-providers');
 var evmNetwork = require('./evm-network.cjs');
 
 class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
     getRpcProvider() {
-        var _a, _b;
+        var _a, _b, _c;
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            const networkId = yield this.getNetwork();
+            const networkId = (_a = (yield this.getNetwork())) !== null && _a !== void 0 ? _a : 1;
             if (this.evmNetworks.length === 0) {
                 return undefined;
             }
@@ -23,14 +23,12 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 solana: [],
                 starknet: undefined,
             };
-            if (!networkId) {
-                return (_a = rpcProviders.getEvmDefaultRpcProvider(configurations)) === null || _a === void 0 ? void 0 : _a.provider;
-            }
-            return (_b = rpcProviders.getEvmRpcProviderByChainId(configurations, networkId)) === null || _b === void 0 ? void 0 : _b.provider;
+            return (_c = (_b = this.chainRpcProviders) === null || _b === void 0 ? void 0 : _b.getEvmProviderByChainId(configurations, networkId)) === null || _c === void 0 ? void 0 : _c.provider;
         });
     }
-    constructor({ evmNetworks }) {
-        super();
+    constructor(props) {
+        var _a;
+        super(props);
         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)
@@ -38,7 +36,24 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 : network.rpcUrls;
             return acc;
         }, {});
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = utils.parseEvmNetworks(props.evmNetworks);
+        this.chainRpcProviders = props.chainRpcProviders;
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerChainProviders(rpcProviders.ProviderChain.EVM, (config) => {
+            const rpcProviders = {};
+            if (config === null || config === void 0 ? void 0 : config.evm) {
+                rpcProviders.evm = utils.parseEvmNetworks(config.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.name,
+                        provider,
+                    };
+                });
+            }
+            return rpcProviders.evm;
+        });
     }
     getNetwork() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
@@ -103,14 +118,14 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 networks: this.evmNetworks,
             });
             if (!network) {
-                throw new errors.DynamicError('Could not find network');
+                throw new utils.DynamicError('Could not find network');
             }
             if (!this.supportsNetworkSwitching()) {
-                throw new errors.DynamicError('Network switching is not supported');
+                throw new utils.DynamicError('Network switching is not supported');
             }
             const provider = this.getWeb3Provider();
             if (!provider) {
-                throw new errors.DynamicError('Provider not found');
+                throw new utils.DynamicError('Provider not found');
             }
             return this.providerSwitchNetwork({ network, provider });
         });
@@ -133,7 +148,7 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
             }
             try {
                 if (!this.supportsNetworkSwitching()) {
-                    throw new errors.DynamicError('Network switching is not supported');
+                    throw new utils.DynamicError('Network switching is not supported');
                 }
                 return yield provider.send('wallet_switchEthereumChain', [
                     {
@@ -144,7 +159,7 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
             catch (error) {
                 if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('rejected')) ||
                     (typeof error === 'string' && error.includes('rejected'))) {
-                    throw new errors.DynamicError("User rejected the wallet's request to switch network");
+                    throw new utils.DynamicError("User rejected the wallet's request to switch network");
                 }
                 else if (error.code === 4902 ||
                     error.message.includes('Unrecognized chain') ||
@@ -163,13 +178,13 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
     providerAddNetwork({ network, provider, }) {
         var _a;
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            const { blockExplorerUrls, chainId, nativeCurrency, rpcUrls, chainName } = network;
+            const { blockExplorerUrls, chainId, nativeCurrency, rpcUrls, name } = network;
             try {
                 return yield provider.send('wallet_addEthereumChain', [
                     {
                         blockExplorerUrls,
                         chainId: `0x${chainId.toString(16)}`,
-                        chainName,
+                        chainName: name,
                         nativeCurrency,
                         rpcUrls,
                     },
@@ -178,7 +193,7 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
             catch (error) {
                 if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('rejected')) ||
                     (typeof error === 'string' && error.includes('rejected'))) {
-                    throw new errors.DynamicError("User rejected the wallet's request to add network");
+                    throw new utils.DynamicError("User rejected the wallet's request to add network");
                 }
                 else {
                     throw error;

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

@@ -1,6 +1,7 @@
 import { ethers } from 'ethers';
 import { NameServiceData, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { EvmNetwork } from './evm-network';
+import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
+import { ChainRpcProviders } from '@dynamic-labs/rpc-providers';
 export type SwitchNetworkOps = {
     networkChainId?: number;
     networkName?: string;
@@ -8,13 +9,16 @@ export type SwitchNetworkOps = {
 type EvmRpcMap = {
     [chainId: number]: string;
 };
+export type EthWalletConnectorOpts = {
+    chainRpcProviders: typeof ChainRpcProviders;
+    evmNetworks: GenericNetwork[];
+    isWalletConnectV2Enabled?: boolean;
+};
 export declare abstract class EthWalletConnector extends WalletConnectorBase {
     evmNetworks: EvmNetwork[];
     abstract getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     getRpcProvider(): Promise<ethers.providers.JsonRpcProvider | undefined>;
-    constructor({ evmNetworks }: {
-        evmNetworks: EvmNetwork[];
-    });
+    constructor(props: EthWalletConnectorOpts);
     getNetwork(): Promise<number | undefined>;
     getNameService(): Promise<NameServiceData | undefined>;
     getSigner(): Promise<ethers.providers.JsonRpcSigner | undefined>;

package/src/wallets/ethereum/EthWalletConnector.js

@@ -1,15 +1,15 @@
 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 { parseEvmNetworks, DynamicError } from '@dynamic-labs/utils';
+import { ProviderChain } from '@dynamic-labs/rpc-providers';
 import { findEvmNetwork } from './evm-network.js';
 
 class EthWalletConnector extends WalletConnectorBase {
     getRpcProvider() {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const networkId = yield this.getNetwork();
+            const networkId = (_a = (yield this.getNetwork())) !== null && _a !== void 0 ? _a : 1;
             if (this.evmNetworks.length === 0) {
                 return undefined;
             }
@@ -19,14 +19,12 @@ class EthWalletConnector extends WalletConnectorBase {
                 solana: [],
                 starknet: undefined,
             };
-            if (!networkId) {
-                return (_a = getEvmDefaultRpcProvider(configurations)) === null || _a === void 0 ? void 0 : _a.provider;
-            }
-            return (_b = getEvmRpcProviderByChainId(configurations, networkId)) === null || _b === void 0 ? void 0 : _b.provider;
+            return (_c = (_b = this.chainRpcProviders) === null || _b === void 0 ? void 0 : _b.getEvmProviderByChainId(configurations, networkId)) === null || _c === void 0 ? void 0 : _c.provider;
         });
     }
-    constructor({ evmNetworks }) {
-        super();
+    constructor(props) {
+        var _a;
+        super(props);
         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)
@@ -34,7 +32,24 @@ class EthWalletConnector extends WalletConnectorBase {
                 : network.rpcUrls;
             return acc;
         }, {});
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = parseEvmNetworks(props.evmNetworks);
+        this.chainRpcProviders = props.chainRpcProviders;
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerChainProviders(ProviderChain.EVM, (config) => {
+            const rpcProviders = {};
+            if (config === null || config === void 0 ? void 0 : config.evm) {
+                rpcProviders.evm = parseEvmNetworks(config.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.name,
+                        provider,
+                    };
+                });
+            }
+            return rpcProviders.evm;
+        });
     }
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -159,13 +174,13 @@ class EthWalletConnector extends WalletConnectorBase {
     providerAddNetwork({ network, provider, }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { blockExplorerUrls, chainId, nativeCurrency, rpcUrls, chainName } = network;
+            const { blockExplorerUrls, chainId, nativeCurrency, rpcUrls, name } = network;
             try {
                 return yield provider.send('wallet_addEthereumChain', [
                     {
                         blockExplorerUrls,
                         chainId: `0x${chainId.toString(16)}`,
-                        chainName,
+                        chainName: name,
                         nativeCurrency,
                         rpcUrls,
                     },

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

@@ -40,7 +40,6 @@ class EmailMagicWalletConnector extends MagicWalletConnector.MagicWalletConnecto
         (_a = this._currentAuthCancellablePromise) === null || _a === void 0 ? void 0 : _a.cancel();
     }
     loginWithMagic() {
-        var _a;
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const client = this._magicClient.getClient();
             const user = yield this.getUserMetadata();
@@ -53,7 +52,6 @@ class EmailMagicWalletConnector extends MagicWalletConnector.MagicWalletConnecto
                 return;
             return client.auth.loginWithMagicLink({
                 email,
-                redirectURI: (_a = this._magicClient.config) === null || _a === void 0 ? void 0 : _a.redirectURI,
                 showUI: false,
             });
         });

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

@@ -36,7 +36,6 @@ class EmailMagicWalletConnector extends MagicWalletConnector {
         (_a = this._currentAuthCancellablePromise) === null || _a === void 0 ? void 0 : _a.cancel();
     }
     loginWithMagic() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const client = this._magicClient.getClient();
             const user = yield this.getUserMetadata();
@@ -49,7 +48,6 @@ class EmailMagicWalletConnector extends MagicWalletConnector {
                 return;
             return client.auth.loginWithMagicLink({
                 email,
-                redirectURI: (_a = this._magicClient.config) === null || _a === void 0 ? void 0 : _a.redirectURI,
                 showUI: false,
             });
         });

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var logger = require('../../../../utils/logger.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var EmailMagicWalletConnector = require('../EmailMagicWalletConnector/EmailMagicWalletConnector.cjs');
 
 class EmailOTPMagicWalletConnector extends EmailMagicWalletConnector.EmailMagicWalletConnector {
@@ -48,7 +48,7 @@ class EmailOTPMagicWalletConnector extends EmailMagicWalletConnector.EmailMagicW
                 yield this._handle;
             }
             catch (err) {
-                logger.logger.error(err);
+                walletConnectorCore.logger.error(err);
             }
             this._handle = client.auth.loginWithEmailOTP({
                 email,

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

@@ -1,5 +1,5 @@
 import { __awaiter } from 'tslib';
-import { logger } from '../../../../utils/logger.js';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { EmailMagicWalletConnector } from '../EmailMagicWalletConnector/EmailMagicWalletConnector.js';
 
 class EmailOTPMagicWalletConnector extends EmailMagicWalletConnector {

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

@@ -3,30 +3,14 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
+var utils = require('@dynamic-labs/utils');
 
-// these are based off of Magic's EthNetworkName type
-const chainNameToChainIdMap = {
-    arbitrum: 42161,
-    avalance: 43114,
-    bsc: 56,
-    gnosis: 100,
-    goerli: 5,
-    mainnet: 1,
-    optimism: 10,
-    polygon: 137,
-    sepolia: 11155111,
-};
 class MagicClientNetworkHandler {
-    constructor({ createClient, evmNetworks, config, }) {
-        var _a, _b;
+    constructor({ createClient, evmNetworks, defaultChainId, }) {
         this._clients = {};
         this.evmNetworks = [];
-        this._config = config;
-        this.evmNetworks = evmNetworks;
-        this._networkId =
-            typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'
-                ? chainNameToChainIdMap[config.network]
-                : (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : 1;
+        this.evmNetworks = utils.parseEvmNetworks(evmNetworks);
+        this._networkId = defaultChainId !== null && defaultChainId !== void 0 ? defaultChainId : 1;
         this._createClient = createClient;
     }
     setListeners(listeners) {
@@ -46,9 +30,6 @@ class MagicClientNetworkHandler {
     get networkId() {
         return this._networkId;
     }
-    get config() {
-        return this._config;
-    }
     getClient() {
         const networkId = this._networkId;
         const client = this._clients[networkId];
@@ -64,27 +45,22 @@ class MagicClientNetworkHandler {
         const rpcUrl = this._getRpcUrlByNetworkId(networkId);
         // Should prioritize custom rpc config form dashboard
         if (rpcUrl) {
-            return Object.assign(Object.assign({}, this._config), { network: {
+            return {
+                network: {
                     chainId: this._getChainIdByNetworkId(networkId),
                     rpcUrl,
-                } });
-        }
-        // Next should return configuration provided through settings
-        if (this.configNetworkId === networkId) {
-            return this._config;
+                },
+            };
         }
         if (networkId === 1) {
-            return Object.assign(Object.assign({}, this._config), { network: 'mainnet' });
+            return {
+                network: 'mainnet',
+            };
         }
         if (networkId === 5) {
-            return Object.assign(Object.assign({}, this._config), { network: 'goerli' });
-        }
-        return this._config;
-    }
-    get configNetworkId() {
-        var _a, _b, _c;
-        if (typeof ((_a = this._config) === null || _a === void 0 ? void 0 : _a.network) !== 'string') {
-            return (_c = (_b = this._config) === null || _b === void 0 ? void 0 : _b.network) === null || _c === void 0 ? void 0 : _c.chainId;
+            return {
+                network: 'goerli',
+            };
         }
         return undefined;
     }

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

@@ -1,32 +1,30 @@
 import { MagicSDKAdditionalConfiguration, MagicSDKExtensionsOption } from 'magic-sdk';
 import { WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
-import { MagicConnectorProps } from '../MagicWalletConnector';
-import { EvmNetwork } from '../../evm-network';
+import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
 export type MagicLinkConfig = Pick<MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>>, 'network' | 'testMode' | 'locale'> & {
     redirectURI?: string;
 };
 type ConfigForNetwork = MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>> | undefined;
-export type MagicClientNetworkHandlerProps<TClient> = Pick<MagicConnectorProps, 'config' | 'evmNetworks'> & {
+export type MagicClientNetworkHandlerProps<TClient> = {
     createClient: (config: ConfigForNetwork) => TClient;
+    defaultChainId?: number;
+    evmNetworks: GenericNetwork[];
 };
 export declare class MagicClientNetworkHandler<TClient = unknown> {
     protected _clients: {
         [chainId: number]: TClient;
     };
     protected _networkId: number;
-    protected _config: MagicLinkConfig | undefined;
     protected _listeners: WalletEventListeners | undefined;
     evmNetworks: EvmNetwork[];
     protected _createClient: MagicClientNetworkHandlerProps<TClient>['createClient'];
-    constructor({ createClient, evmNetworks, config, }: MagicClientNetworkHandlerProps<TClient>);
+    constructor({ createClient, evmNetworks, defaultChainId, }: MagicClientNetworkHandlerProps<TClient>);
     setListeners(listeners: WalletEventListeners | undefined): void;
     onChainChanged(networkChainId: number): void;
     selectNetwork(networkChainId: number): Promise<void>;
     get networkId(): number;
-    get config(): MagicLinkConfig | undefined;
     getClient(): TClient;
     getConfigForNetwork(networkId: number): MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>> | undefined;
-    private get configNetworkId();
     private _getRpcUrlByNetworkId;
     private _getChainIdByNetworkId;
 }

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

@@ -1,28 +1,12 @@
 import { __awaiter } from 'tslib';
+import { parseEvmNetworks } from '@dynamic-labs/utils';
 
-// these are based off of Magic's EthNetworkName type
-const chainNameToChainIdMap = {
-    arbitrum: 42161,
-    avalance: 43114,
-    bsc: 56,
-    gnosis: 100,
-    goerli: 5,
-    mainnet: 1,
-    optimism: 10,
-    polygon: 137,
-    sepolia: 11155111,
-};
 class MagicClientNetworkHandler {
-    constructor({ createClient, evmNetworks, config, }) {
-        var _a, _b;
+    constructor({ createClient, evmNetworks, defaultChainId, }) {
         this._clients = {};
         this.evmNetworks = [];
-        this._config = config;
-        this.evmNetworks = evmNetworks;
-        this._networkId =
-            typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'
-                ? chainNameToChainIdMap[config.network]
-                : (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : 1;
+        this.evmNetworks = parseEvmNetworks(evmNetworks);
+        this._networkId = defaultChainId !== null && defaultChainId !== void 0 ? defaultChainId : 1;
         this._createClient = createClient;
     }
     setListeners(listeners) {
@@ -42,9 +26,6 @@ class MagicClientNetworkHandler {
     get networkId() {
         return this._networkId;
     }
-    get config() {
-        return this._config;
-    }
     getClient() {
         const networkId = this._networkId;
         const client = this._clients[networkId];
@@ -60,27 +41,22 @@ class MagicClientNetworkHandler {
         const rpcUrl = this._getRpcUrlByNetworkId(networkId);
         // Should prioritize custom rpc config form dashboard
         if (rpcUrl) {
-            return Object.assign(Object.assign({}, this._config), { network: {
+            return {
+                network: {
                     chainId: this._getChainIdByNetworkId(networkId),
                     rpcUrl,
-                } });
-        }
-        // Next should return configuration provided through settings
-        if (this.configNetworkId === networkId) {
-            return this._config;
+                },
+            };
         }
         if (networkId === 1) {
-            return Object.assign(Object.assign({}, this._config), { network: 'mainnet' });
+            return {
+                network: 'mainnet',
+            };
         }
         if (networkId === 5) {
-            return Object.assign(Object.assign({}, this._config), { network: 'goerli' });
-        }
-        return this._config;
-    }
-    get configNetworkId() {
-        var _a, _b, _c;
-        if (typeof ((_a = this._config) === null || _a === void 0 ? void 0 : _a.network) !== 'string') {
-            return (_c = (_b = this._config) === null || _b === void 0 ? void 0 : _b.network) === null || _c === void 0 ? void 0 : _c.chainId;
+            return {
+                network: 'goerli',
+            };
         }
         return undefined;
     }

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

@@ -5,17 +5,23 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var oauth = require('@magic-ext/oauth');
 var magicSdk = require('magic-sdk');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var MagicWalletConnector = require('../MagicWalletConnector/MagicWalletConnector.cjs');
-var logger = require('../../../../utils/logger.cjs');
 var MagicClientNetworkHandler = require('../MagicClientNetworkHandler/MagicClientNetworkHandler.cjs');
 
 class MagicSocialWalletConnector extends MagicWalletConnector.MagicWalletConnector {
     constructor(opts) {
+        var _a, _b, _c, _d;
         super(opts);
         this.canConnectViaSocial = true;
+        const apiKey = (_b = (_a = opts.apiProviders) === null || _a === void 0 ? void 0 : _a.magicLink) === null || _b === void 0 ? void 0 : _b.providerProjectId;
+        const defaultChainId = (_d = (_c = opts.apiProviders) === null || _c === void 0 ? void 0 : _c.magicLink) === null || _d === void 0 ? void 0 : _d.defaultChainId;
+        if (!apiKey) {
+            throw new Error('Missing MagicLink configuration. Add your MagicLink API key to your project configuration via the Dynamic Labs dashboard.');
+        }
         this._magicClient = new MagicClientNetworkHandler.MagicClientNetworkHandler({
-            config: opts.config,
-            createClient: (config) => new magicSdk.Magic(opts.apiKey, Object.assign(Object.assign({}, config), { extensions: [new oauth.OAuthExtension()] })),
+            createClient: (config) => new magicSdk.Magic(apiKey, Object.assign(Object.assign({}, config), { extensions: [new oauth.OAuthExtension()] })),
+            defaultChainId: defaultChainId,
             evmNetworks: opts.evmNetworks,
         });
     }
@@ -45,7 +51,7 @@ class MagicSocialWalletConnector extends MagicWalletConnector.MagicWalletConnect
                 return result.oauth;
             }
             catch (e) {
-                logger.logger.error(e);
+                walletConnectorCore.logger.error(e);
                 return undefined;
             }
         });

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

@@ -1,17 +1,23 @@
 import { __awaiter } from 'tslib';
 import { OAuthExtension } from '@magic-ext/oauth';
 import { Magic } from 'magic-sdk';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { MagicWalletConnector } from '../MagicWalletConnector/MagicWalletConnector.js';
-import { logger } from '../../../../utils/logger.js';
 import { MagicClientNetworkHandler } from '../MagicClientNetworkHandler/MagicClientNetworkHandler.js';
 
 class MagicSocialWalletConnector extends MagicWalletConnector {
     constructor(opts) {
+        var _a, _b, _c, _d;
         super(opts);
         this.canConnectViaSocial = true;
+        const apiKey = (_b = (_a = opts.apiProviders) === null || _a === void 0 ? void 0 : _a.magicLink) === null || _b === void 0 ? void 0 : _b.providerProjectId;
+        const defaultChainId = (_d = (_c = opts.apiProviders) === null || _c === void 0 ? void 0 : _c.magicLink) === null || _d === void 0 ? void 0 : _d.defaultChainId;
+        if (!apiKey) {
+            throw new Error('Missing MagicLink configuration. Add your MagicLink API key to your project configuration via the Dynamic Labs dashboard.');
+        }
         this._magicClient = new MagicClientNetworkHandler({
-            config: opts.config,
-            createClient: (config) => new Magic(opts.apiKey, Object.assign(Object.assign({}, config), { extensions: [new OAuthExtension()] })),
+            createClient: (config) => new Magic(apiKey, Object.assign(Object.assign({}, config), { extensions: [new OAuthExtension()] })),
+            defaultChainId: defaultChainId,
             evmNetworks: opts.evmNetworks,
         });
     }