feat: update L2 base fee formula (#951)

* update `CalcBaseFee` * update `TestCalcBaseFee` * update `TestStateProcessorErrors` * bump version * update threshold
scroll-tech · Aug 2, 2024 · 8ceb855 · 8ceb855
1 parent df3713e
commit 8ceb855
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/consensus/misc/eip1559.go b/consensus/misc/eip1559.go
@@ -25,7 +25,7 @@ import (
 )
 
 // Protocol-enforced maximum L2 base fee.
-// We would only go above this if L1 base fee hits 2164 Gwei.
+// We would only go above this if L1 base fee hits 2931 Gwei.
 const MaximumL2BaseFee = 10000000000
 
 // VerifyEip1559Header verifies some header attributes which were changed in EIP-1559,
@@ -52,11 +52,11 @@ func VerifyEip1559Header(config *params.ChainConfig, parent, header *types.Heade
 // CalcBaseFee calculates the basefee of the header.
 func CalcBaseFee(config *params.ChainConfig, parent *types.Header, parentL1BaseFee *big.Int) *big.Int {
 	l2SequencerFee := big.NewInt(1000000) // 0.001 Gwei
-	provingFee := big.NewInt(47700000)    // 0.0477 Gwei
+	provingFee := big.NewInt(33700000)    // 0.0337 Gwei
 
-	// L1_base_fee * 0.0046
+	// L1_base_fee * 0.0034
 	verificationFee := parentL1BaseFee
-	verificationFee = new(big.Int).Mul(verificationFee, big.NewInt(46))
+	verificationFee = new(big.Int).Mul(verificationFee, big.NewInt(34))
 	verificationFee = new(big.Int).Div(verificationFee, big.NewInt(10000))
 
 	baseFee := big.NewInt(0)

diff --git a/consensus/misc/eip1559_test.go b/consensus/misc/eip1559_test.go
@@ -112,12 +112,13 @@ func TestCalcBaseFee(t *testing.T) {
 		parentL1BaseFee   int64
 		expectedL2BaseFee int64
 	}{
-		{0, 48700000},
-		{1000000000, 53300000},
-		{2000000000, 57900000},
-		{100000000000, 508700000},
-		{111111111111, 559811111},
-		{2164000000000, 10000000000}, // cap at max L2 base fee
+		{0, 34700000},
+		{1000000000, 38100000},
+		{2000000000, 41500000},
+		{100000000000, 374700000},
+		{111111111111, 412477777},
+		{2164000000000, 7392300000},
+		{2931000000000, 10000000000}, // cap at max L2 base fee
 	}
 	for i, test := range tests {
 		if have, want := CalcBaseFee(config(), nil, big.NewInt(test.parentL1BaseFee)), big.NewInt(test.expectedL2BaseFee); have.Cmp(want) != 0 {

diff --git a/core/state_processor_test.go b/core/state_processor_test.go
@@ -360,13 +360,13 @@ func TestStateProcessorErrors(t *testing.T) {
 				txs: []*types.Transaction{
 					mkDynamicCreationTx(0, 500000, common.Big0, misc.CalcBaseFee(config, genesis.Header(), parentL1BaseFee), tooBigInitCode[:]),
 				},
-				want: "could not apply tx 0 [0x13f95e090076d99bb91e3c61923b4ddfa270940363b282ac2d17ea07dada4aa4]: max initcode size exceeded: code size 49153 limit 49152",
+				want: "could not apply tx 0 [0x8f780c3573ac61e2d7796f7b447afd0ad753623ed95bc99ef94eb083d9e0d039]: max initcode size exceeded: code size 49153 limit 49152",
 			},
 			{ // ErrIntrinsicGas: Not enough gas to cover init code
 				txs: []*types.Transaction{
 					mkDynamicCreationTx(0, 54299, common.Big0, misc.CalcBaseFee(config, genesis.Header(), parentL1BaseFee), smallInitCode[:]),
 				},
-				want: "could not apply tx 0 [0x74d818187d75665003870481a53dc4bc938fe7ee79d24ebf941ca9042d8ef3ae]: intrinsic gas too low: have 54299, want 54300",
+				want: "could not apply tx 0 [0xbf812bb88c3f53402b6cf5488ac89360595e524b65582b648d1f4ef197690e89]: intrinsic gas too low: have 54299, want 54300",
 			},
 		} {
 			block := GenerateBadBlock(genesis, ethash.NewFaker(), tt.txs, gspec.Config)