Fix crash due to failed estimated gas limit

src/handlers/web3.ts

@@ -433,6 +433,10 @@ export async function estimateGasWithPadding(
       ? contractCallEstimateGas(...(callArguments ?? []), txPayloadToEstimate)
       : p.estimateGas(cleanTxPayload));
 
+    if (!BigNumber.isBigNumber(estimatedGas)) {
+      throw new Error('Invalid gas limit type');
+    }
+
     const lastBlockGasLimit = addBuffer(gasLimit.toString(), 0.9);
     const paddedGas = addBuffer(estimatedGas.toString(), paddingFactor.toString());
     logger.debug('[web3]: ⛽ GAS CALCULATIONS!', {

src/raps/actions/crosschainSwap.ts

@@ -71,9 +71,13 @@ export const estimateCrosschainSwapGasLimit = async ({
       SWAP_GAS_PADDING
     );
 
-    return gasLimit || getCrosschainSwapDefaultGasLimit(quote);
+    if (gasLimit === null || gasLimit === undefined || isNaN(Number(gasLimit))) {
+      return getCrosschainSwapDefaultGasLimit(quote) || getDefaultGasLimitForTrade(quote, chainId);
+    }
+
+    return gasLimit;
   } catch (error) {
-    return getCrosschainSwapDefaultGasLimit(quote);
+    return getCrosschainSwapDefaultGasLimit(quote) || getDefaultGasLimitForTrade(quote, chainId);
   }
 };
 

src/raps/actions/swap.ts

@@ -93,9 +93,13 @@ export const estimateSwapGasLimit = async ({
         WRAP_GAS_PADDING
       );
 
-      return gasLimit || String(quote?.defaultGasLimit) || String(default_estimate);
+      if (gasLimit === null || gasLimit === undefined || isNaN(Number(gasLimit))) {
+        return quote?.defaultGasLimit || default_estimate;
+      }
+
+      return gasLimit;
     } catch (e) {
-      return String(quote?.defaultGasLimit) || String(default_estimate);
+      return quote?.defaultGasLimit || default_estimate;
     }
     // Swap
   } else {
@@ -116,8 +120,11 @@ export const estimateSwapGasLimit = async ({
       }
 
       const gasLimit = await estimateGasWithPadding(params, method, methodArgs, provider, SWAP_GAS_PADDING);
+      if (gasLimit === null || gasLimit === undefined || isNaN(Number(gasLimit))) {
+        return getDefaultGasLimitForTrade(quote, chainId);
+      }
 
-      return gasLimit || getDefaultGasLimitForTrade(quote, chainId);
+      return gasLimit;
     } catch (error) {
       return getDefaultGasLimitForTrade(quote, chainId);
     }

src/raps/actions/unlock.ts

@@ -93,7 +93,12 @@ export const estimateApprove = async ({
     const gasLimit = await tokenContract.estimateGas.approve(spender, MaxUint256, {
       from: owner,
     });
-    return gasLimit ? gasLimit.toString() : `${gasUnits.basic_approval}`;
+
+    if (gasLimit === null || gasLimit === undefined || isNaN(Number(gasLimit))) {
+      return `${gasUnits.basic_approval}`;
+    }
+
+    return gasLimit.toString();
   } catch (error) {
     logger.error(new RainbowError('[raps/unlock]: error estimateApprove'), {
       message: (error as Error)?.message,

src/raps/unlockAndCrosschainSwap.ts

@@ -53,10 +53,8 @@ export const estimateUnlockAndCrosschainSwap = async ({
     });
   }
 
-  let unlockGasLimit;
-
   if (swapAssetNeedsUnlocking) {
-    unlockGasLimit = await estimateApprove({
+    const unlockGasLimit = await estimateApprove({
       owner: accountAddress,
       tokenAddress: sellTokenAddress,
       spender: allowanceTarget,
@@ -71,7 +69,14 @@ export const estimateUnlockAndCrosschainSwap = async ({
     quote,
   });
 
+  if (swapGasLimit === null || swapGasLimit === undefined || isNaN(Number(swapGasLimit))) {
+    return null;
+  }
+
   const gasLimit = gasLimits.concat(swapGasLimit).reduce((acc, limit) => add(acc, limit), '0');
+  if (isNaN(Number(gasLimit))) {
+    return null;
+  }
 
   return gasLimit.toString();
 };

src/raps/unlockAndSwap.ts

@@ -43,7 +43,6 @@ export const estimateUnlockAndSwap = async ({
   let swapAssetNeedsUnlocking = false;
 
   const nativeAsset = isLowerCaseMatch(ETH_ADDRESS_AGGREGATOR, sellTokenAddress) || isNativeAsset(sellTokenAddress, chainId);
-
   if (!isNativeAssetUnwrapping && !nativeAsset) {
     swapAssetNeedsUnlocking = await assetNeedsUnlocking({
       owner: accountAddress,
@@ -65,12 +64,8 @@ export const estimateUnlockAndSwap = async ({
     if (gasLimitFromMetadata) {
       return gasLimitFromMetadata;
     }
-  }
 
-  let unlockGasLimit;
-
-  if (swapAssetNeedsUnlocking) {
-    unlockGasLimit = await estimateApprove({
+    const unlockGasLimit = await estimateApprove({
       owner: accountAddress,
       tokenAddress: sellTokenAddress,
       spender: getRainbowRouterContractAddress(chainId),
@@ -85,7 +80,14 @@ export const estimateUnlockAndSwap = async ({
     quote,
   });
 
+  if (swapGasLimit === null || swapGasLimit === undefined || isNaN(Number(swapGasLimit))) {
+    return null;
+  }
+
   const gasLimit = gasLimits.concat(swapGasLimit).reduce((acc, limit) => add(acc, limit), '0');
+  if (isNaN(Number(gasLimit))) {
+    return null;
+  }
 
   return gasLimit.toString();
 };