@dynamic-labs/starknet 3.0.0-alpha.9 → 3.0.1

package/src/wallets/metamask.cjs

@@ -5,21 +5,101 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
+var logger$1 = require('@dynamic-labs/logger');
 var starknetWalletConnector = require('../starknetWalletConnector.cjs');
 var starknetSnap = require('../utils/starknetSnap.cjs');
 
+const logger = new logger$1.Logger('MetaMask Starknet Snap', logger$1.LogLevel.INFO);
 class MetaMask extends starknetWalletConnector["default"] {
     constructor(opts) {
         super('MetaMask Starknet', 'metamask_snap', opts);
         this.overrideKey = 'metamaskstarknet';
-        this.canSetEventListeners = false;
-        if (!window.starknet_metamask_snap) {
-            const { providers } = utils.Eip6963ProviderSingleton.get();
-            const metamaskProvider = providers.find((p) => ['io.metamask', 'io.metamask.flask'].includes(p.info.rdns));
-            if (metamaskProvider) {
-                window.starknet_metamask_snap = starknetSnap.createMetaMaskProviderWrapper(metamaskProvider.provider);
+        const { providers } = utils.Eip6963ProviderSingleton.get();
+        const metamaskProvider = providers.find((p) => ['io.metamask', 'io.metamask.flask'].includes(p.info.rdns));
+        if (metamaskProvider) {
+            this.provider = metamaskProvider.provider;
+        }
+        if (!window.starknet_metamask_snap && metamaskProvider) {
+            window.starknet_metamask_snap = starknetSnap.createMetaMaskProviderWrapper(metamaskProvider.provider);
+        }
+    }
+    getNetwork() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!this.provider) {
+                logger.error('[getNetwork] - No provider found, returning undefined');
+                return undefined;
+            }
+            try {
+                logger.info('[getNetwork] - trying to fetch network using provider');
+                // we are using this method to get the network so that we always "see" the absolute
+                // active network in the companion site. when using the snap wrapper to get the network,
+                // we don't "see" the actual active network in the companion site – instead we see the
+                // network that was active at the time of the snap initialization
+                const result = yield this.provider.request({
+                    method: 'wallet_invokeSnap',
+                    params: {
+                        request: {
+                            method: 'starkNet_getCurrentNetwork',
+                            params: {},
+                        },
+                        snapId: 'npm:@consensys/starknet-snap',
+                    },
+                });
+                if (!('chainId' in result) || typeof result.chainId !== 'string') {
+                    logger.error(`[getNetwork] - result.chainId should be a string, but got: ${
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    result.chainId}`);
+                    return undefined;
+                }
+                if (result.chainId !== this.currentChainId) {
+                    const resultChainName = this.mapChainIdToNetworkName(result.chainId);
+                    const currentChainName = this.currentChainId
+                        ? this.mapChainIdToNetworkName(this.currentChainId)
+                        : undefined;
+                    logger.info(`[getNetwork] - emitting chainChange event. got chainId: ${result.chainId} (${resultChainName}). current chainId: ${this.currentChainId} (${currentChainName})`);
+                    this.emit('chainChange', { chain: result.chainId });
+                }
+                this.currentChainId = result.chainId;
+                return this.currentChainId;
             }
+            catch (e) {
+                logger.error('[getNetwork] - network fetch request failed, returning undefined', e);
+                return undefined;
+            }
+        });
+    }
+    setupEventListeners() {
+        if (this.intervalId) {
+            return;
         }
+        this.intervalId = setInterval(() => {
+            this.getNetwork().then((chainId) => {
+                if (!chainId) {
+                    return;
+                }
+                const resultChainName = this.mapChainIdToNetworkName(chainId);
+                const currentChainName = this.currentChainId
+                    ? this.mapChainIdToNetworkName(this.currentChainId)
+                    : undefined;
+                logger.info(`[setupEventListeners] - got network: ${chainId} (${resultChainName}). current network: ${this.currentChainId} (${currentChainName})`);
+                if (chainId !== this.currentChainId) {
+                    logger.info(`[setupEventListeners] - emitting chainChange event: ${chainId}`);
+                    this.emit('chainChange', { chain: chainId });
+                    this.currentChainId = chainId;
+                }
+            });
+        }, 5000);
+    }
+    teardownEventListeners() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            clearInterval(this.intervalId);
+            this.intervalId = undefined;
+        });
+    }
+    endSession() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            this.teardownEventListeners();
+        });
     }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -27,21 +107,13 @@ class MetaMask extends starknetWalletConnector["default"] {
             if (!wallet) {
                 return [];
             }
-            try {
-                yield this.reconnectIfNeeded(wallet);
+            const isProviderConnected = this.isProviderConnected();
+            const isPreauthorized = yield wallet.isPreauthorized();
+            const shouldReconnect = !isProviderConnected && isPreauthorized;
+            if (shouldReconnect) {
+                yield this.connect();
             }
-            catch (e) {
-                return [];
-            }
-            const getSelectedAddress = () => wallet.selectedAddress
-                ? Promise.resolve([wallet.selectedAddress])
-                : Promise.reject();
-            return utils.retryableFn(getSelectedAddress, {
-                fallbackValue: [],
-                maxRetries: 10,
-                retryIntervalMs: 750,
-                retryStrategy: 'timeout-and-rejection',
-            });
+            return wallet.selectedAddress ? [wallet.selectedAddress] : [];
         });
     }
 }

