@dynamic-labs/global-wallet-client 4.0.0-alpha.51 → 4.0.0-alpha.52

package/CHANGELOG.md

@@ -1,4 +1,6 @@
 
+## [4.0.0-alpha.52](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.51...v4.0.0-alpha.52) (2025-01-02)
+
 ## [4.0.0-alpha.51](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.50...v4.0.0-alpha.51) (2024-12-30)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.0.0-alpha.51";
+var version = "4.0.0-alpha.52";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.0.0-alpha.51";
+var version = "4.0.0-alpha.52";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/global-wallet-client",
-  "version": "4.0.0-alpha.51",
+  "version": "4.0.0-alpha.52",
   "description": "Core package for building Dynamic's Global Wallet",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -31,11 +31,11 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/assert-package-version": "4.0.0-alpha.51",
-    "@dynamic-labs/logger": "4.0.0-alpha.51",
-    "@dynamic-labs/store": "4.0.0-alpha.51",
-    "@dynamic-labs/types": "4.0.0-alpha.51",
-    "@dynamic-labs/utils": "4.0.0-alpha.51",
+    "@dynamic-labs/assert-package-version": "4.0.0-alpha.52",
+    "@dynamic-labs/logger": "4.0.0-alpha.52",
+    "@dynamic-labs/store": "4.0.0-alpha.52",
+    "@dynamic-labs/types": "4.0.0-alpha.52",
+    "@dynamic-labs/utils": "4.0.0-alpha.52",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {

package/src/lib/actions/connectAction/createConnectAction.cjs

@@ -20,18 +20,19 @@ const createConnectAction = ({ store, openPopup, onConnect }) => (_a) => _tslib.
     const sharedSecret = yield utils.deriveSharedSecret(keyPair.privateKey, yield utils.convertPublicKeyHexToCryptoKey(providerPublicKey));
     const message = yield utils.decryptMessage(sharedSecret, encryptedMessage, iv);
     const { network, wallet } = JSON.parse(message);
-    const connection = {
-        evm: {
-            network,
+    store.setInitialConnectionState({
+        connection: {
+            expiresAt,
+            origin: window.location.origin,
+            sharedSecret,
+        },
+        ethereum: {
+            currentNetworkId: network,
             supportedNetworks: [],
-            wallets: [wallet],
         },
-        expiresAt,
-        sharedSecret,
-        solana: null,
-    };
-    store.setConnection(connection);
-    onConnect === null || onConnect === void 0 ? void 0 : onConnect(connection);
+        wallets: [wallet],
+    });
+    onConnect === null || onConnect === void 0 ? void 0 : onConnect();
     return wallet;
 });
 

package/src/lib/actions/connectAction/createConnectAction.d.ts

@@ -1,10 +1,10 @@
 import { ClientStore } from '../../store';
 import { OpenPopup } from '../../functions/createPopupOpener/createPopupOpener';
-import { ConnectArgs, Connection } from '../../types';
+import { ConnectArgs } from '../../types';
 type CreateConnectActionProps = {
     store: ClientStore;
     openPopup: OpenPopup;
-    onConnect?: (connection: Connection) => void;
+    onConnect?: () => void;
 };
 export declare const createConnectAction: ({ store, openPopup, onConnect }: CreateConnectActionProps) => ({ chain }: ConnectArgs) => Promise<import("@dynamic-labs/types").BaseWallet>;
 export {};

package/src/lib/actions/connectAction/createConnectAction.js

@@ -16,18 +16,19 @@ const createConnectAction = ({ store, openPopup, onConnect }) => (_a) => __await
     const sharedSecret = yield deriveSharedSecret(keyPair.privateKey, yield convertPublicKeyHexToCryptoKey(providerPublicKey));
     const message = yield decryptMessage(sharedSecret, encryptedMessage, iv);
     const { network, wallet } = JSON.parse(message);
-    const connection = {
-        evm: {
-            network,
+    store.setInitialConnectionState({
+        connection: {
+            expiresAt,
+            origin: window.location.origin,
+            sharedSecret,
+        },
+        ethereum: {
+            currentNetworkId: network,
             supportedNetworks: [],
-            wallets: [wallet],
         },
-        expiresAt,
-        sharedSecret,
-        solana: null,
-    };
-    store.setConnection(connection);
-    onConnect === null || onConnect === void 0 ? void 0 : onConnect(connection);
+        wallets: [wallet],
+    });
+    onConnect === null || onConnect === void 0 ? void 0 : onConnect();
     return wallet;
 });
 

package/src/lib/createGlobalWalletClient.cjs

