From c356e768df9e84d5f54abbdd1963f2a166a15e93 Mon Sep 17 00:00:00 2001 From: geoknee Date: Fri, 19 Apr 2024 13:35:05 +0100 Subject: [PATCH 1/7] add l2GenesisEcotoneTimeOffset to getting-started/config.sh --- packages/contracts-bedrock/scripts/getting-started/config.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/contracts-bedrock/scripts/getting-started/config.sh b/packages/contracts-bedrock/scripts/getting-started/config.sh index f6a0e42e581..86131b8f204 100755 --- a/packages/contracts-bedrock/scripts/getting-started/config.sh +++ b/packages/contracts-bedrock/scripts/getting-started/config.sh @@ -77,10 +77,12 @@ config=$(cat << EOL "l2GenesisBlockBaseFeePerGas": "0x3b9aca00", "l2GenesisRegolithTimeOffset": "0x0", + "eip1559Denominator": 50, "eip1559DenominatorCanyon": 250, "eip1559Elasticity": 6, + "l2GenesisEcotoneTimeOffset": "0x0", "l2GenesisDeltaTimeOffset": null, "l2GenesisCanyonTimeOffset": "0x0", From 45f5bdf4e3865deb9d38e11fe2fda81c0086934f Mon Sep 17 00:00:00 2001 From: geoknee Date: Fri, 19 Apr 2024 13:37:28 +0100 Subject: [PATCH 2/7] set l2GenesisDeltaTimeOffset to 0 --- packages/contracts-bedrock/scripts/getting-started/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts-bedrock/scripts/getting-started/config.sh b/packages/contracts-bedrock/scripts/getting-started/config.sh index 86131b8f204..929589f2981 100755 --- a/packages/contracts-bedrock/scripts/getting-started/config.sh +++ b/packages/contracts-bedrock/scripts/getting-started/config.sh @@ -83,7 +83,7 @@ config=$(cat << EOL "eip1559Elasticity": 6, "l2GenesisEcotoneTimeOffset": "0x0", - "l2GenesisDeltaTimeOffset": null, + "l2GenesisDeltaTimeOffset": "0x0", "l2GenesisCanyonTimeOffset": "0x0", "systemConfigStartBlock": 0, From 59b89457307921fa365dcaa0260b9b880f102d34 Mon Sep 17 00:00:00 2001 From: geoknee Date: Fri, 19 Apr 2024 14:00:04 +0100 Subject: [PATCH 3/7] remove unecessary line --- packages/contracts-bedrock/scripts/getting-started/config.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/contracts-bedrock/scripts/getting-started/config.sh b/packages/contracts-bedrock/scripts/getting-started/config.sh index 929589f2981..5334d277586 100755 --- a/packages/contracts-bedrock/scripts/getting-started/config.sh +++ b/packages/contracts-bedrock/scripts/getting-started/config.sh @@ -77,7 +77,6 @@ config=$(cat << EOL "l2GenesisBlockBaseFeePerGas": "0x3b9aca00", "l2GenesisRegolithTimeOffset": "0x0", - "eip1559Denominator": 50, "eip1559DenominatorCanyon": 250, "eip1559Elasticity": 6, From b181d31ec4b4e73a2e8310fd984b7f43db59894c Mon Sep 17 00:00:00 2001 From: geoknee Date: Fri, 19 Apr 2024 14:00:50 +0100 Subject: [PATCH 4/7] parse 4844 params in registry-data tool --- op-chain-ops/cmd/registry-data/main.go | 50 ++++++++++++++------------ 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/op-chain-ops/cmd/registry-data/main.go b/op-chain-ops/cmd/registry-data/main.go index 1f33d65db8d..3b778e2ec0b 100644 --- a/op-chain-ops/cmd/registry-data/main.go +++ b/op-chain-ops/cmd/registry-data/main.go @@ -91,17 +91,19 @@ type GenesisAccount struct { } type Genesis struct { - Nonce uint64 `json:"nonce"` - Timestamp uint64 `json:"timestamp"` - ExtraData []byte `json:"extraData"` - GasLimit uint64 `json:"gasLimit"` - Difficulty *hexutil.Big `json:"difficulty"` - Mixhash common.Hash `json:"mixHash"` - Coinbase common.Address `json:"coinbase"` - Number uint64 `json:"number"` - GasUsed uint64 `json:"gasUsed"` - ParentHash common.Hash `json:"parentHash"` - BaseFee *hexutil.Big `json:"baseFeePerGas"` + Nonce uint64 `json:"nonce"` + Timestamp uint64 `json:"timestamp"` + ExtraData []byte `json:"extraData"` + GasLimit uint64 `json:"gasLimit"` + Difficulty *hexutil.Big `json:"difficulty"` + Mixhash common.Hash `json:"mixHash"` + Coinbase common.Address `json:"coinbase"` + Number uint64 `json:"number"` + GasUsed uint64 `json:"gasUsed"` + ParentHash common.Hash `json:"parentHash"` + 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"` // For genesis definitions without full state (OP-Mainnet, OP-Goerli) @@ -209,18 +211,20 @@ func entrypoint(ctx *cli.Context) error { // convert into allocation data out := Genesis{ - Nonce: genesis.Nonce, - Timestamp: genesis.Timestamp, - ExtraData: genesis.ExtraData, - GasLimit: genesis.GasLimit, - Difficulty: (*hexutil.Big)(genesis.Difficulty), - Mixhash: genesis.Mixhash, - Coinbase: genesis.Coinbase, - Number: genesis.Number, - GasUsed: genesis.GasUsed, - ParentHash: genesis.ParentHash, - BaseFee: (*hexutil.Big)(genesis.BaseFee), - Alloc: make(jsonutil.LazySortedJsonMap[common.Address, GenesisAccount]), + Nonce: genesis.Nonce, + Timestamp: genesis.Timestamp, + ExtraData: genesis.ExtraData, + GasLimit: genesis.GasLimit, + Difficulty: (*hexutil.Big)(genesis.Difficulty), + Mixhash: genesis.Mixhash, + Coinbase: genesis.Coinbase, + Number: genesis.Number, + GasUsed: genesis.GasUsed, + ParentHash: genesis.ParentHash, + BaseFee: (*hexutil.Big)(genesis.BaseFee), + ExcessBlobGas: genesis.ExcessBlobGas, // EIP-4844 + BlobGasUsed: genesis.BlobGasUsed, // EIP-4844 + Alloc: make(jsonutil.LazySortedJsonMap[common.Address, GenesisAccount]), } // write genesis, but only reference code by code-hash, and don't encode the L2 predeploys to save space. From b35d9f514c8dbebf3db4c100531013775d137d20 Mon Sep 17 00:00:00 2001 From: geoknee Date: Fri, 19 Apr 2024 15:52:26 +0100 Subject: [PATCH 5/7] update overhead and scalar --- packages/contracts-bedrock/scripts/getting-started/config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/contracts-bedrock/scripts/getting-started/config.sh b/packages/contracts-bedrock/scripts/getting-started/config.sh index 5334d277586..12d0ca4817b 100755 --- a/packages/contracts-bedrock/scripts/getting-started/config.sh +++ b/packages/contracts-bedrock/scripts/getting-started/config.sh @@ -65,8 +65,8 @@ config=$(cat << EOL "l1FeeVaultWithdrawalNetwork": 0, "sequencerFeeVaultWithdrawalNetwork": 0, - "gasPriceOracleOverhead": 2100, - "gasPriceOracleScalar": 1000000, + "gasPriceOracleOverhead": 0, + "gasPriceOracleScalar": "0x010000000000000000000000000000000000000000000000000c5fc500000558", "enableGovernance": true, "governanceTokenSymbol": "OP", From 7d05ebe69817ce28c14a82cd561ab0f969e704bc Mon Sep 17 00:00:00 2001 From: geoknee Date: Fri, 19 Apr 2024 15:54:59 +0100 Subject: [PATCH 6/7] add 4844 fields to the other Genesis literal --- op-chain-ops/cmd/registry-data/main.go | 28 ++++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/op-chain-ops/cmd/registry-data/main.go b/op-chain-ops/cmd/registry-data/main.go index 3b778e2ec0b..7992edf897d 100644 --- a/op-chain-ops/cmd/registry-data/main.go +++ b/op-chain-ops/cmd/registry-data/main.go @@ -170,19 +170,21 @@ func entrypoint(ctx *cli.Context) error { return errors.New("genesis-header based genesis must have no withdrawals") } out := Genesis{ - Nonce: genesisHeader.Nonce.Uint64(), - Timestamp: genesisHeader.Time, - ExtraData: genesisHeader.Extra, - GasLimit: genesisHeader.GasLimit, - Difficulty: (*hexutil.Big)(genesisHeader.Difficulty), - Mixhash: genesisHeader.MixDigest, - Coinbase: genesisHeader.Coinbase, - Number: genesisHeader.Number.Uint64(), - GasUsed: genesisHeader.GasUsed, - ParentHash: genesisHeader.ParentHash, - BaseFee: (*hexutil.Big)(genesisHeader.BaseFee), - Alloc: make(jsonutil.LazySortedJsonMap[common.Address, GenesisAccount]), - StateHash: &genesisHeader.Root, + Nonce: genesisHeader.Nonce.Uint64(), + Timestamp: genesisHeader.Time, + ExtraData: genesisHeader.Extra, + GasLimit: genesisHeader.GasLimit, + Difficulty: (*hexutil.Big)(genesisHeader.Difficulty), + Mixhash: genesisHeader.MixDigest, + Coinbase: genesisHeader.Coinbase, + Number: genesisHeader.Number.Uint64(), + GasUsed: genesisHeader.GasUsed, + ParentHash: genesisHeader.ParentHash, + BaseFee: (*hexutil.Big)(genesisHeader.BaseFee), + ExcessBlobGas: genesisHeader.ExcessBlobGas, // EIP-4844 + BlobGasUsed: genesisHeader.BlobGasUsed, // EIP-4844 + Alloc: make(jsonutil.LazySortedJsonMap[common.Address, GenesisAccount]), + StateHash: &genesisHeader.Root, } if err := writeGzipJSON(ctx.Path(OutputFlag.Name), out); err != nil { return fmt.Errorf("failed to write output: %w", err) From 58a3fde0a00f00ba2a10ac84e3bfe960eb585c55 Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Thu, 16 May 2024 13:33:56 -0600 Subject: [PATCH 7/7] scalar: revert Co-authored-by: George C. Knee --- packages/contracts-bedrock/scripts/getting-started/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts-bedrock/scripts/getting-started/config.sh b/packages/contracts-bedrock/scripts/getting-started/config.sh index 12d0ca4817b..0e3bc5cf7eb 100755 --- a/packages/contracts-bedrock/scripts/getting-started/config.sh +++ b/packages/contracts-bedrock/scripts/getting-started/config.sh @@ -66,7 +66,7 @@ config=$(cat << EOL "sequencerFeeVaultWithdrawalNetwork": 0, "gasPriceOracleOverhead": 0, - "gasPriceOracleScalar": "0x010000000000000000000000000000000000000000000000000c5fc500000558", + "gasPriceOracleScalar": 1000000, "enableGovernance": true, "governanceTokenSymbol": "OP",