@dynamic-labs/ethereum-core 4.0.0-alpha.9 → 4.0.0

package/src/connector/{EthWalletConnector.cjs → EthereumWalletConnector.cjs}

@@ -17,7 +17,25 @@ var findEvmNetwork = require('../utils/findEvmNetwork/findEvmNetwork.cjs');
 var getNameservice = require('../utils/getNameservice/getNameservice.cjs');
 var EthereumWallet = require('../wallet/EthereumWallet.cjs');
 
-class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
+class EthereumWalletConnector extends walletConnectorCore.WalletConnectorBase {
+    constructor(props) {
+        var _a;
+        super(props);
+        this.supportedChains = ['EVM', 'ETH'];
+        this.connectedChain = 'EVM';
+        this.ChainWallet = EthereumWallet.EthereumWallet;
+        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)
+                ? network.privateCustomerRpcUrls
+                : network.rpcUrls;
+            return acc;
+        }, {});
+        this.walletUiUtils = props.walletUiUtils;
+        this.evmNetworks = utils.parseEvmNetworks(props.evmNetworks);
+        this.chainRpcProviders = props.chainRpcProviders;
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerEvmProviders();
+    }
     getPublicClient() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -37,21 +55,6 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
             return (_b = this.chainRpcProviders.getEvmProviderByChainId(providers, networkId)) === null || _b === void 0 ? void 0 : _b.provider;
         });
     }
-    constructor(props) {
-        var _a;
-        super(props);
-        this.ChainWallet = EthereumWallet.EthereumWallet;
-        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)
-                ? network.privateCustomerRpcUrls
-                : network.rpcUrls;
-            return acc;
-        }, {});
-        this.evmNetworks = utils.parseEvmNetworks(props.evmNetworks);
-        this.chainRpcProviders = props.chainRpcProviders;
-        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerEvmProviders();
-    }
     getNetwork() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const provider = this.getWalletClient();
@@ -183,7 +186,7 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     providerSwitchNetwork(_a) {
         return _tslib.__awaiter(this, arguments, void 0, function* ({ network, provider, }) {
-            var _b, _c, _d, _e;
+            var _b, _c, _d, _e, _f;
             const { chainId } = network;
             const currentNetworkId = yield this.getNetwork();
             if (currentNetworkId && currentNetworkId === chainId) {
@@ -194,7 +197,7 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
                     throw new utils.DynamicError('Network switching is not supported');
                 }
                 const viemChain = getOrMapViemChain.getOrMapViemChain(network);
-                yield provider.switchChain(viemChain);
+                yield provider.switchChain({ id: viemChain.id });
                 if (this.key === 'magiceden') {
                     const newChainId = yield provider.getChainId();
                     this.emit('chainChange', { chain: newChainId.toString() });
@@ -204,16 +207,19 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 }
             }
             catch (error) {
+                if ((_b = error.details) === null || _b === void 0 ? void 0 : _b.includes('"wallet_switchEthereumChain" not implemented')) {
+                    throw new utils.DynamicError('Network switching is not available at this time. The user should manually switch network in their wallet');
+                }
                 // we need to check for unrecognized chain error first because it also contains 'rejected' in message
                 if (error.code === 4902 ||
-                    ((_b = error.message) === null || _b === void 0 ? void 0 : _b.includes('Unrecognized chain')) ||
+                    ((_c = error.message) === null || _c === void 0 ? void 0 : _c.includes('Unrecognized chain')) ||
                     // https://github.com/MetaMask/metamask-mobile/issues/3312#issuecomment-1065923294
-                    ((_d = (_c = error.data) === null || _c === void 0 ? void 0 : _c.orginalError) === null || _d === void 0 ? void 0 : _d.code) === 4902) {
+                    ((_e = (_d = error.data) === null || _d === void 0 ? void 0 : _d.orginalError) === null || _e === void 0 ? void 0 : _e.code) === 4902) {
                     // error code indicates the chain has not been added yet
                     // https://docs.metamask.io/guide/rpc-api.html#usage-with-wallet-switchethereumchain
                     return this.providerAddNetwork({ network, provider });
                 }
-                else if (((_e = error.message) === null || _e === void 0 ? void 0 : _e.includes('rejected')) ||
+                else if (((_f = error.message) === null || _f === void 0 ? void 0 : _f.includes('rejected')) ||
                     (typeof error === 'string' && error.includes('rejected'))) {
                     throw new utils.DynamicError("User rejected the wallet's request to switch network");
                 }
@@ -227,7 +233,16 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
         return _tslib.__awaiter(this, arguments, void 0, function* ({ network, provider, }) {
             var _b;
             try {
-                return yield provider.addChain({ chain: getOrMapViemChain.getOrMapViemChain(network) });
+                if (utils.isMobile()) {
+                    yield this.walletUiUtils.addNetwork({
+                        handler: () => provider.addChain({ chain: getOrMapViemChain.getOrMapViemChain(network) }),
+                        network,
+                        walletConnector: this,
+                    });
+                }
+                else {
+                    yield provider.addChain({ chain: getOrMapViemChain.getOrMapViemChain(network) });
+                }
             }
             catch (error) {
                 if (((_b = error.message) === null || _b === void 0 ? void 0 : _b.includes('rejected')) ||
@@ -283,4 +298,4 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
 }
 
-exports.EthWalletConnector = EthWalletConnector;
+exports.EthereumWalletConnector = EthereumWalletConnector;