From 90fa8b579adbd3285f7bfe772f85bdd1cb723920 Mon Sep 17 00:00:00 2001 From: refcell <21288394+refcell@users.noreply.github.com> Date: Mon, 18 Nov 2024 04:14:48 +0000 Subject: [PATCH 1/2] Update Submodules --- crates/registry/etc/configs.json | 6 ++++++ crates/registry/superchain-registry | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/crates/registry/etc/configs.json b/crates/registry/etc/configs.json index 74954ed..f1a7fae 100644 --- a/crates/registry/etc/configs.json +++ b/crates/registry/etc/configs.json @@ -1327,6 +1327,7 @@ "ecotone_time": 1708534800, "fjord_time": 1716998400, "granite_time": 1723478400, + "holocene_time": 1732633200, "block_time": 2, "seq_window_size": 3600, "max_sequencer_drift": 600, @@ -1851,6 +1852,7 @@ "ecotone_time": 1708534800, "fjord_time": 1716998400, "granite_time": 1723478400, + "holocene_time": 1732633200, "block_time": 2, "seq_window_size": 3600, "max_sequencer_drift": 600, @@ -1993,6 +1995,7 @@ "ecotone_time": 1708534800, "fjord_time": 1716998400, "granite_time": 1723478400, + "holocene_time": 1732633200, "block_time": 2, "seq_window_size": 3600, "max_sequencer_drift": 600, @@ -2127,6 +2130,7 @@ "ecotone_time": 1708534800, "fjord_time": 1716998400, "granite_time": 1723478400, + "holocene_time": 1732633200, "block_time": 2, "seq_window_size": 3600, "max_sequencer_drift": 600, @@ -2206,6 +2210,7 @@ "ecotone_time": 1706634000, "fjord_time": 1715961600, "granite_time": 1723046400, + "holocene_time": 1731682800, "block_time": 2, "seq_window_size": 3600, "max_sequencer_drift": 600, @@ -2275,6 +2280,7 @@ "ecotone_time": 1706634000, "fjord_time": 1715961600, "granite_time": 1723046400, + "holocene_time": 1731682800, "block_time": 2, "seq_window_size": 3600, "max_sequencer_drift": 600, diff --git a/crates/registry/superchain-registry b/crates/registry/superchain-registry index 6ae5888..a560627 160000 --- a/crates/registry/superchain-registry +++ b/crates/registry/superchain-registry @@ -1 +1 @@ -Subproject commit 6ae58888588b0997013e930ea234c6da2706dfc2 +Subproject commit a560627d56d9b12c7c649e782110101a9579a2c4 From aca2e7c5edffafec62fa53427c30a2c44599224f Mon Sep 17 00:00:00 2001 From: refcell Date: Sun, 17 Nov 2024 23:55:42 -0500 Subject: [PATCH 2/2] chore: updates --- Cargo.lock | 8 ++++---- Cargo.toml | 8 ++++++-- crates/registry/src/lib.rs | 8 ++++---- crates/registry/src/superchain.rs | 8 ++++---- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ca3084..0bb4bef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3029,7 +3029,7 @@ dependencies = [ [[package]] name = "kona-derive" version = "0.0.6" -source = "git+https://github.com/anton-rs/kona?branch=main#138a8f29255ee45a6a12f1200303d02a73154e07" +source = "git+https://github.com/anton-rs/kona?branch=rf/chore/alloy-updates#02dad9376a13006204a066f7a31648a9cee97746" dependencies = [ "alloc-no-stdlib", "alloy-consensus", @@ -3051,7 +3051,7 @@ dependencies = [ [[package]] name = "kona-driver" version = "0.0.0" -source = "git+https://github.com/anton-rs/kona?branch=main#138a8f29255ee45a6a12f1200303d02a73154e07" +source = "git+https://github.com/anton-rs/kona?branch=rf/chore/alloy-updates#02dad9376a13006204a066f7a31648a9cee97746" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -4123,8 +4123,7 @@ dependencies = [ [[package]] name = "op-alloy-genesis" version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ebd0391a3123b47e44ccca8a6f63a39ead2d7ea52e4fc132ff1297f6184314e" +source = "git+https://github.com/alloy-rs/op-alloy?branch=rf/feat/holocene-timestamps#47a8eea7c268e7c76cfa8a343ce402e822739d7e" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4132,6 +4131,7 @@ dependencies = [ "alloy-sol-types", "serde", "serde_repr", + "thiserror 2.0.3", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 91d6f8f..ad85652 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,8 +37,12 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [patch.crates-io] -kona-derive = { git = "https://github.com/anton-rs/kona", branch = "main" } -kona-driver = { git = "https://github.com/anton-rs/kona", branch = "main" } +# Kona alloy dep updates - sepolia holocene release can replace this patch +kona-derive = { git = "https://github.com/anton-rs/kona", branch = "rf/chore/alloy-updates" } +kona-driver = { git = "https://github.com/anton-rs/kona", branch = "rf/chore/alloy-updates" } + +# Used for the sepolia holocene release +op-alloy-genesis = { git = "https://github.com/alloy-rs/op-alloy", branch = "rf/feat/holocene-timestamps" } [workspace.dependencies] # Workspace diff --git a/crates/registry/src/lib.rs b/crates/registry/src/lib.rs index fc6bf6e..fcd6b6d 100644 --- a/crates/registry/src/lib.rs +++ b/crates/registry/src/lib.rs @@ -40,10 +40,10 @@ mod tests { #[test] fn test_hardcoded_rollup_configs() { let test_cases = vec![ - (10, op_alloy_genesis::rollup::OP_MAINNET_CONFIG), - (8453, op_alloy_genesis::rollup::BASE_MAINNET_CONFIG), - (11155420, op_alloy_genesis::rollup::OP_SEPOLIA_CONFIG), - (84532, op_alloy_genesis::rollup::BASE_SEPOLIA_CONFIG), + (10, op_alloy_genesis::OP_MAINNET_CONFIG), + (8453, op_alloy_genesis::BASE_MAINNET_CONFIG), + (11155420, op_alloy_genesis::OP_SEPOLIA_CONFIG), + (84532, op_alloy_genesis::BASE_SEPOLIA_CONFIG), ]; for (chain_id, expected) in test_cases { diff --git a/crates/registry/src/superchain.rs b/crates/registry/src/superchain.rs index bf2e9f5..c43169c 100644 --- a/crates/registry/src/superchain.rs +++ b/crates/registry/src/superchain.rs @@ -6,7 +6,7 @@ use alloy_primitives::{ map::{DefaultHashBuilder, HashMap}, Address, }; -use op_alloy_genesis::{chain::HardForkConfiguration, ChainConfig, RollupConfig}; +use op_alloy_genesis::{ChainConfig, HardForkConfiguration, RollupConfig}; /// A superchain configuration. #[derive(Debug, Clone, Default, Eq, PartialEq, serde::Serialize, serde::Deserialize)] @@ -117,8 +117,8 @@ mod tests { use alloy_eips::BlockNumHash; use alloy_primitives::{address, b256, uint}; use op_alloy_genesis::{ - chain::{HardForkConfiguration, SuperchainLevel}, - AddressList, ChainGenesis, SystemConfig, OP_MAINNET_BASE_FEE_PARAMS, + AddressList, ChainGenesis, HardForkConfiguration, SuperchainLevel, SystemConfig, + OP_MAINNET_BASE_FEE_PARAMS, }; #[test] @@ -209,7 +209,7 @@ mod tests { #[test] fn test_read_rollup_configs() { - use op_alloy_genesis::rollup::OP_MAINNET_CONFIG; + use op_alloy_genesis::OP_MAINNET_CONFIG; let superchains = Registry::from_chain_list(); assert_eq!(*superchains.rollup_configs.get(&10).unwrap(), OP_MAINNET_CONFIG); }