omit gas price

pancakeswap · Jul 10, 2023 · cb7b35c · cb7b35c
1 parent 34e4bb4
commit cb7b35c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/apps/web/src/hooks/useApproveCallback.ts b/apps/web/src/hooks/useApproveCallback.ts
@@ -95,14 +95,14 @@ export function useApproveCallback(
 
     const estimatedGas = await tokenContract.estimateGas
       .approve([spender as Address, MaxUint256], {
-        // account: tokenContract.account,
+        account: tokenContract.account,
       })
       .catch(() => {
         // general fallback for tokens who restrict approval amounts
         useExact = true
         return tokenContract.estimateGas
           .approve([spender as Address, amountToApprove?.quotient ?? targetAmount ?? MaxUint256], {
-            // account: tokenContract.account,
+            account: tokenContract.account,
           })
           .catch((e) => {
             console.error('estimate gas failure', e)

diff --git a/apps/web/src/hooks/useCallWithGasPrice.ts b/apps/web/src/hooks/useCallWithGasPrice.ts
@@ -73,26 +73,30 @@ export function useCallWithGasPrice() {
       methodArgs?: Args extends never ? undefined : Args,
       overrides?: Omit<CallParameters, 'chain' | 'to' | 'data'>,
     ): Promise<SendTransactionResult> => {
-      // const gas = await publicClient({ chainId }).estimateContractGas({
-      //   abi: contract.abi,
-      //   address: contract.address,
-      //   // account: walletClient.account,
-      //   functionName: methodName,
-      //   args: methodArgs,
-      //   gasPrice,
-      //   value: 0n,
-      //   ...overrides,
-      // } as unknown as EstimateContractGasParameters)
+      const { gas: gas_, ...overrides_ } = overrides || {}
+      let gas = gas_
+      if (!gas) {
+        gas = await publicClient({ chainId }).estimateContractGas({
+          abi: contract.abi,
+          address: contract.address,
+          account: walletClient.account,
+          functionName: methodName,
+          args: methodArgs,
+          value: 0n,
+          ...overrides_,
+        } as unknown as EstimateContractGasParameters)
+      }
+
       const res = await walletClient.writeContract({
         abi: contract.abi,
         address: contract.address,
         account: walletClient.account,
         functionName: methodName,
         args: methodArgs,
         gasPrice,
-        // gas: calculateGasMargin(gas),
+        gas: calculateGasMargin(gas),
         value: 0n,
-        ...overrides,
+        ...overrides_,
       } as unknown as WriteContractParameters)
 
       const hash = res