Skip to content

Commit

Permalink
Merge pull request #113 from anton-rs/bot/update-submodules
Browse files Browse the repository at this point in the history
[BOT] Update Submodules
  • Loading branch information
refcell authored Nov 18, 2024
2 parents 8abcaf8 + aca2e7c commit aac595a
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 15 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions crates/registry/etc/configs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions crates/registry/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions crates/registry/src/superchain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit aac595a

Please sign in to comment.