@dynamic-labs/sdk-react-core 0.18.100-viem.1 → 0.18.100-viem.10

package/src/lib/utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.cjs

@@ -0,0 +1,48 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+
+const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
+/**
+ * Sends a transaction with an automatically determined nonce, if not provided.
+ *
+ * In Ethereum, each transaction sent from a particular address must have a unique nonce.
+ * If the transaction does not already have a nonce, this function helps to automatically set it.
+ * If a transaction with a particular nonce fails due to a "could not replace transaction" error,
+ * this function will automatically retry with the next nonce.
+ *
+ * @param connector - A Dynamic connector to interact with the Ethereum network.
+ * @param transaction - The transaction details.
+ * @param sendTransactionHandler - A handler function to send the transaction.
+ *
+ * @returns A promise that resolves to the transaction response.
+ */
+const sendTransactionWithAutoNonce = (connector, transaction, sendTransactionHandler) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    if (transaction.nonce !== undefined) {
+        return sendTransactionHandler(transaction);
+    }
+    const publicClient = yield connector.getRpcProvider();
+    const walletClient = yield connector.getSigner();
+    const [address] = yield walletClient.getAddresses();
+    const nonce = yield publicClient.getTransactionCount({
+        address,
+    });
+    const transactionWithNonce = Object.assign(Object.assign({}, transaction), { nonce });
+    try {
+        const response = yield sendTransactionHandler(transactionWithNonce);
+        return response;
+    }
+    catch (err) {
+        if (err.code ===
+            MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE) {
+            const transactionWithNextNonce = Object.assign(Object.assign({}, transaction), { nonce: nonce + 1 });
+            return sendTransactionHandler(transactionWithNextNonce);
+        }
+        throw err;
+    }
+});
+
+exports.MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE;
+exports.sendTransactionWithAutoNonce = sendTransactionWithAutoNonce;

package/src/lib/utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.d.ts

@@ -0,0 +1,18 @@
+import { TransactionRequest, Address } from 'viem';
+import { WalletConnector } from '../../../..';
+export declare const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
+/**
+ * Sends a transaction with an automatically determined nonce, if not provided.
+ *
+ * In Ethereum, each transaction sent from a particular address must have a unique nonce.
+ * If the transaction does not already have a nonce, this function helps to automatically set it.
+ * If a transaction with a particular nonce fails due to a "could not replace transaction" error,
+ * this function will automatically retry with the next nonce.
+ *
+ * @param connector - A Dynamic connector to interact with the Ethereum network.
+ * @param transaction - The transaction details.
+ * @param sendTransactionHandler - A handler function to send the transaction.
+ *
+ * @returns A promise that resolves to the transaction response.
+ */
+export declare const sendTransactionWithAutoNonce: (connector: WalletConnector, transaction: TransactionRequest, sendTransactionHandler: (transaction: TransactionRequest) => Promise<Address>) => Promise<`0x${string}`>;

package/src/lib/utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.js

@@ -0,0 +1,43 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+
+const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
+/**
+ * Sends a transaction with an automatically determined nonce, if not provided.
+ *
+ * In Ethereum, each transaction sent from a particular address must have a unique nonce.
+ * If the transaction does not already have a nonce, this function helps to automatically set it.
+ * If a transaction with a particular nonce fails due to a "could not replace transaction" error,
+ * this function will automatically retry with the next nonce.
+ *
+ * @param connector - A Dynamic connector to interact with the Ethereum network.
+ * @param transaction - The transaction details.
+ * @param sendTransactionHandler - A handler function to send the transaction.
+ *
+ * @returns A promise that resolves to the transaction response.
+ */
+const sendTransactionWithAutoNonce = (connector, transaction, sendTransactionHandler) => __awaiter(void 0, void 0, void 0, function* () {
+    if (transaction.nonce !== undefined) {
+        return sendTransactionHandler(transaction);
+    }
+    const publicClient = yield connector.getRpcProvider();
+    const walletClient = yield connector.getSigner();
+    const [address] = yield walletClient.getAddresses();
+    const nonce = yield publicClient.getTransactionCount({
+        address,
+    });
+    const transactionWithNonce = Object.assign(Object.assign({}, transaction), { nonce });
+    try {
+        const response = yield sendTransactionHandler(transactionWithNonce);
+        return response;
+    }
+    catch (err) {
+        if (err.code ===
+            MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE) {
+            const transactionWithNextNonce = Object.assign(Object.assign({}, transaction), { nonce: nonce + 1 });
+            return sendTransactionHandler(transactionWithNextNonce);
+        }
+        throw err;
+    }
+});
+
+export { MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE, sendTransactionWithAutoNonce };

package/src/lib/utils/functions/stringifyURIQuery/index.d.ts

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

package/src/lib/utils/functions/stringifyURIQuery/stringifyURIQuery.cjs

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const stringifyURIQuery = (obj) => {
+    const str = [];
+    for (const prop in obj) {
+        str.push(encodeURIComponent(prop) + '=' + encodeURIComponent(obj[prop]));
+    }
+    return str.join('&');
+};
+
+exports.stringifyURIQuery = stringifyURIQuery;

