Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove bmpt #125

Merged
merged 6 commits into from
Jan 9, 2025
Merged

feat: remove bmpt #125

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c06347
feat: deprecate bmpt
greged93 Jan 8, 2025
62219ea
chore: ungate examples
greged93 Jan 8, 2025
c3b2e8f
chore: move BitsCompatibility to reth-scroll-trie
greged93 Jan 8, 2025
266ae0d
fix: lints
greged93 Jan 8, 2025
22db520
test: fix various tests
greged93 Jan 8, 2025
ffff7e0
feat: further reduce diff with upstream
greged93 Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: lints 
Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>
  • Loading branch information
@greged93
greged93 committed Jan 8, 2025
commit 266ae0dc994653ce9c6330762e8f624168c3e53c
8 changes: 2 additions & 6 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,9 @@ jobs:
- type: optimism
args: --bin op-reth --workspace --lib --examples --tests --benches --locked
features: "optimism asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
- type: scroll-bmpt
- type: scroll
args: --bin scroll-reth --workspace --lib --examples --tests --benches --locked
features: "scroll asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
- type: scroll-mpt
args: --bin scroll-reth-mpt --workspace --lib --examples --tests --benches --locked
features: "scroll skip-state-root-validation mpt asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
features: "scroll skip-state-root-validation asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
- type: book
args: --manifest-path book/sources/Cargo.toml --workspace --bins
features: ""
Expand Down Expand Up @@ -110,7 +107,6 @@ jobs:
- run: cargo hack check --workspace --exclude op-reth --exclude scroll-reth --exclude scroll-reth-mpt
- run: cargo check -p op-reth --features "optimism"
- run: cargo check -p scroll-reth --features "scroll"
- run: cargo check -p scroll-reth-mpt --features "scroll"

msrv:
name: MSRV / ${{ matrix.network }}
Expand Down
3 changes: 0 additions & 3 deletions bin/reth/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
#![allow(missing_docs)]
// Don't use the crate if `scroll` feature is used.
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
#![cfg(not(feature = "scroll"))]

#[global_allocator]
static ALLOC: reth_cli_util::allocator::Allocator = reth_cli_util::allocator::new_allocator();
Expand Down
3 changes: 0 additions & 3 deletions crates/scroll/revm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
#![warn(unused_crate_dependencies)]
#![cfg_attr(not(feature = "std"), no_std)]

#[cfg(all(not(feature = "std"), feature = "scroll"))]
extern crate alloc as std;

pub use revm::primitives::AccountInfo;

#[cfg(all(feature = "optimism", not(feature = "scroll")))]
Expand Down
5 changes: 2 additions & 3 deletions examples/custom-beacon-withdrawals/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
//! custom mechanism instead of minting native tokens

#![cfg_attr(not(test), warn(unused_crate_dependencies))]
// Don't use the crate if `scroll` feature is used.
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
#![cfg(not(feature = "scroll"))]

use alloy_eips::{eip4895::Withdrawal, eip7685::Requests};
use alloy_sol_macro::sol;
Expand Down Expand Up @@ -268,6 +265,8 @@ fn fill_tx_env_with_system_contract_call(
authorization_list: None,
#[cfg(feature = "optimism")]
optimism: OptimismFields::default(),
#[cfg(feature = "scroll")]
scroll: revm::primitives::ScrollFields::default(),
};

// ensure the block gas limit is >= the tx
Expand Down