Skip to content

Commit 1c9ebaf

Browse files
greged93greged93
authored
feat: scroll l1 message transaction (#41)
* implement Scroll l1 message transaction Signed-off-by: Gregory Edison <[email protected]> * add scroll l1 message transaction to `Transaction` enum Signed-off-by: Gregory Edison <[email protected]> * propagate scroll feature flag in optimism crates for conditional compilation Signed-off-by: Gregory Edison <[email protected]> * nit fixes Signed-off-by: Gregory Edison <[email protected]> * fix lints Signed-off-by: Gregory Edison <[email protected]> * rebasing changes Signed-off-by: Gregory Edison <[email protected]> * move `L1_MESSAGE_TRANSACTION_TYPE` to reth_scroll_primitives Signed-off-by: Gregory Edison <[email protected]> * feature gate Compact derive Signed-off-by: Gregory Edison <[email protected]> * fix lints Signed-off-by: Gregory Edison <[email protected]> * reformat manifest Signed-off-by: Gregory Edison <[email protected]> * fix: answer comments Signed-off-by: Gregory Edison <[email protected]> --------- Signed-off-by: Gregory Edison <[email protected]>
1 parent 9730a0f commit 1c9ebaf

File tree

29 files changed

+768
-160
lines changed

29 files changed

+768
-160
lines changed

‎Cargo.lock‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/optimism/bin/src/lib.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@
2424
issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
2525
)]
2626
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
27-
// The `optimism` feature must be enabled to use this crate.
28-
#![cfg(feature = "optimism")]
29-
// Don't use the crate if `scroll` feature is used.
3027
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
31-
#![cfg(not(feature = "scroll"))]
28+
// The `optimism` feature must be enabled to use this crate.
29+
#![cfg(all(feature = "optimism", not(feature = "scroll")))]
3230

3331
/// Re-exported from `reth_optimism_cli`.
3432
pub mod cli {

‎crates/optimism/bin/src/main.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#![allow(missing_docs, rustdoc::missing_crate_level_docs)]
2-
// The `optimism` feature must be enabled to use this crate.
3-
#![cfg(feature = "optimism")]
4-
// Don't use the crate if `scroll` feature is used.
52
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
6-
#![cfg(not(feature = "scroll"))]
3+
// The `optimism` feature must be enabled to use this crate.
4+
#![cfg(all(feature = "optimism", not(feature = "scroll")))]
75

86
use clap::Parser;
97
use reth_node_builder::{engine_tree_config::TreeConfig, EngineNodeLauncher};

‎crates/optimism/cli/src/lib.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
)]
88
#![cfg_attr(all(not(test), feature = "optimism"), warn(unused_crate_dependencies))]
99
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
10-
// The `optimism` feature must be enabled to use this crate.
11-
#![cfg(feature = "optimism")]
12-
// Don't use the crate if `scroll` feature is used.
1310
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
14-
#![cfg(not(feature = "scroll"))]
11+
// The `optimism` feature must be enabled to use this crate.
12+
#![cfg(all(feature = "optimism", not(feature = "scroll")))]
1513

1614
/// Optimism chain specification parser.
1715
pub mod chainspec;

‎crates/optimism/consensus/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ reth-optimism-chainspec.workspace = true
3636

3737
[features]
3838
optimism = ["reth-primitives/optimism"]
39+
scroll = []

‎crates/optimism/consensus/src/lib.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
77
)]
88
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
9+
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
910
// The `optimism` feature must be enabled to use this crate.
10-
#![cfg(feature = "optimism")]
11+
#![cfg(all(feature = "optimism", not(feature = "scroll")))]
1112

1213
use alloy_consensus::{Header, EMPTY_OMMER_ROOT_HASH};
1314
use alloy_primitives::{B64, U256};

‎crates/optimism/evm/src/lib.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
)]
88
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
99
#![cfg_attr(not(feature = "std"), no_std)]
10-
// The `optimism` feature must be enabled to use this crate.
11-
#![cfg(feature = "optimism")]
12-
// Don't use the crate if `scroll` feature is used.
1310
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
14-
#![cfg(not(feature = "scroll"))]
11+
// The `optimism` feature must be enabled to use this crate.
12+
#![cfg(all(feature = "optimism", not(feature = "scroll")))]
1513

1614
extern crate alloc;
1715

‎crates/optimism/node/src/lib.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66
issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
77
)]
88
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
9-
// The `optimism` feature must be enabled to use this crate.
10-
#![cfg(feature = "optimism")]
11-
// Don't use the crate if `scroll` feature is used.
129
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
13-
#![cfg(not(feature = "scroll"))]
10+
// The `optimism` feature must be enabled to use this crate.
11+
#![cfg(all(feature = "optimism", not(feature = "scroll")))]
1412

1513
/// CLI argument parsing for the optimism node.
1614
pub mod args;

‎crates/optimism/node/tests/e2e/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
44
#![cfg(not(feature = "scroll"))]
55

6-
#[cfg(feature = "optimism")]
6+
#[cfg(all(feature = "optimism", not(feature = "scroll")))]
77
mod p2p;
88

99
const fn main() {}

‎crates/optimism/node/tests/it/main.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
44
#![cfg(not(feature = "scroll"))]
55

6-
#[cfg(feature = "optimism")]
6+
#[cfg(all(feature = "optimism", not(feature = "scroll")))]
77
mod builder;
88

9-
#[cfg(feature = "optimism")]
9+
#[cfg(all(feature = "optimism", not(feature = "scroll")))]
1010
mod priority;
1111

1212
const fn main() {}

0 commit comments

Comments
 (0)