fix: gas estimation

showtime-xyz · Oct 31, 2023 · 11f437d · 11f437d
1 parent 54f9ce8
commit 11f437d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/packages/app/hooks/creator-token/use-creator-token-approve.ts b/packages/app/hooks/creator-token/use-creator-token-approve.ts
@@ -41,29 +41,24 @@ export const useApproveToken = () => {
         );
 
         if (res < maxPrice) {
-          const { gasPrice } = await publicClient.estimateFeesPerGas({
-            type: "legacy",
-          });
           const { maxFeePerGas, maxPriorityFeePerGas } =
             await publicClient.estimateFeesPerGas({
               type: "eip1559",
             });
 
           console.log("gas price  approve", {
-            gasPrice,
             maxFeePerGas,
             maxPriorityFeePerGas,
           });
-          if (gasPrice && maxFeePerGas) {
+          if (maxFeePerGas) {
             const { request } = await publicClient.simulateContract({
               address: usdcAddress,
               account: walletAddress,
               abi: erc20Abi,
               functionName: "approve",
               args: [creatorTokenContract, maxPrice],
               chain: chain,
-              maxFeePerGas:
-                maxFeePerGas > gasPrice * 2n ? maxFeePerGas : gasPrice * 2n,
+              maxFeePerGas,
               maxPriorityFeePerGas,
             });
 

diff --git a/packages/app/hooks/creator-token/use-creator-token-buy.ts b/packages/app/hooks/creator-token/use-creator-token-buy.ts
@@ -73,20 +73,16 @@ export const useCreatorTokenBuy = (params: {
               baseChain?.rpcUrls.default.http[0]
             );
 
-            const { gasPrice } = await publicClient.estimateFeesPerGas({
-              type: "legacy",
-            });
             const { maxFeePerGas, maxPriorityFeePerGas } =
               await publicClient.estimateFeesPerGas({
                 type: "eip1559",
               });
 
             console.log("gas price  buy", {
-              gasPrice,
               maxFeePerGas,
               maxPriorityFeePerGas,
             });
-            if (gasPrice && maxFeePerGas) {
+            if (maxFeePerGas) {
               if (tokenAmount === 1) {
                 const { request } = await publicClient.simulateContract({
                   address: profileData?.data?.profile.creator_token.address,
@@ -96,8 +92,7 @@ export const useCreatorTokenBuy = (params: {
                   args: [priceToBuyNext.data?.totalPrice],
                   chain: baseChain,
                   type: "eip1559",
-                  maxFeePerGas:
-                    maxFeePerGas > gasPrice * 2n ? maxFeePerGas : gasPrice * 2n,
+                  maxFeePerGas,
                   maxPriorityFeePerGas,
                 });
                 requestPayload = request;
@@ -111,8 +106,7 @@ export const useCreatorTokenBuy = (params: {
                   args: [tokenAmount, priceToBuyNext.data?.totalPrice],
                   chain: baseChain,
                   type: "eip1559",
-                  maxFeePerGas:
-                    maxFeePerGas > gasPrice * 2n ? maxFeePerGas : gasPrice * 2n,
+                  maxFeePerGas,
                   maxPriorityFeePerGas,
                 });
                 console.log("bulk buy request", request);