package/src/wallets/metamask.d.ts

@@ -1,8 +1,14 @@
-import { type WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import StarknetProvider from '../starknetWalletConnector';
-export declare class MetaMask extends StarknetProvider implements WalletConnector {
+export declare class MetaMask extends StarknetProvider implements WalletConnectorBase {
     overrideKey: string;
-    canSetEventListeners: boolean;
+    private currentChainId;
+    private intervalId;
+    private provider;
     constructor(opts: any);
+    getNetwork(): Promise<string | undefined>;
+    setupEventListeners(): void;
+    teardownEventListeners(): Promise<void>;
+    endSession(): Promise<void>;
     getConnectedAccounts(): Promise<string[]>;
 }

package/src/wallets/metamask.js

@@ -1,21 +1,101 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
-import { Eip6963ProviderSingleton, retryableFn } from '@dynamic-labs/utils';
+import { Eip6963ProviderSingleton } from '@dynamic-labs/utils';
+import { Logger, LogLevel } from '@dynamic-labs/logger';
 import StarknetWalletConnector from '../starknetWalletConnector.js';
 import { createMetaMaskProviderWrapper } from '../utils/starknetSnap.js';
 
+const logger = new Logger('MetaMask Starknet Snap', LogLevel.INFO);
 class MetaMask extends StarknetWalletConnector {
     constructor(opts) {
         super('MetaMask Starknet', 'metamask_snap', opts);
         this.overrideKey = 'metamaskstarknet';
-        this.canSetEventListeners = false;
-        if (!window.starknet_metamask_snap) {
-            const { providers } = Eip6963ProviderSingleton.get();
-            const metamaskProvider = providers.find((p) => ['io.metamask', 'io.metamask.flask'].includes(p.info.rdns));
-            if (metamaskProvider) {
-                window.starknet_metamask_snap = createMetaMaskProviderWrapper(metamaskProvider.provider);
+        const { providers } = Eip6963ProviderSingleton.get();
+        const metamaskProvider = providers.find((p) => ['io.metamask', 'io.metamask.flask'].includes(p.info.rdns));
+        if (metamaskProvider) {
+            this.provider = metamaskProvider.provider;
+        }
+        if (!window.starknet_metamask_snap && metamaskProvider) {
+            window.starknet_metamask_snap = createMetaMaskProviderWrapper(metamaskProvider.provider);
+        }
+    }
+    getNetwork() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.provider) {
+                logger.error('[getNetwork] - No provider found, returning undefined');
+                return undefined;
+            }
+            try {
+                logger.info('[getNetwork] - trying to fetch network using provider');
+                // we are using this method to get the network so that we always "see" the absolute
+                // active network in the companion site. when using the snap wrapper to get the network,
+                // we don't "see" the actual active network in the companion site – instead we see the
+                // network that was active at the time of the snap initialization
+                const result = yield this.provider.request({
+                    method: 'wallet_invokeSnap',
+                    params: {
+                        request: {
+                            method: 'starkNet_getCurrentNetwork',
+                            params: {},
+                        },
+                        snapId: 'npm:@consensys/starknet-snap',
+                    },
+                });
+                if (!('chainId' in result) || typeof result.chainId !== 'string') {
+                    logger.error(`[getNetwork] - result.chainId should be a string, but got: ${
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    result.chainId}`);
+                    return undefined;
+                }
+                if (result.chainId !== this.currentChainId) {
+                    const resultChainName = this.mapChainIdToNetworkName(result.chainId);
+                    const currentChainName = this.currentChainId
+                        ? this.mapChainIdToNetworkName(this.currentChainId)
+                        : undefined;
+                    logger.info(`[getNetwork] - emitting chainChange event. got chainId: ${result.chainId} (${resultChainName}). current chainId: ${this.currentChainId} (${currentChainName})`);
+                    this.emit('chainChange', { chain: result.chainId });
+                }
+                this.currentChainId = result.chainId;
+                return this.currentChainId;
             }
+            catch (e) {
+                logger.error('[getNetwork] - network fetch request failed, returning undefined', e);
+                return undefined;
+            }
+        });
+    }
+    setupEventListeners() {
+        if (this.intervalId) {
+            return;
         }
+        this.intervalId = setInterval(() => {
+            this.getNetwork().then((chainId) => {
+                if (!chainId) {
+                    return;
+                }
+                const resultChainName = this.mapChainIdToNetworkName(chainId);
+                const currentChainName = this.currentChainId
+                    ? this.mapChainIdToNetworkName(this.currentChainId)
+                    : undefined;
+                logger.info(`[setupEventListeners] - got network: ${chainId} (${resultChainName}). current network: ${this.currentChainId} (${currentChainName})`);
+                if (chainId !== this.currentChainId) {
+                    logger.info(`[setupEventListeners] - emitting chainChange event: ${chainId}`);
+                    this.emit('chainChange', { chain: chainId });
+                    this.currentChainId = chainId;
+                }
+            });
+        }, 5000);
+    }
+    teardownEventListeners() {
+        return __awaiter(this, void 0, void 0, function* () {
+            clearInterval(this.intervalId);
+            this.intervalId = undefined;
+        });
+    }
+    endSession() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.teardownEventListeners();
+        });
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -23,21 +103,13 @@ class MetaMask extends StarknetWalletConnector {
             if (!wallet) {
                 return [];
             }
-            try {
-                yield this.reconnectIfNeeded(wallet);
+            const isProviderConnected = this.isProviderConnected();
+            const isPreauthorized = yield wallet.isPreauthorized();
+            const shouldReconnect = !isProviderConnected && isPreauthorized;
+            if (shouldReconnect) {
+                yield this.connect();
             }
-            catch (e) {
-                return [];
-            }
-            const getSelectedAddress = () => wallet.selectedAddress
-                ? Promise.resolve([wallet.selectedAddress])
-                : Promise.reject();
-            return retryableFn(getSelectedAddress, {
-                fallbackValue: [],
-                maxRetries: 10,
-                retryIntervalMs: 750,
-                retryStrategy: 'timeout-and-rejection',
-            });
+            return wallet.selectedAddress ? [wallet.selectedAddress] : [];
         });
     }
 }

package/src/wallets/okx.d.ts

@@ -1,6 +1,6 @@
-import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import type { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import StarknetProvider from '../starknetWalletConnector';
-export declare class Okx extends StarknetProvider implements WalletConnector {
+export declare class Okx extends StarknetProvider implements WalletConnectorBase {
     overrideKey: string;
     constructor(opts: any);
 }