Skip to content

Commit 9730a0f

Browse files
greged93greged93
authored
feat: scroll account (#39)
* add all the scroll crates Signed-off-by: Gregory Edison <[email protected]> * add `Default::default` to make tests compile Signed-off-by: Gregory Edison <[email protected]> * don't compile optimism crates with `scroll` feature Signed-off-by: Gregory Edison <[email protected]> * fix optimism lints Signed-off-by: Gregory Edison <[email protected]> * propagate account changes to execution Signed-off-by: Gregory Edison <[email protected]> * add transaction create test in execution stage Signed-off-by: Gregory Edison <[email protected]> * fix udeps Signed-off-by: Gregory Edison <[email protected]> * fix rebasing Signed-off-by: Gregory Edison <[email protected]> * don't use DEFAULT_EMPTY_CONTEXT with scroll feature Signed-off-by: Gregory Edison <[email protected]> * fix deny + clean Signed-off-by: Gregory Edison <[email protected]> * feature gate some lossful conversion Signed-off-by: Gregory Edison <[email protected]> * move revm "patching" to workspace level Signed-off-by: Gregory Edison <[email protected]> * fix upstream merge Signed-off-by: Gregory Edison <[email protected]> * fix feature propagation Signed-off-by: Gregory Edison <[email protected]> * revert hash post state changes Signed-off-by: Gregory Edison <[email protected]> * fix manifests indentation Signed-off-by: Gregory Edison <[email protected]> * revert `HashedPostState::from_cache_state` deletion Signed-off-by: Gregory Edison <[email protected]> * remove `WithContext` and `ContextFul` in favour of `FinalizeExecution` Signed-off-by: Gregory Edison <[email protected]> * add `from_account_info` for explicit conversion to `Account` from `AccountInfo` Signed-off-by: Gregory Edison <[email protected]> * update `ContextFul` usage with `FinalizeExecution` bound on `State<DB>` Signed-off-by: Gregory Edison <[email protected]> * include upstream fix for cargo nextest run `--no-tests=warn` Signed-off-by: Gregory Edison <[email protected]> --------- Signed-off-by: Gregory Edison <[email protected]>
1 parent 9c9d82c commit 9730a0f

File tree

111 files changed

+1137
-314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1137
-314
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,13 @@ jobs:
152152
with:
153153
cache-on-failure: true
154154
- uses: taiki-e/install-action@cargo-udeps
155-
- run: cargo udeps --workspace --lib --examples --tests --benches --all-features --locked --exclude "reth-optimism-*" --exclude op-reth
155+
# due to the scroll feature flag, we need to exclude some crates that were annotated with
156+
# #![cfg(not(feature = "scroll))].
157+
- run: |
158+
cargo udeps --workspace --lib --examples --tests --benches --all-features --locked \
159+
--exclude "reth-optimism-*" --exclude op-reth --exclude "example-*" --exclude reth \
160+
--exclude reth-e2e-test-utils --exclude reth-ethereum-payload-builder --exclude reth-exex-test-utils \
161+
--exclude reth-node-ethereum
156162
157163
book:
158164
name: book

‎.github/workflows/unit.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ jobs:
6262
- name: Run tests
6363
run: |
6464
cargo nextest run \
65-
${{ matrix.args }} --workspace --exclude ef-tests \
65+
${{ matrix.args }} --workspace \
66+
--exclude ef-tests --no-tests=warn \
6667
--partition hash:${{ matrix.partition }}/2 \
6768
-E "!kind(test)"
6869

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ reth-trie-db = { path = "crates/trie/db" }
429429
reth-trie-parallel = { path = "crates/trie/parallel" }
430430

431431
# revm
432-
revm = { version = "18.0.0", features = ["std"], default-features = false }
432+
revm = { package = "reth-scroll-revm", path = "crates/scroll/revm", default-features = false }
433433
revm-inspectors = "0.11.0"
434434
revm-primitives = { version = "14.0.0", features = [
435435
"std",

‎bin/reth/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ jemalloc-prof = [
120120
"reth-cli-util/jemalloc-prof"
121121
]
122122
tracy-allocator = ["reth-cli-util/tracy-allocator"]
123+
scroll = []
123124

124125
min-error-logs = ["tracing/release_max_level_error"]
125126
min-warn-logs = ["tracing/release_max_level_warn"]

‎bin/reth/src/lib.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
)]
2727
#![cfg_attr(not(test), warn(unused_crate_dependencies))]
2828
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
29+
// Don't use the crate if `scroll` feature is used.
30+
#![cfg_attr(feature = "scroll", allow(unused_crate_dependencies))]
31+
#![cfg(not(feature = "scroll"))]
2932

3033
pub mod cli;
3134
pub mod commands;

0 commit comments

Comments
 (0)