@dynamic-labs/global-wallet-client 4.14.0 → 4.15.0

package/src/lib/errors/NetworkNotSupportedError.cjs

@@ -0,0 +1,18 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+class NetworkNotSupportedError extends Error {
+    constructor(network, supportedNetworks) {
+        const supportedNetworksString = supportedNetworks
+            .map((n) => `- ${n}`)
+            .join('\n');
+        super(`Network not supported ${network}
+
+      The following networks are supported:
+      ${supportedNetworksString}`);
+    }
+}
+
+exports.NetworkNotSupportedError = NetworkNotSupportedError;

package/src/lib/errors/NetworkNotSupportedError.d.ts

@@ -0,0 +1,3 @@
+export declare class NetworkNotSupportedError extends Error {
+    constructor(network: number, supportedNetworks: number[]);
+}

package/src/lib/errors/NetworkNotSupportedError.js

@@ -0,0 +1,14 @@
+'use client'
+class NetworkNotSupportedError extends Error {
+    constructor(network, supportedNetworks) {
+        const supportedNetworksString = supportedNetworks
+            .map((n) => `- ${n}`)
+            .join('\n');
+        super(`Network not supported ${network}
+
+      The following networks are supported:
+      ${supportedNetworksString}`);
+    }
+}
+
+export { NetworkNotSupportedError };

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

@@ -6,22 +6,35 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var viem = require('viem');
 var eventemitter3 = require('eventemitter3');
-var isNetworkSupported = require('../isNetworkSupported/isNetworkSupported.cjs');
-var PopupClosedError = require('../../../errors/PopupClosedError.cjs');
-var DisconnectError = require('../../../errors/DisconnectError.cjs');
+require('@dynamic-labs/logger');
+require('@dynamic-labs/store');
+require('@dynamic-labs/utils');
 var logger = require('../../../constants/logger.cjs');
