Commit 13d61468 authored by George C. Knee's avatar George C. Knee Committed by GitHub

Some Superchain L2 Genesis Fixes (#10231)

* add l2GenesisEcotoneTimeOffset to getting-started/config.sh

* set l2GenesisDeltaTimeOffset to 0

* remove unecessary line

* parse 4844 params in registry-data tool

* update overhead and scalar

* add 4844 fields to the other Genesis literal

* scalar: revert
Co-authored-by: default avatarGeorge C. Knee <georgeknee@googlemail.com>

---------
Co-authored-by: default avatarMark Tyneway <mark.tyneway@gmail.com>
parent 9fec999d
...@@ -102,6 +102,8 @@ type Genesis struct { ...@@ -102,6 +102,8 @@ type Genesis struct {
GasUsed uint64 `json:"gasUsed"` GasUsed uint64 `json:"gasUsed"`
ParentHash common.Hash `json:"parentHash"` ParentHash common.Hash `json:"parentHash"`
BaseFee *hexutil.Big `json:"baseFeePerGas"` BaseFee *hexutil.Big `json:"baseFeePerGas"`
ExcessBlobGas *uint64 `json:"excessBlobGas"` // EIP-4844
BlobGasUsed *uint64 `json:"blobGasUsed"` // EIP-4844
Alloc jsonutil.LazySortedJsonMap[common.Address, GenesisAccount] `json:"alloc"` Alloc jsonutil.LazySortedJsonMap[common.Address, GenesisAccount] `json:"alloc"`
// For genesis definitions without full state (OP-Mainnet, OP-Goerli) // For genesis definitions without full state (OP-Mainnet, OP-Goerli)
...@@ -179,6 +181,8 @@ func entrypoint(ctx *cli.Context) error { ...@@ -179,6 +181,8 @@ func entrypoint(ctx *cli.Context) error {
GasUsed: genesisHeader.GasUsed, GasUsed: genesisHeader.GasUsed,
ParentHash: genesisHeader.ParentHash, ParentHash: genesisHeader.ParentHash,
BaseFee: (*hexutil.Big)(genesisHeader.BaseFee), BaseFee: (*hexutil.Big)(genesisHeader.BaseFee),
ExcessBlobGas: genesisHeader.ExcessBlobGas, // EIP-4844
BlobGasUsed: genesisHeader.BlobGasUsed, // EIP-4844
Alloc: make(jsonutil.LazySortedJsonMap[common.Address, GenesisAccount]), Alloc: make(jsonutil.LazySortedJsonMap[common.Address, GenesisAccount]),
StateHash: &genesisHeader.Root, StateHash: &genesisHeader.Root,
} }
...@@ -220,6 +224,8 @@ func entrypoint(ctx *cli.Context) error { ...@@ -220,6 +224,8 @@ func entrypoint(ctx *cli.Context) error {
GasUsed: genesis.GasUsed, GasUsed: genesis.GasUsed,
ParentHash: genesis.ParentHash, ParentHash: genesis.ParentHash,
BaseFee: (*hexutil.Big)(genesis.BaseFee), BaseFee: (*hexutil.Big)(genesis.BaseFee),
ExcessBlobGas: genesis.ExcessBlobGas, // EIP-4844
BlobGasUsed: genesis.BlobGasUsed, // EIP-4844
Alloc: make(jsonutil.LazySortedJsonMap[common.Address, GenesisAccount]), Alloc: make(jsonutil.LazySortedJsonMap[common.Address, GenesisAccount]),
} }
......
...@@ -65,7 +65,7 @@ config=$(cat << EOL ...@@ -65,7 +65,7 @@ config=$(cat << EOL
"l1FeeVaultWithdrawalNetwork": 0, "l1FeeVaultWithdrawalNetwork": 0,
"sequencerFeeVaultWithdrawalNetwork": 0, "sequencerFeeVaultWithdrawalNetwork": 0,
"gasPriceOracleOverhead": 2100, "gasPriceOracleOverhead": 0,
"gasPriceOracleScalar": 1000000, "gasPriceOracleScalar": 1000000,
"enableGovernance": true, "enableGovernance": true,
...@@ -81,7 +81,8 @@ config=$(cat << EOL ...@@ -81,7 +81,8 @@ config=$(cat << EOL
"eip1559DenominatorCanyon": 250, "eip1559DenominatorCanyon": 250,
"eip1559Elasticity": 6, "eip1559Elasticity": 6,
"l2GenesisDeltaTimeOffset": null, "l2GenesisEcotoneTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": "0x0",
"l2GenesisCanyonTimeOffset": "0x0", "l2GenesisCanyonTimeOffset": "0x0",
"systemConfigStartBlock": 0, "systemConfigStartBlock": 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment