jovian: remove feature toggles

geoknee · geoknee · commit d3738b2bb956 · 2025-10-23T07:57:03.000+01:00
scope is now fixed
diff --git a/op-acceptance-tests/tests/jovian/min_base_fee_test.go b/op-acceptance-tests/tests/jovian/min_base_fee_test.go
@@ -83,7 +83,7 @@ func (mbf *minBaseFeeEnv) verifyMinBaseFee(t devtest.T, minBase *big.Int) {
 // waitForMinBaseFeeConfigChangeOnL2 waits until the L2 latest payload extra-data encodes the expected min base fee.
 func (mbf *minBaseFeeEnv) waitForMinBaseFeeConfigChangeOnL2(t devtest.T, expected uint64) {
 	client := mbf.l2EL.Escape().L2EthClient()
-	expectedExtraData := eth.BytesMax32(eip1559.EncodeMinBaseFeeExtraData(250, 6, expected))
+	expectedExtraData := eth.BytesMax32(eip1559.EncodeJovianExtraData(250, 6, expected))
 
 	// Check extradata in block header (for all clients)
 	var actualBlockExtraData []byte
diff --git a/op-chain-ops/genesis/genesis.go b/op-chain-ops/genesis/genesis.go
@@ -23,7 +23,7 @@ const defaultGasLimit = 30_000_000
 var HoloceneExtraData = eip1559.EncodeHoloceneExtraData(250, 6)
 
 // MinBaseFeeExtraData represents the default extra data for Jovian-genesis chains.
-var MinBaseFeeExtraData = eip1559.EncodeMinBaseFeeExtraData(250, 6, 0)
+var MinBaseFeeExtraData = eip1559.EncodeJovianExtraData(250, 6, 0)
 
 // NewL2Genesis will create a new L2 genesis
 func NewL2Genesis(config *DeployConfig, l1StartHeader *eth.BlockRef) (*core.Genesis, error) {
@@ -123,7 +123,7 @@ func NewL2Genesis(config *DeployConfig, l1StartHeader *eth.BlockRef) (*core.Gene
 	if optimismChainConfig.IsIsthmus(genesis.Timestamp) {
 		genesis.Alloc[params.HistoryStorageAddress] = types.Account{Nonce: 1, Code: params.HistoryStorageCode, Balance: common.Big0}
 	}
-	if optimismChainConfig.IsMinBaseFee(genesis.Timestamp) {
+	if optimismChainConfig.IsJovian(genesis.Timestamp) {
 		genesis.ExtraData = MinBaseFeeExtraData
 	}
 
diff --git a/op-devstack/dsl/bridge.go b/op-devstack/dsl/bridge.go
@@ -604,7 +604,7 @@ func gasCost(rcpt *types.Receipt, rollupCfg *rollup.Config, blockTimestamp *uint
 		}
 		operatorCost := new(big.Int).SetUint64(rcpt.GasUsed)
 		operatorCost.Mul(operatorCost, new(big.Int).SetUint64(*rcpt.OperatorFeeScalar))
-		if rollupCfg.IsOperatorFeeFix(*blockTimestamp) {
+		if rollupCfg.IsJovian(*blockTimestamp) {
 			operatorCost.Mul(operatorCost, big.NewInt(100))
 		} else {
 			operatorCost.Div(operatorCost, big.NewInt(1_000_000))
diff --git a/op-e2e/actions/proofs/jovian_activation_test.go b/op-e2e/actions/proofs/jovian_activation_test.go
@@ -71,7 +71,7 @@ func Test_ProgramAction_JovianActivation(gt *testing.T) {
 		// Build the activation block
 		env.Sequencer.ActL2EmptyBlock(t)
 		activationBlock := env.Engine.L2Chain().GetBlockByHash(env.Sequencer.L2Unsafe().Hash)
-		require.Equal(t, eip1559.EncodeMinBaseFeeExtraData(250, 6, 0), activationBlock.Extra(), "activation block should have Jovian extraData")
+		require.Equal(t, eip1559.EncodeJovianExtraData(250, 6, 0), activationBlock.Extra(), "activation block should have Jovian extraData")
 
 		// Set the minimum base fee
 		setMinBaseFeeViaSystemConfig(t, env, minBaseFee)
@@ -92,7 +92,7 @@ func Test_ProgramAction_JovianActivation(gt *testing.T) {
 		// Block after the SystemConfig change
 		env.Sequencer.ActL2EmptyBlock(t)
 		blockAfterSystemConfigChange := env.Engine.L2Chain().GetBlockByHash(env.Sequencer.L2Unsafe().Hash)
-		expectedJovianExtraDataWithMinFee := eip1559.EncodeMinBaseFeeExtraData(250, 6, minBaseFee)
+		expectedJovianExtraDataWithMinFee := eip1559.EncodeJovianExtraData(250, 6, minBaseFee)
 		require.Equal(t, expectedJovianExtraDataWithMinFee, blockAfterSystemConfigChange.Extra(), "block should have updated Jovian extraData with min base fee")
 
 		// Verify base fee is clamped
diff --git a/op-node/p2p/gossip.go b/op-node/p2p/gossip.go
@@ -387,7 +387,7 @@ func BuildBlocksValidator(log log.Logger, cfg *rollup.Config, runCfg GossipRunti
 				log.Warn("payload is on v3 topic, but has nil blob gas used", "bad_hash", payload.BlockHash.String())
 				return pubsub.ValidationReject
 				// [REJECT] if the block is on a topic >= V3 and has a non-zero blob gas used field pre-Jovian
-			} else if !cfg.IsDAFootprintBlockLimit(uint64(payload.Timestamp)) && *payload.BlobGasUsed != 0 {
+			} else if !cfg.IsJovian(uint64(payload.Timestamp)) && *payload.BlobGasUsed != 0 {
 				log.Warn("payload is on v3 topic, but has non-zero blob gas used",
 					"bad_hash", payload.BlockHash.String(), "blob_gas_used", *payload.BlobGasUsed)
 				return pubsub.ValidationReject
diff --git a/op-node/rollup/attributes/engine_consolidate_test.go b/op-node/rollup/attributes/engine_consolidate_test.go
@@ -48,7 +48,7 @@ func jovianArgs() matchArgs {
 		validTxData, _        = validTx.MarshalBinary()
 		minBaseFee            = uint64(1e9)
 
-		validJovianExtraData = eth.BytesMax32(eip1559.EncodeMinBaseFeeExtraData(
+		validJovianExtraData = eth.BytesMax32(eip1559.EncodeJovianExtraData(
 			*defaultOpConfig.EIP1559DenominatorCanyon, defaultOpConfig.EIP1559Elasticity, minBaseFee))
 		validJovianEIP1559Params = new(eth.Bytes8)
 	)
diff --git a/op-node/rollup/derive/attributes.go b/op-node/rollup/derive/attributes.go
@@ -146,7 +146,7 @@ func (ba *FetchingAttributesBuilder) PreparePayloadAttributes(ctx context.Contex
 	}
 
 	if ba.rollupCfg.IsJovianActivationBlock(nextL2Time) {
-		jovian, err := JovianNetworkUpgradeTransactions(ba.rollupCfg.IsDAFootprintBlockLimit(nextL2Time), ba.rollupCfg.IsOperatorFeeFix(nextL2Time))
+		jovian, err := JovianNetworkUpgradeTransactions()
 		if err != nil {
 			return nil, NewCriticalError(fmt.Errorf("failed to build jovian network upgrade txs: %w", err))
 		}
@@ -209,7 +209,7 @@ func (ba *FetchingAttributesBuilder) PreparePayloadAttributes(ctx context.Contex
 		r.EIP1559Params = new(eth.Bytes8)
 		*r.EIP1559Params = sysConfig.EIP1559Params
 	}
-	if ba.rollupCfg.IsMinBaseFee(nextL2Time) {
+	if ba.rollupCfg.IsJovian(nextL2Time) {
 		r.MinBaseFee = &sysConfig.MinBaseFee
 	}
 	return r, nil
diff --git a/op-node/rollup/derive/jovian_upgrade_transactions.go b/op-node/rollup/derive/jovian_upgrade_transactions.go
@@ -128,24 +128,20 @@ func OperatorFeeFixUpgradeTransactions() ([]hexutil.Bytes, error) {
 	return upgradeTxns, nil
 }
 
-func JovianNetworkUpgradeTransactions(IsDAFootprintBlockLimit, IsOperatorFeeFix bool) ([]hexutil.Bytes, error) {
+func JovianNetworkUpgradeTransactions() ([]hexutil.Bytes, error) {
 	upgradeTxs := make([]hexutil.Bytes, 0)
 
-	if IsDAFootprintBlockLimit {
-		txs, err := DAFootprintNetworkUpgradeTransactions()
-		if err != nil {
-			return nil, err
-		}
-		upgradeTxs = append(upgradeTxs, txs...)
+	txs, err := DAFootprintNetworkUpgradeTransactions()
+	if err != nil {
+		return nil, err
 	}
+	upgradeTxs = append(upgradeTxs, txs...)
 
-	if IsOperatorFeeFix {
-		txs, err := OperatorFeeFixUpgradeTransactions()
-		if err != nil {
-			return nil, err
-		}
-		upgradeTxs = append(upgradeTxs, txs...)
+	txs, err = OperatorFeeFixUpgradeTransactions()
+	if err != nil {
+		return nil, err
 	}
+	upgradeTxs = append(upgradeTxs, txs...)
 
 	return upgradeTxs, nil
 }
diff --git a/op-node/rollup/derive/payload_util.go b/op-node/rollup/derive/payload_util.go
@@ -104,11 +104,9 @@ func PayloadToSystemConfig(rollupCfg *rollup.Config, payload *eth.ExecutionPaylo
 		})
 	}
 
-	if rollupCfg.IsMinBaseFee(uint64(payload.Timestamp)) {
+	if rollupCfg.IsJovian(uint64(payload.Timestamp)) {
 		// ValidateOptimismExtraData returning a nil error guarantees that m is not nil
 		r.MinBaseFee = *m
-	}
-	if rollupCfg.IsDAFootprintBlockLimit(uint64(payload.Timestamp)) {
 		r.SetDAFootprintGasScalar(info.DAFootprintGasScalar)
 	}
 	return r, nil
diff --git a/op-node/rollup/interop/indexing/attributes.go b/op-node/rollup/interop/indexing/attributes.go
@@ -54,7 +54,7 @@ func AttributesToReplaceInvalidBlock(invalidatedBlock *eth.ExecutionPayloadEnvel
 	// unfortunately, the engine API needs the inner value, not the extra-data.
 	// So we translate it here.
 	extraData := invalidatedBlock.ExecutionPayload.ExtraData
-	denominator, elasticity, minBaseFee := eip1559.DecodeMinBaseFeeExtraData(extraData)
+	denominator, elasticity, minBaseFee := eip1559.DecodeJovianExtraData(extraData)
 	eip1559Params := eth.Bytes8(eip1559.EncodeHolocene1559Params(denominator, elasticity))
 
 	attrs := &eth.PayloadAttributes{
diff --git a/op-node/rollup/toggles.go b/op-node/rollup/toggles.go
@@ -1,16 +1,10 @@
 package rollup
 
-// 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 *Config) IsMinBaseFee(time uint64) bool {
-	return c.IsJovian(time) // Replace with return false to disable
-}
-
-func (c *Config) IsDAFootprintBlockLimit(time uint64) bool {
-	return c.IsJovian(time) // Replace with return false to disable
-}
-
-func (c *Config) IsOperatorFeeFix(time uint64) bool {
-	return c.IsJovian(time) // Replace with return false to disable
-}
+// Example:
+// func (c *Config) IsMinBaseFee(time uint64) bool {
+// 	return c.IsJovian(time) // Replace with return false to disable
+// }
diff --git a/op-program/client/l2/test/miner.go b/op-program/client/l2/test/miner.go
@@ -122,7 +122,7 @@ func (m *Miner) Fork(t *testing.T, blockNumber uint64, attrs *eth.PayloadAttribu
 			GasLimit:              &gasLimit,
 			EIP1559Params:         &eip1559Params,
 		}
-		if m.backend.Config().IsMinBaseFee(head.Time) {
+		if m.backend.Config().IsJovian(head.Time) {
 			stub := uint64(1e9)
 			attrs.MinBaseFee = &stub
 		}
@@ -146,7 +146,7 @@ func (m *Miner) MineAt(t *testing.T, head *types.Header, attrs *eth.PayloadAttri
 			GasLimit:              &gasLimit,
 			EIP1559Params:         &eip1559Params,
 		}
-		if m.backend.Config().IsMinBaseFee(head.Time) {
+		if m.backend.Config().IsJovian(head.Time) {
 			stub := uint64(1e9)
 			attrs.MinBaseFee = &stub
 		}

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ const defaultGasLimit = 30_000_000`
`23`	`23`	`var HoloceneExtraData = eip1559.EncodeHoloceneExtraData(250, 6)`
`24`	`24`
`25`	`25`	`// MinBaseFeeExtraData represents the default extra data for Jovian-genesis chains.`
`26`		`-var MinBaseFeeExtraData = eip1559.EncodeMinBaseFeeExtraData(250, 6, 0)`
	`26`	`+var MinBaseFeeExtraData = eip1559.EncodeJovianExtraData(250, 6, 0)`
`27`	`27`
`28`	`28`	`// NewL2Genesis will create a new L2 genesis`
`29`	`29`	`func NewL2Genesis(config DeployConfig, l1StartHeader eth.BlockRef) (*core.Genesis, error) {`
`@@ -123,7 +123,7 @@ func NewL2Genesis(config DeployConfig, l1StartHeader eth.BlockRef) (*core.Gene`
`123`	`123`	`if optimismChainConfig.IsIsthmus(genesis.Timestamp) {`
`124`	`124`	`genesis.Alloc[params.HistoryStorageAddress] = types.Account{Nonce: 1, Code: params.HistoryStorageCode, Balance: common.Big0}`
`125`	`125`	`}`
`126`		`- if optimismChainConfig.IsMinBaseFee(genesis.Timestamp) {`
	`126`	`+ if optimismChainConfig.IsJovian(genesis.Timestamp) {`
`127`	`127`	`genesis.ExtraData = MinBaseFeeExtraData`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -604,7 +604,7 @@ func gasCost(rcpt types.Receipt, rollupCfg rollup.Config, blockTimestamp *uint`
`604`	`604`	`}`
`605`	`605`	`operatorCost := new(big.Int).SetUint64(rcpt.GasUsed)`
`606`	`606`	`operatorCost.Mul(operatorCost, new(big.Int).SetUint64(*rcpt.OperatorFeeScalar))`
`607`		`- if rollupCfg.IsOperatorFeeFix(*blockTimestamp) {`
	`607`	`+ if rollupCfg.IsJovian(*blockTimestamp) {`
`608`	`608`	`operatorCost.Mul(operatorCost, big.NewInt(100))`
`609`	`609`	`} else {`
`610`	`610`	`operatorCost.Div(operatorCost, big.NewInt(1_000_000))`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func jovianArgs() matchArgs {`
`48`	`48`	`validTxData, _ = validTx.MarshalBinary()`
`49`	`49`	`minBaseFee = uint64(1e9)`
`50`	`50`
`51`		`- validJovianExtraData = eth.BytesMax32(eip1559.EncodeMinBaseFeeExtraData(`
	`51`	`+ validJovianExtraData = eth.BytesMax32(eip1559.EncodeJovianExtraData(`
`52`	`52`	`*defaultOpConfig.EIP1559DenominatorCanyon, defaultOpConfig.EIP1559Elasticity, minBaseFee))`
`53`	`53`	`validJovianEIP1559Params = new(eth.Bytes8)`
`54`	`54`	`)`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ func (ba *FetchingAttributesBuilder) PreparePayloadAttributes(ctx context.Contex`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`if ba.rollupCfg.IsJovianActivationBlock(nextL2Time) {`
`149`		`- jovian, err := JovianNetworkUpgradeTransactions(ba.rollupCfg.IsDAFootprintBlockLimit(nextL2Time), ba.rollupCfg.IsOperatorFeeFix(nextL2Time))`
	`149`	`+ jovian, err := JovianNetworkUpgradeTransactions()`
`150`	`150`	`if err != nil {`
`151`	`151`	`return nil, NewCriticalError(fmt.Errorf("failed to build jovian network upgrade txs: %w", err))`
`152`	`152`	`}`
`@@ -209,7 +209,7 @@ func (ba *FetchingAttributesBuilder) PreparePayloadAttributes(ctx context.Contex`
`209`	`209`	`r.EIP1559Params = new(eth.Bytes8)`
`210`	`210`	`*r.EIP1559Params = sysConfig.EIP1559Params`
`211`	`211`	`}`
`212`		`- if ba.rollupCfg.IsMinBaseFee(nextL2Time) {`
	`212`	`+ if ba.rollupCfg.IsJovian(nextL2Time) {`
`213`	`213`	`r.MinBaseFee = &sysConfig.MinBaseFee`
`214`	`214`	`}`
`215`	`215`	`return r, nil`
Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,9 @@ func PayloadToSystemConfig(rollupCfg rollup.Config, payload eth.ExecutionPaylo`
`104`	`104`	`})`
`105`	`105`	`}`
`106`	`106`
`107`		`- if rollupCfg.IsMinBaseFee(uint64(payload.Timestamp)) {`
	`107`	`+ if rollupCfg.IsJovian(uint64(payload.Timestamp)) {`
`108`	`108`	`// ValidateOptimismExtraData returning a nil error guarantees that m is not nil`
`109`	`109`	`r.MinBaseFee = *m`
`110`		`- }`
`111`		`- if rollupCfg.IsDAFootprintBlockLimit(uint64(payload.Timestamp)) {`
`112`	`110`	`r.SetDAFootprintGasScalar(info.DAFootprintGasScalar)`
`113`	`111`	`}`
`114`	`112`	`return r, nil`