+var DisconnectError = require('../../../errors/DisconnectError.cjs');
+var PopupClosedError = require('../../../errors/PopupClosedError.cjs');
+var onEvent = require('../../../functions/onEvent/onEvent.cjs');
+var disconnect = require('../../../functions/disconnect/disconnect.cjs');
+var getCore = require('../../../client/getCore/getCore.cjs');
+var isEthereumNetworkSupported = require('../../../functions/isEthereumNetworkSupported/isEthereumNetworkSupported.cjs');
+var connect = require('../../../functions/connect/connect.cjs');
+var isEthereumWallet = require('../../../functions/isEthereumWallet/isEthereumWallet.cjs');
+var getCurrentEthereumNetworkId = require('../../../functions/getCurrentEthereumNetworkId/getCurrentEthereumNetworkId.cjs');
+var getEthereumWallets = require('../../../functions/getEthereumWallets/getEthereumWallets.cjs');
+var getSupportedEthereumNetworks = require('../../../functions/getSupportedEthereumNetworks/getSupportedEthereumNetworks.cjs');
+var switchEthereumNetwork = require('../../../functions/switchEthereumNetwork/switchEthereumNetwork.cjs');
+var getActiveConnection = require('../../../functions/getActiveConnection/getActiveConnection.cjs');
 
 const createEIP1193Provider = (client) => {
     const eventEmitter = new eventemitter3.EventEmitter();
-    client.on('connect', () => {
-        const currentNetwork = client.ethereum.currentNetworkId;
+    onEvent.onEvent(client, 'connect', () => {
+        const currentNetwork = getCurrentEthereumNetworkId.getCurrentEthereumNetworkId(client);
         if (!currentNetwork)
             return;
         eventEmitter.emit('connect', {
             chainId: viem.toHex(currentNetwork),
         });
     });
-    client.on('disconnect', () => {
+    onEvent.onEvent(client, 'disconnect', () => {
         eventEmitter.emit('disconnect', new viem.ProviderDisconnectedError(new Error('User disconnected')));
     });
     return {
@@ -58,7 +71,7 @@ const createEIP1193Provider = (client) => {
                     });
                     return result;
                 }
-                const currentNetwork = client.ethereum.supportedNetworks.find((network) => network.chainId === client.ethereum.currentNetworkId);
+                const currentNetwork = getSupportedEthereumNetworks.getSupportedEthereumNetworks(client).find((network) => network.chainId === getCurrentEthereumNetworkId.getCurrentEthereumNetworkId(client));
                 if (currentNetwork === null || currentNetwork === void 0 ? void 0 : currentNetwork.rpcUrl) {
                     const result = yield viem.http(currentNetwork === null || currentNetwork === void 0 ? void 0 : currentNetwork.rpcUrl)({}).request({
                         method,
@@ -90,13 +103,11 @@ const createEIP1193Provider = (client) => {
 };
 // Utility functions
 const isConnected = (client) => {
-    var _a, _b;
-    const wallets = (_b = (_a = client === null || client === void 0 ? void 0 : client.ethereum) === null || _a === void 0 ? void 0 : _a.wallets) !== null && _b !== void 0 ? _b : [];
+    const wallets = getEthereumWallets.getEthereumWallets(client);
     return wallets.length > 0;
 };
 const getConnectedAddresses = (client) => {
-    var _a, _b;
-    const wallets = (_b = (_a = client === null || client === void 0 ? void 0 : client.ethereum) === null || _a === void 0 ? void 0 : _a.wallets) !== null && _b !== void 0 ? _b : [];
+    const wallets = getEthereumWallets.getEthereumWallets(client);
     return wallets.map((wallet) => wallet.address);
 };
 // Method handlers
@@ -105,46 +116,47 @@ const handleEthRequestAccounts = (client) => {
     if (isConnected(client)) {
         return getConnectedAddresses(client);
     }
-    return client
-        .connect({ chain: 'evm' })
-        .then(({ address }) => [address])
+    return connect.connect(client)
+        .then((wallets) => wallets.filter(isEthereumWallet.isEthereumWallet).map((wallet) => wallet.address))
         .catch(mapErrorToStandard);
 };
 const handleWalletRevokePermissions = (client) => {
-    client.disconnect();
+    disconnect.disconnect(client);
     return null;
 };
 const handleEthChainId = (client) => {
-    if (client.ethereum.currentNetworkId) {
-        return viem.toHex(client.ethereum.currentNetworkId);
+    const currentEthereumNetworkId = getCurrentEthereumNetworkId.getCurrentEthereumNetworkId(client);
+    if (currentEthereumNetworkId) {
+        return viem.toHex(currentEthereumNetworkId);
     }
     return null;
 };
 const handleWalletSwitchEthereumChain = (client, eventEmitter, params) => {
-    var _a, _b;
     if (!Array.isArray(params) || params.length === 0 || !params[0].chainId) {
         throw new Error('Invalid parameters for wallet_switchEthereumChain');
     }
     const [{ chainId }] = params;
-    const supportedNetworks = (_b = (_a = client === null || client === void 0 ? void 0 : client.ethereum) === null || _a === void 0 ? void 0 : _a.supportedNetworks) !== null && _b !== void 0 ? _b : [];
+    const supportedNetworks = getSupportedEthereumNetworks.getSupportedEthereumNetworks(client);
     if (supportedNetworks.length === 0) {
         throw new viem.SwitchChainError(new Error('No supported networks'));
     }
-    if (!isNetworkSupported.isNetworkSupported(viem.fromHex(chainId, 'number'), supportedNetworks)) {
+    if (!isEthereumNetworkSupported.isEthereumNetworkSupported(viem.fromHex(chainId, 'number'), supportedNetworks)) {
         throw new viem.SwitchChainError(new Error('Chain not supported'));
     }
-    client.ethereum.switchNetwork(viem.fromHex(chainId, 'number'));
+    switchEthereumNetwork.switchEthereumNetwork(client, { networkId: viem.fromHex(chainId, 'number') });
     eventEmitter.emit('chainChanged', chainId);
     return null;
 };
 const handleMethodInPopup = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ client, method, params, }) {
-    if (!client.ethereum.currentNetworkId) {
+    const currentEthereumNetworkId = getCurrentEthereumNetworkId.getCurrentEthereumNetworkId(client);
+    if (!currentEthereumNetworkId) {
         throw new Error('No network id found');
     }
-    const { data } = yield client
-        .invoke({
+    const { data } = yield getCore.getCore(client)
+        .request({
+        connection: getActiveConnection.getActiveConnection(client),
         params: {
-            chainId: client.ethereum.currentNetworkId,
+            chainId: currentEthereumNetworkId,
             method,
             params,
         },

package/src/lib/ethereum/functions/eip1193Provider/createEIP1193Provider.d.ts

@@ -1,3 +1,3 @@
 import { EIP1193Provider } from 'viem';
-import { GlobalWalletClient } from '../../../createGlobalWalletClient';
+import { GlobalWalletClient } from '../../../client';
 export declare const createEIP1193Provider: (client: GlobalWalletClient) => EIP1193Provider;

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

@@ -2,22 +2,35 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { toHex, ProviderDisconnectedError, http, UnsupportedProviderMethodError, SwitchChainError, fromHex, UserRejectedRequestError } from 'viem';
 import { EventEmitter } from 'eventemitter3';
-import { isNetworkSupported } from '../isNetworkSupported/isNetworkSupported.js';
-import { PopupClosedError } from '../../../errors/PopupClosedError.js';
-import { DisconnectError } from '../../../errors/DisconnectError.js';
+import '@dynamic-labs/logger';
+import '@dynamic-labs/store';
+import '@dynamic-labs/utils';
 import { logger } from '../../../constants/logger.js';
+import { DisconnectError } from '../../../errors/DisconnectError.js';
+import { PopupClosedError } from '../../../errors/PopupClosedError.js';
+import { onEvent } from '../../../functions/onEvent/onEvent.js';
+import { disconnect } from '../../../functions/disconnect/disconnect.js';
+import { getCore } from '../../../client/getCore/getCore.js';
+import { isEthereumNetworkSupported } from '../../../functions/isEthereumNetworkSupported/isEthereumNetworkSupported.js';
+import { connect } from '../../../functions/connect/connect.js';
+import { isEthereumWallet } from '../../../functions/isEthereumWallet/isEthereumWallet.js';
+import { getCurrentEthereumNetworkId } from '../../../functions/getCurrentEthereumNetworkId/getCurrentEthereumNetworkId.js';
+import { getEthereumWallets } from '../../../functions/getEthereumWallets/getEthereumWallets.js';
+import { getSupportedEthereumNetworks } from '../../../functions/getSupportedEthereumNetworks/getSupportedEthereumNetworks.js';
+import { switchEthereumNetwork } from '../../../functions/switchEthereumNetwork/switchEthereumNetwork.js';
+import { getActiveConnection } from '../../../functions/getActiveConnection/getActiveConnection.js';
 
 const createEIP1193Provider = (client) => {
     const eventEmitter = new EventEmitter();
-    client.on('connect', () => {
-        const currentNetwork = client.ethereum.currentNetworkId;
+    onEvent(client, 'connect', () => {
+        const currentNetwork = getCurrentEthereumNetworkId(client);
         if (!currentNetwork)
             return;
         eventEmitter.emit('connect', {
             chainId: toHex(currentNetwork),
         });
     });
-    client.on('disconnect', () => {
+    onEvent(client, 'disconnect', () => {
         eventEmitter.emit('disconnect', new ProviderDisconnectedError(new Error('User disconnected')));
     });
     return {
@@ -54,7 +67,7 @@ const createEIP1193Provider = (client) => {
                     });
                     return result;
                 }
-                const currentNetwork = client.ethereum.supportedNetworks.find((network) => network.chainId === client.ethereum.currentNetworkId);
+                const currentNetwork = getSupportedEthereumNetworks(client).find((network) => network.chainId === getCurrentEthereumNetworkId(client));
                 if (currentNetwork === null || currentNetwork === void 0 ? void 0 : currentNetwork.rpcUrl) {
                     const result = yield http(currentNetwork === null || currentNetwork === void 0 ? void 0 : currentNetwork.rpcUrl)({}).request({
                         method,
@@ -86,13 +99,11 @@ const createEIP1193Provider = (client) => {
 };
 // Utility functions
 const isConnected = (client) => {
-    var _a, _b;
-    const wallets = (_b = (_a = client === null || client === void 0 ? void 0 : client.ethereum) === null || _a === void 0 ? void 0 : _a.wallets) !== null && _b !== void 0 ? _b : [];
+    const wallets = getEthereumWallets(client);
     return wallets.length > 0;
 };
 const getConnectedAddresses = (client) => {
-    var _a, _b;
-    const wallets = (_b = (_a = client === null || client === void 0 ? void 0 : client.ethereum) === null || _a === void 0 ? void 0 : _a.wallets) !== null && _b !== void 0 ? _b : [];
+    const wallets = getEthereumWallets(client);
     return wallets.map((wallet) => wallet.address);
 };
 // Method handlers
@@ -101,46 +112,47 @@ const handleEthRequestAccounts = (client) => {
     if (isConnected(client)) {
         return getConnectedAddresses(client);
     }
-    return client
-        .connect({ chain: 'evm' })
-        .then(({ address }) => [address])
+    return connect(client)
+        .then((wallets) => wallets.filter(isEthereumWallet).map((wallet) => wallet.address))
         .catch(mapErrorToStandard);
 };
 const handleWalletRevokePermissions = (client) => {
-    client.disconnect();
+    disconnect(client);
     return null;
 };
 const handleEthChainId = (client) => {
-    if (client.ethereum.currentNetworkId) {
-        return toHex(client.ethereum.currentNetworkId);
+    const currentEthereumNetworkId = getCurrentEthereumNetworkId(client);
+    if (currentEthereumNetworkId) {
+        return toHex(currentEthereumNetworkId);
     }
     return null;
 };
 const handleWalletSwitchEthereumChain = (client, eventEmitter, params) => {
-    var _a, _b;
     if (!Array.isArray(params) || params.length === 0 || !params[0].chainId) {
         throw new Error('Invalid parameters for wallet_switchEthereumChain');
     }
     const [{ chainId }] = params;
-    const supportedNetworks = (_b = (_a = client === null || client === void 0 ? void 0 : client.ethereum) === null || _a === void 0 ? void 0 : _a.supportedNetworks) !== null && _b !== void 0 ? _b : [];
+    const supportedNetworks = getSupportedEthereumNetworks(client);
     if (supportedNetworks.length === 0) {
         throw new SwitchChainError(new Error('No supported networks'));
     }
-    if (!isNetworkSupported(fromHex(chainId, 'number'), supportedNetworks)) {
+    if (!isEthereumNetworkSupported(fromHex(chainId, 'number'), supportedNetworks)) {
         throw new SwitchChainError(new Error('Chain not supported'));
     }
-    client.ethereum.switchNetwork(fromHex(chainId, 'number'));
+    switchEthereumNetwork(client, { networkId: fromHex(chainId, 'number') });
     eventEmitter.emit('chainChanged', chainId);
     return null;
 };
 const handleMethodInPopup = (_a) => __awaiter(void 0, [_a], void 0, function* ({ client, method, params, }) {
-    if (!client.ethereum.currentNetworkId) {
+    const currentEthereumNetworkId = getCurrentEthereumNetworkId(client);
+    if (!currentEthereumNetworkId) {
         throw new Error('No network id found');
     }
-    const { data } = yield client
-        .invoke({
+    const { data } = yield getCore(client)
+        .request({
+        connection: getActiveConnection(client),
         params: {
-            chainId: client.ethereum.currentNetworkId,
+            chainId: currentEthereumNetworkId,
             method,
             params,
         },

package/src/lib/functions/clearStore/clearStore.cjs

@@ -0,0 +1,24 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('eventemitter3');
+require('@dynamic-labs/logger');
+require('@dynamic-labs/store');
+require('../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs/utils');
+require('../../constants/logger.cjs');
+require('../../errors/DisconnectError.cjs');
+var getCore = require('../../client/getCore/getCore.cjs');
+
+/**
+ * Resets the store to its initial state
+ */
+const clearStore = (client) => {
+    const core = getCore.getCore(client);
+    core.logger.logVerboseTroubleshootingMessage('clear store');
+    core.store.setState(core.store.getInitialState());
+};
+
+exports.clearStore = clearStore;

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

@@ -0,0 +1,5 @@
+import { GlobalWalletClient } from '../../client';
+/**
+ * Resets the store to its initial state
+ */
+export declare const clearStore: (client: GlobalWalletClient) => void;

package/src/lib/functions/clearStore/clearStore.js

@@ -0,0 +1,20 @@
+'use client'
+import 'eventemitter3';
+import '@dynamic-labs/logger';
+import '@dynamic-labs/store';
+import '../../../../_virtual/_tslib.js';
+import '@dynamic-labs/utils';
+import '../../constants/logger.js';
+import '../../errors/DisconnectError.js';
+import { getCore } from '../../client/getCore/getCore.js';
+
+/**
+ * Resets the store to its initial state
+ */
+const clearStore = (client) => {
+    const core = getCore(client);
+    core.logger.logVerboseTroubleshootingMessage('clear store');
+    core.store.setState(core.store.getInitialState());
+};
+
+export { clearStore };

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

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

package/src/lib/{actions/connectAction/createConnectAction.cjs → functions/connect/connect.cjs}

@@ -5,13 +5,37 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
+require('eventemitter3');
+require('@dynamic-labs/logger');
+require('@dynamic-labs/store');
+require('../../constants/logger.cjs');
+require('../../errors/DisconnectError.cjs');
+var clearStore = require('../clearStore/clearStore.cjs');
+var getActiveConnection = require('../getActiveConnection/getActiveConnection.cjs');
+var assignClient = require('../../client/assignClient/assignClient.cjs');
+var getCore = require('../../client/getCore/getCore.cjs');
+var setInitialConnectionState = require('../setInitialConnectionState/setInitialConnectionState.cjs');
 
-const createConnectAction = ({ store, openPopup, onConnect }) => (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ chain }) {
-    store.clear();
+/**
+ * Connects the global wallet to the dapp.
+ *
+ * @param client - The global wallet client.
+ *
+ * @returns The connected wallets.
+ * @example
+ * ```ts
+ * import { Wallet } from 'wallet';
+ *
+ * const connectedWallets = await connect(wallet);
+ * ```
+ */
+const connect = (client) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const core = getCore.getCore(client);
+    clearStore.clearStore(client);
     const keyPair = yield utils.createKeyPair();
-    const data = yield openPopup({
+    const data = yield core.request({
+        connection: getActiveConnection.getActiveConnection(client),
         params: {
-            chain,
             receiver_public_key: yield utils.convertPublicKeyCryptoKeyToHex(keyPair.publicKey),
         },
         pathname: 'connect',
@@ -20,7 +44,7 @@ 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 { ethereum, solana, wallets } = JSON.parse(message);
-    store.setInitialConnectionState({
+    setInitialConnectionState.setInitialConnectionState(client, {
         connection: {
             expiresAt,
             // TODO: use PlatformService
@@ -40,12 +64,8 @@ const createConnectAction = ({ store, openPopup, onConnect }) => (_a) => _tslib.
             : null,
         wallets,
     });
-    onConnect === null || onConnect === void 0 ? void 0 : onConnect();
-    const wallet = wallets.find((w) => w.chain === (chain === 'evm' ? 'EVM' : 'SOL'));
-    if (!wallet) {
-        throw new Error('Wallet not found');
-    }
-    return wallet;
+    core.eventEmitter.emit('connect');
+    return wallets.map((wallet) => assignClient.assignClient(wallet, client));
 });
 
-exports.createConnectAction = createConnectAction;
+exports.connect = connect;

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

@@ -0,0 +1,15 @@
+import { GlobalWalletClient } from '../../client';
+/**
+ * Connects the global wallet to the dapp.
+ *
+ * @param client - The global wallet client.
+ *
+ * @returns The connected wallets.
+ * @example
+ * ```ts
+ * import { Wallet } from 'wallet';
+ *
+ * const connectedWallets = await connect(wallet);
+ * ```
+ */
+export declare const connect: (client: GlobalWalletClient) => Promise<import("@dynamic-labs/types").BaseWallet[]>;

package/src/lib/{actions/connectAction/createConnectAction.js → functions/connect/connect.js}

@@ -1,13 +1,37 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { createKeyPair, convertPublicKeyCryptoKeyToHex, deriveSharedSecret, convertPublicKeyHexToCryptoKey, decryptMessage } from '@dynamic-labs/utils';
+import 'eventemitter3';
+import '@dynamic-labs/logger';
+import '@dynamic-labs/store';
+import '../../constants/logger.js';
+import '../../errors/DisconnectError.js';
+import { clearStore } from '../clearStore/clearStore.js';
+import { getActiveConnection } from '../getActiveConnection/getActiveConnection.js';
+import { assignClient } from '../../client/assignClient/assignClient.js';
+import { getCore } from '../../client/getCore/getCore.js';
+import { setInitialConnectionState } from '../setInitialConnectionState/setInitialConnectionState.js';
 
-const createConnectAction = ({ store, openPopup, onConnect }) => (_a) => __awaiter(void 0, [_a], void 0, function* ({ chain }) {
-    store.clear();
+/**
+ * Connects the global wallet to the dapp.
+ *
+ * @param client - The global wallet client.
+ *
+ * @returns The connected wallets.
+ * @example
+ * ```ts
+ * import { Wallet } from 'wallet';
+ *
+ * const connectedWallets = await connect(wallet);
+ * ```
+ */
+const connect = (client) => __awaiter(void 0, void 0, void 0, function* () {
+    const core = getCore(client);
+    clearStore(client);
     const keyPair = yield createKeyPair();
-    const data = yield openPopup({
+    const data = yield core.request({
+        connection: getActiveConnection(client),
         params: {
-            chain,
             receiver_public_key: yield convertPublicKeyCryptoKeyToHex(keyPair.publicKey),
         },
         pathname: 'connect',
@@ -16,7 +40,7 @@ const createConnectAction = ({ store, openPopup, onConnect }) => (_a) => __await
     const sharedSecret = yield deriveSharedSecret(keyPair.privateKey, yield convertPublicKeyHexToCryptoKey(providerPublicKey));
     const message = yield decryptMessage(sharedSecret, encryptedMessage, iv);
     const { ethereum, solana, wallets } = JSON.parse(message);
-    store.setInitialConnectionState({
+    setInitialConnectionState(client, {
         connection: {
             expiresAt,
             // TODO: use PlatformService
@@ -36,12 +60,8 @@ const createConnectAction = ({ store, openPopup, onConnect }) => (_a) => __await
             : null,
         wallets,
     });
-    onConnect === null || onConnect === void 0 ? void 0 : onConnect();
-    const wallet = wallets.find((w) => w.chain === (chain === 'evm' ? 'EVM' : 'SOL'));
-    if (!wallet) {
-        throw new Error('Wallet not found');
-    }
-    return wallet;
+    core.eventEmitter.emit('connect');
+    return wallets.map((wallet) => assignClient(wallet, client));
 });
 
-export { createConnectAction };
+export { connect };

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

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

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

@@ -1,3 +1,8 @@
+export type PopupMessageClient<T extends Record<string, (...args: any[]) => void>> = {
+    listenForMessage: <TMessageName extends keyof T = keyof T>(messageName: TMessageName, callback: (...args: Parameters<T[TMessageName]>) => void) => VoidFunction;
+    waitForMessage: <TMessageName extends keyof T = keyof T>(messageName: TMessageName, timeout?: number) => Promise<Parameters<T[TMessageName]>>;
+    postMessage: <TMessageName extends keyof T = keyof T>(messageName: TMessageName, ...args: Parameters<T[TMessageName]>) => Promise<void>;
+};
 export type RawMessage = {
     name: string;
     args: unknown[];
@@ -6,9 +11,4 @@ export type MessageEncoder = {
     encode: (message: RawMessage) => Promise<any>;
     decode: (data: any) => Promise<RawMessage>;
 };
-export declare const createPopupMessageClient: <T extends Record<string, (...args: any[]) => void>>(popupWindow: Window, targetOrigin: string, messageEncoder?: MessageEncoder) => {
-    listenForMessage: <TMessageName extends keyof T = keyof T>(messageName: TMessageName, callback: (...args: Parameters<T[TMessageName]>) => void) => VoidFunction;
-    postMessage: <TMessageName_1 extends keyof T = keyof T>(messageName: TMessageName_1, ...args: Parameters<T[TMessageName_1]>) => Promise<void>;
-    waitForMessage: <TMessageName_2 extends keyof T = keyof T>(messageName: TMessageName_2, timeout?: number) => Promise<Parameters<T[TMessageName_2]>>;
-};
-export type PopupMessageClient<TMessage extends Record<string, (...args: any[]) => void>> = ReturnType<typeof createPopupMessageClient<TMessage>>;
+export declare const createPopupMessageClient: <T extends Record<string, (...args: any[]) => void>>(popupWindow: Window, targetOrigin: string, messageEncoder?: MessageEncoder) => PopupMessageClient<T>;

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

@@ -12,7 +12,7 @@ var getCenteredPopupFeatures = require('../getCenteredPopupFeatures/getCenteredP
 var PopupClosedError = require('../../errors/PopupClosedError.cjs');
 var logger = require('../../constants/logger.cjs');
 
-const createPopupOpener = ({ environmentId, popupUrl, popupWidth = 420, popupHeight = 640, store, popupActionTimeout = 1000, // Wait page up to 1 second for new actions before closing
+const createPopupOpener = ({ environmentId, popupUrl, popupWidth = 420, popupHeight = 640, popupActionTimeout = 1000, // Wait page up to 1 second for new actions before closing
 onError, }) => {
     let popup = null;
     let didOpenPopup = false;
@@ -24,7 +24,7 @@ onError, }) => {
         didOpenPopup = false;
         lastActionId = null;
     };
-    return (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ params, pathname, }) {
+    return (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ params, pathname, connection, }) {
         logger.logger.logVerboseTroubleshootingMessage('new popup action', {
             params,
             pathname,
@@ -33,7 +33,6 @@ onError, }) => {
         const actionId = new Date().getTime();
         lastActionId = actionId;
         const popupFinalUrl = new URL(popupUrl);
-        const activeConnection = store.getActiveConnection();
         const resultDeferredPromise = new utils.DeferredPromise();
         // Setup popup URL and data
         popupFinalUrl.hash = `/${pathname}`;
@@ -50,15 +49,15 @@ onError, }) => {
         }
         // Encrypt params if active connection is present
         if (params) {
-            yield mergeAndEncryptParams.mergeAndEncryptParams(popupFinalUrl, params, activeConnection);
+            yield mergeAndEncryptParams.mergeAndEncryptParams(popupFinalUrl, params, connection);
         }
         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);
+                if (connection && utils.isEncryptedMessage(data)) {
+                    const decryptedData = yield utils.decryptMessage(connection.sharedSecret, data.encryptedMessage, data.iv);
                     return JSON.parse(decryptedData);
                 }
                 return data;

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

@@ -1,18 +1,17 @@
-import { GetPopupActionFuncArgs, GetPopupActionName, GetPopupActionResult, IPopupAction } from '@dynamic-labs/types';
-import { ClientStore } from '../../store/createClientStore';
+import { GetPopupActionFuncArgs, GetPopupActionName, GetPopupActionResult, GlobalWalletConnection, IPopupAction } from '@dynamic-labs/types';
+export type PopupOpener = <TPopupAction extends IPopupAction>(props: OpenPopupProps<TPopupAction>) => Promise<GetPopupActionResult<TPopupAction>>;
 type CreatePopupOpenerProps = {
     environmentId: string;
     popupUrl: string;
     popupWidth?: number;
     popupHeight?: number;
-    store: ClientStore;
     popupActionTimeout?: number;
     onError?: (error: Error) => void;
 };
 type OpenPopupProps<TAction extends IPopupAction> = {
     params: GetPopupActionFuncArgs<TAction>;
     pathname: GetPopupActionName<TAction>;
+    connection: GlobalWalletConnection | null;
 };
-export declare const createPopupOpener: ({ environmentId, popupUrl, popupWidth, popupHeight, store, popupActionTimeout, onError, }: CreatePopupOpenerProps) => <TPopupAction extends IPopupAction>({ params, pathname, }: OpenPopupProps<TPopupAction>) => Promise<GetPopupActionResult<TPopupAction>>;
-export type OpenPopup = ReturnType<typeof createPopupOpener>;
+export declare const createPopupOpener: ({ environmentId, popupUrl, popupWidth, popupHeight, popupActionTimeout, onError, }: CreatePopupOpenerProps) => PopupOpener;
 export {};