@dynamic-labs/starknet 3.0.0-alpha.5 → 3.0.0-alpha.6

package/CHANGELOG.md

@@ -1,4 +1,21 @@
 
+## [3.0.0-alpha.6](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.5...v3.0.0-alpha.6) (2024-06-18)
+
+
+### Features
+
+* implement useExternalAuth hook to signin using external jwt auth ([#6039](https://github.com/dynamic-labs/DynamicAuth/issues/6039)) ([ba90908](https://github.com/dynamic-labs/DynamicAuth/commit/ba90908509ec21f708a4a0782a7f94861fc3b484))
+
+
+### Bug Fixes
+
+* allow sign-in with different ME BTC wallet after initial connection ([a527b46](https://github.com/dynamic-labs/DynamicAuth/commit/a527b464f321b4fc27730f57c3812e996b5ed878))
+* close sign modal when signing in with a wallet when embedded wallet is enabled ([#6013](https://github.com/dynamic-labs/DynamicAuth/issues/6013)) ([0f4f3c8](https://github.com/dynamic-labs/DynamicAuth/commit/0f4f3c83db162f7a1794a3549b60bbad6b03e2c0))
+* custom network without a valid icon should still display its name in network picker ([#6018](https://github.com/dynamic-labs/DynamicAuth/issues/6018)) ([0b10df6](https://github.com/dynamic-labs/DynamicAuth/commit/0b10df68950bfc9b8492443158a6bb030dc1122c))
+* e2e: remove page pause ([#6045](https://github.com/dynamic-labs/DynamicAuth/issues/6045)) ([55bba00](https://github.com/dynamic-labs/DynamicAuth/commit/55bba0034255055d6ae266b1296542f47ed48e2b))
+* more fixes for connect starknet button ([#6046](https://github.com/dynamic-labs/DynamicAuth/issues/6046)) ([0fb570a](https://github.com/dynamic-labs/DynamicAuth/commit/0fb570a44e65f8dd6d4d2bf5edb2ee54985ec9d4))
+* set verified credentials on embedded wallet creation ([#6044](https://github.com/dynamic-labs/DynamicAuth/issues/6044)) ([b52a96d](https://github.com/dynamic-labs/DynamicAuth/commit/b52a96d321e7efdb30dce9cdb3f6f176c24ceb81))
+
 ## [3.0.0-alpha.5](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.4...v3.0.0-alpha.5) (2024-06-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/starknet",
-  "version": "3.0.0-alpha.5",
+  "version": "3.0.0-alpha.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -30,11 +30,12 @@
     "get-starknet-core": "3.2.0",
     "text-encoding": "0.7.0",
     "starknetkit": "1.1.3",
-    "@dynamic-labs/sdk-api-core": "0.0.461",
-    "@dynamic-labs/rpc-provider-starknet": "3.0.0-alpha.5",
-    "@dynamic-labs/utils": "3.0.0-alpha.5",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.5",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.5"
+    "@dynamic-labs/sdk-api-core": "0.0.470",
+    "@module-federation/runtime": "0.1.18",
+    "@dynamic-labs/rpc-provider-starknet": "3.0.0-alpha.6",
+    "@dynamic-labs/utils": "3.0.0-alpha.6",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.6",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.6"
   },
   "peerDependencies": {}
 }

package/src/index.cjs

@@ -9,6 +9,7 @@ var argentxMobile = require('./wallets/argentxMobile.cjs');
 var argentxWeb = require('./wallets/argentxWeb.cjs');
 var bitget = require('./wallets/bitget.cjs');
 var okx = require('./wallets/okx.cjs');
+var metamask = require('./wallets/metamask.cjs');
 require('@dynamic-labs/rpc-provider-starknet');
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -19,6 +20,7 @@ const StarknetWalletConnectors = (props) => [
     argentxWeb.ArgentXWeb,
     okx.Okx,
     bitget.Bitget,
+    metamask.MetaMask,
 ];
 
 exports.StarknetWalletConnectors = StarknetWalletConnectors;

package/src/index.js

@@ -5,6 +5,7 @@ import { ArgentXMobile } from './wallets/argentxMobile.js';
 import { ArgentXWeb } from './wallets/argentxWeb.js';
 import { Bitget } from './wallets/bitget.js';
 import { Okx } from './wallets/okx.js';
+import { MetaMask } from './wallets/metamask.js';
 import '@dynamic-labs/rpc-provider-starknet';
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -15,6 +16,7 @@ const StarknetWalletConnectors = (props) => [
     ArgentXWeb,
     Okx,
     Bitget,
+    MetaMask,
 ];
 
 export { StarknetWalletConnectors };

package/src/starknetWalletConnector.cjs

@@ -22,6 +22,8 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
         this.connectedChain = 'STARK';
         this.supportedChains = ['STARK'];
         this.switchNetworkOnlyFromWallet = true;
+        // required for metamask snap integration as MM snaps don't have event listeners
+        this.canSetEventListeners = true;
         this.name = name;
         this.windowKey = windowKey;
         this.starknetNetworks = opts.starknetNetworks;
@@ -182,6 +184,24 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
             if (!wallet) {
                 return [];
             }
+            try {
+                yield this.reconnectIfNeeded(wallet);
+            }
+            catch (e) {
+                return [];
+            }
+            const getSelectedAddress = () => wallet.selectedAddress
+                ? Promise.resolve([wallet.selectedAddress])
+                : Promise.reject();
+            return utils.retryableFn(getSelectedAddress, {
+                fallbackValue: [],
+                retryIntervalMs: 100,
+                retryStrategy: 'timeout-and-rejection',
+            });
+        });
+    }
+    reconnectIfNeeded(wallet) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
             const needsReconnection = !this.isProviderConnected() && (yield wallet.isPreauthorized());
             if (needsReconnection) {
                 /**
@@ -199,24 +219,18 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
                     }
                     catch (_a) {
                         localStorage.removeItem('dynamic_should_have_wallet');
-                        return [];
+                        throw new Error('Could not reconnect');
                     }
                 }
                 else {
                     yield this.connect();
                 }
             }
-            const getSelectedAddress = () => wallet.selectedAddress
-                ? Promise.resolve([wallet.selectedAddress])
-                : Promise.reject();
-            return utils.retryableFn(getSelectedAddress, {
-                fallbackValue: [],
-                retryIntervalMs: 100,
-                retryStrategy: 'timeout-and-rejection',
-            });
         });
     }
     setupEventListeners() {
+        if (!this.canSetEventListeners)
+            return;
         const wallet = this.getWallet();
         if (!wallet) {
             return walletConnectorCore.logger.error('Wallet has not been found');
@@ -245,6 +259,8 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     teardownEventListeners() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!this.canSetEventListeners)
+                return;
             const wallet = this.getWallet();
             if (this.handleAccountChange) {
                 wallet === null || wallet === void 0 ? void 0 : wallet.off(ACCOUNT_CHANGED_EVENT_LISTENER, this.handleAccountChange);

package/src/starknetWalletConnector.d.ts

@@ -23,6 +23,7 @@ declare abstract class StarknetWalletConnector extends WalletConnectorBase {
     handleNetworkChange: NetworkChangeEventHandler | undefined;
     switchNetworkOnlyFromWallet: boolean;
     starknetNetworks: NetworkConfiguration[];
+    canSetEventListeners: boolean;
     constructor(name: string, windowKey: StarknetWalletKey, opts: {
         chainRpcProviders: IChainRpcProviders;
         starknetNetworks: NetworkConfiguration[];
@@ -63,6 +64,10 @@ declare abstract class StarknetWalletConnector extends WalletConnectorBase {
                 features: string[];
                 name: string;
             } | undefined;
+            walletStandardLocators?: {
+                name: string;
+                locator: string;
+            }[] | undefined;
             windowLocations?: string[] | undefined;
         }[] | undefined;
         mobile?: {
@@ -98,6 +103,7 @@ declare abstract class StarknetWalletConnector extends WalletConnectorBase {
     getWallet(): StarknetWindowObject | undefined;
     isInstalledOnBrowser(): boolean;
     getConnectedAccounts(): Promise<string[]>;
+    reconnectIfNeeded(wallet: StarknetWindowObject): Promise<Promise<Promise<void>>>;
     setupEventListeners(): void;
     teardownEventListeners(): Promise<void>;
     mapNetworkNameToChainId(networkNameOrChainId: string): constants.StarknetChainId | undefined;

package/src/starknetWalletConnector.js

@@ -18,6 +18,8 @@ class StarknetWalletConnector extends WalletConnectorBase {
         this.connectedChain = 'STARK';
         this.supportedChains = ['STARK'];
         this.switchNetworkOnlyFromWallet = true;
+        // required for metamask snap integration as MM snaps don't have event listeners
+        this.canSetEventListeners = true;
         this.name = name;
         this.windowKey = windowKey;
         this.starknetNetworks = opts.starknetNetworks;
@@ -178,6 +180,24 @@ class StarknetWalletConnector extends WalletConnectorBase {
             if (!wallet) {
                 return [];
             }
+            try {
+                yield this.reconnectIfNeeded(wallet);
+            }
+            catch (e) {
+                return [];
+            }
+            const getSelectedAddress = () => wallet.selectedAddress
+                ? Promise.resolve([wallet.selectedAddress])
+                : Promise.reject();
+            return retryableFn(getSelectedAddress, {
+                fallbackValue: [],
+                retryIntervalMs: 100,
+                retryStrategy: 'timeout-and-rejection',
+            });
+        });
+    }
+    reconnectIfNeeded(wallet) {
+        return __awaiter(this, void 0, void 0, function* () {
             const needsReconnection = !this.isProviderConnected() && (yield wallet.isPreauthorized());
             if (needsReconnection) {
                 /**
@@ -195,24 +215,18 @@ class StarknetWalletConnector extends WalletConnectorBase {
                     }
                     catch (_a) {
                         localStorage.removeItem('dynamic_should_have_wallet');
-                        return [];
+                        throw new Error('Could not reconnect');
                     }
                 }
                 else {
                     yield this.connect();
                 }
             }
-            const getSelectedAddress = () => wallet.selectedAddress
-                ? Promise.resolve([wallet.selectedAddress])
-                : Promise.reject();
-            return retryableFn(getSelectedAddress, {
-                fallbackValue: [],
-                retryIntervalMs: 100,
-                retryStrategy: 'timeout-and-rejection',
-            });
         });
     }
     setupEventListeners() {
+        if (!this.canSetEventListeners)
+            return;
         const wallet = this.getWallet();
         if (!wallet) {
             return logger.error('Wallet has not been found');
@@ -241,6 +255,8 @@ class StarknetWalletConnector extends WalletConnectorBase {
     }
     teardownEventListeners() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.canSetEventListeners)
+                return;
             const wallet = this.getWallet();
             if (this.handleAccountChange) {
                 wallet === null || wallet === void 0 ? void 0 : wallet.off(ACCOUNT_CHANGED_EVENT_LISTENER, this.handleAccountChange);

package/src/types.d.ts

@@ -1,5 +1,5 @@
 import type { StarknetWindowObject } from 'get-starknet-core';
-export type StarknetWalletKey = 'braavos' | 'argentX' | 'argentXMobile' | 'argentWebWallet' | 'okxwallet' | 'bitkeep';
+export type StarknetWalletKey = 'braavos' | 'argentX' | 'argentXMobile' | 'argentWebWallet' | 'okxwallet' | 'bitkeep' | 'metamask_snap';
 export type StarknetWindowKey = `starknet_${StarknetWalletKey}` | 'starknet';
 type StarknetWindow = {
     [key in StarknetWindowKey]: StarknetWindowObject;

package/src/utils/starknetSnap.cjs

@@ -0,0 +1,81 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../_virtual/_tslib.cjs');
+var index_cjs_js = require('@module-federation/runtime/dist/index.cjs.js');
+
+let metaMaskSnapWallet;
+/**
+ *
+ * @param {IEthereum} provider the metamask window provider object
+ * @returns {StarknetWindowObject} the metamask provider wrapper formed into starknet window object
+ */
+const createMetaMaskProviderWrapper = (provider) => {
+    const metaMaskProviderWrapper = {
+        get account() {
+            return metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.account;
+        },
+        get chainId() {
+            return metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.chainId;
+        },
+        enable: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            if (!metaMaskSnapWallet) {
+                yield index_cjs_js.init({
+                    name: 'MetaMaskStarknetSnapWallet',
+                    remotes: [
+                        {
+                            alias: 'MetaMaskStarknetSnapWallet',
+                            entry: 'https://snaps.consensys.io/starknet/get-starknet/v1/remoteEntry.js',
+                            name: 'MetaMaskStarknetSnapWallet',
+                        },
+                    ],
+                });
+                const result = yield index_cjs_js.loadRemote('MetaMaskStarknetSnapWallet/index');
+                const { MetaMaskSnapWallet } = result;
+                metaMaskSnapWallet = new MetaMaskSnapWallet(provider, '*');
+            }
+            if (!metaMaskSnapWallet) {
+                return [];
+            }
+            return metaMaskSnapWallet.enable();
+        }),
+        icon: '',
+        id: 'MetaMaskStarknetSnapWallet',
+        get isConnected() {
+            return metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.isConnected;
+        },
+        isPreauthorized: () => { var _a; return (_a = metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.isPreauthorized()) !== null && _a !== void 0 ? _a : Promise.resolve(false); },
+        name: 'MetaMaskStarknetSnapWallet',
+        off: (
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        event, 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        handleEvent) => undefined,
+        on: (
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        event, 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        handleEvent) => undefined,
+        get provider() {
+            return metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.provider;
+        },
+        request: (call) => {
+            if (!metaMaskSnapWallet) {
+                throw new Error('Wallet not enabled');
+            }
+            return metaMaskSnapWallet.request(call);
+        },
+        get selectedAddress() {
+            return metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.selectedAddress;
+        },
+        get version() {
+            var _a;
+            return (_a = metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.version) !== null && _a !== void 0 ? _a : '0.0.0';
+        },
+    };
+    return metaMaskProviderWrapper;
+};
+
+exports.createMetaMaskProviderWrapper = createMetaMaskProviderWrapper;

package/src/utils/starknetSnap.d.ts

@@ -0,0 +1,8 @@
+import { StarknetWindowObject } from 'get-starknet-core';
+import { IEthereum } from '@dynamic-labs/utils';
+/**
+ *
+ * @param {IEthereum} provider the metamask window provider object
+ * @returns {StarknetWindowObject} the metamask provider wrapper formed into starknet window object
+ */
+export declare const createMetaMaskProviderWrapper: (provider: IEthereum) => StarknetWindowObject;

package/src/utils/starknetSnap.js

@@ -0,0 +1,77 @@
+'use client'
+import { __awaiter } from '../../_virtual/_tslib.js';
+import { init, loadRemote } from '@module-federation/runtime/dist/index.cjs.js';
+
+let metaMaskSnapWallet;
+/**
+ *
+ * @param {IEthereum} provider the metamask window provider object
+ * @returns {StarknetWindowObject} the metamask provider wrapper formed into starknet window object
+ */
+const createMetaMaskProviderWrapper = (provider) => {
+    const metaMaskProviderWrapper = {
+        get account() {
+            return metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.account;
+        },
+        get chainId() {
+            return metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.chainId;
+        },
+        enable: () => __awaiter(void 0, void 0, void 0, function* () {
+            if (!metaMaskSnapWallet) {
+                yield init({
+                    name: 'MetaMaskStarknetSnapWallet',
+                    remotes: [
+                        {
+                            alias: 'MetaMaskStarknetSnapWallet',
+                            entry: 'https://snaps.consensys.io/starknet/get-starknet/v1/remoteEntry.js',
+                            name: 'MetaMaskStarknetSnapWallet',
+                        },
+                    ],
+                });
+                const result = yield loadRemote('MetaMaskStarknetSnapWallet/index');
+                const { MetaMaskSnapWallet } = result;
+                metaMaskSnapWallet = new MetaMaskSnapWallet(provider, '*');
+            }
+            if (!metaMaskSnapWallet) {
+                return [];
+            }
+            return metaMaskSnapWallet.enable();
+        }),
+        icon: '',
+        id: 'MetaMaskStarknetSnapWallet',
+        get isConnected() {
+            return metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.isConnected;
+        },
+        isPreauthorized: () => { var _a; return (_a = metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.isPreauthorized()) !== null && _a !== void 0 ? _a : Promise.resolve(false); },
+        name: 'MetaMaskStarknetSnapWallet',
+        off: (
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        event, 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        handleEvent) => undefined,
+        on: (
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        event, 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        handleEvent) => undefined,
+        get provider() {
+            return metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.provider;
+        },
+        request: (call) => {
+            if (!metaMaskSnapWallet) {
+                throw new Error('Wallet not enabled');
+            }
+            return metaMaskSnapWallet.request(call);
+        },
+        get selectedAddress() {
+            return metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.selectedAddress;
+        },
+        get version() {
+            var _a;
+            return (_a = metaMaskSnapWallet === null || metaMaskSnapWallet === void 0 ? void 0 : metaMaskSnapWallet.version) !== null && _a !== void 0 ? _a : '0.0.0';
+        },
+    };
+    return metaMaskProviderWrapper;
+};
+
+export { createMetaMaskProviderWrapper };

package/src/wallets/metamask.cjs

@@ -0,0 +1,49 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../_virtual/_tslib.cjs');
+var utils = require('@dynamic-labs/utils');
+var starknetWalletConnector = require('../starknetWalletConnector.cjs');
+var starknetSnap = require('../utils/starknetSnap.cjs');
+
+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);
+            }
+        }
+    }
+    getConnectedAccounts() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            if (!wallet) {
+                return [];
+            }
+            try {
+                yield this.reconnectIfNeeded(wallet);
+            }
+            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',
+            });
+        });
+    }
+}
+
+exports.MetaMask = MetaMask;

package/src/wallets/metamask.d.ts

@@ -0,0 +1,8 @@
+import { type WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import StarknetProvider from '../starknetWalletConnector';
+export declare class MetaMask extends StarknetProvider implements WalletConnector {
+    overrideKey: string;
+    canSetEventListeners: boolean;
+    constructor(opts: any);
+    getConnectedAccounts(): Promise<string[]>;
+}

package/src/wallets/metamask.js

@@ -0,0 +1,45 @@
+'use client'
+import { __awaiter } from '../../_virtual/_tslib.js';
+import { Eip6963ProviderSingleton, retryableFn } from '@dynamic-labs/utils';
+import StarknetWalletConnector from '../starknetWalletConnector.js';
+import { createMetaMaskProviderWrapper } from '../utils/starknetSnap.js';
+
+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);
+            }
+        }
+    }
+    getConnectedAccounts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            if (!wallet) {
+                return [];
+            }
+            try {
+                yield this.reconnectIfNeeded(wallet);
+            }
+            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',
+            });
+        });
+    }
+}
+
+export { MetaMask };