Skip to content

Commit 0f6bfd0

Browse files
greged93greged93
committed
fix: move no-default-features check to riscv check
Signed-off-by: Gregory Edison <[email protected]>
1 parent 2c97cb3 commit 0f6bfd0

File tree

12 files changed

+55
-48
lines changed

12 files changed

+55
-48
lines changed

‎.github/assets/check_rv32imac.sh

+8
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ crates_to_check=(
3030
reth-optimism-consensus
3131
reth-optimism-primitives
3232
reth-optimism-evm
33+
34+
## scroll
35+
reth-scroll-chainspec
36+
scroll-alloy-consensus
37+
scroll-alloy-evm
38+
scroll-alloy-rpc-types
39+
scroll-alloy-rpc-types-engine
40+
3341
)
3442

3543
# Array to hold the results

‎.github/workflows/lint.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,7 @@ jobs:
251251
cache-on-failure: true
252252
- name: cargo install cargo-hack
253253
uses: taiki-e/install-action@cargo-hack
254-
- run: |
255-
make check-features
256-
make check-features-scroll
254+
- run: make check-features
257255
env:
258256
RUSTFLAGS: -D warnings
259257

‎Cargo.lock

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ revm-context = { version = "2.0.0", default-features = false }
467467
revm-context-interface = { version = "2.0.0", default-features = false }
468468
revm-database-interface = { version = "2.0.0", default-features = false }
469469
op-revm = { version = "2.0.0", default-features = false }
470-
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm" }
470+
revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", default-features = false }
471471
revm-inspectors = "0.18.0"
472472

473473
# eth
@@ -512,19 +512,19 @@ alloy-transport-ipc = { version = "0.13.0", default-features = false }
512512
alloy-transport-ws = { version = "0.13.0", default-features = false }
513513

514514
# scroll
515-
scroll-alloy-consensus = { path = "crates/scroll/alloy/consensus" }
515+
scroll-alloy-consensus = { path = "crates/scroll/alloy/consensus", default-features = false }
516516
scroll-alloy-evm = { path = "crates/scroll/alloy/evm" }
517-
scroll-alloy-hardforks = { path = "crates/scroll/alloy/hardforks" }
517+
scroll-alloy-hardforks = { path = "crates/scroll/alloy/hardforks", default-features = false }
518518
scroll-alloy-network = { path = "crates/scroll/alloy/network" }
519519
scroll-alloy-rpc-types = { path = "crates/scroll/alloy/rpc-types" }
520-
scroll-alloy-rpc-types-engine = { path = "crates/scroll/alloy/rpc-types-engine" }
520+
scroll-alloy-rpc-types-engine = { path = "crates/scroll/alloy/rpc-types-engine",default-features = false }
521521
scroll-alloy-provider = { path = "crates/scroll/alloy/provider" }
522-
reth-scroll-chainspec = { path = "crates/scroll/chainspec" }
522+
reth-scroll-chainspec = { path = "crates/scroll/chainspec", default-features = false }
523523
reth-scroll-cli = { path = "crates/scroll/cli" }
524524
reth-scroll-consensus = { path = "crates/scroll/consensus" }
525525
reth-scroll-evm = { path = "crates/scroll/evm" }
526526
reth-scroll-engine-primitives = { path = "crates/scroll/engine-primitives" }
527-
reth-scroll-forks = { path = "crates/scroll/hardforks" }
527+
reth-scroll-forks = { path = "crates/scroll/hardforks", default-features = false }
528528
reth-scroll-node = { path = "crates/scroll/node" }
529529
reth-scroll-payload = { path = "crates/scroll/payload" }
530530
reth-scroll-primitives = { path = "crates/scroll/primitives" }
@@ -546,7 +546,7 @@ op-alloy-rpc-jsonrpsee = { version = "0.12.0", default-features = false }
546546

