jovian: remove feature toggles

the scope is now locked

Author: geoknee

consensus/beacon/consensus.go

@@ -412,7 +412,7 @@ func (beacon *Beacon) FinalizeAndAssemble(chain consensus.ChainHeaderReader, hea
 
 	// Store DA footprint in BlobGasUsed header field if it hasn't already been set yet.
 	// Builder code may already calculate it during block building to avoid recalculating it here.
-	if chain.Config().IsDAFootprintBlockLimit(header.Time) && (header.BlobGasUsed == nil || *header.BlobGasUsed == 0) {
+	if chain.Config().IsJovian(header.Time) && (header.BlobGasUsed == nil || *header.BlobGasUsed == 0) {
 		daFootprint, err := types.CalcDAFootprint(body.Transactions)
 		if err != nil {
 			return nil, fmt.Errorf("error calculating DA footprint: %w", err)

consensus/misc/eip1559/eip1559.go

@@ -92,7 +92,7 @@ func CalcBaseFee(config *params.ChainConfig, parent *types.Header, time uint64)
 func calcBaseFeeInner(config *params.ChainConfig, parent *types.Header, elasticity uint64, denominator uint64) *big.Int {
 	parentGasTarget := parent.GasLimit / elasticity
 	parentGasMetered := parent.GasUsed
-	if config.IsDAFootprintBlockLimit(parent.Time) {
+	if config.IsJovian(parent.Time) {
 		if parent.BlobGasUsed == nil {
 			panic("Jovian parent block has nil BlobGasUsed")
 		} else if *parent.BlobGasUsed > parent.GasUsed {

core/block_validator.go

@@ -117,7 +117,7 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
 	}
 
 	// OP Stack Jovian DA footprint block limit.
-	if v.config.IsDAFootprintBlockLimit(header.Time) {
+	if v.config.IsJovian(header.Time) {
 		if header.BlobGasUsed == nil {
 			return errors.New("nil blob gas used in post-Jovian block header, should store DA footprint")
 		}

miner/miner_optimism_test.go

@@ -113,7 +113,7 @@ func testMineAndExecute(t *testing.T, numTxs uint64, cfg *params.ChainConfig, as
 	parent := b.chain.CurrentBlock()
 	ts := parent.Time + 12
 	dtx := new(types.DepositTx)
-	if cfg.IsDAFootprintBlockLimit(parent.Time) {
+	if cfg.IsJovian(parent.Time) {
 		dtx = jovianDepositTx(testDAFootprintGasScalar)
 	}
 

miner/payload_building_test.go

@@ -271,7 +271,7 @@ func newPayloadArgs(parentHash common.Hash, cfg *params.ChainConfig) *BuildPaylo
 		args.EIP1559Params = validEIP1559Params
 	}
 	dtx := new(types.DepositTx)
-	if cfg.IsDAFootprintBlockLimit(args.Timestamp) {
+	if cfg.IsJovian(args.Timestamp) {
 		dtx = jovianDepositTx(testDAFootprintGasScalar)
 	}
 	args.Transactions = []*types.Transaction{types.NewTx(dtx)}

miner/worker.go

@@ -355,7 +355,7 @@ func (miner *Miner) prepareWork(genParams *generateParams, witness bool) (*envir
 		return nil, err
 	}
 	env.noTxs = genParams.noTxs
-	if miner.chainConfig.IsDAFootprintBlockLimit(parent.Time) {
+	if miner.chainConfig.IsJovian(parent.Time) {
 		if len(genParams.txs) == 0 || !genParams.txs[0].IsDepositTx() {
 			return nil, errors.New("missing L1 attributes deposit transaction")
 		}
@@ -506,7 +506,7 @@ func (miner *Miner) commitTransactions(env *environment, plainTxs, blobTxs *tran
 
 	// OP-Stack additions: throttling and DA footprint limit
 	blockDABytes := new(big.Int)
-	isJovian := miner.chainConfig.IsDAFootprintBlockLimit(env.header.Time)
+	isJovian := miner.chainConfig.IsJovian(env.header.Time)
 	minTransactionDAFootprint := types.MinTransactionSize.Uint64() * uint64(env.daFootprintGasScalar)
 
 	for {

params/optimism_feature_toggles.go

@@ -1,17 +1,11 @@
 package params
 
 // OPStack diff
-// This file contains ephemeral feature toggles which should be removed
+// This file contains ephemeral feature toggles for the next
+// fork while it is in development. They should be removed
 // after the fork scope is locked.
 
-func (c *ChainConfig) IsMinBaseFee(time uint64) bool {
-	return c.IsJovian(time) // Replace with return false to disable
-}
-
-func (c *ChainConfig) IsDAFootprintBlockLimit(time uint64) bool {
-	return c.IsJovian(time) // Replace with return false to disable
-}
-
-func (c *ChainConfig) IsOperatorFeeFix(time uint64) bool {
-	return c.IsJovian(time) // Replace with return false to disable
-}
+// Example:
+// func (c *ChainConfig) IsMinBaseFee(time uint64) bool {
+// 	return c.IsJovian(time) // Replace with return false to disable
+// }