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

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### [0.17.29](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.28...v0.17.29) (2023-07-28)
+
+
+### Bug Fixes
+
+* **transaction:** improve gas estimate in transaction confirmation ([#2756](https://github.com/dynamic-labs/DynamicAuth/issues/2756)) ([a45c99d](https://github.com/dynamic-labs/DynamicAuth/commit/a45c99d40208a17f206e192d72c3ce599389069b))
+
 ### [0.17.28](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.27...v0.17.28) (2023-07-26)
 
 

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "0.17.28";
+var version = "0.17.29";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",

package/package.js

@@ -1,4 +1,4 @@
-var version = "0.17.28";
+var version = "0.17.29";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.17.28",
+  "version": "0.17.29",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -16,13 +16,13 @@
     "formik": "2.2.9",
     "qrcode": "1.5.1",
     "ethers": "5.7.2",
-    "@dynamic-labs/logger": "0.17.28",
-    "@dynamic-labs/multi-wallet": "0.17.28",
-    "@dynamic-labs/rpc-providers": "0.17.28",
-    "@dynamic-labs/types": "0.17.28",
-    "@dynamic-labs/utils": "0.17.28",
-    "@dynamic-labs/wallet-book": "0.17.28",
-    "@dynamic-labs/wallet-connector-core": "0.17.28"
+    "@dynamic-labs/logger": "0.17.29",
+    "@dynamic-labs/multi-wallet": "0.17.29",
+    "@dynamic-labs/rpc-providers": "0.17.29",
+    "@dynamic-labs/types": "0.17.29",
+    "@dynamic-labs/utils": "0.17.29",
+    "@dynamic-labs/wallet-book": "0.17.29",
+    "@dynamic-labs/wallet-connector-core": "0.17.29"
   },
   "devDependencies": {
     "semver": "7.3.8"

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

@@ -25,3 +25,4 @@ export { useGetSocialIcon } from './useGetSocialIcon';
 export { useIconThemeVariant } from './useIconThemeVariant';
 export type { IconThemeVariant } from './useIconThemeVariant';
 export { useTransactionWithGasPrice } from './useTransactionWithGasPrice';
+export { useTransactionEstimatedGas } from './useTransactionEstimatedGas';

package/src/lib/utils/hooks/useTransactionEstimatedGas/index.d.ts

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

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

@@ -0,0 +1,42 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var usePromise = require('../usePromise/usePromise.cjs');
+require('@dynamic-labs/sdk-api');
+var logger = require('../../../shared/logger.cjs');
+require('../../../config/LSSuffix.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/utils');
+require('../../constants/colors.cjs');
+require('ethers');
+require('../../../shared/consts/index.cjs');
+
+const useTransactionEstimatedGas = (provider, transaction) => usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    // 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"]);
+    try {
+        return yield provider.estimateGas(transactionWithNoOrigin);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    }
+    catch (err) {
+        logger.logger.error(err);
+        // If the error is UNPREDICTABLE_GAS_LIMIT, we try to estimate gas again
+        // with original transaction
+        // https://docs.ethers.org/v5/troubleshooting/errors/#help-UNPREDICTABLE_GAS_LIMIT
+        if (err.code === 'UNPREDICTABLE_GAS_LIMIT') {
+            return provider.estimateGas(transaction);
+        }
+        throw err;
+    }
+}));
+
+exports.useTransactionEstimatedGas = useTransactionEstimatedGas;

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

@@ -0,0 +1,2 @@
+import { ethers } from 'ethers';
+export declare const useTransactionEstimatedGas: (provider: ethers.providers.Web3Provider, transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>) => import("../usePromise").PromiseState<ethers.BigNumber, unknown>;

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

@@ -0,0 +1,38 @@
+import { __awaiter, __rest } from '../../../../../_virtual/_tslib.js';
+import { usePromise } from '../usePromise/usePromise.js';
+import '@dynamic-labs/sdk-api';
+import { logger } from '../../../shared/logger.js';
+import '../../../config/LSSuffix.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/utils';
+import '../../constants/colors.js';
+import 'ethers';
+import '../../../shared/consts/index.js';
+
+const useTransactionEstimatedGas = (provider, transaction) => usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
+    // 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"]);
+    try {
+        return yield provider.estimateGas(transactionWithNoOrigin);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    }
+    catch (err) {
+        logger.error(err);
+        // If the error is UNPREDICTABLE_GAS_LIMIT, we try to estimate gas again
+        // with original transaction
+        // https://docs.ethers.org/v5/troubleshooting/errors/#help-UNPREDICTABLE_GAS_LIMIT
+        if (err.code === 'UNPREDICTABLE_GAS_LIMIT') {
+            return provider.estimateGas(transaction);
+        }
+        throw err;
+    }
+}));
+
+export { useTransactionEstimatedGas };

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

@@ -40,20 +40,14 @@ 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: 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;
@@ -74,7 +68,7 @@ const useTransactionData = ({ provider, transaction, }) => {
         if (transactionGasFee !== undefined && transactionValue !== undefined) {
             return transactionGasFee.add(transactionValue);
         }
-        return transactionValue || gasEstimate;
+        return transactionValue || transactionGasFee;
     }, [gasEstimate, transactionGas, transactionValue]);
     const isLoading = React.useMemo(() => isEffectiveValueLoading ||
         isGasPriceLoading ||

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,20 +36,14 @@ 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: 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;
@@ -70,7 +64,7 @@ const useTransactionData = ({ provider, transaction, }) => {
         if (transactionGasFee !== undefined && transactionValue !== undefined) {
             return transactionGasFee.add(transactionValue);
         }
-        return transactionValue || gasEstimate;
+        return transactionValue || transactionGasFee;
     }, [gasEstimate, transactionGas, transactionValue]);
     const isLoading = useMemo(() => isEffectiveValueLoading ||
         isGasPriceLoading ||