547547
# misc
548548
aquamarine = "0.6"
549-
auto_impl = "1"
549+
auto_impl = { version = "1", default-features = false }
550550
backon = { version = "1.2", default-features = false, features = ["std-blocking-sleep", "tokio-sleep"] }
551551
bincode = "1.3"
552552
bitflags = "2.4"

‎Makefile

-8
Original file line numberDiff line numberDiff line change
@@ -519,11 +519,3 @@ check-features:
519519
--package reth-primitives-traits \
520520
--package reth-primitives \
521521
--feature-powerset
522-
523-
check-features-scroll:
524-
cargo hack check \
525-
--package reth-scroll-chainspec \
526-
--package reth-scroll-engine-primitives \
527-
--package scroll-alloy-consensus \
528-
--package scroll-alloy-rpc-types-engine \
529-
--each-feature

‎crates/scroll/alloy/evm/Cargo.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ workspace = true
1313

1414
[dependencies]
1515
# alloy
16-
alloy-consensus.workspace = true
17-
alloy-eips.workspace = true
18-
alloy-evm.workspace = true
19-
alloy-primitives.workspace = true
16+
alloy-consensus = { workspace = true, default-features = false }
17+
alloy-eips = { workspace = true, default-features = false }
18+
alloy-evm = { workspace = true, default-features = false }
19+
alloy-primitives = { workspace = true, default-features = false }
2020

2121
# revm
22-
revm = { workspace = true, features = ["optional_no_base_fee"] }
22+
revm = { workspace = true, default-features = false, features = ["optional_no_base_fee"] }
2323

2424
# scroll
25-
revm-scroll.workspace = true
25+
revm-scroll = { workspace = true, default-features = false }
2626

2727
# scroll
28-
scroll-alloy-consensus.workspace = true
29-
scroll-alloy-hardforks.workspace = true
28+
scroll-alloy-consensus = { workspace = true, default-features = false }
29+
scroll-alloy-hardforks = { workspace = true, default-features = false }
3030

3131
# misc
32-
auto_impl.workspace = true
32+
auto_impl = { workspace = true, default-features = false }
3333
serde = { workspace = true, default-features = false, features = ["derive"], optional = true }
3434

3535
[dev-dependencies]

‎crates/scroll/alloy/hardforks/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ workspace = true
1616
alloy-hardforks.workspace = true
1717

1818
# misc
19-
auto_impl.workspace = true
19+
auto_impl = { workspace = true, default-features = false }
2020
serde = { workspace = true, optional = true }
2121

2222
[features]
23+
default = ["std"]
24+
std = ["serde?/std"]
2325
serde = ["dep:serde", "alloy-hardforks/serde"]

‎crates/scroll/alloy/hardforks/src/lib.rs

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
//! Scroll-Reth hard forks.
22
3+
#![cfg_attr(not(feature = "std"), no_std)]
4+
#[cfg(not(feature = "std"))]
5+
extern crate alloc as std;
6+
37
use alloy_hardforks::{EthereumHardfork, EthereumHardforks, ForkCondition};
8+
use std::vec::Vec;
49

510
pub use hardfork::ScrollHardfork;
611
pub mod hardfork;

‎crates/scroll/alloy/provider/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ reth-rpc-engine-api.workspace = true
4444
reth-scroll-engine-primitives.workspace = true
4545
reth-scroll-node.workspace = true
4646
reth-scroll-payload = { workspace = true, features = ["test-utils"] }
47-
reth-scroll-primitives.workspace = true
4847
reth-scroll-chainspec.workspace = true
4948
reth-tasks.workspace = true
5049
reth-tracing.workspace = true

‎crates/scroll/alloy/provider/src/engine/provider.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use reqwest::Url;
1616
use scroll_alloy_network::Scroll;
1717
use scroll_alloy_rpc_types_engine::ScrollPayloadAttributes;
1818

