feat(feynman): add new compression-aware rollup fee formula

consensus/misc/curie.go

@@ -18,6 +18,6 @@ func ApplyCurieHardFork(statedb *state.StateDB) {
 	// initialize new storage slots
 	statedb.SetState(rcfg.L1GasPriceOracleAddress, rcfg.IsCurieSlot, common.BytesToHash([]byte{1}))
 	statedb.SetState(rcfg.L1GasPriceOracleAddress, rcfg.L1BlobBaseFeeSlot, common.BytesToHash([]byte{1}))
-	statedb.SetState(rcfg.L1GasPriceOracleAddress, rcfg.CommitScalarSlot, common.BigToHash(rcfg.InitialCommitScalar))
+	statedb.SetState(rcfg.L1GasPriceOracleAddress, rcfg.ExecScalarSlot, common.BigToHash(rcfg.InitialCommitScalar))
 	statedb.SetState(rcfg.L1GasPriceOracleAddress, rcfg.BlobScalarSlot, common.BigToHash(rcfg.InitialBlobScalar))
 }

core/blockchain_test.go

@@ -3757,7 +3757,7 @@ func TestCurieTransition(t *testing.T) {
 		poseidonCodeHash := statedb.GetPoseidonCodeHash(rcfg.L1GasPriceOracleAddress)
 
 		l1BlobBaseFee := statedb.GetState(rcfg.L1GasPriceOracleAddress, rcfg.L1BlobBaseFeeSlot)
-		commitScalar := statedb.GetState(rcfg.L1GasPriceOracleAddress, rcfg.CommitScalarSlot)
+		commitScalar := statedb.GetState(rcfg.L1GasPriceOracleAddress, rcfg.ExecScalarSlot)
 		blobScalar := statedb.GetState(rcfg.L1GasPriceOracleAddress, rcfg.BlobScalarSlot)
 		isCurie := statedb.GetState(rcfg.L1GasPriceOracleAddress, rcfg.IsCurieSlot)
 

ethclient/ethclient_test.go

@@ -201,7 +201,7 @@ var genesis = &core.Genesis{
 				rcfg.OverheadSlot:      common.BigToHash(big.NewInt(10000)),
 				rcfg.ScalarSlot:        common.BigToHash(big.NewInt(10000)),
 				rcfg.L1BlobBaseFeeSlot: common.BigToHash(big.NewInt(10000)),
-				rcfg.CommitScalarSlot:  common.BigToHash(big.NewInt(10000)),
+				rcfg.ExecScalarSlot:    common.BigToHash(big.NewInt(10000)),
 				rcfg.BlobScalarSlot:    common.BigToHash(big.NewInt(10000)),
 				rcfg.IsCurieSlot:       common.BytesToHash([]byte{1}),
 			},

ethclient/gethclient/gethclient_test.go

@@ -85,7 +85,7 @@ func generateTestChain() (*core.Genesis, []*types.Block) {
 					rcfg.OverheadSlot:      common.BigToHash(big.NewInt(10000)),
 					rcfg.ScalarSlot:        common.BigToHash(big.NewInt(10000)),
 					rcfg.L1BlobBaseFeeSlot: common.BigToHash(big.NewInt(10000)),
-					rcfg.CommitScalarSlot:  common.BigToHash(big.NewInt(10000)),
+					rcfg.ExecScalarSlot:    common.BigToHash(big.NewInt(10000)),
 					rcfg.BlobScalarSlot:    common.BigToHash(big.NewInt(10000)),
 					rcfg.IsCurieSlot:       common.BytesToHash([]byte{1}),
 				},

params/config.go

@@ -988,6 +988,11 @@ func (c *ChainConfig) IsEuclidV2(now uint64) bool {
 	return isForkedTime(now, c.EuclidV2Time)
 }
 
+// IsFeynman returns whether num is either equal to the Feynman fork block or greater.
+func (c *ChainConfig) IsFeynman(num *big.Int) bool {
+	return false // placeholder
+}
+
 // IsTerminalPoWBlock returns whether the given block is the last block of PoW stage.
 func (c *ChainConfig) IsTerminalPoWBlock(parentTotalDiff *big.Int, totalDiff *big.Int) bool {
 	if c.TerminalTotalDifficulty == nil {

rollup/fees/rollup_fee.go

@@ -51,7 +51,7 @@ type gpoState struct {
 	overhead      *big.Int
 	scalar        *big.Int
 	l1BlobBaseFee *big.Int
-	commitScalar  *big.Int
+	execScalar    *big.Int
 	blobScalar    *big.Int
 }
 
@@ -74,15 +74,17 @@ func EstimateL1DataFeeForMessage(msg Message, baseFee *big.Int, config *params.C
 
 	gpoState := readGPOStorageSlots(rcfg.L1GasPriceOracleAddress, state)
 
-	var l1DataFee *big.Int
+	var rollupFee *big.Int
 
 	if !config.IsCurie(blockNumber) {
-		l1DataFee = calculateEncodedL1DataFee(raw, gpoState.overhead, gpoState.l1BaseFee, gpoState.scalar)
+		rollupFee = calculateEncodedL1DataFee(raw, gpoState.overhead, gpoState.l1BaseFee, gpoState.scalar)
+	} else if !config.IsFeynman(blockNumber) {
+		rollupFee = calculateEncodedL1DataFeeCurie(raw, gpoState.l1BaseFee, gpoState.l1BlobBaseFee, gpoState.execScalar, gpoState.blobScalar)
 	} else {
-		l1DataFee = calculateEncodedL1DataFeeCurie(raw, gpoState.l1BaseFee, gpoState.l1BlobBaseFee, gpoState.commitScalar, gpoState.blobScalar)
+		rollupFee = calculateEncodedRollupFeeFeeFeynman(raw, gpoState.l1BaseFee, gpoState.l1BlobBaseFee, gpoState.execScalar, gpoState.blobScalar)
 	}
 
-	return l1DataFee, nil
+	return rollupFee, nil
 }
 
 // asUnsignedTx turns a Message into a types.Transaction
@@ -164,7 +166,7 @@ func readGPOStorageSlots(addr common.Address, state StateDB) gpoState {
 	gpoState.overhead = state.GetState(addr, rcfg.OverheadSlot).Big()
 	gpoState.scalar = state.GetState(addr, rcfg.ScalarSlot).Big()
 	gpoState.l1BlobBaseFee = state.GetState(addr, rcfg.L1BlobBaseFeeSlot).Big()
-	gpoState.commitScalar = state.GetState(addr, rcfg.CommitScalarSlot).Big()
+	gpoState.execScalar = state.GetState(addr, rcfg.ExecScalarSlot).Big()
 	gpoState.blobScalar = state.GetState(addr, rcfg.BlobScalarSlot).Big()
 	return gpoState
 }
@@ -193,6 +195,38 @@ func calculateEncodedL1DataFeeCurie(data []byte, l1BaseFee *big.Int, l1BlobBaseF
 	return l1DataFee
 }
 
+// calculateEncodedRollupFeeFeeFeynman computes the L1 fee for an RLP-encoded tx, post Feynman
+func calculateEncodedRollupFeeFeeFeynman(
+	data []byte,
+	l1BaseFee *big.Int,
+	l1BlobBaseFee *big.Int,
+	execScalar *big.Int,
+	blobScalar *big.Int,
+) *big.Int {
+	// tx size (RLP-encoded)
+	txSize := big.NewInt(int64(len(data)))
+
+	// compression_ratio(tx) = 1 (placeholder, scaled to match scalars precision)
+	compressionRatio := big.NewInt(rcfg.Precision.Int64())
+
+	// compute gas components
+	execGas := new(big.Int).Mul(execScalar, l1BaseFee)
+	blobGas := new(big.Int).Mul(blobScalar, l1BlobBaseFee)
+
+	// fee per byte = execGas + blobGas
+	feePerByte := new(big.Int).Add(execGas, blobGas)
+
+	// rollupFee = compression_ratio * tx_size * feePerByte
+	rollupFee := new(big.Int).Mul(compressionRatio, txSize)
+	rollupFee.Mul(rollupFee, feePerByte)
+
+	// Divide by rcfg.Precision (once for ratio, once for scalar)
+	rollupFee.Div(rollupFee, rcfg.Precision)
+	rollupFee.Div(rollupFee, rcfg.Precision)
+
+	return rollupFee
+}
+
 // calculateL1GasUsed computes the L1 gas used based on the calldata and
 // constant sized overhead. The overhead can be decreased as the cost of the
 // batch submission goes down via contract optimizations. This will not overflow
@@ -238,21 +272,23 @@ func CalculateL1DataFee(tx *types.Transaction, state StateDB, config *params.Cha
 
 	gpoState := readGPOStorageSlots(rcfg.L1GasPriceOracleAddress, state)
 
-	var l1DataFee *big.Int
+	var rollupFee *big.Int
 
 	if !config.IsCurie(blockNumber) {
-		l1DataFee = calculateEncodedL1DataFee(raw, gpoState.overhead, gpoState.l1BaseFee, gpoState.scalar)
+		rollupFee = calculateEncodedL1DataFee(raw, gpoState.overhead, gpoState.l1BaseFee, gpoState.scalar)
+	} else if !config.IsFeynman(blockNumber) {
+		rollupFee = calculateEncodedL1DataFeeCurie(raw, gpoState.l1BaseFee, gpoState.l1BlobBaseFee, gpoState.execScalar, gpoState.blobScalar)
 	} else {
-		l1DataFee = calculateEncodedL1DataFeeCurie(raw, gpoState.l1BaseFee, gpoState.l1BlobBaseFee, gpoState.commitScalar, gpoState.blobScalar)
+		rollupFee = calculateEncodedRollupFeeFeeFeynman(raw, gpoState.l1BaseFee, gpoState.l1BlobBaseFee, gpoState.execScalar, gpoState.blobScalar)
 	}
 
-	// ensure l1DataFee fits into uint64 for circuit compatibility
+	// ensure rollupFee fits into uint64 for circuit compatibility
 	// (note: in practice this value should never be this big)
-	if !l1DataFee.IsUint64() {
-		l1DataFee.SetUint64(math.MaxUint64)
+	if !rollupFee.IsUint64() {
+		rollupFee.SetUint64(math.MaxUint64)
 	}
 
-	return l1DataFee, nil
+	return rollupFee, nil
 }
 
 func GetL1BaseFee(state StateDB) *big.Int {

rollup/rcfg/config.go

@@ -32,7 +32,7 @@ var (
 
 	// New fields added in the Curie hard fork
 	L1BlobBaseFeeSlot = common.BigToHash(big.NewInt(5))
-	CommitScalarSlot  = common.BigToHash(big.NewInt(6))
+	ExecScalarSlot    = common.BigToHash(big.NewInt(6))
 	BlobScalarSlot    = common.BigToHash(big.NewInt(7))
 	IsCurieSlot       = common.BigToHash(big.NewInt(8))
 

rollup/tracing/tracing.go

@@ -543,7 +543,7 @@ func (env *TraceEnv) fillBlockTrace(block *types.Block) (*types.BlockTrace, erro
 			rcfg.OverheadSlot,
 			rcfg.ScalarSlot,
 			rcfg.L1BlobBaseFeeSlot,
-			rcfg.CommitScalarSlot,
+			rcfg.ExecScalarSlot,
 			rcfg.BlobScalarSlot,
 			rcfg.IsCurieSlot,
 		},