@dynamic-labs/global-wallet-client 4.9.10 → 4.9.12

package/CHANGELOG.md

@@ -1,4 +1,21 @@
 
+### [4.9.12](https://github.com/dynamic-labs/dynamic-auth/compare/v4.9.11...v4.9.12) (2025-03-28)
+
+
+### Bug Fixes
+
+* prevent event subscription from throwing a page error ([#8393](https://github.com/dynamic-labs/dynamic-auth/issues/8393)) ([eda85cd](https://github.com/dynamic-labs/dynamic-auth/commit/eda85cdeed4cc208e20618882cf3e5a54b176356))
+* global wallet popup in rainbowkit reopening ([#8395](https://github.com/dynamic-labs/dynamic-auth/issues/8395)) ([5473e87](https://github.com/dynamic-labs/dynamic-auth/commit/5473e87834c5a2102f7d87fc649590726bc390c7))
+* notify user when sei is not enable in keplr ([#8396](https://github.com/dynamic-labs/dynamic-auth/issues/8396)) ([79aea59](https://github.com/dynamic-labs/dynamic-auth/commit/79aea59bde82dabbe070a1f0fc5ac484a696e7ac))
+* respect tokenBalance order from backend for SendBalance view ([#8398](https://github.com/dynamic-labs/dynamic-auth/issues/8398)) ([fdb0e1c](https://github.com/dynamic-labs/dynamic-auth/commit/fdb0e1cc2f1614326f506dfdb1726f4c5baf9c0c))
+
+### [4.9.11](https://github.com/dynamic-labs/dynamic-auth/compare/v4.9.10...v4.9.11) (2025-03-26)
+
+
+### Bug Fixes
+
+* ensure global wallet users can disconnect from dapp ([#8389](https://github.com/dynamic-labs/dynamic-auth/issues/8389)) ([79e5892](https://github.com/dynamic-labs/dynamic-auth/commit/79e58921de673757dc0662977ed4eb391aaaf632))
+
 ### [4.9.10](https://github.com/dynamic-labs/dynamic-auth/compare/v4.9.9...v4.9.10) (2025-03-26)
 
 

package/package.cjs

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

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.9.10";
+var version = "4.9.12";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/global-wallet-client",
-  "version": "4.9.10",
+  "version": "4.9.12",
   "description": "Core package for building Dynamic's Global Wallet",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -39,12 +39,12 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/assert-package-version": "4.9.10",
-    "@dynamic-labs/logger": "4.9.10",
-    "@dynamic-labs/message-transport": "4.9.10",
-    "@dynamic-labs/store": "4.9.10",
-    "@dynamic-labs/types": "4.9.10",
-    "@dynamic-labs/utils": "4.9.10",
+    "@dynamic-labs/assert-package-version": "4.9.12",
+    "@dynamic-labs/logger": "4.9.12",
+    "@dynamic-labs/message-transport": "4.9.12",
+    "@dynamic-labs/store": "4.9.12",
+    "@dynamic-labs/types": "4.9.12",
+    "@dynamic-labs/utils": "4.9.12",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {

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

@@ -18,9 +18,7 @@ const createConnectAction = ({ store, openPopup, onConnect }) => (_a) => _tslib.
     });
     const { encryptedMessage, expiresAt, iv, providerPublicKey } = data;
     const sharedSecret = yield utils.deriveSharedSecret(keyPair.privateKey, yield utils.convertPublicKeyHexToCryptoKey(providerPublicKey));
-    const { sessionAuthCode } = store;
-    utils.assertDefined(sessionAuthCode, 'Session auth code is required');
-    const message = yield utils.decryptMessage(sharedSecret, encryptedMessage, iv, sessionAuthCode);
+    const message = yield utils.decryptMessage(sharedSecret, encryptedMessage, iv);
     const { ethereum, solana, wallets } = JSON.parse(message);
     store.setInitialConnectionState({
         connection: {

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
-import { createKeyPair, convertPublicKeyCryptoKeyToHex, deriveSharedSecret, convertPublicKeyHexToCryptoKey, assertDefined, decryptMessage } from '@dynamic-labs/utils';
+import { createKeyPair, convertPublicKeyCryptoKeyToHex, deriveSharedSecret, convertPublicKeyHexToCryptoKey, decryptMessage } from '@dynamic-labs/utils';
 
 const createConnectAction = ({ store, openPopup, onConnect }) => (_a) => __awaiter(void 0, [_a], void 0, function* ({ chain }) {
     store.clear();
@@ -14,9 +14,7 @@ const createConnectAction = ({ store, openPopup, onConnect }) => (_a) => __await
     });
     const { encryptedMessage, expiresAt, iv, providerPublicKey } = data;
     const sharedSecret = yield deriveSharedSecret(keyPair.privateKey, yield convertPublicKeyHexToCryptoKey(providerPublicKey));
-    const { sessionAuthCode } = store;
-    assertDefined(sessionAuthCode, 'Session auth code is required');
-    const message = yield decryptMessage(sharedSecret, encryptedMessage, iv, sessionAuthCode);
+    const message = yield decryptMessage(sharedSecret, encryptedMessage, iv);
     const { ethereum, solana, wallets } = JSON.parse(message);
     store.setInitialConnectionState({
         connection: {

package/src/lib/constants/logger.cjs

@@ -0,0 +1,10 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var logger$1 = require('@dynamic-labs/logger');
+
+const logger = new logger$1.Logger('@dynamic-labs/global-wallet-client');
+
+exports.logger = logger;

package/src/lib/constants/logger.js

@@ -0,0 +1,6 @@
+'use client'
+import { Logger } from '@dynamic-labs/logger';
+
+const logger = new Logger('@dynamic-labs/global-wallet-client');
+
+export { logger };

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

@@ -5,146 +5,80 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
+var waitForPopupResponse = require('../waitForPopupResponse/waitForPopupResponse.cjs');
 var onPopupClose = require('../onPopupClose/onPopupClose.cjs');
+var mergeAndEncryptParams = require('../mergeAndEncryptParams/mergeAndEncryptParams.cjs');
 var getCenteredPopupFeatures = require('../getCenteredPopupFeatures/getCenteredPopupFeatures.cjs');
-var createPopupMessageClient = require('../createPopupMessageClient/createPopupMessageClient.cjs');
-var createEncryptedMessageEncoder = require('../createEncryptedMessageEncoder/createEncryptedMessageEncoder.cjs');
 var PopupClosedError = require('../../errors/PopupClosedError.cjs');
-var mapErrorFromPopup = require('./utils/mapErrorFromPopup.cjs');
 
 const createPopupOpener = ({ environmentId, popupUrl, popupWidth = 420, popupHeight = 640, store, popupActionTimeout = 1000, // Wait page up to 1 second for new actions before closing
 onError, }) => {
     let popup = null;
+    let didOpenPopup = false;
     let lastActionId = null;
-    let clientSessionKeyPair = null;
     const closePopup = () => {
         popup === null || popup === void 0 ? void 0 : popup.close();
         popup = null;
+        didOpenPopup = false;
         lastActionId = null;
     };
-    // TODO update definition here to use name and args
     return (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ params, pathname, }) {
-        clientSessionKeyPair = clientSessionKeyPair !== null && clientSessionKeyPair !== void 0 ? clientSessionKeyPair : (yield utils.createKeyPair());
         // Used as a unique identifier for the action
-        const actionId = new Date().getTime().toString();
+        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}`;
         popupFinalUrl.searchParams.set('provider_env_id', environmentId);
+        // TODO: use PlatformService
         popupFinalUrl.searchParams.set('requester_origin', window.location.origin);
-        popupFinalUrl.searchParams.set('client_session_public_key', yield utils.convertPublicKeyCryptoKeyToHex(clientSessionKeyPair.publicKey));
-        /**
-         * Open a new popup centered on the screen
-         */
-        const initializePopup = () => {
+        if (popup === null) {
             const features = getCenteredPopupFeatures.getCenteredPopupFeatures({
                 height: popupHeight,
                 width: popupWidth,
             });
             // Open popup
-            const popup = window.open('', '_blank', features);
-            if (popup === null) {
-                throw new Error('Failed to open popup');
-            }
-            popup.location = popupFinalUrl.href;
-            return popup;
-        };
-        /**
-         * Perform the initial handshake with the popup to get the session public key and nonce
-         */
-        const popupHandshake = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            utils.assertDefined(clientSessionKeyPair, 'Client session key pair is not set');
-            utils.assertDefined(popup, 'Popup is not defined');
-            const popupMessageClient = createPopupMessageClient.createPopupMessageClient(popup, popupFinalUrl.origin);
-            const [[popupSessionPublicKey], [nonce]] = yield Promise.all([
-                popupMessageClient.waitForMessage('sendPopupSessionPublicKey', 20000),
-                popupMessageClient.waitForMessage('sendPopupNonce', 20000),
-            ]);
-            const sessionSharedSecret = yield utils.deriveSharedSecret(clientSessionKeyPair.privateKey, yield utils.convertPublicKeyHexToCryptoKey(popupSessionPublicKey));
-            store.setSessionAuthCode(new TextEncoder().encode(yield utils.generateHMAC(sessionSharedSecret, nonce)));
-        });
-        /**
-         * Watch for the popup to close
-         */
-        const watchForPopupClose = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            utils.assertDefined(popup, 'Popup is not defined');
-            return new Promise((_, reject) => {
-                utils.assertDefined(popup, 'Popup is not defined');
-                onPopupClose.onPopupClose(popup, () => {
-                    reject(new PopupClosedError.PopupClosedError());
-                });
-            });
-        });
-        /**
-         * Wait for the action response from the popup
-         */
-        const waitForActionResponse = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            utils.assertDefined(popup, 'Popup is not defined');
-            utils.assertDefined(store.sessionAuthCode, 'Session auth code is not set');
-            const resultDeferredPromise = new utils.DeferredPromise();
-            /**
-             * Recreate the popup message if the encryption is available
-             */
-            const encoder = activeConnection
-                ? createEncryptedMessageEncoder.createEncryptedMessageEncoder(activeConnection, store.sessionAuthCode)
-                : undefined;
-            const popupMessageClient = createPopupMessageClient.createPopupMessageClient(popup, popupFinalUrl.origin, encoder);
-            void popupMessageClient.postMessage('sendAction', {
-                id: actionId,
-                name: pathname,
-                params,
-            });
-            /**
-             * Listen for action resolved
-             */
-            const cleanUpActionResolvedListener = popupMessageClient.listenForMessage('actionResolved', ({ data, id }) => {
-                if (id === actionId) {
-                    resultDeferredPromise.resolve(data);
+            popup = window.open('', '_blank', features);
+        }
+        // Encrypt params if active connection is present
+        if (params) {
+            yield mergeAndEncryptParams.mergeAndEncryptParams(popupFinalUrl, params, activeConnection);
+        }
+        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);
                 }
-            });
-            /**
-             * Listen for action rejected
-             */
-            const cleanUpActionRejectedListener = popupMessageClient.listenForMessage('actionRejected', ({ serializedError, id }) => {
-                if (id !== actionId)
-                    return;
-                resultDeferredPromise.reject(mapErrorFromPopup.mapErrorFromPopup(serializedError));
-            });
-            /**
-             * Listen for a global error
-             */
-            const cleanUpSendErrorListener = popupMessageClient.listenForMessage('sendError', (serializedError) => resultDeferredPromise.reject(mapErrorFromPopup.mapErrorFromPopup(serializedError)));
-            return resultDeferredPromise.promise.finally(() => {
-                cleanUpActionResolvedListener();
-                cleanUpActionRejectedListener();
-                cleanUpSendErrorListener();
-            });
+                return data;
+            }),
+            onError: (error) => resultDeferredPromise.reject(error),
+            onResponse: (response) => resultDeferredPromise.resolve(response.data),
+            popupUrl: popupFinalUrl.toString(),
+        });
+        onPopupClose.onPopupClose(popup, () => {
+            resultDeferredPromise.reject(new PopupClosedError.PopupClosedError());
         });
-        // This array will contain all parallel promises
-        const promises = [];
         /**
-         * If no popup is present, it means this is a fresh new popup
-         * This block will create a new popup, perform the handshake and wait for the action response
+         * Assign action to popup
          */
-        if (popup === null) {
-            popup = initializePopup();
-            promises.push(watchForPopupClose());
-            promises.push(popupHandshake().then(waitForActionResponse));
+        if (didOpenPopup) {
+            popup === null || popup === void 0 ? void 0 : popup.postMessage({
+                actionPath: popupFinalUrl.search + popupFinalUrl.hash,
+                event: 'new-action',
+            }, popupFinalUrl.origin);
         }
         else {
-            /**
-             * If a popup is present, it means this is a re-use of the same popup
-             * This block will watch for the popup to close and wait for the action response
-             */
-            promises.push(watchForPopupClose());
-            promises.push(waitForActionResponse());
+            // Load popup
+            popup.location = popupFinalUrl.href;
         }
-        /**
-         * Return the promise and setup the popup cleanup
-         * and error handling
-         */
-        return Promise.race(promises)
+        didOpenPopup = true;
+        return resultDeferredPromise.promise
             .catch((err) => {
             onError === null || onError === void 0 ? void 0 : onError(err);
             closePopup();

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

@@ -1,146 +1,80 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
-import { createKeyPair, convertPublicKeyCryptoKeyToHex, assertDefined, deriveSharedSecret, convertPublicKeyHexToCryptoKey, generateHMAC, DeferredPromise } from '@dynamic-labs/utils';
+import { DeferredPromise, isEncryptedMessage, decryptMessage } from '@dynamic-labs/utils';
+import { waitForPopupResponse } from '../waitForPopupResponse/waitForPopupResponse.js';
 import { onPopupClose } from '../onPopupClose/onPopupClose.js';
+import { mergeAndEncryptParams } from '../mergeAndEncryptParams/mergeAndEncryptParams.js';
 import { getCenteredPopupFeatures } from '../getCenteredPopupFeatures/getCenteredPopupFeatures.js';
-import { createPopupMessageClient } from '../createPopupMessageClient/createPopupMessageClient.js';
-import { createEncryptedMessageEncoder } from '../createEncryptedMessageEncoder/createEncryptedMessageEncoder.js';
 import { PopupClosedError } from '../../errors/PopupClosedError.js';
-import { mapErrorFromPopup } from './utils/mapErrorFromPopup.js';
 
 const createPopupOpener = ({ environmentId, popupUrl, popupWidth = 420, popupHeight = 640, store, popupActionTimeout = 1000, // Wait page up to 1 second for new actions before closing
 onError, }) => {
     let popup = null;
+    let didOpenPopup = false;
     let lastActionId = null;
-    let clientSessionKeyPair = null;
     const closePopup = () => {
         popup === null || popup === void 0 ? void 0 : popup.close();
         popup = null;
+        didOpenPopup = false;
         lastActionId = null;
     };
-    // TODO update definition here to use name and args
     return (_a) => __awaiter(void 0, [_a], void 0, function* ({ params, pathname, }) {
-        clientSessionKeyPair = clientSessionKeyPair !== null && clientSessionKeyPair !== void 0 ? clientSessionKeyPair : (yield createKeyPair());
         // Used as a unique identifier for the action
-        const actionId = new Date().getTime().toString();
+        const actionId = new Date().getTime();
         lastActionId = actionId;
         const popupFinalUrl = new URL(popupUrl);
         const activeConnection = store.getActiveConnection();
+        const resultDeferredPromise = new DeferredPromise();
         // Setup popup URL and data
+        popupFinalUrl.hash = `/${pathname}`;
         popupFinalUrl.searchParams.set('provider_env_id', environmentId);
+        // TODO: use PlatformService
         popupFinalUrl.searchParams.set('requester_origin', window.location.origin);
-        popupFinalUrl.searchParams.set('client_session_public_key', yield convertPublicKeyCryptoKeyToHex(clientSessionKeyPair.publicKey));
-        /**
-         * Open a new popup centered on the screen
-         */
-        const initializePopup = () => {
+        if (popup === null) {
             const features = getCenteredPopupFeatures({
                 height: popupHeight,
                 width: popupWidth,
             });
             // Open popup
-            const popup = window.open('', '_blank', features);
-            if (popup === null) {
-                throw new Error('Failed to open popup');
-            }
-            popup.location = popupFinalUrl.href;
-            return popup;
-        };
-        /**
-         * Perform the initial handshake with the popup to get the session public key and nonce
-         */
-        const popupHandshake = () => __awaiter(void 0, void 0, void 0, function* () {
-            assertDefined(clientSessionKeyPair, 'Client session key pair is not set');
-            assertDefined(popup, 'Popup is not defined');
-            const popupMessageClient = createPopupMessageClient(popup, popupFinalUrl.origin);
-            const [[popupSessionPublicKey], [nonce]] = yield Promise.all([
-                popupMessageClient.waitForMessage('sendPopupSessionPublicKey', 20000),
-                popupMessageClient.waitForMessage('sendPopupNonce', 20000),
-            ]);
-            const sessionSharedSecret = yield deriveSharedSecret(clientSessionKeyPair.privateKey, yield convertPublicKeyHexToCryptoKey(popupSessionPublicKey));
-            store.setSessionAuthCode(new TextEncoder().encode(yield generateHMAC(sessionSharedSecret, nonce)));
-        });
-        /**
-         * Watch for the popup to close
-         */
-        const watchForPopupClose = () => __awaiter(void 0, void 0, void 0, function* () {
-            assertDefined(popup, 'Popup is not defined');
-            return new Promise((_, reject) => {
-                assertDefined(popup, 'Popup is not defined');
-                onPopupClose(popup, () => {
-                    reject(new PopupClosedError());
-                });
-            });
-        });
-        /**
-         * Wait for the action response from the popup
-         */
-        const waitForActionResponse = () => __awaiter(void 0, void 0, void 0, function* () {
-            assertDefined(popup, 'Popup is not defined');
-            assertDefined(store.sessionAuthCode, 'Session auth code is not set');
-            const resultDeferredPromise = new DeferredPromise();
-            /**
-             * Recreate the popup message if the encryption is available
-             */
-            const encoder = activeConnection
-                ? createEncryptedMessageEncoder(activeConnection, store.sessionAuthCode)
-                : undefined;
-            const popupMessageClient = createPopupMessageClient(popup, popupFinalUrl.origin, encoder);
-            void popupMessageClient.postMessage('sendAction', {
-                id: actionId,
-                name: pathname,
-                params,
-            });
-            /**
-             * Listen for action resolved
-             */
-            const cleanUpActionResolvedListener = popupMessageClient.listenForMessage('actionResolved', ({ data, id }) => {
-                if (id === actionId) {
-                    resultDeferredPromise.resolve(data);
+            popup = window.open('', '_blank', features);
+        }
+        // Encrypt params if active connection is present
+        if (params) {
+            yield mergeAndEncryptParams(popupFinalUrl, params, activeConnection);
+        }
+        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);
                 }
-            });
-            /**
-             * Listen for action rejected
-             */
-            const cleanUpActionRejectedListener = popupMessageClient.listenForMessage('actionRejected', ({ serializedError, id }) => {
-                if (id !== actionId)
-                    return;
-                resultDeferredPromise.reject(mapErrorFromPopup(serializedError));
-            });
-            /**
-             * Listen for a global error
-             */
-            const cleanUpSendErrorListener = popupMessageClient.listenForMessage('sendError', (serializedError) => resultDeferredPromise.reject(mapErrorFromPopup(serializedError)));
-            return resultDeferredPromise.promise.finally(() => {
-                cleanUpActionResolvedListener();
-                cleanUpActionRejectedListener();
-                cleanUpSendErrorListener();
-            });
+                return data;
+            }),
+            onError: (error) => resultDeferredPromise.reject(error),
+            onResponse: (response) => resultDeferredPromise.resolve(response.data),
+            popupUrl: popupFinalUrl.toString(),
+        });
+        onPopupClose(popup, () => {
+            resultDeferredPromise.reject(new PopupClosedError());
         });
-        // This array will contain all parallel promises
-        const promises = [];
         /**
-         * If no popup is present, it means this is a fresh new popup
-         * This block will create a new popup, perform the handshake and wait for the action response
+         * Assign action to popup
          */
-        if (popup === null) {
-            popup = initializePopup();
-            promises.push(watchForPopupClose());
-            promises.push(popupHandshake().then(waitForActionResponse));
+        if (didOpenPopup) {
+            popup === null || popup === void 0 ? void 0 : popup.postMessage({
+                actionPath: popupFinalUrl.search + popupFinalUrl.hash,
+                event: 'new-action',
+            }, popupFinalUrl.origin);
         }
         else {
-            /**
-             * If a popup is present, it means this is a re-use of the same popup
-             * This block will watch for the popup to close and wait for the action response
-             */
-            promises.push(watchForPopupClose());
-            promises.push(waitForActionResponse());
+            // Load popup
+            popup.location = popupFinalUrl.href;
         }
-        /**
-         * Return the promise and setup the popup cleanup
-         * and error handling
-         */
-        return Promise.race(promises)
+        didOpenPopup = true;
+        return resultDeferredPromise.promise
             .catch((err) => {
             onError === null || onError === void 0 ? void 0 : onError(err);
             closePopup();

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

@@ -1,4 +1,4 @@
 import { SerializedError } from '@dynamic-labs/message-transport';
 import { DisconnectError } from '../../../errors/DisconnectError';
 import { UnknownError } from '../../../errors/UnknownError';
-export declare const mapErrorFromPopup: (serializedError: SerializedError) => DisconnectError | unknown[] | UnknownError;
+export declare const mapErrorFromPopup: (serializedError: SerializedError) => UnknownError | unknown[] | DisconnectError;

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

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

package/src/lib/functions/mergeAndEncryptParams/mergeAndEncryptParams.cjs

@@ -0,0 +1,23 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../_virtual/_tslib.cjs');
+var utils = require('@dynamic-labs/utils');
+var mergeURLSearchParams = require('../mergeURLSearchParams/mergeURLSearchParams.cjs');
+
+const mergeAndEncryptParams = (url, params, activeConnection) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    if (activeConnection) {
+        const encryptedParams = yield utils.encryptMessage(activeConnection.sharedSecret, JSON.stringify(params));
+        mergeURLSearchParams.mergeURLSearchParams(url.searchParams, new URLSearchParams({
+            encrypted_message: encryptedParams.encryptedMessage,
+            iv: encryptedParams.iv,
+        }));
+    }
+    else {
+        mergeURLSearchParams.mergeURLSearchParams(url.searchParams, new URLSearchParams(params));
+    }
+});
+
+exports.mergeAndEncryptParams = mergeAndEncryptParams;

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

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

package/src/lib/functions/mergeAndEncryptParams/mergeAndEncryptParams.js

@@ -0,0 +1,19 @@
+'use client'
+import { __awaiter } from '../../../../_virtual/_tslib.js';
+import { encryptMessage } from '@dynamic-labs/utils';
+import { mergeURLSearchParams } from '../mergeURLSearchParams/mergeURLSearchParams.js';
+
+const mergeAndEncryptParams = (url, params, activeConnection) => __awaiter(void 0, void 0, void 0, function* () {
+    if (activeConnection) {
+        const encryptedParams = yield encryptMessage(activeConnection.sharedSecret, JSON.stringify(params));
+        mergeURLSearchParams(url.searchParams, new URLSearchParams({
+            encrypted_message: encryptedParams.encryptedMessage,
+            iv: encryptedParams.iv,
+        }));
+    }
+    else {
+        mergeURLSearchParams(url.searchParams, new URLSearchParams(params));
+    }
+});
+
+export { mergeAndEncryptParams };

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

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

package/src/lib/functions/mergeURLSearchParams/mergeURLSearchParams.cjs

@@ -0,0 +1,17 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * Merges URL search parameters from a source into a target URLSearchParams object
+ * @param target - The URLSearchParams object to merge into
+ * @param source - The URLSearchParams object to merge from
+ */
+const mergeURLSearchParams = (target, source) => {
+    source.forEach((value, key) => {
+        target.set(key, value);
+    });
+};
+
+exports.mergeURLSearchParams = mergeURLSearchParams;

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

@@ -0,0 +1,6 @@
+/**
+ * Merges URL search parameters from a source into a target URLSearchParams object
+ * @param target - The URLSearchParams object to merge into
+ * @param source - The URLSearchParams object to merge from
+ */
+export declare const mergeURLSearchParams: (target: URLSearchParams, source: URLSearchParams) => void;

package/src/lib/functions/mergeURLSearchParams/mergeURLSearchParams.js

@@ -0,0 +1,13 @@
+'use client'
+/**
+ * Merges URL search parameters from a source into a target URLSearchParams object
+ * @param target - The URLSearchParams object to merge into
+ * @param source - The URLSearchParams object to merge from
+ */
+const mergeURLSearchParams = (target, source) => {
+    source.forEach((value, key) => {
+        target.set(key, value);
+    });
+};
+
+export { mergeURLSearchParams };

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

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

package/src/lib/functions/waitForPopupResponse/waitForPopupResponse.cjs

@@ -0,0 +1,61 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../_virtual/_tslib.cjs');
+var logger = require('../../constants/logger.cjs');
+var DisconnectError = require('../../errors/DisconnectError.cjs');
+
+const waitForPopupResponse = ({ popupUrl, decode, onResponse, onError, }) => {
+    const handleOnWindowEvent = (event) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (event.origin !== new URL(popupUrl).origin)
+            return;
+        let parsedData = null;
+        try {
+            parsedData = JSON.parse(event.data);
+        }
+        catch (err) {
+            logger.logger.debug('Error parsing data from WebExtension iFrame event', err);
+            return;
+        }
+        const decodedMessage = decode ? yield decode(parsedData) : parsedData;
+        const { error, success } = parseData(decodedMessage);
+        if (!error && !success) {
+            logger.logger.debug('Error validating event data schema from popup response event', parsedData);
+            return;
+        }
+        if (success) {
+            onResponse(success);
+        }
+        else {
+            if (DisconnectError.DisconnectError.isDisconnectError(error)) {
+                onError(new DisconnectError.DisconnectError());
+            }
+            else {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                onError(new Error(error.message));
+            }
+        }
+    });
+    window.addEventListener('message', handleOnWindowEvent);
+    return () => {
+        window.removeEventListener('message', handleOnWindowEvent);
+    };
+};
+const parseData = (data) => {
+    if (!data || typeof data !== 'object') {
+        return {};
+    }
+    // Check if it's a success response
+    if (data.name && data.data) {
+        return { success: data };
+    }
+    // Check if it's an error response
+    if (data.message) {
+        return { error: data };
+    }
+    return {};
+};
+
+exports.waitForPopupResponse = waitForPopupResponse;

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

@@ -0,0 +1,9 @@
+import { IPopupActionSuccessResponse } from '@dynamic-labs/types';
+type WaitForPopupResponseProps = {
+    popupUrl: string;
+    decode?: (data: any) => Promise<any>;
+    onResponse: (response: IPopupActionSuccessResponse) => void;
+    onError: (error: Error) => void;
+};
+export declare const waitForPopupResponse: ({ popupUrl, decode, onResponse, onError, }: WaitForPopupResponseProps) => () => void;
+export {};

package/src/lib/functions/waitForPopupResponse/waitForPopupResponse.js

@@ -0,0 +1,57 @@
+'use client'
+import { __awaiter } from '../../../../_virtual/_tslib.js';
+import { logger } from '../../constants/logger.js';
+import { DisconnectError } from '../../errors/DisconnectError.js';
+
+const waitForPopupResponse = ({ popupUrl, decode, onResponse, onError, }) => {
+    const handleOnWindowEvent = (event) => __awaiter(void 0, void 0, void 0, function* () {
+        if (event.origin !== new URL(popupUrl).origin)
+            return;
+        let parsedData = null;
+        try {
+            parsedData = JSON.parse(event.data);
+        }
+        catch (err) {
+            logger.debug('Error parsing data from WebExtension iFrame event', err);
+            return;
+        }
+        const decodedMessage = decode ? yield decode(parsedData) : parsedData;
+        const { error, success } = parseData(decodedMessage);
+        if (!error && !success) {
+            logger.debug('Error validating event data schema from popup response event', parsedData);
+            return;
+        }
+        if (success) {
+            onResponse(success);
+        }
+        else {
+            if (DisconnectError.isDisconnectError(error)) {
+                onError(new DisconnectError());
+            }
+            else {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                onError(new Error(error.message));
+            }
+        }
+    });
+    window.addEventListener('message', handleOnWindowEvent);
+    return () => {
+        window.removeEventListener('message', handleOnWindowEvent);
+    };
+};
+const parseData = (data) => {
+    if (!data || typeof data !== 'object') {
+        return {};
+    }
+    // Check if it's a success response
+    if (data.name && data.data) {
+        return { success: data };
+    }
+    // Check if it's an error response
+    if (data.message) {
+        return { error: data };
+    }
+    return {};
+};
+
+export { waitForPopupResponse };

package/src/lib/store/createClientStore.cjs

@@ -8,20 +8,11 @@ var store = require('@dynamic-labs/store');
 const createClientStore = ({ storage = localStorage, } = {}) => {
     const store$1 = store.persist({
         name: 'global-wallet-client',
-        /**
-         * The client should not persist sessionAuthCode
-         */
-        partialize: (state) => ({
-            connection: state.connection,
-            ethereum: state.ethereum,
-            solana: state.solana,
-            wallets: state.wallets,
-        }),
+        partialize: (state) => state,
         storage,
         store: store.createStore(() => ({
             connection: null,
             ethereum: null,
-            sessionAuthCode: null,
             solana: null,
             wallets: [],
         })),
@@ -56,12 +47,6 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
             }
             return connection;
         },
-        /**
-         * Retrieves the session auth code
-         */
-        get sessionAuthCode() {
-            return store$1.getState().sessionAuthCode;
-        },
         /**
          * Updates current connection, wallets
          * Used when the popup confirm a connection
@@ -70,13 +55,6 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
         setInitialConnectionState: ({ connection, wallets, ethereum, solana, }) => {
             store$1.setState({ connection, ethereum, solana, wallets });
         },
-        /**
-         * Updates the session auth code
-         * @param {BufferSource} sessionAuthCode - The session auth code to store
-         */
-        setSessionAuthCode: (sessionAuthCode) => {
-            store$1.setState({ sessionAuthCode });
-        },
         /**
          * Get all Solana wallets connected to the current connection
          */

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

@@ -26,11 +26,6 @@ type ClientStoreState = {
     solana: {
         currentNetwork: string;
     } | null;
-    /**
-     * Session Auth Code
-     * Used to decrypt and encrypt messages between client and popup
-     */
-    sessionAuthCode: BufferSource | null;
 };
 export declare const createClientStore: ({ storage, }?: CreateClientStoreProps) => {
     /**
@@ -51,21 +46,12 @@ export declare const createClientStore: ({ storage, }?: CreateClientStoreProps)
      * @returns {Connection | null} The current connection or null if no connection exists or it has expired
      */
     getActiveConnection: () => GlobalWalletConnection | null;
-    /**
-     * Retrieves the session auth code
-     */
-    readonly sessionAuthCode: BufferSource | null;
     /**
      * Updates current connection, wallets
      * Used when the popup confirm a connection
      * @param {GlobalWalletConnection | null} connection - The connection to store, or null to clear it
      */
     setInitialConnectionState: ({ connection, wallets, ethereum, solana, }: Pick<ClientStoreState, 'connection' | 'wallets' | 'ethereum' | 'solana'>) => void;
-    /**
-     * Updates the session auth code
-     * @param {BufferSource} sessionAuthCode - The session auth code to store
-     */
-    setSessionAuthCode: (sessionAuthCode: BufferSource) => void;
     /**
      * Get all Solana wallets connected to the current connection
      */

package/src/lib/store/createClientStore.js

@@ -4,20 +4,11 @@ import { persist, createStore } from '@dynamic-labs/store';
 const createClientStore = ({ storage = localStorage, } = {}) => {
     const store = persist({
         name: 'global-wallet-client',
-        /**
-         * The client should not persist sessionAuthCode
-         */
-        partialize: (state) => ({
-            connection: state.connection,
-            ethereum: state.ethereum,
-            solana: state.solana,
-            wallets: state.wallets,
-        }),
+        partialize: (state) => state,
         storage,
         store: createStore(() => ({
             connection: null,
             ethereum: null,
-            sessionAuthCode: null,
             solana: null,
             wallets: [],
         })),
@@ -52,12 +43,6 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
             }
             return connection;
         },
-        /**
-         * Retrieves the session auth code
-         */
-        get sessionAuthCode() {
-            return store.getState().sessionAuthCode;
-        },
         /**
          * Updates current connection, wallets
          * Used when the popup confirm a connection
@@ -66,13 +51,6 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
         setInitialConnectionState: ({ connection, wallets, ethereum, solana, }) => {
             store.setState({ connection, ethereum, solana, wallets });
         },
-        /**
-         * Updates the session auth code
-         * @param {BufferSource} sessionAuthCode - The session auth code to store
-         */
-        setSessionAuthCode: (sessionAuthCode) => {
-            store.setState({ sessionAuthCode });
-        },
         /**
          * Get all Solana wallets connected to the current connection
          */

package/src/lib/errors/UnknownError.cjs

@@ -1,12 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-class UnknownError extends Error {
-    constructor() {
-        super('Unknown error');
-    }
-}
-
-exports.UnknownError = UnknownError;

package/src/lib/errors/UnknownError.js

@@ -1,8 +0,0 @@
-'use client'
-class UnknownError extends Error {
-    constructor() {
-        super('Unknown error');
-    }
-}
-
-export { UnknownError };

package/src/lib/functions/createEncryptedMessageEncoder/createEncryptedMessageEncoder.cjs

@@ -1,19 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../../../_virtual/_tslib.cjs');
-var utils = require('@dynamic-labs/utils');
-
-const createEncryptedMessageEncoder = (activeConnection, additionalData) => ({
-    decode: (data) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        utils.assertDefined(data.encryptedMessage, 'Encrypted message is not defined');
-        utils.assertDefined(data.iv, 'IV is not defined');
-        const decryptedData = yield utils.decryptMessage(activeConnection.sharedSecret, data.encryptedMessage, data.iv, additionalData);
-        return JSON.parse(decryptedData);
-    }),
-    encode: (message) => utils.encryptMessage(activeConnection.sharedSecret, JSON.stringify(message), additionalData),
-});
-
-exports.createEncryptedMessageEncoder = createEncryptedMessageEncoder;

package/src/lib/functions/createEncryptedMessageEncoder/createEncryptedMessageEncoder.js

@@ -1,15 +0,0 @@
-'use client'
-import { __awaiter } from '../../../../_virtual/_tslib.js';
-import { assertDefined, decryptMessage, encryptMessage } from '@dynamic-labs/utils';
-
-const createEncryptedMessageEncoder = (activeConnection, additionalData) => ({
-    decode: (data) => __awaiter(void 0, void 0, void 0, function* () {
-        assertDefined(data.encryptedMessage, 'Encrypted message is not defined');
-        assertDefined(data.iv, 'IV is not defined');
-        const decryptedData = yield decryptMessage(activeConnection.sharedSecret, data.encryptedMessage, data.iv, additionalData);
-        return JSON.parse(decryptedData);
-    }),
-    encode: (message) => encryptMessage(activeConnection.sharedSecret, JSON.stringify(message), additionalData),
-});
-
-export { createEncryptedMessageEncoder };

package/src/lib/functions/createPopupMessageClient/createPopupMessageClient.cjs

@@ -1,74 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../../../_virtual/_tslib.cjs');
-var utils = require('@dynamic-labs/utils');
-
-const createPopupMessageClient = (popupWindow, targetOrigin, messageEncoder) => {
-    const listenForMessage = (messageName, callback) => {
-        const handleOnWindowEvent = (event) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            if (event.origin !== targetOrigin)
-                return;
-            let parsedMessage = null;
-            try {
-                parsedMessage = JSON.parse(event.data);
-                if (messageEncoder) {
-                    parsedMessage = yield messageEncoder.decode(parsedMessage);
-                }
-                parsedMessage =
-                    parseDataFromWindowEvent(parsedMessage);
-            }
-            catch (err) {
-                return;
-            }
-            if (parsedMessage.name !== messageName)
-                return;
-            callback(...parsedMessage.args);
-        });
-        window.addEventListener('message', handleOnWindowEvent);
-        return () => {
-            window.removeEventListener('message', handleOnWindowEvent);
-        };
-    };
-    const waitForMessage = (messageName, timeout) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const deferred = new utils.DeferredPromise();
-        const timeoutId = timeout
-            ? setTimeout(() => {
-                deferred.reject(new Error(`Timeout waiting for message: ${messageName}`));
-            }, timeout)
-            : undefined;
-        const cleanup = listenForMessage(messageName, (...args) => deferred.resolve(args));
-        return deferred.promise.finally(() => {
-            cleanup === null || cleanup === void 0 ? void 0 : cleanup();
-            clearTimeout(timeoutId);
-        });
-    });
-    const postMessage = (messageName, 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ...args) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        const message = {
-            args,
-            name: messageName,
-        };
-        const messageToPost = (_a = (yield (messageEncoder === null || messageEncoder === void 0 ? void 0 : messageEncoder.encode(message)))) !== null && _a !== void 0 ? _a : message;
-        popupWindow.postMessage(JSON.stringify(messageToPost), targetOrigin);
-    });
-    return {
-        listenForMessage,
-        postMessage,
-        waitForMessage,
-    };
-};
-const parseDataFromWindowEvent = (data) => {
-    utils.assertDefined(data.name, 'Name is required');
-    utils.assertDefined(data.args, 'Args is required');
-    return {
-        args: data.args,
-        name: data.name,
-    };
-};
-
-exports.createPopupMessageClient = createPopupMessageClient;

package/src/lib/functions/createPopupMessageClient/createPopupMessageClient.js

@@ -1,70 +0,0 @@
-'use client'
-import { __awaiter } from '../../../../_virtual/_tslib.js';
-import { DeferredPromise, assertDefined } from '@dynamic-labs/utils';
-
-const createPopupMessageClient = (popupWindow, targetOrigin, messageEncoder) => {
-    const listenForMessage = (messageName, callback) => {
-        const handleOnWindowEvent = (event) => __awaiter(void 0, void 0, void 0, function* () {
-            if (event.origin !== targetOrigin)
-                return;
-            let parsedMessage = null;
-            try {
-                parsedMessage = JSON.parse(event.data);
-                if (messageEncoder) {
-                    parsedMessage = yield messageEncoder.decode(parsedMessage);
-                }
-                parsedMessage =
-                    parseDataFromWindowEvent(parsedMessage);
-            }
-            catch (err) {
-                return;
-            }
-            if (parsedMessage.name !== messageName)
-                return;
-            callback(...parsedMessage.args);
-        });
-        window.addEventListener('message', handleOnWindowEvent);
-        return () => {
-            window.removeEventListener('message', handleOnWindowEvent);
-        };
-    };
-    const waitForMessage = (messageName, timeout) => __awaiter(void 0, void 0, void 0, function* () {
-        const deferred = new DeferredPromise();
-        const timeoutId = timeout
-            ? setTimeout(() => {
-                deferred.reject(new Error(`Timeout waiting for message: ${messageName}`));
-            }, timeout)
-            : undefined;
-        const cleanup = listenForMessage(messageName, (...args) => deferred.resolve(args));
-        return deferred.promise.finally(() => {
-            cleanup === null || cleanup === void 0 ? void 0 : cleanup();
-            clearTimeout(timeoutId);
-        });
-    });
-    const postMessage = (messageName, 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ...args) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        const message = {
-            args,
-            name: messageName,
-        };
-        const messageToPost = (_a = (yield (messageEncoder === null || messageEncoder === void 0 ? void 0 : messageEncoder.encode(message)))) !== null && _a !== void 0 ? _a : message;
-        popupWindow.postMessage(JSON.stringify(messageToPost), targetOrigin);
-    });
-    return {
-        listenForMessage,
-        postMessage,
-        waitForMessage,
-    };
-};
-const parseDataFromWindowEvent = (data) => {
-    assertDefined(data.name, 'Name is required');
-    assertDefined(data.args, 'Args is required');
-    return {
-        args: data.args,
-        name: data.name,
-    };
-};
-
-export { createPopupMessageClient };

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

@@ -1,25 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var messageTransport = require('@dynamic-labs/message-transport');
-var DisconnectError = require('../../../errors/DisconnectError.cjs');
-var UnknownError = require('../../../errors/UnknownError.cjs');
-
-const mapErrorFromPopup = (serializedError) => {
-    if (messageTransport.isSerializedError(serializedError)) {
-        const error = messageTransport.parseErrorFromTransport(serializedError);
-        if (DisconnectError.DisconnectError.isDisconnectError(error)) {
-            return new DisconnectError.DisconnectError();
-        }
-        else {
-            return error;
-        }
-    }
-    else {
-        return new UnknownError.UnknownError();
-    }
-};
-
-exports.mapErrorFromPopup = mapErrorFromPopup;

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

@@ -1,21 +0,0 @@
-'use client'
-import { isSerializedError, parseErrorFromTransport } from '@dynamic-labs/message-transport';
-import { DisconnectError } from '../../../errors/DisconnectError.js';
-import { UnknownError } from '../../../errors/UnknownError.js';
-
-const mapErrorFromPopup = (serializedError) => {
-    if (isSerializedError(serializedError)) {
-        const error = parseErrorFromTransport(serializedError);
-        if (DisconnectError.isDisconnectError(error)) {
-            return new DisconnectError();
-        }
-        else {
-            return error;
-        }
-    }
-    else {
-        return new UnknownError();
-    }
-};
-
-export { mapErrorFromPopup };