Base Fee Floor (fixed) configuration (#231)

celo-org · Oct 16, 2024 · 49178b4 · 49178b4
1 parent 0954bcc
commit 49178b4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/op-chain-ops/cmd/celo-migrate/state.go b/op-chain-ops/cmd/celo-migrate/state.go
@@ -253,6 +253,12 @@ func applyStateMigrationChanges(config *genesis.DeployConfig, l2Allocs types.Gen
 		EIP1559DenominatorCanyon: &config.EIP1559DenominatorCanyon,
 		EIP1559Elasticity:        config.EIP1559Elasticity,
 	}
+
+	// Set the Celo options.
+	cfg.Celo = &params.CeloConfig{
+		EIP1559BaseFeeFloor: config.EIP1559BaseFeeFloor,
+	}
+
 	// Set Optimism hardforks
 	cfg.BedrockBlock = cel2Block.Number()
 	cfg.RegolithTime = &cel2Header.Time

diff --git a/op-chain-ops/genesis/config.go b/op-chain-ops/genesis/config.go
@@ -310,6 +310,8 @@ type EIP1559DeployConfig struct {
 	EIP1559Denominator uint64 `json:"eip1559Denominator"`
 	// EIP1559DenominatorCanyon is the denominator of EIP1559 base fee market when Canyon is active.
 	EIP1559DenominatorCanyon uint64 `json:"eip1559DenominatorCanyon"`
+	// EIP1559BaseFeeFloor is the fixed floor for the EIP1559 base fee market.
+	EIP1559BaseFeeFloor uint64 `json:"eip1559BaseFeeFloor,omitempty"`
 }
 
 var _ ConfigChecker = (*EIP1559DeployConfig)(nil)

diff --git a/op-chain-ops/genesis/genesis.go b/op-chain-ops/genesis/genesis.go
@@ -77,6 +77,9 @@ func NewL2Genesis(config *DeployConfig, l1StartHeader *types.Header) (*core.Gene
 			EIP1559Elasticity:        eip1559Elasticity,
 			EIP1559DenominatorCanyon: &eip1559DenomCanyon,
 		},
+		Celo: &params.CeloConfig{
+			EIP1559BaseFeeFloor: config.EIP1559BaseFeeFloor,
+		},
 	}
 
 	gasLimit := config.L2GenesisBlockGasLimit

diff --git a/op-chain-ops/genesis/testdata/test-deploy-config-full.json b/op-chain-ops/genesis/testdata/test-deploy-config-full.json
@@ -94,5 +94,6 @@
   "daChallengeWindow": 0,
   "daResolveWindow": 0,
   "daResolverRefundPercentage": 0,
-  "deployCeloContracts": false
+  "deployCeloContracts": false,
+  "eip1559BaseFeeFloor": 5000000000
 }
diff --git a/packages/contracts-bedrock/scripts/getting-started/config-vars-celo.sh b/packages/contracts-bedrock/scripts/getting-started/config-vars-celo.sh
@@ -106,9 +106,10 @@ cat << EOL > tmp_config.json
   "l2GenesisBlockGasLimit": "0x1c9c380",
   "l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
 
-  "eip1559Denominator": 50,
-  "eip1559DenominatorCanyon": 250,
-  "eip1559Elasticity": 6,
+  "eip1559Denominator": 400,
+  "eip1559DenominatorCanyon": 400,
+  "eip1559Elasticity": 5,
+  "eip1559BaseFeeFloor": 5000000000,
 EOL
 
 # Append conditional environment variables with their corresponding default values