19-
/// An authenticated [`alloy_provider::Provider`] to the [`super::ScrollEngineApi`].
19+
/// An authenticated [`alloy_provider::Provider`] to the [`ScrollEngineApi`].
2020
#[derive(Debug, Clone, Deref)]
2121
pub struct ScrollAuthEngineApiProvider<N: Network = Scroll> {
2222
auth_provider: RootProvider<N>,
@@ -43,7 +43,7 @@ impl ScrollAuthEngineApiProvider {
4343
}
4444

4545
#[async_trait::async_trait]
46-
impl ScrollEngineApi<scroll_alloy_network::Scroll> for ScrollAuthEngineApiProvider {
46+
impl ScrollEngineApi<Scroll> for ScrollAuthEngineApiProvider {
4747
async fn new_payload_v1(&self, payload: ExecutionPayloadV1) -> TransportResult<PayloadStatus> {
4848
self.auth_provider.new_payload_v1(payload).await
4949
}

‎crates/scroll/chainspec/Cargo.toml

+16-16
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ workspace = true
1414
[dependencies]
1515
# reth
1616
reth-chainspec = { workspace = true, features = ["scroll"] }
17-
reth-ethereum-forks.workspace = true
18-
reth-network-peers.workspace = true
19-
reth-primitives-traits.workspace = true
20-
reth-trie-common.workspace = true
17+
reth-ethereum-forks = {workspace = true, default-features = false}
18+
reth-network-peers = {workspace = true, default-features = false}
19+
reth-primitives-traits = {workspace = true, default-features = false}
20+
reth-trie-common = {workspace = true, default-features = false}
2121

2222
# scroll
23-
reth-scroll-forks.workspace = true
24-
scroll-alloy-hardforks.workspace = true
23+
reth-scroll-forks = {workspace = true, default-features = false}
24+
scroll-alloy-hardforks = {workspace = true, default-features = false}
2525

2626
# ethereum
27-
alloy-chains.workspace = true
28-
alloy-genesis.workspace = true
29-
alloy-primitives.workspace = true
30-
alloy-consensus.workspace = true
31-
alloy-eips.workspace = true
32-
alloy-serde.workspace = true
27+
alloy-chains = {workspace = true, default-features = false}
28+
alloy-genesis = {workspace = true, default-features = false}
29+
alloy-primitives = {workspace = true, default-features = false}
30+
alloy-consensus = {workspace = true, default-features = false}
31+
alloy-eips = {workspace = true, default-features = false}
32+
alloy-serde = {workspace = true, default-features = false}
3333

3434
# io
35-
serde_json.workspace = true
36-
serde = { workspace = true, features = ["derive"] }
35+
serde_json = {workspace = true, default-features = false}
36+
serde = { workspace = true, default-features = false, features = ["derive"] }
3737

3838
# misc
39-
derive_more.workspace = true
40-
once_cell.workspace = true
39+
derive_more = {workspace = true, default-features = false}
40+
once_cell = {workspace = true, default-features = false}
4141

4242
[dev-dependencies]
4343
alloy-genesis.workspace = true

‎crates/scroll/hardforks/src/lib.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
//! Scroll-Reth hard forks.
22
3+
#![cfg_attr(not(feature = "std"), no_std)]
34
#![doc = include_str!("../docs/hardforks.md")]
5+
#[cfg(not(feature = "std"))]
6+
extern crate alloc as std;
47

58
use reth_ethereum_forks::{ChainHardforks, EthereumHardfork, ForkCondition, Hardfork};
69

@@ -11,6 +14,7 @@ pub use scroll_alloy_hardforks::{ScrollHardfork, ScrollHardforks};
1114
use once_cell::sync::Lazy as LazyLock;
1215
#[cfg(feature = "std")]
1316
use std::sync::LazyLock;
17+
use std::vec;
1418

1519
/// Scroll mainnet hardforks
1620
pub static SCROLL_MAINNET_HARDFORKS: LazyLock<ChainHardforks> = LazyLock::new(|| {

0 commit comments

Comments
 (0)