fallback to legacy if no baseBlockFee in last block

d4mr · d4mr · commit 66fbe309aeec · 2025-02-26T17:13:52.000+05:30
diff --git a/packages/thirdweb/src/gas/fee-data.ts b/packages/thirdweb/src/gas/fee-data.ts
@@ -169,7 +169,7 @@ async function getDynamicFeeData(
     eth_maxPriorityFeePerGas(rpcRequest).catch(() => null),
   ]);
 
-  const baseBlockFee = block?.baseFeePerGas ?? 0n;
+  const baseBlockFee = block?.baseFeePerGas;
 
   const chainId = chain.id;
   // flag chain testnet & flag chain
@@ -187,7 +187,7 @@ async function getDynamicFeeData(
     maxPriorityFeePerGas_ = maxPriorityFeePerGas;
   }
 
-  if (maxPriorityFeePerGas_ == null) {
+  if (maxPriorityFeePerGas_ == null || baseBlockFee == null) {
     // chain does not support eip-1559, return null for both
     return { maxFeePerGas: null, maxPriorityFeePerGas: null };
   }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ async function getDynamicFeeData(`
`169`	`169`	`eth_maxPriorityFeePerGas(rpcRequest).catch(() => null),`
`170`	`170`	`]);`
`171`	`171`
`172`		`- const baseBlockFee = block?.baseFeePerGas ?? 0n;`
	`172`	`+ const baseBlockFee = block?.baseFeePerGas;`
`173`	`173`
`174`	`174`	`const chainId = chain.id;`
`175`	`175`	`// flag chain testnet & flag chain`
`@@ -187,7 +187,7 @@ async function getDynamicFeeData(`
`187`	`187`	`maxPriorityFeePerGas_ = maxPriorityFeePerGas;`
`188`	`188`	`}`
`189`	`189`
`190`		`- if (maxPriorityFeePerGas_ == null) {`
	`190`	`+ if (maxPriorityFeePerGas_ == null \|\| baseBlockFee == null) {`
`191`	`191`	`// chain does not support eip-1559, return null for both`
`192`	`192`	`return { maxFeePerGas: null, maxPriorityFeePerGas: null };`
`193`	`193`	`}`