reuse baseFeeOverhead as proving base fee

Author: colinlyguo

consensus/misc/eip1559.go

@@ -107,18 +107,20 @@ func CalcBaseFee(config *params.ChainConfig, parent *types.Header, parentL1BaseF
 		return big.NewInt(10000000) // 0.01 Gwei
 	}
 
+	scalar, overhead := ReadL2BaseFeeCoefficients()
+
 	if parent == nil || parent.Number == nil || !config.IsFeynman(currentHeaderTime) {
-		scalar, overhead := ReadL2BaseFeeCoefficients()
 		return calcBaseFee(scalar, overhead, parentL1BaseFee)
 	}
-	return calcBaseFeeFeynman(config, parent)
+	// In Feynman base fee calculation, we reuse the contract's baseFeeOverhead slot as the proving base fee.
+	return calcBaseFeeFeynman(config, parent, overhead)
 }
 
 // calcBaseFeeFeynman calculates the basefee of the header for Feynman fork.
-func calcBaseFeeFeynman(config *params.ChainConfig, parent *types.Header) *big.Int {
+func calcBaseFeeFeynman(config *params.ChainConfig, parent *types.Header, overhead *big.Int) *big.Int {
 	baseFeeEIP1559 := calcBaseFeeEIP1559(config, parent)
 	baseFee := new(big.Int).Set(baseFeeEIP1559)
-	baseFee.Add(baseFee, config.ProvingBaseFee)
+	baseFee.Add(baseFee, overhead)
 
 	return baseFee
 }
@@ -170,7 +172,9 @@ func calcBaseFeeEIP1559(config *params.ChainConfig, parent *types.Header) *big.I
 }
 
 func extractBaseFeeEIP1559(config *params.ChainConfig, baseFee *big.Int) *big.Int {
-	return new(big.Int).Sub(baseFee, config.ProvingBaseFee)
+	_, overhead := ReadL2BaseFeeCoefficients()
+	// In Feynman base fee calculation, we reuse the contract's baseFeeOverhead slot as the proving base fee.
+	return new(big.Int).Sub(baseFee, overhead)
 }
 
 // MinBaseFee calculates the minimum L2 base fee based on the current coefficients.

core/state_processor_test.go

@@ -68,7 +68,6 @@ func TestStateProcessorErrors(t *testing.T) {
 			EuclidTime:          new(uint64),
 			EuclidV2Time:        new(uint64),
 			FeynmanTime:         new(uint64),
-			ProvingBaseFee:      new(big.Int),
 			Ethash:              new(params.EthashConfig),
 		}
 		signer  = types.LatestSigner(config)

params/config.go

@@ -524,7 +524,6 @@ var (
 		EuclidTime:              new(uint64),
 		EuclidV2Time:            new(uint64),
 		FeynmanTime:             new(uint64),
-		ProvingBaseFee:          new(big.Int),
 		TerminalTotalDifficulty: nil,
 		Ethash:                  new(EthashConfig),
 		Clique:                  nil,
@@ -667,7 +666,6 @@ type ChainConfig struct {
 	EuclidTime          *uint64  `json:"euclidTime,omitempty"`          // Euclid switch time (nil = no fork, 0 = already on euclid)
 	EuclidV2Time        *uint64  `json:"euclidv2Time,omitempty"`        // EuclidV2 switch time (nil = no fork, 0 = already on euclidv2)
 	FeynmanTime         *uint64  `json:"feynmanTime,omitempty"`         // Feynman switch time (nil = no fork, 0 = already on feynman)
-	ProvingBaseFee      *big.Int `json:"provingFee,omitempty"`          // Proving base fee to be added to EIP1559 l2 base fee to account for proving costs
 
 	// TerminalTotalDifficulty is the amount of total difficulty reached by
 	// the network that triggers the consensus upgrade.