moved 89/88 override to defaultGasOverride

Author: nischitpra

packages/thirdweb/src/gas/fee-data.ts

@@ -47,6 +47,8 @@ const FORCE_GAS_PRICE_CHAIN_IDS = [
   2020, // Ronin Mainnet
   2021, // Ronin Testnet (Saigon)
   98866, // Plume mainnet
+  89, // Viction Testnet
+  88, // Viction Mainnet
 ];
 
 /**
@@ -135,8 +137,16 @@ export async function getDefaultGasOverrides(
     resolvedFeeType === "legacy" ||
     FORCE_GAS_PRICE_CHAIN_IDS.includes(chain.id)
   ) {
+    const gasPrice = await getGasPrice({ chain, client, percentMultiplier: 10 })
+    if(chain.id === 88 || chain.id === 89) {
+      return {
+        maxPriorityFeePerGas: gasPrice || 0n,
+        maxFeePerGas: gasPrice || 0n
+      }
+    }
+
     return {
-      gasPrice: await getGasPrice({ chain, client, percentMultiplier: 10 }),
+      gasPrice,
     };
   }
   const feeData = await getDynamicFeeData(client, chain);

packages/thirdweb/src/wallets/smart/lib/userop.ts

@@ -269,11 +269,6 @@ async function getGasFees(args: {
       maxPriorityFeePerGas =
         resolvedMaxPriorityFeePerGas ?? feeData.maxPriorityFeePerGas ?? 0n;
       maxFeePerGas = resolvedMaxFeePerGas ?? feeData.maxFeePerGas ?? 0n;
-
-      if(chain.id === 88 || chain.id === 89) {
-        maxPriorityFeePerGas = maxPriorityFeePerGas || feeData.gasPrice || 0n
-        maxFeePerGas = maxFeePerGas || feeData.gasPrice || 0n
-      }
     }
   }
   return { maxFeePerGas, maxPriorityFeePerGas };