From 90e9c3944df2603bfe1c28c1b6527b81217d0228 Mon Sep 17 00:00:00 2001
From: Ayaan <kangrangx@gmail.com>
Date: Thu, 24 Oct 2024 08:12:37 +0900
Subject: [PATCH] feat: apply rollup cost to gas calculation logic

---
 core/state_processor_rip7560.go | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/core/state_processor_rip7560.go b/core/state_processor_rip7560.go
index bbd5fb3f34..feca04cca4 100644
--- a/core/state_processor_rip7560.go
+++ b/core/state_processor_rip7560.go
@@ -229,11 +229,28 @@ func handleRip7560Transactions(
 	return validatedTransactions, receipts, validationFailureInfos, allLogs, nil
 }
 
+func calculateRollupCost(
+	chainConfig *params.ChainConfig,
+	header *types.Header,
+	tx *types.Transaction,
+	state vm.StateDB,
+) (*uint256.Int, error) {
+	// calculate rollup cost
+	L1CostFunc := types.NewL1CostFunc(chainConfig, state)
+	if L1CostFunc == nil {
+		return nil, wrapError(
+			fmt.Errorf("L1CostFunc is nil. Maybe config.Optimism is not set"),
+		)
+	}
+	return uint256.MustFromBig(L1CostFunc(tx.RollupCostData(), header.Time)), nil
+}
+
 func BuyGasRip7560Transaction(
 	st *types.Rip7560AccountAbstractionTx,
 	state vm.StateDB,
 	gasPrice *uint256.Int,
 	gp *GasPool,
+	rollupCost *uint256.Int,
 ) (uint64, *uint256.Int, error) {
 	gasLimit, err := st.TotalGasLimit()
 	if err != nil {
@@ -244,6 +261,10 @@ func BuyGasRip7560Transaction(
 	preCharge := new(uint256.Int).SetUint64(gasLimit)
 	preCharge = preCharge.Mul(preCharge, gasPrice)
 
+	// adjust rollup cost
+	gasLimit += rollupCost.Uint64()
+	preCharge = preCharge.Add(preCharge, rollupCost)
+
 	chargeFrom := st.GasPayer()
 
 	if have, want := state.GetBalance(*chargeFrom), preCharge; have.Cmp(want) < 0 {
@@ -340,7 +361,14 @@ func ApplyRip7560ValidationPhases(
 
 	gasPrice := aatx.EffectiveGasPrice(header.BaseFee)
 	effectiveGasPrice := uint256.MustFromBig(gasPrice)
-	gasLimit, preCharge, err := BuyGasRip7560Transaction(aatx, statedb, effectiveGasPrice, gp)
+
+	// calculate rollup cost
+	rollupCost, err := calculateRollupCost(chainConfig, header, tx, statedb)
+	if err != nil {
+		return nil, err
+	}
+
+	gasLimit, preCharge, err := BuyGasRip7560Transaction(aatx, statedb, effectiveGasPrice, gp, rollupCost)
 	if err != nil {
 		return nil, wrapError(err)
 	}