@dynamic-labs/sdk-react-core 0.17.27 → 0.17.29

package/src/lib/views/TransactionConfirmationView/hooks/useTransactionData/useTransactionData.cjs

@@ -40,33 +40,36 @@ require('../../../../context/MockContext/MockContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 var usePromise = require('../../../../utils/hooks/usePromise/usePromise.cjs');
 require('../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
+var useTransactionEstimatedGas = require('../../../../utils/hooks/useTransactionEstimatedGas/useTransactionEstimatedGas.cjs');
 
 const useTransactionData = ({ provider, transaction, }) => {
     const { data: transactionValue, isLoading: isEffectiveValueLoading } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const val = yield transaction.value;
         return val ? ethers.ethers.BigNumber.from(val) : undefined;
     }));
-    const { data: estimatedGas, isLoading: isEstimatedGasLoading } = usePromise.usePromise(() => {
-        // To safely run estimateGas using alchemy, we need to remove the from address
-        // because alchemy checks the origin address funds and can return an error if
-        // origin wallet has no funds for the transaction
-        // https://docs.alchemy.com/reference/eth-estimategas
-        const { from } = transaction, transactionWithNoOrigin = _tslib.__rest(transaction, ["from"]);
-        return provider.estimateGas(transactionWithNoOrigin);
-    });
-    const { data: gasPrice, isLoading: isFeeDataLoading } = usePromise.usePromise(() => provider.getGasPrice());
-    const isGasPriceLoading = isEstimatedGasLoading || isFeeDataLoading;
-    const gasEstimate = React.useMemo(() => gasPrice && estimatedGas
-        ? ethers.ethers.BigNumber.from(gasPrice).mul(estimatedGas)
-        : undefined, [gasPrice, estimatedGas]);
+    const { data: estimatedGas, isLoading: isEstimatedGasLoading } = useTransactionEstimatedGas.useTransactionEstimatedGas(provider, transaction);
+    const { data: providerGasPrice, isLoading: isProviderGasPrice } = usePromise.usePromise(() => provider.getGasPrice(), []);
+    const { data: transactionGasPrice, isLoading: isTransactionGasPriceLoading } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const gasPrice = yield transaction.gasPrice;
+        return gasPrice ? ethers.ethers.BigNumber.from(gasPrice) : undefined;
+    }), [transaction.gasPrice]);
+    const isGasPriceLoading = isEstimatedGasLoading || isProviderGasPrice || isTransactionGasPriceLoading;
+    const isGasLoading = isProviderGasPrice || isTransactionGasPriceLoading;
+    const transactionGas = React.useMemo(() => transactionGasPrice && estimatedGas
+        ? ethers.ethers.BigNumber.from(transactionGasPrice).mul(estimatedGas)
+        : undefined, [estimatedGas, transactionGasPrice]);
+    const gasEstimate = React.useMemo(() => !transactionGasPrice && providerGasPrice && estimatedGas
+        ? ethers.ethers.BigNumber.from(providerGasPrice).mul(estimatedGas)
+        : undefined, [transactionGasPrice, estimatedGas, providerGasPrice]);
     const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise.usePromise(() => transaction.to);
     const { data: transactionFromAddress, isLoading: isTransactionFromAddressLoading, } = usePromise.usePromise(() => transaction.from);
     const total = React.useMemo(() => {
-        if (gasEstimate !== undefined && transactionValue !== undefined) {
-            return gasEstimate.add(transactionValue);
+        const transactionGasFee = transactionGas || gasEstimate;
+        if (transactionGasFee !== undefined && transactionValue !== undefined) {
+            return transactionGasFee.add(transactionValue);
         }
-        return transactionValue || gasEstimate;
-    }, [gasEstimate, transactionValue]);
+        return transactionValue || transactionGasFee;
+    }, [gasEstimate, transactionGas, transactionValue]);
     const isLoading = React.useMemo(() => isEffectiveValueLoading ||
         isGasPriceLoading ||
         isTransactionToAddressLoading ||
@@ -79,12 +82,16 @@ const useTransactionData = ({ provider, transaction, }) => {
     return {
         gasEstimate,
         isEffectiveValueLoading,
+        isGasLoading,
         isGasPriceLoading,
         isLoading,
         isTransactionFromAddressLoading,
+        isTransactionGasPriceLoading,
         isTransactionToAddressLoading,
         total,
         transactionFromAddress,
+        transactionGas,
+        transactionGasPrice,
         transactionToAddress,
         transactionValue,
     };

package/src/lib/views/TransactionConfirmationView/hooks/useTransactionData/useTransactionData.d.ts

@@ -6,12 +6,16 @@ type TransactionDataHookProps = {
 export declare const useTransactionData: ({ provider, transaction, }: TransactionDataHookProps) => {
     gasEstimate: ethers.BigNumber | undefined;
     isEffectiveValueLoading: boolean;
+    isGasLoading: boolean;
     isGasPriceLoading: boolean;
     isLoading: boolean;
     isTransactionFromAddressLoading: boolean;
+    isTransactionGasPriceLoading: boolean;
     isTransactionToAddressLoading: boolean;
     total: ethers.BigNumber | undefined;
     transactionFromAddress: string | undefined;
+    transactionGas: ethers.BigNumber | undefined;
+    transactionGasPrice: ethers.BigNumber | undefined;
     transactionToAddress: string | undefined;
     transactionValue: ethers.BigNumber | undefined;
 };

package/src/lib/views/TransactionConfirmationView/hooks/useTransactionData/useTransactionData.js

@@ -1,4 +1,4 @@
-import { __awaiter, __rest } from '../../../../../../_virtual/_tslib.js';
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { useMemo } from 'react';
 import { ethers } from 'ethers';
 import '@dynamic-labs/utils';
@@ -36,33 +36,36 @@ import '../../../../context/MockContext/MockContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import { usePromise } from '../../../../utils/hooks/usePromise/usePromise.js';
 import '../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
+import { useTransactionEstimatedGas } from '../../../../utils/hooks/useTransactionEstimatedGas/useTransactionEstimatedGas.js';
 
 const useTransactionData = ({ provider, transaction, }) => {
     const { data: transactionValue, isLoading: isEffectiveValueLoading } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
         const val = yield transaction.value;
         return val ? ethers.BigNumber.from(val) : undefined;
     }));
-    const { data: estimatedGas, isLoading: isEstimatedGasLoading } = usePromise(() => {
-        // To safely run estimateGas using alchemy, we need to remove the from address
-        // because alchemy checks the origin address funds and can return an error if
-        // origin wallet has no funds for the transaction
-        // https://docs.alchemy.com/reference/eth-estimategas
-        const { from } = transaction, transactionWithNoOrigin = __rest(transaction, ["from"]);
-        return provider.estimateGas(transactionWithNoOrigin);
-    });
-    const { data: gasPrice, isLoading: isFeeDataLoading } = usePromise(() => provider.getGasPrice());
-    const isGasPriceLoading = isEstimatedGasLoading || isFeeDataLoading;
-    const gasEstimate = useMemo(() => gasPrice && estimatedGas
-        ? ethers.BigNumber.from(gasPrice).mul(estimatedGas)
-        : undefined, [gasPrice, estimatedGas]);
+    const { data: estimatedGas, isLoading: isEstimatedGasLoading } = useTransactionEstimatedGas(provider, transaction);
+    const { data: providerGasPrice, isLoading: isProviderGasPrice } = usePromise(() => provider.getGasPrice(), []);
+    const { data: transactionGasPrice, isLoading: isTransactionGasPriceLoading } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
+        const gasPrice = yield transaction.gasPrice;
+        return gasPrice ? ethers.BigNumber.from(gasPrice) : undefined;
+    }), [transaction.gasPrice]);
+    const isGasPriceLoading = isEstimatedGasLoading || isProviderGasPrice || isTransactionGasPriceLoading;
+    const isGasLoading = isProviderGasPrice || isTransactionGasPriceLoading;
+    const transactionGas = useMemo(() => transactionGasPrice && estimatedGas
+        ? ethers.BigNumber.from(transactionGasPrice).mul(estimatedGas)
+        : undefined, [estimatedGas, transactionGasPrice]);
+    const gasEstimate = useMemo(() => !transactionGasPrice && providerGasPrice && estimatedGas
+        ? ethers.BigNumber.from(providerGasPrice).mul(estimatedGas)
+        : undefined, [transactionGasPrice, estimatedGas, providerGasPrice]);
     const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise(() => transaction.to);
     const { data: transactionFromAddress, isLoading: isTransactionFromAddressLoading, } = usePromise(() => transaction.from);
     const total = useMemo(() => {
-        if (gasEstimate !== undefined && transactionValue !== undefined) {
-            return gasEstimate.add(transactionValue);
+        const transactionGasFee = transactionGas || gasEstimate;
+        if (transactionGasFee !== undefined && transactionValue !== undefined) {
+            return transactionGasFee.add(transactionValue);
         }
-        return transactionValue || gasEstimate;
-    }, [gasEstimate, transactionValue]);
+        return transactionValue || transactionGasFee;
+    }, [gasEstimate, transactionGas, transactionValue]);
     const isLoading = useMemo(() => isEffectiveValueLoading ||
         isGasPriceLoading ||
         isTransactionToAddressLoading ||
@@ -75,12 +78,16 @@ const useTransactionData = ({ provider, transaction, }) => {
     return {
         gasEstimate,
         isEffectiveValueLoading,
+        isGasLoading,
         isGasPriceLoading,
         isLoading,
         isTransactionFromAddressLoading,
+        isTransactionGasPriceLoading,
         isTransactionToAddressLoading,
         total,
         transactionFromAddress,
+        transactionGas,
+        transactionGasPrice,
         transactionToAddress,
         transactionValue,
     };