From 2c97cb350280e42dbfa9a5a55eed541fec527d2c Mon Sep 17 00:00:00 2001 From: Gregory Edison Date: Thu, 3 Apr 2025 10:12:13 +0200 Subject: [PATCH 1/6] fix: no-std on reth-scroll-engine-primitives + add basic features lint for scroll crates Signed-off-by: Gregory Edison --- .github/workflows/lint.yml | 4 +++- Makefile | 8 ++++++++ crates/scroll/alloy/consensus/Cargo.toml | 6 +++--- crates/scroll/engine-primitives/src/lib.rs | 2 ++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ad3d2465d8a1..e58fa9e6c79b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -251,7 +251,9 @@ jobs: cache-on-failure: true - name: cargo install cargo-hack uses: taiki-e/install-action@cargo-hack - - run: make check-features + - run: | + make check-features + make check-features-scroll env: RUSTFLAGS: -D warnings diff --git a/Makefile b/Makefile index 41e9433f48ba..86973af0445a 100644 --- a/Makefile +++ b/Makefile @@ -519,3 +519,11 @@ check-features: --package reth-primitives-traits \ --package reth-primitives \ --feature-powerset + +check-features-scroll: + cargo hack check \ + --package reth-scroll-chainspec \ + --package reth-scroll-engine-primitives \ + --package scroll-alloy-consensus \ + --package scroll-alloy-rpc-types-engine \ + --each-feature diff --git a/crates/scroll/alloy/consensus/Cargo.toml b/crates/scroll/alloy/consensus/Cargo.toml index aba0e0348621..6c45faeee8f6 100644 --- a/crates/scroll/alloy/consensus/Cargo.toml +++ b/crates/scroll/alloy/consensus/Cargo.toml @@ -53,7 +53,7 @@ default = [ std = [ "serde/std", "alloy-primitives/std", - "reth-codecs/std", + "reth-codecs?/std", "alloy-consensus/std", "alloy-eips/std", "alloy-rlp/std", @@ -85,7 +85,7 @@ arbitrary = [ "alloy-consensus/arbitrary", "alloy-eips/arbitrary", "alloy-serde/arbitrary", - "reth-codecs/arbitrary", + "reth-codecs?/arbitrary", "alloy-primitives/rand", ] serde = [ @@ -95,7 +95,7 @@ serde = [ "alloy-consensus/serde", "alloy-eips/serde", "rand/serde", - "reth-codecs/serde", + "reth-codecs?/serde", ] serde-bincode-compat = [ "alloy-consensus/serde-bincode-compat", diff --git a/crates/scroll/engine-primitives/src/lib.rs b/crates/scroll/engine-primitives/src/lib.rs index 2867b9222ee1..a82ec2581c09 100644 --- a/crates/scroll/engine-primitives/src/lib.rs +++ b/crates/scroll/engine-primitives/src/lib.rs @@ -1,6 +1,8 @@ //! The engine primitives for Scroll. #![cfg_attr(not(feature = "std"), no_std)] +#[cfg(not(feature = "std"))] +extern crate alloc as std; mod payload; pub use payload::{ From 0f6bfd013d6c3d2e4f88b22e829efaf3ab8d717b Mon Sep 17 00:00:00 2001 From: Gregory Edison Date: Thu, 3 Apr 2025 10:30:10 +0200 Subject: [PATCH 2/6] fix: move no-default-features check to riscv check Signed-off-by: Gregory Edison --- .github/assets/check_rv32imac.sh | 8 +++++ .github/workflows/lint.yml | 4 +-- Cargo.lock | 1 - Cargo.toml | 14 ++++---- Makefile | 8 ----- crates/scroll/alloy/evm/Cargo.toml | 18 +++++------ crates/scroll/alloy/hardforks/Cargo.toml | 4 ++- crates/scroll/alloy/hardforks/src/lib.rs | 5 +++ crates/scroll/alloy/provider/Cargo.toml | 1 - .../alloy/provider/src/engine/provider.rs | 4 +-- crates/scroll/chainspec/Cargo.toml | 32 +++++++++---------- crates/scroll/hardforks/src/lib.rs | 4 +++ 12 files changed, 55 insertions(+), 48 deletions(-) diff --git a/.github/assets/check_rv32imac.sh b/.github/assets/check_rv32imac.sh index ec935d3493ec..e636adc225e9 100755 --- a/.github/assets/check_rv32imac.sh +++ b/.github/assets/check_rv32imac.sh @@ -30,6 +30,14 @@ crates_to_check=( reth-optimism-consensus reth-optimism-primitives reth-optimism-evm + + ## scroll + reth-scroll-chainspec + scroll-alloy-consensus + scroll-alloy-evm + scroll-alloy-rpc-types + scroll-alloy-rpc-types-engine + ) # Array to hold the results diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e58fa9e6c79b..ad3d2465d8a1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -251,9 +251,7 @@ jobs: cache-on-failure: true - name: cargo install cargo-hack uses: taiki-e/install-action@cargo-hack - - run: | - make check-features - make check-features-scroll + - run: make check-features env: RUSTFLAGS: -D warnings diff --git a/Cargo.lock b/Cargo.lock index d058b0d14cb4..27ac22067848 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11361,7 +11361,6 @@ dependencies = [ "reth-scroll-engine-primitives", "reth-scroll-node", "reth-scroll-payload", - "reth-scroll-primitives", "reth-tasks", "reth-tracing", "reth-transaction-pool", diff --git a/Cargo.toml b/Cargo.toml index 39102012699c..2864d0948799 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -467,7 +467,7 @@ revm-context = { version = "2.0.0", default-features = false } revm-context-interface = { version = "2.0.0", default-features = false } revm-database-interface = { version = "2.0.0", default-features = false } op-revm = { version = "2.0.0", default-features = false } -revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm" } +revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", default-features = false } revm-inspectors = "0.18.0" # eth @@ -512,19 +512,19 @@ alloy-transport-ipc = { version = "0.13.0", default-features = false } alloy-transport-ws = { version = "0.13.0", default-features = false } # scroll -scroll-alloy-consensus = { path = "crates/scroll/alloy/consensus" } +scroll-alloy-consensus = { path = "crates/scroll/alloy/consensus", default-features = false } scroll-alloy-evm = { path = "crates/scroll/alloy/evm" } -scroll-alloy-hardforks = { path = "crates/scroll/alloy/hardforks" } +scroll-alloy-hardforks = { path = "crates/scroll/alloy/hardforks", default-features = false } scroll-alloy-network = { path = "crates/scroll/alloy/network" } scroll-alloy-rpc-types = { path = "crates/scroll/alloy/rpc-types" } -scroll-alloy-rpc-types-engine = { path = "crates/scroll/alloy/rpc-types-engine" } +scroll-alloy-rpc-types-engine = { path = "crates/scroll/alloy/rpc-types-engine",default-features = false } scroll-alloy-provider = { path = "crates/scroll/alloy/provider" } -reth-scroll-chainspec = { path = "crates/scroll/chainspec" } +reth-scroll-chainspec = { path = "crates/scroll/chainspec", default-features = false } reth-scroll-cli = { path = "crates/scroll/cli" } reth-scroll-consensus = { path = "crates/scroll/consensus" } reth-scroll-evm = { path = "crates/scroll/evm" } reth-scroll-engine-primitives = { path = "crates/scroll/engine-primitives" } -reth-scroll-forks = { path = "crates/scroll/hardforks" } +reth-scroll-forks = { path = "crates/scroll/hardforks", default-features = false } reth-scroll-node = { path = "crates/scroll/node" } reth-scroll-payload = { path = "crates/scroll/payload" } reth-scroll-primitives = { path = "crates/scroll/primitives" } @@ -546,7 +546,7 @@ op-alloy-rpc-jsonrpsee = { version = "0.12.0", default-features = false } # misc aquamarine = "0.6" -auto_impl = "1" +auto_impl = { version = "1", default-features = false } backon = { version = "1.2", default-features = false, features = ["std-blocking-sleep", "tokio-sleep"] } bincode = "1.3" bitflags = "2.4" diff --git a/Makefile b/Makefile index 86973af0445a..41e9433f48ba 100644 --- a/Makefile +++ b/Makefile @@ -519,11 +519,3 @@ check-features: --package reth-primitives-traits \ --package reth-primitives \ --feature-powerset - -check-features-scroll: - cargo hack check \ - --package reth-scroll-chainspec \ - --package reth-scroll-engine-primitives \ - --package scroll-alloy-consensus \ - --package scroll-alloy-rpc-types-engine \ - --each-feature diff --git a/crates/scroll/alloy/evm/Cargo.toml b/crates/scroll/alloy/evm/Cargo.toml index 9b3971a15835..5a05ba7ddce6 100644 --- a/crates/scroll/alloy/evm/Cargo.toml +++ b/crates/scroll/alloy/evm/Cargo.toml @@ -13,23 +13,23 @@ workspace = true [dependencies] # alloy -alloy-consensus.workspace = true -alloy-eips.workspace = true -alloy-evm.workspace = true -alloy-primitives.workspace = true +alloy-consensus = { workspace = true, default-features = false } +alloy-eips = { workspace = true, default-features = false } +alloy-evm = { workspace = true, default-features = false } +alloy-primitives = { workspace = true, default-features = false } # revm -revm = { workspace = true, features = ["optional_no_base_fee"] } +revm = { workspace = true, default-features = false, features = ["optional_no_base_fee"] } # scroll -revm-scroll.workspace = true +revm-scroll = { workspace = true, default-features = false } # scroll -scroll-alloy-consensus.workspace = true -scroll-alloy-hardforks.workspace = true +scroll-alloy-consensus = { workspace = true, default-features = false } +scroll-alloy-hardforks = { workspace = true, default-features = false } # misc -auto_impl.workspace = true +auto_impl = { workspace = true, default-features = false } serde = { workspace = true, default-features = false, features = ["derive"], optional = true } [dev-dependencies] diff --git a/crates/scroll/alloy/hardforks/Cargo.toml b/crates/scroll/alloy/hardforks/Cargo.toml index 2313d8bb19f4..7dea06ea9bba 100644 --- a/crates/scroll/alloy/hardforks/Cargo.toml +++ b/crates/scroll/alloy/hardforks/Cargo.toml @@ -16,8 +16,10 @@ workspace = true alloy-hardforks.workspace = true # misc -auto_impl.workspace = true +auto_impl = { workspace = true, default-features = false } serde = { workspace = true, optional = true } [features] +default = ["std"] +std = ["serde?/std"] serde = ["dep:serde", "alloy-hardforks/serde"] diff --git a/crates/scroll/alloy/hardforks/src/lib.rs b/crates/scroll/alloy/hardforks/src/lib.rs index 328d920fca32..4cd69d44d8a0 100644 --- a/crates/scroll/alloy/hardforks/src/lib.rs +++ b/crates/scroll/alloy/hardforks/src/lib.rs @@ -1,6 +1,11 @@ //! Scroll-Reth hard forks. +#![cfg_attr(not(feature = "std"), no_std)] +#[cfg(not(feature = "std"))] +extern crate alloc as std; + use alloy_hardforks::{EthereumHardfork, EthereumHardforks, ForkCondition}; +use std::vec::Vec; pub use hardfork::ScrollHardfork; pub mod hardfork; diff --git a/crates/scroll/alloy/provider/Cargo.toml b/crates/scroll/alloy/provider/Cargo.toml index ddc8aee11a64..0ecd7d740a6c 100644 --- a/crates/scroll/alloy/provider/Cargo.toml +++ b/crates/scroll/alloy/provider/Cargo.toml @@ -44,7 +44,6 @@ reth-rpc-engine-api.workspace = true reth-scroll-engine-primitives.workspace = true reth-scroll-node.workspace = true reth-scroll-payload = { workspace = true, features = ["test-utils"] } -reth-scroll-primitives.workspace = true reth-scroll-chainspec.workspace = true reth-tasks.workspace = true reth-tracing.workspace = true diff --git a/crates/scroll/alloy/provider/src/engine/provider.rs b/crates/scroll/alloy/provider/src/engine/provider.rs index ce94360a1b5f..cf6aefc97e03 100644 --- a/crates/scroll/alloy/provider/src/engine/provider.rs +++ b/crates/scroll/alloy/provider/src/engine/provider.rs @@ -16,7 +16,7 @@ use reqwest::Url; use scroll_alloy_network::Scroll; use scroll_alloy_rpc_types_engine::ScrollPayloadAttributes; -/// An authenticated [`alloy_provider::Provider`] to the [`super::ScrollEngineApi`]. +/// An authenticated [`alloy_provider::Provider`] to the [`ScrollEngineApi`]. #[derive(Debug, Clone, Deref)] pub struct ScrollAuthEngineApiProvider { auth_provider: RootProvider, @@ -43,7 +43,7 @@ impl ScrollAuthEngineApiProvider { } #[async_trait::async_trait] -impl ScrollEngineApi for ScrollAuthEngineApiProvider { +impl ScrollEngineApi for ScrollAuthEngineApiProvider { async fn new_payload_v1(&self, payload: ExecutionPayloadV1) -> TransportResult { self.auth_provider.new_payload_v1(payload).await } diff --git a/crates/scroll/chainspec/Cargo.toml b/crates/scroll/chainspec/Cargo.toml index a43dac9f3534..3400ba125f54 100644 --- a/crates/scroll/chainspec/Cargo.toml +++ b/crates/scroll/chainspec/Cargo.toml @@ -14,30 +14,30 @@ workspace = true [dependencies] # reth reth-chainspec = { workspace = true, features = ["scroll"] } -reth-ethereum-forks.workspace = true -reth-network-peers.workspace = true -reth-primitives-traits.workspace = true -reth-trie-common.workspace = true +reth-ethereum-forks = {workspace = true, default-features = false} +reth-network-peers = {workspace = true, default-features = false} +reth-primitives-traits = {workspace = true, default-features = false} +reth-trie-common = {workspace = true, default-features = false} # scroll -reth-scroll-forks.workspace = true -scroll-alloy-hardforks.workspace = true +reth-scroll-forks = {workspace = true, default-features = false} +scroll-alloy-hardforks = {workspace = true, default-features = false} # ethereum -alloy-chains.workspace = true -alloy-genesis.workspace = true -alloy-primitives.workspace = true -alloy-consensus.workspace = true -alloy-eips.workspace = true -alloy-serde.workspace = true +alloy-chains = {workspace = true, default-features = false} +alloy-genesis = {workspace = true, default-features = false} +alloy-primitives = {workspace = true, default-features = false} +alloy-consensus = {workspace = true, default-features = false} +alloy-eips = {workspace = true, default-features = false} +alloy-serde = {workspace = true, default-features = false} # io -serde_json.workspace = true -serde = { workspace = true, features = ["derive"] } +serde_json = {workspace = true, default-features = false} +serde = { workspace = true, default-features = false, features = ["derive"] } # misc -derive_more.workspace = true -once_cell.workspace = true +derive_more = {workspace = true, default-features = false} +once_cell = {workspace = true, default-features = false} [dev-dependencies] alloy-genesis.workspace = true diff --git a/crates/scroll/hardforks/src/lib.rs b/crates/scroll/hardforks/src/lib.rs index 267833c4ae4f..fd139796a272 100644 --- a/crates/scroll/hardforks/src/lib.rs +++ b/crates/scroll/hardforks/src/lib.rs @@ -1,6 +1,9 @@ //! Scroll-Reth hard forks. +#![cfg_attr(not(feature = "std"), no_std)] #![doc = include_str!("../docs/hardforks.md")] +#[cfg(not(feature = "std"))] +extern crate alloc as std; use reth_ethereum_forks::{ChainHardforks, EthereumHardfork, ForkCondition, Hardfork}; @@ -11,6 +14,7 @@ pub use scroll_alloy_hardforks::{ScrollHardfork, ScrollHardforks}; use once_cell::sync::Lazy as LazyLock; #[cfg(feature = "std")] use std::sync::LazyLock; +use std::vec; /// Scroll mainnet hardforks pub static SCROLL_MAINNET_HARDFORKS: LazyLock = LazyLock::new(|| { From 3facb188232225601d16ba635a75cd64d2d6a96e Mon Sep 17 00:00:00 2001 From: Gregory Edison Date: Thu, 3 Apr 2025 12:26:57 +0200 Subject: [PATCH 3/6] fix: lints Signed-off-by: Gregory Edison --- Cargo.toml | 2 +- crates/scroll/chainspec/Cargo.toml | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2864d0948799..570d56d495cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -517,7 +517,7 @@ scroll-alloy-evm = { path = "crates/scroll/alloy/evm" } scroll-alloy-hardforks = { path = "crates/scroll/alloy/hardforks", default-features = false } scroll-alloy-network = { path = "crates/scroll/alloy/network" } scroll-alloy-rpc-types = { path = "crates/scroll/alloy/rpc-types" } -scroll-alloy-rpc-types-engine = { path = "crates/scroll/alloy/rpc-types-engine",default-features = false } +scroll-alloy-rpc-types-engine = { path = "crates/scroll/alloy/rpc-types-engine", default-features = false } scroll-alloy-provider = { path = "crates/scroll/alloy/provider" } reth-scroll-chainspec = { path = "crates/scroll/chainspec", default-features = false } reth-scroll-cli = { path = "crates/scroll/cli" } diff --git a/crates/scroll/chainspec/Cargo.toml b/crates/scroll/chainspec/Cargo.toml index 3400ba125f54..a1c9d4fdab06 100644 --- a/crates/scroll/chainspec/Cargo.toml +++ b/crates/scroll/chainspec/Cargo.toml @@ -14,30 +14,30 @@ workspace = true [dependencies] # reth reth-chainspec = { workspace = true, features = ["scroll"] } -reth-ethereum-forks = {workspace = true, default-features = false} -reth-network-peers = {workspace = true, default-features = false} -reth-primitives-traits = {workspace = true, default-features = false} -reth-trie-common = {workspace = true, default-features = false} +reth-ethereum-forks = { workspace = true, default-features = false } +reth-network-peers = { workspace = true, default-features = false } +reth-primitives-traits = { workspace = true, default-features = false } +reth-trie-common = { workspace = true, default-features = false } # scroll -reth-scroll-forks = {workspace = true, default-features = false} -scroll-alloy-hardforks = {workspace = true, default-features = false} +reth-scroll-forks = { workspace = true, default-features = false } +scroll-alloy-hardforks = { workspace = true, default-features = false } # ethereum -alloy-chains = {workspace = true, default-features = false} -alloy-genesis = {workspace = true, default-features = false} -alloy-primitives = {workspace = true, default-features = false} -alloy-consensus = {workspace = true, default-features = false} -alloy-eips = {workspace = true, default-features = false} -alloy-serde = {workspace = true, default-features = false} +alloy-chains = { workspace = true, default-features = false } +alloy-genesis = { workspace = true, default-features = false } +alloy-primitives = { workspace = true, default-features = false } +alloy-consensus = { workspace = true, default-features = false } +alloy-eips = { workspace = true, default-features = false } +alloy-serde = { workspace = true, default-features = false } # io -serde_json = {workspace = true, default-features = false} +serde_json = { workspace = true, default-features = false } serde = { workspace = true, default-features = false, features = ["derive"] } # misc -derive_more = {workspace = true, default-features = false} -once_cell = {workspace = true, default-features = false} +derive_more = { workspace = true, default-features = false } +once_cell = { workspace = true, default-features = false } [dev-dependencies] alloy-genesis.workspace = true From 7c8e3164e25fb30073f9eee96c9a76f01b81d4f0 Mon Sep 17 00:00:00 2001 From: Gregory Edison Date: Tue, 8 Apr 2025 08:32:34 +0200 Subject: [PATCH 4/6] fix: zepter Signed-off-by: Gregory Edison --- crates/payload/primitives/Cargo.toml | 1 + crates/primitives-traits/Cargo.toml | 1 + crates/scroll/alloy/evm/Cargo.toml | 2 ++ crates/scroll/alloy/provider/Cargo.toml | 1 + crates/scroll/alloy/rpc-types/Cargo.toml | 1 + crates/scroll/chainspec/Cargo.toml | 1 + crates/scroll/engine-primitives/Cargo.toml | 3 +++ crates/scroll/evm/Cargo.toml | 1 + crates/scroll/hardforks/Cargo.toml | 1 + crates/scroll/payload/Cargo.toml | 4 ++++ 10 files changed, 16 insertions(+) diff --git a/crates/payload/primitives/Cargo.toml b/crates/payload/primitives/Cargo.toml index ddb39693b674..3953554c456b 100644 --- a/crates/payload/primitives/Cargo.toml +++ b/crates/payload/primitives/Cargo.toml @@ -45,6 +45,7 @@ std = [ "serde/std", "thiserror/std", "reth-primitives-traits/std", + "scroll-alloy-rpc-types-engine?/std", ] op = [ "dep:op-alloy-rpc-types-engine", diff --git a/crates/primitives-traits/Cargo.toml b/crates/primitives-traits/Cargo.toml index a0681f6c4c61..677bc5a32b53 100644 --- a/crates/primitives-traits/Cargo.toml +++ b/crates/primitives-traits/Cargo.toml @@ -99,6 +99,7 @@ std = [ "reth-chainspec/std", "revm-bytecode/std", "revm-state/std", + "scroll-alloy-consensus?/std", ] secp256k1 = ["dep:secp256k1"] test-utils = [ diff --git a/crates/scroll/alloy/evm/Cargo.toml b/crates/scroll/alloy/evm/Cargo.toml index 5a05ba7ddce6..42b753d4f7a9 100644 --- a/crates/scroll/alloy/evm/Cargo.toml +++ b/crates/scroll/alloy/evm/Cargo.toml @@ -44,6 +44,8 @@ std = [ "serde/std", "alloy-consensus/std", "alloy-eips/std", + "scroll-alloy-consensus/std", + "scroll-alloy-hardforks/std", ] serde = [ "dep:serde", diff --git a/crates/scroll/alloy/provider/Cargo.toml b/crates/scroll/alloy/provider/Cargo.toml index 0ecd7d740a6c..f28feb21e7a4 100644 --- a/crates/scroll/alloy/provider/Cargo.toml +++ b/crates/scroll/alloy/provider/Cargo.toml @@ -64,4 +64,5 @@ std = [ "reth-primitives-traits/std", "reth-scroll-payload/std", "futures-util/std", + "reth-scroll-chainspec/std", ] diff --git a/crates/scroll/alloy/rpc-types/Cargo.toml b/crates/scroll/alloy/rpc-types/Cargo.toml index 75bcae97455b..ceb402689dfb 100644 --- a/crates/scroll/alloy/rpc-types/Cargo.toml +++ b/crates/scroll/alloy/rpc-types/Cargo.toml @@ -57,4 +57,5 @@ std = [ "derive_more/std", "serde/std", "serde_json/std", + "scroll-alloy-consensus/std", ] diff --git a/crates/scroll/chainspec/Cargo.toml b/crates/scroll/chainspec/Cargo.toml index a1c9d4fdab06..f62e7b8e5d1b 100644 --- a/crates/scroll/chainspec/Cargo.toml +++ b/crates/scroll/chainspec/Cargo.toml @@ -62,4 +62,5 @@ std = [ "derive_more/std", "reth-network-peers/std", "serde_json/std", + "scroll-alloy-hardforks/std", ] diff --git a/crates/scroll/engine-primitives/Cargo.toml b/crates/scroll/engine-primitives/Cargo.toml index 6f983b18f45b..0e11f7b1d42e 100644 --- a/crates/scroll/engine-primitives/Cargo.toml +++ b/crates/scroll/engine-primitives/Cargo.toml @@ -58,4 +58,7 @@ std = [ "reth-primitives-traits/std", "serde/std", "sha2/std", + "reth-scroll-chainspec/std", + "scroll-alloy-hardforks/std", + "scroll-alloy-rpc-types-engine/std", ] diff --git a/crates/scroll/evm/Cargo.toml b/crates/scroll/evm/Cargo.toml index 2bf13532b86a..be87cc1801ee 100644 --- a/crates/scroll/evm/Cargo.toml +++ b/crates/scroll/evm/Cargo.toml @@ -72,4 +72,5 @@ std = [ "revm/std", "thiserror/std", "tracing/std", + "scroll-alloy-hardforks/std", ] diff --git a/crates/scroll/hardforks/Cargo.toml b/crates/scroll/hardforks/Cargo.toml index 41ab480f252b..bd69a2a489a6 100644 --- a/crates/scroll/hardforks/Cargo.toml +++ b/crates/scroll/hardforks/Cargo.toml @@ -35,6 +35,7 @@ std = [ "serde?/std", "alloy-chains/std", "reth-ethereum-forks/std", + "scroll-alloy-hardforks/std", ] serde = [ "dep:serde", diff --git a/crates/scroll/payload/Cargo.toml b/crates/scroll/payload/Cargo.toml index 1f9a8afc7a4a..c59b4e6b96ba 100644 --- a/crates/scroll/payload/Cargo.toml +++ b/crates/scroll/payload/Cargo.toml @@ -66,6 +66,10 @@ std = [ "revm/std", "thiserror/std", "tracing/std", + "reth-scroll-chainspec/std", + "reth-scroll-forks/std", + "scroll-alloy-consensus/std", + "scroll-alloy-hardforks/std", ] test-utils = [ "dep:futures-util", From 133c21a2dc872abe83c9bca0b833c582c5584a31 Mon Sep 17 00:00:00 2001 From: Gregory Edison Date: Tue, 8 Apr 2025 08:33:38 +0200 Subject: [PATCH 5/6] fix: formatting Signed-off-by: Gregory Edison --- .github/assets/check_rv32imac.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/assets/check_rv32imac.sh b/.github/assets/check_rv32imac.sh index e636adc225e9..361410fa06c9 100755 --- a/.github/assets/check_rv32imac.sh +++ b/.github/assets/check_rv32imac.sh @@ -33,10 +33,10 @@ crates_to_check=( ## scroll reth-scroll-chainspec - scroll-alloy-consensus - scroll-alloy-evm - scroll-alloy-rpc-types - scroll-alloy-rpc-types-engine + scroll-alloy-consensus + scroll-alloy-evm + scroll-alloy-rpc-types + scroll-alloy-rpc-types-engine ) From d7f837c31aa60ca5ff8660e6851efe9d9e0eabe0 Mon Sep 17 00:00:00 2001 From: Gregory Edison Date: Tue, 8 Apr 2025 08:46:52 +0200 Subject: [PATCH 6/6] fix: tokio advisory Signed-off-by: Gregory Edison --- Cargo.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 27ac22067848..fe6ea4e0a56b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2753,7 +2753,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18e4fdb82bd54a12e42fb58a800dcae6b9e13982238ce2296dc3570b92148e1f" dependencies = [ "data-encoding", - "syn 2.0.100", + "syn 1.0.109", ] [[package]] @@ -5267,7 +5267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -12343,9 +12343,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.44.1" +version = "1.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" dependencies = [ "backtrace", "bytes", @@ -12686,7 +12686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69fff37da548239c3bf9e64a12193d261e8b22b660991c6fd2df057c168f435f" dependencies = [ "cc", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]]