Filter by total gas rather than GasUsed

eth/gasprice/fee_info_provider.go

@@ -92,10 +92,17 @@ func (f *feeInfoProvider) addHeader(ctx context.Context, header *types.Header) (
 		timestamp: header.Time,
 		baseFee:   header.BaseFee,
 	}
+
+	totalGasUsed := new(big.Int).SetUint64(header.GasUsed)
+	if header.ExtDataGasUsed != nil {
+		totalGasUsed.Add(totalGasUsed, header.ExtDataGasUsed)
+	}
+	minGasUsed := new(big.Int).SetUint64(f.minGasUsed)
+
 	// Don't bias the estimate with blocks containing a limited number of transactions paying to
 	// expedite block production.
 	var err error
-	if f.minGasUsed <= header.GasUsed {
+	if minGasUsed.Cmp(totalGasUsed) <= 0 {
 		// Compute minimum required tip to be included in previous block
 		//
 		// NOTE: Using this approach, we will never recommend that the caller

eth/gasprice/gasprice_test.go

@@ -395,3 +395,13 @@ func TestSuggestTipCapMaxBlocksSecondsLookback(t *testing.T) {
 		expectedTip:     big.NewInt(92_212_529_424),
 	}, timeCrunchOracleConfig())
 }
+
+func TestSuggestTipCapIncludesExtraDataGas(t *testing.T) {
+	applyGasPriceTest(t, suggestTipCapTest{
+		chainConfig:     params.TestChainConfig,
+		numBlocks:       20,
+		extDataGasUsage: DefaultMinGasUsed,
+		genBlock:        testGenBlock(t, 100_000, 1),
+		expectedTip:     big.NewInt(83_603_561_239),
+	}, timeCrunchOracleConfig())
+}