@@ -8,6 +8,7 @@ var createPopupOpener = require('./functions/createPopupOpener/createPopupOpener
 var createClientStore = require('./store/createClientStore.cjs');
 var createClientEventEmitter = require('./functions/createClientEventEmitter/createClientEventEmitter.cjs');
 var createDisconnectAction = require('./actions/disconnectAction/createDisconnectAction.cjs');
+var createEthereumModule = require('./functions/createEthereumModule/createEthereumModule.cjs');
 
 const createGlobalWalletClient = ({ environmentId, popup: popupInfo, }) => {
     const eventEmitter = createClientEventEmitter.createClientEventEmitter();
@@ -25,18 +26,15 @@ const createGlobalWalletClient = ({ environmentId, popup: popupInfo, }) => {
     return {
         connect,
         disconnect,
-        get ethereum() {
-            var _a, _b;
-            return (_b = (_a = store.getActiveConnection()) === null || _a === void 0 ? void 0 : _a.evm) !== null && _b !== void 0 ? _b : null;
-        },
+        ethereum: createEthereumModule.createEthereumModule({ store }),
         invoke: openPopup,
         off: eventEmitter.off.bind(eventEmitter),
         on: eventEmitter.on.bind(eventEmitter),
         once: eventEmitter.once.bind(eventEmitter),
         removeAllListeners: eventEmitter.removeAllListeners.bind(eventEmitter),
         removeListener: eventEmitter.removeListener.bind(eventEmitter),
-        get userWallets() {
-            return store.userWallets;
+        get wallets() {
+            return store.wallets;
         },
     };
 };

package/src/lib/createGlobalWalletClient.d.ts

@@ -6,13 +6,13 @@ export type CreateGlobalWalletClientProps = {
 export declare const createGlobalWalletClient: ({ environmentId, popup: popupInfo, }: CreateGlobalWalletClientProps) => {
     connect: ({ chain }: import("./types").ConnectArgs) => Promise<import("dist/packages/types/src").BaseWallet>;
     disconnect: () => void;
-    readonly ethereum: {
-        supportedNetworks: {
+    ethereum: {
+        readonly currentNetworkId: number | null;
+        readonly supportedNetworks: {
             chainId: number;
         }[];
-        wallets: import("dist/packages/types/src").BaseWallet[];
-        network: string;
-    } | null;
+        readonly wallets: import("dist/packages/types/src").BaseWallet[];
+    };
     invoke: <TPopupAction extends import("dist/packages/types/src").IPopupAction>({ params, pathname, }: {
         params: import("dist/packages/types/src").GetPopupActionFuncArgs<TPopupAction>;
         pathname: import("dist/packages/types/src").GetPopupActionName<TPopupAction>;
@@ -49,6 +49,6 @@ export declare const createGlobalWalletClient: ({ environmentId, popup: popupInf
         connect: () => void;
         disconnect: () => void;
     }, any>;
-    readonly userWallets: import("dist/packages/types/src").BaseWallet[];
+    readonly wallets: import("dist/packages/types/src").BaseWallet[];
 };
 export type GlobalWalletClient = ReturnType<typeof createGlobalWalletClient>;

package/src/lib/createGlobalWalletClient.js

@@ -4,6 +4,7 @@ import { createPopupOpener } from './functions/createPopupOpener/createPopupOpen
 import { createClientStore } from './store/createClientStore.js';
 import { createClientEventEmitter } from './functions/createClientEventEmitter/createClientEventEmitter.js';
 import { createDisconnectAction } from './actions/disconnectAction/createDisconnectAction.js';
+import { createEthereumModule } from './functions/createEthereumModule/createEthereumModule.js';
 
 const createGlobalWalletClient = ({ environmentId, popup: popupInfo, }) => {
     const eventEmitter = createClientEventEmitter();
@@ -21,18 +22,15 @@ const createGlobalWalletClient = ({ environmentId, popup: popupInfo, }) => {
     return {
         connect,
         disconnect,
-        get ethereum() {
-            var _a, _b;
-            return (_b = (_a = store.getActiveConnection()) === null || _a === void 0 ? void 0 : _a.evm) !== null && _b !== void 0 ? _b : null;
-        },
+        ethereum: createEthereumModule({ store }),
         invoke: openPopup,
         off: eventEmitter.off.bind(eventEmitter),
         on: eventEmitter.on.bind(eventEmitter),
         once: eventEmitter.once.bind(eventEmitter),
         removeAllListeners: eventEmitter.removeAllListeners.bind(eventEmitter),
         removeListener: eventEmitter.removeListener.bind(eventEmitter),
-        get userWallets() {
-            return store.userWallets;
+        get wallets() {
+            return store.wallets;
         },
     };
 };

package/src/lib/ethereum/functions/eip1193Provider/createEIP1193Provider.cjs

@@ -12,11 +12,11 @@ const createEIP1193Provider = (client) => {
     const eventEmitter = new eventemitter3.EventEmitter();
     client.on('connect', () => {
         var _a;
-        const chainId = (_a = client.ethereum) === null || _a === void 0 ? void 0 : _a.network;
-        if (!chainId)
+        const currentNetwork = (_a = client.ethereum) === null || _a === void 0 ? void 0 : _a.currentNetworkId;
+        if (!currentNetwork)
             return;
         eventEmitter.emit('connect', {
-            chainId: viem.toHex(parseInt(chainId, 10)),
+            chainId: viem.toHex(currentNetwork),
         });
     });
     client.on('disconnect', () => {
@@ -26,7 +26,7 @@ const createEIP1193Provider = (client) => {
         on: eventEmitter.on.bind(eventEmitter),
         removeListener: eventEmitter.removeListener.bind(eventEmitter),
         request: ((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ method, params }) {
-            var _b, _c, _d;
+            var _b, _c, _d, _e;
             const wallets = (_c = (_b = client === null || client === void 0 ? void 0 : client.ethereum) === null || _b === void 0 ? void 0 : _b.wallets) !== null && _c !== void 0 ? _c : [];
             const connectedAddresses = wallets.map((wallet) => wallet.address);
             // Define if user is connected with ethereum wallets
@@ -55,7 +55,10 @@ const createEIP1193Provider = (client) => {
                     .then(({ address }) => [address]);
             }
             if (method === 'eth_chainId') {
-                return (_d = client.ethereum) === null || _d === void 0 ? void 0 : _d.network;
+                if ((_d = client.ethereum) === null || _d === void 0 ? void 0 : _d.currentNetworkId) {
+                    return viem.toHex((_e = client.ethereum) === null || _e === void 0 ? void 0 : _e.currentNetworkId);
+                }
+                return null;
             }
             /**
              * Opens the popup to request user confirmation for the request

package/src/lib/ethereum/functions/eip1193Provider/createEIP1193Provider.js

@@ -8,11 +8,11 @@ const createEIP1193Provider = (client) => {
     const eventEmitter = new EventEmitter();
     client.on('connect', () => {
         var _a;
-        const chainId = (_a = client.ethereum) === null || _a === void 0 ? void 0 : _a.network;
-        if (!chainId)
+        const currentNetwork = (_a = client.ethereum) === null || _a === void 0 ? void 0 : _a.currentNetworkId;
+        if (!currentNetwork)
             return;
         eventEmitter.emit('connect', {
-            chainId: toHex(parseInt(chainId, 10)),
+            chainId: toHex(currentNetwork),
         });
     });
     client.on('disconnect', () => {
@@ -22,7 +22,7 @@ const createEIP1193Provider = (client) => {
         on: eventEmitter.on.bind(eventEmitter),
         removeListener: eventEmitter.removeListener.bind(eventEmitter),
         request: ((_a) => __awaiter(void 0, [_a], void 0, function* ({ method, params }) {
-            var _b, _c, _d;
+            var _b, _c, _d, _e;
             const wallets = (_c = (_b = client === null || client === void 0 ? void 0 : client.ethereum) === null || _b === void 0 ? void 0 : _b.wallets) !== null && _c !== void 0 ? _c : [];
             const connectedAddresses = wallets.map((wallet) => wallet.address);
             // Define if user is connected with ethereum wallets
@@ -51,7 +51,10 @@ const createEIP1193Provider = (client) => {
                     .then(({ address }) => [address]);
             }
             if (method === 'eth_chainId') {
-                return (_d = client.ethereum) === null || _d === void 0 ? void 0 : _d.network;
+                if ((_d = client.ethereum) === null || _d === void 0 ? void 0 : _d.currentNetworkId) {
+                    return toHex((_e = client.ethereum) === null || _e === void 0 ? void 0 : _e.currentNetworkId);
+                }
+                return null;
             }
             /**
              * Opens the popup to request user confirmation for the request

package/src/lib/functions/createEthereumModule/createEthereumModule.cjs

@@ -0,0 +1,21 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const createEthereumModule = ({ store }) => ({
+    get currentNetworkId() {
+        var _a, _b;
+        return (_b = (_a = store.ethereum) === null || _a === void 0 ? void 0 : _a.currentNetworkId) !== null && _b !== void 0 ? _b : null;
+    },
+    get supportedNetworks() {
+        var _a, _b;
+        return (_b = (_a = store.ethereum) === null || _a === void 0 ? void 0 : _a.supportedNetworks) !== null && _b !== void 0 ? _b : [];
+    },
+    get wallets() {
+        var _a;
+        return (_a = store.wallets.filter(({ chain }) => chain === 'EVM')) !== null && _a !== void 0 ? _a : [];
+    },
+});
+
+exports.createEthereumModule = createEthereumModule;

package/src/lib/functions/createEthereumModule/createEthereumModule.d.ts

@@ -0,0 +1,10 @@
+import { ClientStore } from '../../store';
+export declare const createEthereumModule: ({ store }: {
+    store: ClientStore;
+}) => {
+    readonly currentNetworkId: number | null;
+    readonly supportedNetworks: {
+        chainId: number;
+    }[];
+    readonly wallets: import("dist/packages/types/src").BaseWallet[];
+};

package/src/lib/functions/createEthereumModule/createEthereumModule.js

@@ -0,0 +1,17 @@
+'use client'
+const createEthereumModule = ({ store }) => ({
+    get currentNetworkId() {
+        var _a, _b;
+        return (_b = (_a = store.ethereum) === null || _a === void 0 ? void 0 : _a.currentNetworkId) !== null && _b !== void 0 ? _b : null;
+    },
+    get supportedNetworks() {
+        var _a, _b;
+        return (_b = (_a = store.ethereum) === null || _a === void 0 ? void 0 : _a.supportedNetworks) !== null && _b !== void 0 ? _b : [];
+    },
+    get wallets() {
+        var _a;
+        return (_a = store.wallets.filter(({ chain }) => chain === 'EVM')) !== null && _a !== void 0 ? _a : [];
+    },
+});
+
+export { createEthereumModule };

package/src/lib/functions/createEthereumModule/index.d.ts

@@ -0,0 +1 @@
+export { createEthereumModule } from './createEthereumModule';

package/src/lib/functions/createPopupOpener/createPopupOpener.cjs

@@ -9,44 +9,82 @@ var waitForPopupResponse = require('../waitForPopupResponse/waitForPopupResponse
 var onPopupClose = require('../onPopupClose/onPopupClose.cjs');
 var mergeAndEncryptParams = require('../mergeAndEncryptParams/mergeAndEncryptParams.cjs');
 
-const createPopupOpener = ({ environmentId, popupInfo, store }) => (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ params, pathname, }) {
-    var _b, _c;
-    const popupFinalUrl = new URL(popupInfo.url);
-    const activeConnection = store.getActiveConnection();
-    const resultDeferredPromise = new utils.DeferredPromise();
-    const popupWidth = (_b = popupInfo.width) !== null && _b !== void 0 ? _b : 420;
-    const popupHeight = (_c = popupInfo.height) !== null && _c !== void 0 ? _c : 520;
-    // Setup popup URL and data
-    popupFinalUrl.hash = `/${pathname}`;
-    popupFinalUrl.searchParams.set('provider_env_id', environmentId);
-    popupFinalUrl.searchParams.set('requester_origin', window.location.origin);
-    // Encrypt params if active connection is present
-    if (params) {
-        yield mergeAndEncryptParams.mergeAndEncryptParams(popupFinalUrl, params, activeConnection);
-    }
-    // Open popup
-    const popup = window.open('', '_blank', `width=${popupWidth},height=${popupHeight}`);
-    if (popup === null) {
-        throw new Error('Failed to open popup');
-    }
-    waitForPopupResponse.waitForPopupResponse({
-        decode: (data) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            if (activeConnection && utils.isEncryptedMessage(data)) {
-                const decryptedData = yield utils.decryptMessage(activeConnection.sharedSecret, data.encryptedMessage, data.iv);
-                return JSON.parse(decryptedData);
-            }
-            return data;
-        }),
-        onError: (error) => resultDeferredPromise.reject(error),
-        onResponse: (response) => resultDeferredPromise.resolve(response.data),
-        popupUrl: popupFinalUrl.toString(),
+const createPopupOpener = ({ environmentId, popupInfo, store, popupActionTimeout = 100, }) => {
+    let popup = null;
+    let didOpenPopup = false;
+    let lastActionId = null;
+    const closePopup = () => {
+        popup === null || popup === void 0 ? void 0 : popup.close();
+        popup = null;
+        didOpenPopup = false;
+        lastActionId = null;
+    };
+    return (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ params, pathname, }) {
+        var _b, _c;
+        // Used as a unique identifier for the action
+        const actionId = new Date().getTime();
+        lastActionId = actionId;
+        const popupFinalUrl = new URL(popupInfo.url);
+        const activeConnection = store.getActiveConnection();
+        const resultDeferredPromise = new utils.DeferredPromise();
+        const popupWidth = (_b = popupInfo.width) !== null && _b !== void 0 ? _b : 420;
+        const popupHeight = (_c = popupInfo.height) !== null && _c !== void 0 ? _c : 520;
+        // Setup popup URL and data
+        popupFinalUrl.hash = `/${pathname}`;
+        popupFinalUrl.searchParams.set('provider_env_id', environmentId);
+        popupFinalUrl.searchParams.set('requester_origin', window.location.origin);
+        // Encrypt params if active connection is present
+        if (params) {
+            yield mergeAndEncryptParams.mergeAndEncryptParams(popupFinalUrl, params, activeConnection);
+        }
+        if (popup === null) {
+            // Open popup
+            popup = window.open('', '_blank', `width=${popupWidth},height=${popupHeight}`);
+        }
+        if (popup === null) {
+            throw new Error('Failed to open popup');
+        }
+        waitForPopupResponse.waitForPopupResponse({
+            decode: (data) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                if (activeConnection && utils.isEncryptedMessage(data)) {
+                    const decryptedData = yield utils.decryptMessage(activeConnection.sharedSecret, data.encryptedMessage, data.iv);
+                    return JSON.parse(decryptedData);
+                }
+                return data;
+            }),
+            onError: (error) => resultDeferredPromise.reject(error),
+            onResponse: (response) => resultDeferredPromise.resolve(response.data),
+            popupUrl: popupFinalUrl.toString(),
+        });
+        onPopupClose.onPopupClose(popup, () => {
+            resultDeferredPromise.reject(new Error('Popup closed'));
+        });
+        /**
+         * Assign action to popup
+         */
+        if (didOpenPopup) {
+            popup === null || popup === void 0 ? void 0 : popup.postMessage({
+                actionPath: popupFinalUrl.search + popupFinalUrl.hash,
+                event: 'new-action',
+            }, popupFinalUrl.origin);
+        }
+        else {
+            // Load popup
+            popup.location.assign(popupFinalUrl.toString());
+        }
+        didOpenPopup = true;
+        return resultDeferredPromise.promise.finally(() => {
+            /**
+             * Sets a timeout to close the popup.
+             * It will only no new actions were fired.
+             */
+            setTimeout(() => {
+                if (lastActionId === actionId) {
+                    closePopup();
+                }
+            }, popupActionTimeout);
+        });
     });
-    onPopupClose.onPopupClose(popup, () => {
-        resultDeferredPromise.reject(new Error('Popup closed'));
-    });
-    // Load popup
-    popup.location.assign(popupFinalUrl.toString());
-    return resultDeferredPromise.promise.finally(popup.close);
-});
+};
 
 exports.createPopupOpener = createPopupOpener;

package/src/lib/functions/createPopupOpener/createPopupOpener.d.ts

@@ -5,11 +5,12 @@ type CreatePopupOpenerProps = {
     environmentId: string;
     popupInfo: PopupInfo;
     store: ClientStore;
+    popupActionTimeout?: number;
 };
 type OpenPopupProps<TAction extends IPopupAction> = {
     params: GetPopupActionFuncArgs<TAction>;
     pathname: GetPopupActionName<TAction>;
 };
-export declare const createPopupOpener: ({ environmentId, popupInfo, store }: CreatePopupOpenerProps) => <TPopupAction extends IPopupAction>({ params, pathname, }: OpenPopupProps<TPopupAction>) => Promise<GetPopupActionResult<TPopupAction>>;
+export declare const createPopupOpener: ({ environmentId, popupInfo, store, popupActionTimeout, }: CreatePopupOpenerProps) => <TPopupAction extends IPopupAction>({ params, pathname, }: OpenPopupProps<TPopupAction>) => Promise<GetPopupActionResult<TPopupAction>>;
 export type OpenPopup = ReturnType<typeof createPopupOpener>;
 export {};

package/src/lib/functions/createPopupOpener/createPopupOpener.js

@@ -5,44 +5,82 @@ import { waitForPopupResponse } from '../waitForPopupResponse/waitForPopupRespon
 import { onPopupClose } from '../onPopupClose/onPopupClose.js';
 import { mergeAndEncryptParams } from '../mergeAndEncryptParams/mergeAndEncryptParams.js';
 
-const createPopupOpener = ({ environmentId, popupInfo, store }) => (_a) => __awaiter(void 0, [_a], void 0, function* ({ params, pathname, }) {
-    var _b, _c;
-    const popupFinalUrl = new URL(popupInfo.url);
-    const activeConnection = store.getActiveConnection();
-    const resultDeferredPromise = new DeferredPromise();
-    const popupWidth = (_b = popupInfo.width) !== null && _b !== void 0 ? _b : 420;
-    const popupHeight = (_c = popupInfo.height) !== null && _c !== void 0 ? _c : 520;
-    // Setup popup URL and data
-    popupFinalUrl.hash = `/${pathname}`;
-    popupFinalUrl.searchParams.set('provider_env_id', environmentId);
-    popupFinalUrl.searchParams.set('requester_origin', window.location.origin);
-    // Encrypt params if active connection is present
-    if (params) {
-        yield mergeAndEncryptParams(popupFinalUrl, params, activeConnection);
-    }
-    // Open popup
-    const popup = window.open('', '_blank', `width=${popupWidth},height=${popupHeight}`);
-    if (popup === null) {
-        throw new Error('Failed to open popup');
-    }
-    waitForPopupResponse({
-        decode: (data) => __awaiter(void 0, void 0, void 0, function* () {
-            if (activeConnection && isEncryptedMessage(data)) {
-                const decryptedData = yield decryptMessage(activeConnection.sharedSecret, data.encryptedMessage, data.iv);
-                return JSON.parse(decryptedData);
-            }
-            return data;
-        }),
-        onError: (error) => resultDeferredPromise.reject(error),
-        onResponse: (response) => resultDeferredPromise.resolve(response.data),
-        popupUrl: popupFinalUrl.toString(),
+const createPopupOpener = ({ environmentId, popupInfo, store, popupActionTimeout = 100, }) => {
+    let popup = null;
+    let didOpenPopup = false;
+    let lastActionId = null;
+    const closePopup = () => {
+        popup === null || popup === void 0 ? void 0 : popup.close();
+        popup = null;
+        didOpenPopup = false;
+        lastActionId = null;
+    };
+    return (_a) => __awaiter(void 0, [_a], void 0, function* ({ params, pathname, }) {
+        var _b, _c;
+        // Used as a unique identifier for the action
+        const actionId = new Date().getTime();
+        lastActionId = actionId;
+        const popupFinalUrl = new URL(popupInfo.url);
+        const activeConnection = store.getActiveConnection();
+        const resultDeferredPromise = new DeferredPromise();
+        const popupWidth = (_b = popupInfo.width) !== null && _b !== void 0 ? _b : 420;
+        const popupHeight = (_c = popupInfo.height) !== null && _c !== void 0 ? _c : 520;
+        // Setup popup URL and data
+        popupFinalUrl.hash = `/${pathname}`;
+        popupFinalUrl.searchParams.set('provider_env_id', environmentId);
+        popupFinalUrl.searchParams.set('requester_origin', window.location.origin);
+        // Encrypt params if active connection is present
+        if (params) {
+            yield mergeAndEncryptParams(popupFinalUrl, params, activeConnection);
+        }
+        if (popup === null) {
+            // Open popup
+            popup = window.open('', '_blank', `width=${popupWidth},height=${popupHeight}`);
+        }
+        if (popup === null) {
+            throw new Error('Failed to open popup');
+        }
+        waitForPopupResponse({
+            decode: (data) => __awaiter(void 0, void 0, void 0, function* () {
+                if (activeConnection && isEncryptedMessage(data)) {
+                    const decryptedData = yield decryptMessage(activeConnection.sharedSecret, data.encryptedMessage, data.iv);
+                    return JSON.parse(decryptedData);
+                }
+                return data;
+            }),
+            onError: (error) => resultDeferredPromise.reject(error),
+            onResponse: (response) => resultDeferredPromise.resolve(response.data),
+            popupUrl: popupFinalUrl.toString(),
+        });
+        onPopupClose(popup, () => {
+            resultDeferredPromise.reject(new Error('Popup closed'));
+        });
+        /**
+         * Assign action to popup
+         */
+        if (didOpenPopup) {
+            popup === null || popup === void 0 ? void 0 : popup.postMessage({
+                actionPath: popupFinalUrl.search + popupFinalUrl.hash,
+                event: 'new-action',
+            }, popupFinalUrl.origin);
+        }
+        else {
+            // Load popup
+            popup.location.assign(popupFinalUrl.toString());
+        }
+        didOpenPopup = true;
+        return resultDeferredPromise.promise.finally(() => {
+            /**
+             * Sets a timeout to close the popup.
+             * It will only no new actions were fired.
+             */
+            setTimeout(() => {
+                if (lastActionId === actionId) {
+                    closePopup();
+                }
+            }, popupActionTimeout);
+        });
     });
-    onPopupClose(popup, () => {
-        resultDeferredPromise.reject(new Error('Popup closed'));
-    });
-    // Load popup
-    popup.location.assign(popupFinalUrl.toString());
-    return resultDeferredPromise.promise.finally(popup.close);
-});
+};
 
 export { createPopupOpener };

package/src/lib/functions/mergeAndEncryptParams/mergeAndEncryptParams.d.ts

@@ -1,2 +1,2 @@
-import { Connection } from '../../types';
-export declare const mergeAndEncryptParams: (url: URL, params: Record<string, string>, activeConnection: Connection | null) => Promise<void>;
+import { GlobalWalletConnection } from '@dynamic-labs/types';
+export declare const mergeAndEncryptParams: (url: URL, params: Record<string, string>, activeConnection: GlobalWalletConnection | null) => Promise<void>;

package/src/lib/store/createClientStore.cjs

@@ -12,6 +12,8 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
         storage,
         store: store.createStore(() => ({
             connection: null,
+            ethereum: null,
+            wallets: [],
         })),
     });
     return {
@@ -21,6 +23,13 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
         clear: () => {
             store$1.setState(store$1.getInitialState());
         },
+        /**
+         * Get all Ethereum state from the current connection
+         */
+        get ethereum() {
+            this.getActiveConnection();
+            return store$1.getState().ethereum;
+        },
         /**
          * Retrieves the current active connection if it exists and hasn't expired
          * @returns {Connection | null} The current connection or null if no connection exists or it has expired
@@ -38,28 +47,19 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
             return connection;
         },
         /**
-         * Updates the connection in the store
-         * @param {Connection | null} connection - The connection to store, or null to clear it
-         */
-        setConnection: (connection) => {
-            store$1.setState({ connection });
-        },
-        /**
-         * Gets the current state of the store
-         * @returns The complete store state
+         * Updates current connection, wallets
+         * Used when the popup confirm a connection
+         * @param {GlobalWalletConnection | null} connection - The connection to store, or null to clear it
          */
-        get state() {
-            return store$1.getState();
+        setInitialConnectionState: ({ connection, wallets, ethereum, }) => {
+            store$1.setState({ connection, ethereum, wallets });
         },
         /**
-         * Gets the current user's wallets
-         * @returns The current user's wallets
+         * Get all wallets connected to the current connection
          */
-        get userWallets() {
-            var _a, _b, _c, _d, _e;
-            const evm = (_c = (_b = (_a = store$1.getState().connection) === null || _a === void 0 ? void 0 : _a.evm) === null || _b === void 0 ? void 0 : _b.wallets) !== null && _c !== void 0 ? _c : [];
-            const solana = (_e = (_d = store$1.getState().connection) === null || _d === void 0 ? void 0 : _d.solana) === null || _e === void 0 ? void 0 : _e.wallet;
-            return solana ? [...evm, solana] : evm;
+        get wallets() {
+            this.getActiveConnection();
+            return store$1.getState().wallets;
         },
     };
 };

package/src/lib/store/createClientStore.d.ts

@@ -1,34 +1,55 @@
-import { Connection } from '../types';
+import { BaseWallet, GlobalWalletConnection } from '@dynamic-labs/types';
 type CreateClientStoreProps = {
     storage?: Storage;
 };
+type ClientStoreState = {
+    /**
+     * Connection data between client and popup
+     */
+    connection: GlobalWalletConnection | null;
+    /**
+     * All EVM and Solana wallets connected to this Dapp
+     */
+    wallets: BaseWallet[];
+    /**
+     * Ethereum specific state
+     */
+    ethereum: {
+        supportedNetworks: {
+            chainId: number;
+        }[];
+        currentNetworkId: number;
+    } | null;
+};
 export declare const createClientStore: ({ storage, }?: CreateClientStoreProps) => {
     /**
      * Resets the store to its initial state
      */
     clear: () => void;
     /**
-     * Retrieves the current active connection if it exists and hasn't expired
-     * @returns {Connection | null} The current connection or null if no connection exists or it has expired
+     * Get all Ethereum state from the current connection
      */
-    getActiveConnection: () => Connection | null;
+    readonly ethereum: {
+        supportedNetworks: {
+            chainId: number;
+        }[];
+        currentNetworkId: number;
+    } | null;
     /**
-     * Updates the connection in the store
-     * @param {Connection | null} connection - The connection to store, or null to clear it
+     * Retrieves the current active connection if it exists and hasn't expired
+     * @returns {Connection | null} The current connection or null if no connection exists or it has expired
      */
-    setConnection: (connection: Connection | null) => void;
+    getActiveConnection: () => GlobalWalletConnection | null;
     /**
-     * Gets the current state of the store
-     * @returns The complete store state
+     * Updates current connection, wallets
+     * Used when the popup confirm a connection
+     * @param {GlobalWalletConnection | null} connection - The connection to store, or null to clear it
      */
-    readonly state: {
-        connection: Connection | null;
-    };
+    setInitialConnectionState: ({ connection, wallets, ethereum, }: Pick<ClientStoreState, 'connection' | 'wallets' | 'ethereum'>) => void;
     /**
-     * Gets the current user's wallets
-     * @returns The current user's wallets
+     * Get all wallets connected to the current connection
      */
-    readonly userWallets: import("dist/packages/types/src").BaseWallet[];
+    readonly wallets: BaseWallet[];
 };
 export type ClientStore = ReturnType<typeof createClientStore>;
 export {};

package/src/lib/store/createClientStore.js

@@ -8,6 +8,8 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
         storage,
         store: createStore(() => ({
             connection: null,
+            ethereum: null,
+            wallets: [],
         })),
     });
     return {
@@ -17,6 +19,13 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
         clear: () => {
             store.setState(store.getInitialState());
         },
+        /**
+         * Get all Ethereum state from the current connection
+         */
+        get ethereum() {
+            this.getActiveConnection();
+            return store.getState().ethereum;
+        },
         /**
          * Retrieves the current active connection if it exists and hasn't expired
          * @returns {Connection | null} The current connection or null if no connection exists or it has expired
@@ -34,28 +43,19 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
             return connection;
         },
         /**
-         * Updates the connection in the store
-         * @param {Connection | null} connection - The connection to store, or null to clear it
-         */
-        setConnection: (connection) => {
-            store.setState({ connection });
-        },
-        /**
-         * Gets the current state of the store
-         * @returns The complete store state
+         * Updates current connection, wallets
+         * Used when the popup confirm a connection
+         * @param {GlobalWalletConnection | null} connection - The connection to store, or null to clear it
          */
-        get state() {
-            return store.getState();
+        setInitialConnectionState: ({ connection, wallets, ethereum, }) => {
+            store.setState({ connection, ethereum, wallets });
         },
         /**
-         * Gets the current user's wallets
-         * @returns The current user's wallets
+         * Get all wallets connected to the current connection
          */
-        get userWallets() {
-            var _a, _b, _c, _d, _e;
-            const evm = (_c = (_b = (_a = store.getState().connection) === null || _a === void 0 ? void 0 : _a.evm) === null || _b === void 0 ? void 0 : _b.wallets) !== null && _c !== void 0 ? _c : [];
-            const solana = (_e = (_d = store.getState().connection) === null || _d === void 0 ? void 0 : _d.solana) === null || _e === void 0 ? void 0 : _e.wallet;
-            return solana ? [...evm, solana] : evm;
+        get wallets() {
+            this.getActiveConnection();
+            return store.getState().wallets;
         },
     };
 };

package/src/lib/types.d.ts

@@ -1,4 +1,3 @@
-import { BaseWallet } from '@dynamic-labs/types';
 export type IconCode = `data:image/png;base64,${string}`;
 export type PopupInfo = {
     url: string;
@@ -8,30 +7,3 @@ export type PopupInfo = {
 export type ConnectArgs = {
     chain: 'evm' | 'solana';
 };
-/**
- * Defines the current dapp connection
- */
-export type Connection = {
-    /** Unix timestamp when the connection expires */
-    expiresAt: number;
-    /** EVM blockchain configuration */
-    evm: {
-        /** List of networks that can be switched to */
-        supportedNetworks: {
-            chainId: number;
-        }[];
-        /** Connected EVM wallets */
-        wallets: BaseWallet[];
-        /** Currently active network identifier */
-        network: string;
-    } | null;
-    /** Solana blockchain configuration */
-    solana: {
-        /** Connected Solana wallet */
-        wallet: BaseWallet;
-        /** Currently active network identifier */
-        network: string;
-    } | null;
-    /** Encryption key for secure communication */
-    sharedSecret: string;
-};