@broxus/evm-connect 1.3.2 → 1.3.4

package/dist/cjs/components/EvmProvidersDispatcher/ProviderButton/index.js

@@ -45,7 +45,7 @@ exports.ProviderButton = (0, mobx_react_lite_1.observer)((props) => {
     const walletProviders = (0, context_1.useEvmWalletProviders)();
     const { providerConfig, onSelect: onSelectProvider } = props;
     const [hasProvider, setHasProvider] = React.useState(() => {
-        if (providerConfig.connector.type === types_1.ConnectionType.WALLET_CONNECT_V2) {
+        if (providerConfig.connector.type === types_1.EthereumConnectionType.WALLET_CONNECT_V2) {
             return true;
         }
         return undefined;
@@ -57,7 +57,7 @@ exports.ProviderButton = (0, mobx_react_lite_1.observer)((props) => {
         }
     };
     React.useEffect(() => (0, mobx_1.reaction)(() => providerConfig.connector, connector => {
-        if (connector.type !== types_1.ConnectionType.WALLET_CONNECT_V2) {
+        if (connector.type !== types_1.EthereumConnectionType.WALLET_CONNECT_V2) {
             setHasProvider(connector.provider != null);
         }
     }, { fireImmediately: true }), [providerConfig.connector]);

package/dist/cjs/core/EIP6963Connector.d.ts

@@ -1,14 +1,14 @@
 import { type EIP6963ProviderInfo } from 'web3/lib/commonjs/web3_eip6963';
 import { type EthExecutionAPI, type ProviderConnectInfo } from 'web3-types';
 import { EthereumConnector, type EthereumConnectorCtorParams } from '../core';
-import { type AddEthereumChainParams, ConnectionType, type SupportedProviders } from '../types';
+import { type AddEthereumChainParams, EthereumConnectionType, type SupportedProviders } from '../types';
 export interface EIP6963ConnectorCtorParams extends EthereumConnectorCtorParams {
     info: EIP6963ProviderInfo;
     provider: Readonly<SupportedProviders<EthExecutionAPI>>;
 }
 export declare class EIP6963Connector extends EthereumConnector {
     protected readonly params: Readonly<EIP6963ConnectorCtorParams>;
-    readonly type = ConnectionType.EIP_6963_INJECTED;
+    readonly type = EthereumConnectionType.EIP_6963_INJECTED;
     constructor(params: Readonly<EIP6963ConnectorCtorParams>);
     connect(chainIdOrParams?: number | AddEthereumChainParams): Promise<void>;
     disconnect(): Promise<void>;

package/dist/cjs/core/EIP6963Connector.js

@@ -17,7 +17,7 @@ const types_1 = require("../types");
 const utils_1 = require("../utils");
 class EIP6963Connector extends core_1.EthereumConnector {
     params;
-    type = types_1.ConnectionType.EIP_6963_INJECTED;
+    type = types_1.EthereumConnectionType.EIP_6963_INJECTED;
     constructor(params) {
         super(params);
         this.params = params;

package/dist/cjs/core/EthereumConnector.d.ts

@@ -1,6 +1,6 @@
 import { AbstractStore } from '@broxus/js-core';
 import { type EthExecutionAPI, type ProviderRpcError } from 'web3-types';
-import { type AddEthereumChainParams, type ConnectionType, type SupportedProviders, type WatchAssetParameters } from '../types';
+import { type AddEthereumChainParams, type EthereumConnectionType, type SupportedProviders, type WatchAssetParameters } from '../types';
 export interface EthereumConnectorCtorParams {
     onDisconnect?: (err: ProviderRpcError) => Promise<void> | void;
 }
@@ -16,7 +16,7 @@ export interface EthereumConnectorState {
 }
 export declare abstract class EthereumConnector extends AbstractStore<EthereumConnectorData, EthereumConnectorState> {
     protected readonly params?: Readonly<EthereumConnectorCtorParams> | undefined;
-    readonly type?: ConnectionType;
+    readonly type?: EthereumConnectionType;
     /**
      * An
      * EIP-1193 ({@link https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1193.md}) and

package/dist/cjs/core/MetaMask.d.ts

@@ -1,7 +1,7 @@
 import detectEthereumProvider from '@metamask/detect-provider';
 import { type EthExecutionAPI, type MetaMaskProvider, type ProviderConnectInfo } from 'web3-types';
 import { EthereumConnector, type EthereumConnectorCtorParams } from '../core/EthereumConnector';
-import { type AddEthereumChainParams, ConnectionType } from '../types';
+import { type AddEthereumChainParams, EthereumConnectionType } from '../types';
 interface MetaMaskEthereumProvider extends MetaMaskProvider<EthExecutionAPI> {
     isConnected?: () => boolean;
     providers?: MetaMaskEthereumProvider[];
@@ -13,7 +13,7 @@ export interface MetaMaskCtorParams extends EthereumConnectorCtorParams {
 }
 export declare class MetaMask extends EthereumConnector {
     protected readonly params?: Readonly<MetaMaskCtorParams> | undefined;
-    readonly type = ConnectionType.INJECTED;
+    readonly type = EthereumConnectionType.INJECTED;
     provider?: MetaMaskEthereumProvider;
     constructor(params?: Readonly<MetaMaskCtorParams> | undefined);
     connect(chainIdOrParams?: number | AddEthereumChainParams): Promise<void>;

package/dist/cjs/core/MetaMask.js

@@ -22,7 +22,7 @@ const utils_1 = require("../utils");
 const INJECTABLE_WALLETS = ['isBraveWallet', 'isRabby', 'isLedgerConnect', 'isTrust'];
 class MetaMask extends EthereumConnector_1.EthereumConnector {
     params;
-    type = types_1.ConnectionType.INJECTED;
+    type = types_1.EthereumConnectionType.INJECTED;
     constructor(params) {
         super(params);
         this.params = params;

package/dist/cjs/core/WalletConnect.d.ts

@@ -1,6 +1,6 @@
 import EthereumProvider, { type EthereumProviderOptions } from '@walletconnect/ethereum-provider';
 import { EthereumConnector, type EthereumConnectorCtorParams } from '../core';
-import { type AddEthereumChainParams, ConnectionType } from '../types';
+import { type AddEthereumChainParams, EthereumConnectionType } from '../types';
 export interface WalletConnectOptions extends Omit<EthereumProviderOptions, 'rpcMap'> {
     rpcMap?: Record<number, string | string[]>;
 }
@@ -9,7 +9,7 @@ export interface WalletConnectCtorParams extends EthereumConnectorCtorParams {
 }
 export declare class WalletConnect extends EthereumConnector {
     protected readonly params: Readonly<WalletConnectCtorParams>;
-    readonly type = ConnectionType.WALLET_CONNECT_V2;
+    readonly type = EthereumConnectionType.WALLET_CONNECT_V2;
     provider?: EthereumProvider;
     protected readonly options: WalletConnectOptions;
     constructor(params: Readonly<WalletConnectCtorParams>);

package/dist/cjs/core/WalletConnect.js

@@ -20,7 +20,7 @@ const core_1 = require("../core");
 const types_1 = require("../types");
 class WalletConnect extends core_1.EthereumConnector {
     params;
-    type = types_1.ConnectionType.WALLET_CONNECT_V2;
+    type = types_1.EthereumConnectionType.WALLET_CONNECT_V2;
     options;
     constructor(params) {
         super(params);

package/dist/cjs/hooks/useRecentConnectionMeta.d.ts

@@ -1,9 +1,9 @@
-import { ConnectionType } from '../types';
+import { EthereumConnectionType } from '../types';
 export interface RecentConnectionMeta {
     chainId?: string;
     disconnected?: boolean;
     providerId: string;
-    type?: ConnectionType;
+    type?: EthereumConnectionType;
 }
 export declare function storeRecentConnectionMeta(meta: RecentConnectionMeta | undefined): void;
 export declare function getRecentConnectionMeta(): RecentConnectionMeta | undefined;

package/dist/cjs/hooks/useRecentConnectionMeta.js

@@ -30,7 +30,7 @@ const constants_1 = require("../constants");
 const types_1 = require("../types");
 function isRecentConnectionMeta(value) {
     const meta = { providerId: value.providerId, type: value.type };
-    return Boolean(meta.type && types_1.ConnectionType[meta.type] && !!meta.providerId);
+    return Boolean(meta.type && types_1.EthereumConnectionType[meta.type] && !!meta.providerId);
 }
 function storeRecentConnectionMeta(meta) {
     if (!meta) {

package/dist/cjs/services/EvmWalletService.d.ts

@@ -26,6 +26,11 @@ export interface EvmWalletServiceState {
 export declare class EvmWalletService extends AbstractStore<EvmWalletServiceData, EvmWalletServiceState> {
     protected readonly params?: Readonly<EvmWalletServiceCtorParams> | undefined;
     constructor(params?: Readonly<EvmWalletServiceCtorParams> | undefined);
+    /**
+     * Define current provider connector
+     * @returns {EthereumConnector|undefined}
+     */
+    get connector(): EthereumConnector | undefined;
     /**
      * Manually connect to the wallet
      * @returns {Promise<void>}
@@ -42,12 +47,12 @@ export declare class EvmWalletService extends AbstractStore<EvmWalletServiceData
      * @returns {Promise<void>}
      */
     switchNetwork(chainIdOrParams: number | AddEthereumChainParams): Promise<void>;
-    watchAsset(params: WatchAssetParameters): Promise<true | undefined>;
     /**
-     * Define current provider connector
-     * @returns {EthereumConnector|undefined}
+     * Request to the wallet for watch asset
+     * @param {WatchAssetParameters} params
+     * @returns {Promise<true | undefined>}
      */
-    get connector(): EthereumConnector | undefined;
+    watchAsset(params: WatchAssetParameters): Promise<true | undefined>;
     /**
      * An independent RPC connection that allows you to receive data from the blockchain without being
      * able to send transactions.

package/dist/cjs/services/EvmWalletService.js

@@ -34,6 +34,13 @@ class EvmWalletService extends js_core_1.AbstractStore {
             (0, js_utils_1.error)('Wallet init failed with an error', reason);
         });
     }
+    /**
+     * Define current provider connector
+     * @returns {EthereumConnector|undefined}
+     */
+    get connector() {
+        return this.providers?.find(config => config.id === this.providerId)?.connector;
+    }
     /**
      * Manually connect to the wallet
      * @returns {Promise<void>}
@@ -67,9 +74,6 @@ class EvmWalletService extends js_core_1.AbstractStore {
         catch (e) {
             (0, js_utils_1.error)('EVM Wallet disconnect error', e);
         }
-        finally {
-            //
-        }
     }
     /**
      * Switch network or add a new one if not exists in the current connected wallet
@@ -79,15 +83,13 @@ class EvmWalletService extends js_core_1.AbstractStore {
     async switchNetwork(chainIdOrParams) {
         await this.connector?.switchNetwork(chainIdOrParams);
     }
-    async watchAsset(params) {
-        return this.connector?.watchAsset(params);
-    }
     /**
-     * Define current provider connector
-     * @returns {EthereumConnector|undefined}
+     * Request to the wallet for watch asset
+     * @param {WatchAssetParameters} params
+     * @returns {Promise<true | undefined>}
      */
-    get connector() {
-        return this.providers?.find(config => config.id === this.providerId)?.connector;
+    async watchAsset(params) {
+        return this.connector?.watchAsset(params);
     }
     /**
      * An independent RPC connection that allows you to receive data from the blockchain without being
@@ -146,7 +148,6 @@ class EvmWalletService extends js_core_1.AbstractStore {
      */
     get currency() {
         return {
-            balance: this.balance,
             decimals: this.network?.currency.decimals ?? 18,
             icon: this.network?.currency.icon,
             name: this.network?.currency.name,
@@ -216,7 +217,7 @@ class EvmWalletService extends js_core_1.AbstractStore {
      * @returns {EthereumConnector["chainId"]}
      */
     get chainId() {
-        return this.connector?.chainId;
+        return this.connector?.chainId ?? this.params?.defaultNetworkId;
     }
     /**
      * Returns `true` if wallet is connecting
@@ -296,6 +297,11 @@ class EvmWalletService extends js_core_1.AbstractStore {
     networkDisposer;
 }
 exports.EvmWalletService = EvmWalletService;
+__decorate([
+    mobx_1.computed,
+    __metadata("design:type", Object),
+    __metadata("design:paramtypes", [])
+], EvmWalletService.prototype, "connector", null);
 __decorate([
     mobx_1.action.bound,
     __metadata("design:type", Function),
@@ -320,11 +326,6 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], EvmWalletService.prototype, "watchAsset", null);
-__decorate([
-    mobx_1.computed,
-    __metadata("design:type", Object),
-    __metadata("design:paramtypes", [])
-], EvmWalletService.prototype, "connector", null);
 __decorate([
     mobx_1.computed,
     __metadata("design:type", Object),