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

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

@@ -1,18 +1,17 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { toHex, ProviderDisconnectedError, UserRejectedRequestError, UnsupportedProviderMethodError } from 'viem';
+import { toHex, ProviderDisconnectedError, UnsupportedProviderMethodError, SwitchChainError, fromHex, UserRejectedRequestError } from 'viem';
 import { EventEmitter } from 'eventemitter3';
+import { isNetworkSupported } from '../isNetworkSupported/isNetworkSupported.js';
 
-const methodsHandledByPopup = ['personal_sign', 'eth_sendTransaction'];
 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 = client.ethereum.currentNetworkId;
+        if (!currentNetwork)
             return;
         eventEmitter.emit('connect', {
-            chainId: toHex(parseInt(chainId, 10)),
+            chainId: toHex(currentNetwork),
         });
     });
     client.on('disconnect', () => {
@@ -22,57 +21,23 @@ 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;
-            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
-            const isConnected = connectedAddresses.length > 0;
-            if (method === 'eth_accounts') {
-                return isConnected ? connectedAddresses : [];
-            }
-            if (method === 'eth_requestAccounts') {
-                if (isConnected) {
-                    return connectedAddresses;
-                }
-                return client
-                    .connect({ chain: 'evm' })
-                    .then(({ address }) => [address]);
-            }
-            if (method === 'wallet_revokePermissions') {
-                client.disconnect();
-                return null;
-            }
-            if (method === 'wallet_requestPermissions') {
-                if (isConnected) {
-                    return connectedAddresses;
-                }
-                return client
-                    .connect({ chain: 'evm' })
-                    .then(({ address }) => [address]);
-            }
-            if (method === 'eth_chainId') {
-                return (_d = client.ethereum) === null || _d === void 0 ? void 0 : _d.network;
-            }
-            /**
-             * Opens the popup to request user confirmation for the request
-             * and to execute the request
-             */
-            if (methodsHandledByPopup.includes(method) && params) {
-                const { data } = yield client
-                    .invoke({
-                    params: {
-                        method,
-                        params,
-                    },
-                    pathname: 'eth-request',
-                })
-                    .catch((err) => {
-                    if (err.message === 'Popup closed') {
-                        throw new UserRejectedRequestError(err);
-                    }
-                    throw err;
-                });
-                return data;
+            const methodHandlerMap = {
+                eth_accounts: () => handleEthAccounts(client),
+                eth_chainId: () => handleEthChainId(client),
+                eth_requestAccounts: () => handleEthRequestAccounts(client),
+                eth_sendTransaction: () => handleMethodInPopup({
+                    client,
+                    method: 'eth_sendTransaction',
+                    params,
+                }),
+                personal_sign: () => handleMethodInPopup({ client, method: 'personal_sign', params }),
+                wallet_requestPermissions: () => handleEthRequestAccounts(client),
+                wallet_revokePermissions: () => handleWalletRevokePermissions(client),
+                wallet_switchEthereumChain: () => handleWalletSwitchEthereumChain(client, eventEmitter, params),
+            };
+            const handler = methodHandlerMap[method];
+            if (handler) {
+                return handler();
             }
             throw new UnsupportedProviderMethodError(new Error('Method not implemented'), {
                 method,
@@ -80,5 +45,72 @@ 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 : [];
+    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 : [];
+    return wallets.map((wallet) => wallet.address);
+};
+// Method handlers
+const handleEthAccounts = (client) => isConnected(client) ? getConnectedAddresses(client) : [];
+const handleEthRequestAccounts = (client) => {
+    if (isConnected(client)) {
+        return getConnectedAddresses(client);
+    }
+    return client.connect({ chain: 'evm' }).then(({ address }) => [address]);
+};
+const handleWalletRevokePermissions = (client) => {
+    client.disconnect();
+    return null;
+};
+const handleEthChainId = (client) => {
+    if (client.ethereum.currentNetworkId) {
+        return toHex(client.ethereum.currentNetworkId);
+    }
+    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 : [];
+    if (supportedNetworks.length === 0) {
+        throw new SwitchChainError(new Error('No supported networks'));
+    }
+    if (!isNetworkSupported(fromHex(chainId, 'number'), supportedNetworks)) {
+        throw new SwitchChainError(new Error('Chain not supported'));
+    }
+    client.ethereum.switchNetwork(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) {
+        throw new Error('No network id found');
+    }
+    const { data } = yield client
+        .invoke({
+        params: {
+            chainId: client.ethereum.currentNetworkId,
+            method,
+            params,
+        },
+        pathname: 'eth-request',
+    })
+        .catch((err) => {
+        if (err.message === 'Popup closed') {
+            throw new UserRejectedRequestError(err);
+        }
+        throw err;
+    });
+    return data;
+});
 
 export { createEIP1193Provider };

package/src/lib/ethereum/functions/isNetworkSupported/index.d.ts

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

package/src/lib/ethereum/functions/isNetworkSupported/isNetworkSupported.cjs

@@ -0,0 +1,8 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isNetworkSupported = (chainId, supportedNetworks) => supportedNetworks.some((network) => network.chainId === chainId);
+
+exports.isNetworkSupported = isNetworkSupported;

package/src/lib/ethereum/functions/isNetworkSupported/isNetworkSupported.d.ts

@@ -0,0 +1,3 @@
+export declare const isNetworkSupported: (chainId: number, supportedNetworks: {
+    chainId: number;
+}[]) => boolean;

package/src/lib/ethereum/functions/isNetworkSupported/isNetworkSupported.js

@@ -0,0 +1,4 @@
+'use client'
+const isNetworkSupported = (chainId, supportedNetworks) => supportedNetworks.some((network) => network.chainId === chainId);
+
+export { isNetworkSupported };

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

@@ -0,0 +1,24 @@
+'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 : [];
+    },
+    switchNetwork: (network) => {
+        store.switchEthereumNetwork(network);
+    },
+    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,11 @@
+import { ClientStore } from '../../store';
+export declare const createEthereumModule: ({ store }: {
+    store: ClientStore;
+}) => {
+    readonly currentNetworkId: number | null;
+    readonly supportedNetworks: {
+        chainId: number;
+    }[];
+    switchNetwork: (network: number) => void;
+    readonly wallets: import("dist/packages/types/src").BaseWallet[];
+};

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

@@ -0,0 +1,20 @@
+'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 : [];
+    },
+    switchNetwork: (network) => {
+        store.switchEthereumNetwork(network);
+    },
+    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,83 @@ 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 = 1000, // Wait page up to 1 second for new actions before closing
+ }) => {
+    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,83 @@ 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 = 1000, // Wait page up to 1 second for new actions before closing
+ }) => {
+    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/createSolanaModule/createSolanaModule.cjs

@@ -0,0 +1,17 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const createSolanaModule = ({ store }) => ({
+    get currentNetwork() {
+        var _a, _b;
+        return (_b = (_a = store.solana) === null || _a === void 0 ? void 0 : _a.currentNetwork) !== null && _b !== void 0 ? _b : null;
+    },
+    get wallets() {
+        var _a;
+        return (_a = store.wallets.filter(({ chain }) => chain === 'SOL')) !== null && _a !== void 0 ? _a : [];
+    },
+});
+
+exports.createSolanaModule = createSolanaModule;

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

@@ -0,0 +1,9 @@
+import { ClientStore } from '../../store';
+type CreateSolanaModuleProps = {
+    store: ClientStore;
+};
+export declare const createSolanaModule: ({ store }: CreateSolanaModuleProps) => {
+    readonly currentNetwork: string | null;
+    readonly wallets: import("dist/packages/types/src").BaseWallet[];
+};
+export {};

package/src/lib/functions/createSolanaModule/createSolanaModule.js

@@ -0,0 +1,13 @@
+'use client'
+const createSolanaModule = ({ store }) => ({
+    get currentNetwork() {
+        var _a, _b;
+        return (_b = (_a = store.solana) === null || _a === void 0 ? void 0 : _a.currentNetwork) !== null && _b !== void 0 ? _b : null;
+    },
+    get wallets() {
+        var _a;
+        return (_a = store.wallets.filter(({ chain }) => chain === 'SOL')) !== null && _a !== void 0 ? _a : [];
+    },
+});
+
+export { createSolanaModule };

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

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

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/solana/functions/convertBaseWalletToWalletAccount/convertBaseWalletToWalletAccount.cjs

@@ -0,0 +1,36 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var web3_js = require('@solana/web3.js');
+var getSolanaChains = require('../getSolanaChains/getSolanaChains.cjs');
+
+const convertBaseWalletToWalletAccount = (wallet, client) => {
+    try {
+        const publicKey = new web3_js.PublicKey(wallet.address);
+        // Validate the public key is valid base58
+        if (!web3_js.PublicKey.isOnCurve(publicKey.toBytes())) {
+            throw new Error('Invalid public key');
+        }
+        return {
+            address: publicKey.toBase58(),
+            get chains() {
+                return getSolanaChains.getSolanaChains(client);
+            },
+            features: [
+                'solana:signAndSendTransaction',
+                'solana:signTransaction',
+                'standard:connect',
+                'standard:disconnect',
+                'standard:events',
+            ],
+            publicKey: publicKey.toBytes(),
+        };
+    }
+    catch (error) {
+        throw new Error(`Invalid Solana address: ${wallet.address}`);
+    }
+};
+
+exports.convertBaseWalletToWalletAccount = convertBaseWalletToWalletAccount;

package/src/lib/solana/functions/convertBaseWalletToWalletAccount/convertBaseWalletToWalletAccount.d.ts

@@ -0,0 +1,4 @@
+import type { WalletAccount } from '@wallet-standard/base';
+import { BaseWallet } from '@dynamic-labs/types';
+import { GlobalWalletClient } from '../../../createGlobalWalletClient';
+export declare const convertBaseWalletToWalletAccount: (wallet: BaseWallet, client: GlobalWalletClient) => WalletAccount;