package/src/lib/utils/functions/stringifyURIQuery/stringifyURIQuery.d.ts

@@ -0,0 +1 @@
+export declare const stringifyURIQuery: (obj: any) => string;

package/src/lib/utils/functions/stringifyURIQuery/stringifyURIQuery.js

@@ -0,0 +1,9 @@
+const stringifyURIQuery = (obj) => {
+    const str = [];
+    for (const prop in obj) {
+        str.push(encodeURIComponent(prop) + '=' + encodeURIComponent(obj[prop]));
+    }
+    return str.join('&');
+};
+
+export { stringifyURIQuery };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -32,7 +32,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain, connectedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -72,9 +72,15 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             }
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
-                if (shouldUpdateWallets) {
+                // we don't want to re-calculate wallets to connect state if wallet is already connected.
+                // it may happen when user switch network in connect flow on already connected wallet
+                const isAlreadyConnected = connectedWallets.find((wallet) => walletConnectorCore.isSameAddress(publicWalletAddress, wallet.address, wallet.chain));
+                if (shouldUpdateWallets && !isAlreadyConnected) {
                     handleWalletsToConnect();
                 }
+                if (isAlreadyConnected) {
+                    setView('bridge-next-wallet-connection');
+                }
                 if (!isFullyConnected || (walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)) {
                     setCallback('connectSuccess');
                 }

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
+import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector, isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
@@ -28,7 +28,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain, connectedWallets, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -68,9 +68,15 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             }
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
-                if (shouldUpdateWallets) {
+                // we don't want to re-calculate wallets to connect state if wallet is already connected.
+                // it may happen when user switch network in connect flow on already connected wallet
+                const isAlreadyConnected = connectedWallets.find((wallet) => isSameAddress(publicWalletAddress, wallet.address, wallet.chain));
+                if (shouldUpdateWallets && !isAlreadyConnected) {
                     handleWalletsToConnect();
                 }
+                if (isAlreadyConnected) {
+                    setView('bridge-next-wallet-connection');
+                }
                 if (!isFullyConnected || (walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)) {
                     setCallback('connectSuccess');
                 }

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.cjs

@@ -93,6 +93,10 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
             }
             // user is logged in (has valid jwt), but no wallet is connected
             if (isAuthenticated && e.code === errors.MISSING_ADDRESS_ERROR) {
+                if (!primaryWallet.connector.isInstalledOnBrowser()) {
+                    handleLogOut();
+                    return;
+                }
                 setShowAuthFlow(true);
                 setView('wallet-locked-view');
             }

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.js

@@ -89,6 +89,10 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
             }
             // user is logged in (has valid jwt), but no wallet is connected
             if (isAuthenticated && e.code === MISSING_ADDRESS_ERROR) {
+                if (!primaryWallet.connector.isInstalledOnBrowser()) {
+                    handleLogOut();
+                    return;
+                }
                 setShowAuthFlow(true);
                 setView('wallet-locked-view');
             }

package/src/lib/utils/hooks/useConnectWallet/useConnectWallet.cjs

@@ -130,8 +130,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             network: currentWalletConnectoNetwork,
         });
     });
-    const shouldSkipCreatingVisit = React.useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
-        connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
+    const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!publicWalletAddress) {
@@ -168,21 +167,20 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnectorKey: walletConnector.name,
                 walletId,
             });
+            if (!shouldSkipCreatingVisit) {
+                // send information to backend to kick off background jobs
+                // so verify/sign on the next step could go by more quickly
+                // this is async work, but DO NOT AWAIT
+                api.createVisit({
+                    authMode,
+                    chain: walletChain || '',
+                    environmentId,
+                    publicWalletAddress,
+                    walletName: walletConnector.name,
+                    walletProvider: getWalletProvider.getWalletProvider(walletConnector),
+                });
+            }
         }
-        if (shouldSkipCreatingVisit) {
-            return Promise.resolve(publicWalletAddress);
-        }
-        // send information to backend to kick off background jobs
-        // so verify/sign on the next step could go by more quickly
-        // this is async work, but DO NOT AWAIT
-        api.createVisit({
-            authMode,
-            chain: walletChain || '',
-            environmentId,
-            publicWalletAddress,
-            walletName: walletConnector.name,
-            walletProvider: getWalletProvider.getWalletProvider(walletConnector),
-        });
         return Promise.resolve(publicWalletAddress);
     });
     const unlinkConnectedWallet = (walletId) => {

package/src/lib/utils/hooks/useConnectWallet/useConnectWallet.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useCallback, useEffect, useMemo } from 'react';
+import { useState, useCallback, useEffect } from 'react';
 import { getWalletConnectorByName, logger } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
@@ -126,8 +126,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             network: currentWalletConnectoNetwork,
         });
     });
-    const shouldSkipCreatingVisit = useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
-        connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
+    const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => __awaiter(void 0, void 0, void 0, function* () {
         const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!publicWalletAddress) {
@@ -164,21 +163,20 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnectorKey: walletConnector.name,
                 walletId,
             });
