Skip to content

Commit 857624c

Browse files
greged93Peponks9ForostovecRomanHodulaksky-coderay
authored
chore: merge upstream 7779ed8 (#363)
* docs: yellowpaper sections in consensus implementation (paradigmxyz#18881) * fix(era-utils): fix off-by-one for Excluded end bound in process_iter (paradigmxyz#18731) Co-authored-by: Roman Hodulák <[email protected]> * refactor: eliminate redundant allocation in precompile cache example (paradigmxyz#18886) * chore: relax `ChainSpec` impls (paradigmxyz#18894) * chore: make clippy happy (paradigmxyz#18900) * fix(trie): Reveal extension child when extension is last remaining child of a branch (paradigmxyz#18891) * chore(node): simplify EngineApiExt bounds by removing redundant constraints (paradigmxyz#18905) * refactor(engine): separate concerns in on_forkchoice_updated for better maintainability (paradigmxyz#18661) Co-authored-by: Nathaniel Bajo <[email protected]> Co-authored-by: YK <[email protected]> Co-authored-by: Brian Picciano <[email protected]> * feat(provider): add get_account_before_block to ChangesetReader (paradigmxyz#18898) * refactor: replace collect().is_empty() with next().is_none() in tests (paradigmxyz#18902) Co-authored-by: Alexey Shekhirin <[email protected]> * ci: cache hive simulator images to reduce prepare-hive job time (paradigmxyz#18899) * docs: duplicate comment in Eip4844PoolTransactionError (paradigmxyz#18858) * chore: align node_config threshold constant (paradigmxyz#18914) * feat: wait for new blocks when build is in progress (paradigmxyz#18831) Co-authored-by: Roman Hodulák <[email protected]> * perf(tree): worker pooling for storage in multiproof generation (paradigmxyz#18887) Co-authored-by: Brian Picciano <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Alexey Shekhirin <[email protected]> * chore(grafana): use precompile address as legend (paradigmxyz#18913) * refactor: remove needless collect() calls in trie tests (paradigmxyz#18937) * fix(examples): change method to launch with debug capabilities (paradigmxyz#18946) * fix(example): launch with debug capabilities (paradigmxyz#18947) * fix(testsuite): Fix unused updates in e2e-test-utils (paradigmxyz#18953) * fix(payload): correct Debug label for PayloadTimestamp in PayloadServiceCommand (paradigmxyz#18954) * chore(rpc): Moves `SequencerMetrics` into `reth-optimism-rpc` (paradigmxyz#18921) * refactor: replace println! with structured logging in test_vectors (paradigmxyz#18956) * refactor(cli): use structured logging (tracing) in p2p command (paradigmxyz#18957) * perf(tree): add elapsed time to parallel state root completion log (paradigmxyz#18959) * fix(trie): Properly upsert into StoragesTrie in repair-trie (paradigmxyz#18941) * fix: misleading error message in db list: show actual table name (paradigmxyz#18896) * fix: remove noisy stderr prints in ERA1 cleanup (EraClient::delete_outside_range) (paradigmxyz#18895) * fix: use max B256 for upper bound in empty-storage check (paradigmxyz#18962) * ci: remove reproducible build from release.yml (paradigmxyz#18958) * chore(rpc): Remove redundant U256::from in suggested_priority_fee (paradigmxyz#18969) * chore(ci): update eest 7594 issue link in hive expected failures file (paradigmxyz#18976) * perf(tests): remove redundant format! in ef-tests run_only (paradigmxyz#18909) * feat(cli): enable traces export via `tracing-otlp` cli arg (paradigmxyz#18242) Co-authored-by: Dan Cline <[email protected]> * feat: allow otlp level to be configurable (paradigmxyz#18981) * chore(optimism): remove unnecessary Debug bounds from header generics (paradigmxyz#18989) * refactor: convert satisfy_base_fee_ids to use closure (paradigmxyz#18979) * chore: bump otlp crates (paradigmxyz#18984) * fix(network): prevent metric leak in outgoing message queue on session teardown (paradigmxyz#18847) * chore: remove unused imports in blockchain_provider (paradigmxyz#18867) Co-authored-by: Matthias Seitz <[email protected]> * fix(stateless): enforce BLOCKHASH ancestor header limit (paradigmxyz#18920) * chore(evm): mark ExecuteOutput as unused and slated for removal (paradigmxyz#18754) * refactor: unify `Pipeline` creation codepaths (paradigmxyz#18955) * fix(engine): flatten storage cache (paradigmxyz#18880) * perf(tree): worker pooling for account proofs (paradigmxyz#18901) Co-authored-by: Brian Picciano <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Alexey Shekhirin <[email protected]> * refactor(storage): fix ChainStateKey enum variant name (paradigmxyz#18992) * refactor(trie): remove proof task manager (paradigmxyz#18934) Co-authored-by: Brian Picciano <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Alexey Shekhirin <[email protected]> * fix: required optimism primitives features in db-api (paradigmxyz#19005) * refactor(engine): simplify InvalidBlockWitnessHook::on_invalid_block for better testability (paradigmxyz#18696) * chore: replace poll_next_unpin loop with poll_recv_many (paradigmxyz#18978) * fix: Set Era pipeline stage to last checkpoint when there is no target (paradigmxyz#19000) * ci: Add tests for Paris scenario in hive.yml (paradigmxyz#19013) * chore: bump book timeout (paradigmxyz#19016) * feat: add metrics for safe and finalized block heights (paradigmxyz#18987) * chore(privitives-traits): remove unused serde derives and camelCase attribute (paradigmxyz#19014) * chore: refactor loop in `add_new_transactions` (paradigmxyz#19006) * chore(ci): bump hive eest to v5.3.0 (paradigmxyz#19021) * feat(devp2p): make eth p2p networkId configurable (paradigmxyz#19020) Co-authored-by: frankudoags <frankudoags.com> * chore: remove unused Args struct from exex-subscription example (paradigmxyz#19019) * feat: add pending sequence as pub (paradigmxyz#19022) * chore: bump alloy-core (paradigmxyz#19026) * fix: unused warnings for tracing (paradigmxyz#19025) * fix: respect cli blob size setting (paradigmxyz#19024) * feat(engine): deprecate TestPipelineBuilder::with_executor_results (paradigmxyz#19017) * perf: background init of workers (paradigmxyz#19012) * chore(ci): update expected failures (paradigmxyz#19034) * fix: use header type generic for mask (paradigmxyz#19037) * fix: correct `Compact` impl for `Option` (paradigmxyz#19042) * chore: increase versioned hash index cache (paradigmxyz#19038) * chore(primitives-traits): relax SignerRecoverable bounds for Extended<B,T> (paradigmxyz#19045) * feat: bump revm (paradigmxyz#18999) * fix: resolve upstream merge Signed-off-by: Gregory Edison <[email protected]> * bump revm * update deps and fix lints * update openvm deps * skip exex wal storage test * pin revm tag scroll-v91 * bump openvm compat --------- Signed-off-by: Gregory Edison <[email protected]> Co-authored-by: josé v <[email protected]> Co-authored-by: Forostovec <[email protected]> Co-authored-by: Roman Hodulák <[email protected]> Co-authored-by: Skylar Ray <[email protected]> Co-authored-by: Arsenii Kulikov <[email protected]> Co-authored-by: Léa Narzis <[email protected]> Co-authored-by: Brian Picciano <[email protected]> Co-authored-by: radik878 <[email protected]> Co-authored-by: William Nwoke <[email protected]> Co-authored-by: Nathaniel Bajo <[email protected]> Co-authored-by: YK <[email protected]> Co-authored-by: Dan Cline <[email protected]> Co-authored-by: Merkel Tranjes <[email protected]> Co-authored-by: Alexey Shekhirin <[email protected]> Co-authored-by: Federico Gimenez <[email protected]> Co-authored-by: stevencartavia <[email protected]> Co-authored-by: emmmm <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: MIHAO PARK <[email protected]> Co-authored-by: Tilak Madichetti <[email protected]> Co-authored-by: Emilia Hane <[email protected]> Co-authored-by: maradini77 <[email protected]> Co-authored-by: sashaodessa <[email protected]> Co-authored-by: Alvarez <[email protected]> Co-authored-by: MozirDmitriy <[email protected]> Co-authored-by: drhgencer <[email protected]> Co-authored-by: Matthias Seitz <[email protected]> Co-authored-by: anim001k <[email protected]> Co-authored-by: Julian Meyer <[email protected]> Co-authored-by: Karl Yu <[email protected]> Co-authored-by: Jennifer <[email protected]> Co-authored-by: Ivan Wang <[email protected]> Co-authored-by: GarmashAlex <[email protected]> Co-authored-by: Udoagwa Franklin <[email protected]> Co-authored-by: Luca Provini <[email protected]> Co-authored-by: Galoretka <[email protected]> Co-authored-by: sashass1315 <[email protected]> Co-authored-by: frisitano <[email protected]>
1 parent cc79edb commit 857624c

File tree

202 files changed

+5854
-3021
lines changed

Some content is hidden

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

202 files changed

+5854
-3021
lines changed

.github/assets/hive/build_simulators.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ go build .
1111

1212
# Run each hive command in the background for each simulator and wait
1313
echo "Building images"
14-
./hive -client reth --sim "ethereum/eest" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/v5.1.0/fixtures_develop.tar.gz --sim.buildarg branch=v5.1.0 -sim.timelimit 1s || true &
14+
./hive -client reth --sim "ethereum/eest" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/v5.3.0/fixtures_develop.tar.gz --sim.buildarg branch=v5.3.0 -sim.timelimit 1s || true &
1515
./hive -client reth --sim "ethereum/engine" -sim.timelimit 1s || true &
1616
./hive -client reth --sim "devp2p" -sim.timelimit 1s || true &
1717
./hive -client reth --sim "ethereum/rpc-compat" -sim.timelimit 1s || true &

.github/assets/hive/expected_failures.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,14 @@ engine-cancun:
4141

4242
sync: []
4343

44-
# https://github.com/ethereum/hive/issues/1277
45-
engine-auth:
46-
- "JWT Authentication: No time drift, correct secret (Paris) (reth)"
47-
- "JWT Authentication: Negative time drift, within limit, correct secret (Paris) (reth)"
48-
- "JWT Authentication: Positive time drift, within limit, correct secret (Paris) (reth)"
44+
engine-auth: []
4945

5046
# 7702 test - no fix: it’s too expensive to check whether the storage is empty on each creation
5147
# 6110 related tests - may start passing when fixtures improve
5248
# 7002 related tests - post-fork test, should fix for spec compliance but not
5349
# realistic on mainnet
5450
# 7251 related tests - modified contract, not necessarily practical on mainnet,
55-
# 7594: https://github.com/paradigmxyz/reth/issues/18471
51+
# 7594: https://github.com/paradigmxyz/reth/issues/18975
5652
# worth re-visiting when more of these related tests are passing
5753
eest/consume-engine:
5854
- tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test_engine-zero_nonce]-reth

.github/workflows/book.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
jobs:
1414
build:
1515
runs-on: ubuntu-latest
16-
timeout-minutes: 60
16+
timeout-minutes: 90
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v5

.github/workflows/hive.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,39 @@ jobs:
3333
repository: ethereum/hive
3434
path: hivetests
3535

36+
- name: Get hive commit hash
37+
id: hive-commit
38+
run: echo "hash=$(cd hivetests && git rev-parse HEAD)" >> $GITHUB_OUTPUT
39+
3640
- uses: actions/setup-go@v6
3741
with:
3842
go-version: "^1.13.1"
3943
- run: go version
4044

45+
- name: Restore hive assets cache
46+
id: cache-hive
47+
uses: actions/cache@v4
48+
with:
49+
path: ./hive_assets
50+
key: hive-assets-${{ steps.hive-commit.outputs.hash }}-${{ hashFiles('.github/assets/hive/build_simulators.sh') }}
51+
4152
- name: Build hive assets
53+
if: steps.cache-hive.outputs.cache-hit != 'true'
4254
run: .github/assets/hive/build_simulators.sh
4355

56+
- name: Load cached Docker images
57+
if: steps.cache-hive.outputs.cache-hit == 'true'
58+
run: |
59+
cd hive_assets
60+
for tar_file in *.tar; do
61+
if [ -f "$tar_file" ]; then
62+
echo "Loading $tar_file..."
63+
docker load -i "$tar_file"
64+
fi
65+
done
66+
# Make hive binary executable
67+
chmod +x hive
68+
4469
- name: Upload hive assets
4570
uses: actions/upload-artifact@v4
4671
with:
@@ -127,6 +152,8 @@ jobs:
127152
limit: .*tests/homestead.*
128153
- sim: ethereum/eest/consume-engine
129154
limit: .*tests/frontier.*
155+
- sim: ethereum/eest/consume-engine
156+
limit: .*tests/paris.*
130157

131158
# consume-rlp
132159
- sim: ethereum/eest/consume-rlp
@@ -145,6 +172,8 @@ jobs:
145172
limit: .*tests/homestead.*
146173
- sim: ethereum/eest/consume-rlp
147174
limit: .*tests/frontier.*
175+
- sim: ethereum/eest/consume-rlp
176+
limit: .*tests/paris.*
148177
needs:
149178
- prepare-reth
150179
- prepare-hive

.github/workflows/release.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ env:
1818
REPO_NAME: ${{ github.repository_owner }}/reth
1919
IMAGE_NAME: ${{ github.repository_owner }}/reth
2020
OP_IMAGE_NAME: ${{ github.repository_owner }}/op-reth
21-
REPRODUCIBLE_IMAGE_NAME: ${{ github.repository_owner }}/reth-reproducible
2221
CARGO_TERM_COLOR: always
2322
DOCKER_IMAGE_NAME_URL: https://ghcr.io/${{ github.repository_owner }}/reth
2423
DOCKER_OP_IMAGE_NAME_URL: https://ghcr.io/${{ github.repository_owner }}/op-reth
@@ -74,10 +73,6 @@ jobs:
7473
os: ubuntu-24.04
7574
profile: maxperf
7675
allow_fail: false
77-
- target: x86_64-unknown-linux-gnu
78-
os: ubuntu-24.04
79-
profile: reproducible
80-
allow_fail: false
8176
- target: aarch64-unknown-linux-gnu
8277
os: ubuntu-24.04
8378
profile: maxperf
@@ -124,13 +119,7 @@ jobs:
124119
echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV
125120
126121
- name: Build Reth
127-
if: ${{ !(matrix.build.binary == 'op-reth' && matrix.configs.profile == 'reproducible') }}
128-
run: |
129-
if [[ "${{ matrix.build.binary }}" == "reth" && "${{ matrix.configs.profile }}" == "reproducible" ]]; then
130-
make build-reth-reproducible
131-
else
132-
make PROFILE=${{ matrix.configs.profile }} ${{ matrix.build.command }}-${{ matrix.configs.target }}
133-
fi
122+
run: make PROFILE=${{ matrix.configs.profile }} ${{ matrix.build.command }}-${{ matrix.configs.target }}
134123

135124
- name: Build Reth deb package
136125
if: ${{ matrix.build.binary == 'reth' && contains(env.DEB_SUPPORTED_TARGETS, matrix.configs.target) }}
@@ -141,13 +130,6 @@ jobs:
141130
mkdir artifacts
142131
[[ "${{ matrix.configs.target }}" == *windows* ]] && ext=".exe"
143132
144-
# Handle reproducible builds which always target x86_64-unknown-linux-gnu
145-
if [[ "${{ matrix.build.binary }}" == "reth" && "${{ matrix.configs.profile }}" == "reproducible" ]]; then
146-
mv "target/x86_64-unknown-linux-gnu/${{ matrix.configs.profile }}/${{ matrix.build.binary }}${ext}" ./artifacts
147-
else
148-
mv "target/${{ matrix.configs.target }}/${{ matrix.configs.profile }}/${{ matrix.build.binary }}${ext}" ./artifacts
149-
fi
150-
151133
# Move deb packages if they exist
152134
if [[ "${{ matrix.build.binary }}" == "reth" && "${{ env.DEB_SUPPORTED_TARGETS }}" == *"${{ matrix.configs.target }}"* ]]; then
153135
mv "target/${{ matrix.configs.target }}/${{ matrix.configs.profile }}/${{ matrix.build.binary }}-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.configs.target }}-${{ matrix.configs.profile }}.deb" ./artifacts

0 commit comments

Comments
 (0)