apply comments

Author: fakedev9999

core/types/rollup_cost.go

@@ -220,13 +220,18 @@ func NewOperatorCostFunc(config *params.ChainConfig, statedb StateGetter) Operat
 			}
 		}
 		operatorFeeParams := statedb.GetState(L1BlockAddr, OperatorFeeParamsSlot)
+		if operatorFeeParams == (common.Hash{}) {
+			return func(gas uint64) *uint256.Int {
+				return uint256.NewInt(0)
+			}
+		}
 		operatorFeeScalar, operatorFeeConstant := ExtractOperatorFeeParams(operatorFeeParams)
 
-		// Return the Jovian version if Jovian is active
-		if config.IsOptimismJovian(blockTime) {
-			return newOperatorCostFuncJovian(operatorFeeScalar, operatorFeeConstant)
+		// Return the Operator Fee fix version if the feature is active
+		if config.IsOperatorFeeFix(blockTime) {
+			return newOperatorCostFuncOperatorFeeFix(operatorFeeScalar, operatorFeeConstant)
 		}
-		return newOperatorCostFunc(operatorFeeScalar, operatorFeeConstant)
+		return newOperatorCostFuncIsthmus(operatorFeeScalar, operatorFeeConstant)
 	}
 
 	return func(gas uint64, blockTime uint64) *uint256.Int {
@@ -239,8 +244,8 @@ func NewOperatorCostFunc(config *params.ChainConfig, statedb StateGetter) Operat
 	}
 }
 
-// newOperatorCostFunc returns the operator cost function for Isthmus.
-func newOperatorCostFunc(operatorFeeScalar *big.Int, operatorFeeConstant *big.Int) operatorCostFunc {
+// newOperatorCostFuncIsthmus returns the operator cost function introduced with Isthmus.
+func newOperatorCostFuncIsthmus(operatorFeeScalar *big.Int, operatorFeeConstant *big.Int) operatorCostFunc {
 	return func(gas uint64) *uint256.Int {
 		fee := new(big.Int).SetUint64(gas)
 		fee = fee.Mul(fee, operatorFeeScalar)
@@ -257,8 +262,8 @@ func newOperatorCostFunc(operatorFeeScalar *big.Int, operatorFeeConstant *big.In
 	}
 }
 
-// newOperatorCostFuncJovian returns the operator cost function for Jovian and later.
-func newOperatorCostFuncJovian(operatorFeeScalar *big.Int, operatorFeeConstant *big.Int) operatorCostFunc {
+// newOperatorCostFuncOperatorFeeFix returns the operator cost function for the operator fee fix feature.
+func newOperatorCostFuncOperatorFeeFix(operatorFeeScalar *big.Int, operatorFeeConstant *big.Int) operatorCostFunc {
 	return func(gas uint64) *uint256.Int {
 		fee := new(big.Int).SetUint64(gas)
 		fee = fee.Mul(fee, operatorFeeScalar)

params/config.go

@@ -898,6 +898,12 @@ func (c *ChainConfig) IsOptimismJovian(time uint64) bool {
 	return c.IsOptimism() && c.IsJovian(time)
 }
 
+// IsOperatorFeeFix returns true if the operator fee fix feature is active.
+// TODO(fakedev9999): decouple from Jovian activation by wiring this into an explicit feature toggle.
+func (c *ChainConfig) IsOperatorFeeFix(time uint64) bool {
+	return c.IsOptimismJovian(time)
+}
+
 // IsOptimismPreBedrock returns true iff this is an optimism node & bedrock is not yet active
 func (c *ChainConfig) IsOptimismPreBedrock(num *big.Int) bool {
 	return c.IsOptimism() && !c.IsBedrock(num)