+            if (!shouldSkipCreatingVisit) {
+                // send information to backend to kick off background jobs
+                // so verify/sign on the next step could go by more quickly
+                // this is async work, but DO NOT AWAIT
+                createVisit({
+                    authMode,
+                    chain: walletChain || '',
+                    environmentId,
+                    publicWalletAddress,
+                    walletName: walletConnector.name,
+                    walletProvider: getWalletProvider(walletConnector),
+                });
+            }
         }
-        if (shouldSkipCreatingVisit) {
-            return Promise.resolve(publicWalletAddress);
-        }
-        // send information to backend to kick off background jobs
-        // so verify/sign on the next step could go by more quickly
-        // this is async work, but DO NOT AWAIT
-        createVisit({
-            authMode,
-            chain: walletChain || '',
-            environmentId,
-            publicWalletAddress,
-            walletName: walletConnector.name,
-            walletProvider: getWalletProvider(walletConnector),
-        });
         return Promise.resolve(publicWalletAddress);
     });
     const unlinkConnectedWallet = (walletId) => {

package/src/lib/utils/hooks/useConnectedWalletsNetworkValidation/useConnectedWalletsNetworkValidation.cjs

@@ -22,7 +22,7 @@ var isProgrammableNetworkSwitchSupported = require('../../functions/isProgrammab
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { view, setView } = ViewContext.useViewContext();
+    const { setView } = ViewContext.useViewContext();
     React.useEffect(() => {
         if (!isBridgeFlow) {
             return;
@@ -53,16 +53,17 @@ const useConnectedWalletsNetworkValidation = () => {
             }
             setView(networkNotSupportedView);
         }
+        // we need it to remove 'showAuthFlow' property. we don't want to react to it,
+        // because closing modal on network switch causes it to re-open
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        isBridgeFlow,
         connectedWallets,
-        view,
+        isBridgeFlow,
         selectedWalletConnector,
-        walletsToConnectByChain,
-        showAuthFlow,
-        setView,
         setSelectedWalletConnector,
         setShowAuthFlow,
+        setView,
+        walletsToConnectByChain,
     ]);
 };
 

package/src/lib/utils/hooks/useConnectedWalletsNetworkValidation/useConnectedWalletsNetworkValidation.js

@@ -18,7 +18,7 @@ import { isProgrammableNetworkSwitchSupported } from '../../functions/isProgramm
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext();
-    const { view, setView } = useViewContext();
+    const { setView } = useViewContext();
     useEffect(() => {
         if (!isBridgeFlow) {
             return;
@@ -49,16 +49,17 @@ const useConnectedWalletsNetworkValidation = () => {
             }
             setView(networkNotSupportedView);
         }
+        // we need it to remove 'showAuthFlow' property. we don't want to react to it,
+        // because closing modal on network switch causes it to re-open
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        isBridgeFlow,
         connectedWallets,
-        view,
+        isBridgeFlow,
         selectedWalletConnector,
-        walletsToConnectByChain,
-        showAuthFlow,
-        setView,
         setSelectedWalletConnector,
         setShowAuthFlow,
+        setView,
+        walletsToConnectByChain,
     ]);
 };
 

package/src/lib/utils/hooks/usePrimaryWalletId/usePrimaryWalletId.cjs

@@ -20,11 +20,15 @@ require('../../../shared/consts/index.cjs');
 var primaryWalletIdValidator = require('../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.cjs');
 require('@dynamic-labs/multi-wallet');
 
-const usePrimaryWalletId = () => {
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage.useLocalStorage(localStorage.PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator.primaryWalletIdValidator);
+const usePrimaryWalletId = (internalEvents) => {
+    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletIdStorage,] = useLocalStorage.useLocalStorage(localStorage.PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator.primaryWalletIdValidator);
     const setPrimaryWalletId = React.useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
+    const clearPrimaryWalletId = () => {
+        clearPrimaryWalletIdStorage();
+        internalEvents.emit('clearPrimaryWallet');
+    };
     return {
         clearPrimaryWalletId,
         primaryWalletId,

package/src/lib/utils/hooks/usePrimaryWalletId/usePrimaryWalletId.d.ts

@@ -1,4 +1,5 @@
-export declare const usePrimaryWalletId: () => {
+import { InternalEventEmitter } from '../../../context/DynamicContext/internalEvents';
+export declare const usePrimaryWalletId: (internalEvents: InternalEventEmitter) => {
     clearPrimaryWalletId: () => void;
     primaryWalletId: string | undefined;
     setPrimaryWalletId: (walletId: string) => void;

package/src/lib/utils/hooks/usePrimaryWalletId/usePrimaryWalletId.js

@@ -16,11 +16,15 @@ import '../../../shared/consts/index.js';
 import { primaryWalletIdValidator } from '../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.js';
 import '@dynamic-labs/multi-wallet';
 
-const usePrimaryWalletId = () => {
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);
+const usePrimaryWalletId = (internalEvents) => {
+    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletIdStorage,] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);
     const setPrimaryWalletId = useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
+    const clearPrimaryWalletId = () => {
+        clearPrimaryWalletIdStorage();
+        internalEvents.emit('clearPrimaryWallet');
+    };
     return {
         clearPrimaryWalletId,
         primaryWalletId,