Skip to content

Commit

Permalink
feat: scroll account (#39)
Browse files Browse the repository at this point in the history
* add all the scroll crates

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* add `Default::default` to make tests compile

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* don't compile optimism crates with `scroll` feature

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* fix optimism lints

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* propagate account changes to execution

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* add transaction create test in execution stage

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* fix udeps

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* fix rebasing

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* don't use DEFAULT_EMPTY_CONTEXT with scroll feature

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* fix deny + clean

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* feature gate some lossful conversion

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* move revm "patching" to workspace level

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* fix upstream merge

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* fix feature propagation

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* revert hash post state changes

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* fix manifests indentation

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* revert `HashedPostState::from_cache_state` deletion

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* remove `WithContext` and `ContextFul` in favour of `FinalizeExecution`

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* add `from_account_info` for explicit conversion to `Account` from `AccountInfo`

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* update `ContextFul` usage with `FinalizeExecution` bound on `State<DB>`

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

* include upstream fix for cargo nextest run `--no-tests=warn`

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

---------

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>
  • Loading branch information
greged93 authored Nov 28, 2024
1 parent 9c9d82c commit 9730a0f
Show file tree
Hide file tree
Showing 111 changed files with 1,137 additions and 314 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,13 @@ jobs:
with:
cache-on-failure: true
- uses: taiki-e/install-action@cargo-udeps
- run: cargo udeps --workspace --lib --examples --tests --benches --all-features --locked --exclude "reth-optimism-*" --exclude op-reth
# due to the scroll feature flag, we need to exclude some crates that were annotated with
# #![cfg(not(feature = "scroll))].
- run: |
cargo udeps --workspace --lib --examples --tests --benches --all-features --locked \
--exclude "reth-optimism-*" --exclude op-reth --exclude "example-*" --exclude reth \
--exclude reth-e2e-test-utils --exclude reth-ethereum-payload-builder --exclude reth-exex-test-utils \
--exclude reth-node-ethereum
book:
name: book
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ jobs:
- name: Run tests
run: |
cargo nextest run \
${{ matrix.args }} --workspace --exclude ef-tests \
${{ matrix.args }} --workspace \
--exclude ef-tests --no-tests=warn \
--partition hash:${{ matrix.partition }}/2 \
-E "!kind(test)"
Expand Down
69 changes: 43 additions & 26 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ reth-trie-db = { path = "crates/trie/db" }
reth-trie-parallel = { path = "crates/trie/parallel" }

# revm
revm = { version = "18.0.0", features = ["std"], default-features = false }
revm = { package = "reth-scroll-revm", path = "crates/scroll/revm", default-features = false }
revm-inspectors = "0.11.0"
revm-primitives = { version = "14.0.0", features = [
"std",
Expand Down
1 change: 1 addition & 0 deletions bin/reth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ jemalloc-prof = [
"reth-cli-util/jemalloc-prof"
]
tracy-allocator = ["reth-cli-util/tracy-allocator"]
scroll = []

min-error-logs = ["tracing/release_max_level_error"]
min-warn-logs = ["tracing/release_max_level_warn"]
Expand Down
3 changes: 3 additions & 0 deletions bin/reth/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
)]
#![cfg_attr(not(test), warn(unused_crate_dependencies))]
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
// Don't use the crate if `scroll` feature is used.
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
#![cfg(not(feature = "scroll"))]

pub mod cli;
pub mod commands;
Expand Down
Loading

0 comments on commit 9730a0f

Please sign in to comment.