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

Jump to bottom

Chore merge upstream a96bc6110 #157

Merged
merged 119 commits into from
Feb 19, 2025
Merged

Chore merge upstream a96bc6110 #157

merged 119 commits into from
Feb 19, 2025

Conversation

greged93
Copy link
Collaborator

Bumps revm to v56 and fixes current changes to the codebase to fit Scroll.

both modified:   Cargo.lock
	both modified:   crates/ethereum/consensus/src/validation.rs
	both modified:   crates/optimism/consensus/Cargo.toml
	both modified:   crates/storage/db-api/Cargo.toml
	both modified:   crates/storage/db/Cargo.toml

rkrasiuk and others added 30 commits February 10, 2025 09:12
@rkrasiuk
prague: testnet timestamps (paradigmxyz#14270)
f84d497
@klkvr
feat: EngineApiBuilder (paradigmxyz#14354)
7e3b135
@0xNarumi
Fix: Correct functionality of get_queued_transactions_by_sender and…
6172872 
… `get_pending_transactions_by_sender` (paradigmxyz#14353)
@mattsse
chore: rm reth-primitives from eth payload (paradigmxyz#14357)
47bc55b
@leruaa
feat: avoid zstd dependency in reth-evm, reth-evm-ethereum and reth-o…
37adaf2 
…ptimism-evm (paradigmxyz#14356)
@shekhirin
feat(tree): enter tracing span for each storage trie in state root ta…
a7f895e 
…sk (paradigmxyz#14363)
@rkrasiuk
feat(engine): invalid block event (paradigmxyz#14365)
b495038
@mattsse
chore: remove code snippets from stages.md (paradigmxyz#14367)
db375d2
@emhane
feat(l2-withdrawals): Declare OpEngineApiServer and `OpEngineApiCli…
c6ac747 
…ent` (paradigmxyz#14359)
@mattsse
feat: add reth-eth meta crate (paradigmxyz#14361)
b9b5193
@leruaa @mattsse
feat: add operator fee params on RPC L1BlockInfo (paradigmxyz#14269)
d4e37ce 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@shekhirin
fix(trie): do not reveal same node twice in sparse trie (paradigmxyz#…
30488a1 
…14370)
@PoulavBhowmick03 @mattsse
Added from<alloy_rpc_types_eth::Transaction> for TransactionSigned (p…
cdb7c63 
…aradigmxyz#14350)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@emhane
feat(l2-withdrawals): Use OpExecutionPayloadV4 for new payload v4 (p…
477b747 
…aradigmxyz#14379)
@klkvr
chore: abstract OpPayloadBuilder over ChainSpec (paradigmxyz#14374)
4d9a987
@mattsse
chore: re-export rpc types (paradigmxyz#14381)
2e8bc7d
@fgimenez
feat(op, txpool): impl send_raw_tx_cond endpoint (paradigmxyz#14311)
fe32237
@Fallengirl
chore: correct the comments (paradigmxyz#14339)
731b771
@fgimenez
feat: add cross-block cache size cli arg (paradigmxyz#14305)
d9e660b
@yohkaz
Introduce StatusEth69 for eth/69 status messages (paradigmxyz#14292)
ecabf75
@varun-doshi @Cyber-Mitch @mattsse
feat: Add cli arg for pool lifetime (paradigmxyz#14273)
85f66ff 
Co-authored-by: Reentrancy <reentrancy@0xReentrancy.0xReentrancy>
Co-authored-by: Reentrancy <osawarumitchell@gmail.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@mattsse
fix: bytecode override (paradigmxyz#14390)
ba8cec3
@cakevm @mattsse
chore: rm unused dependencies from optimism crates (paradigmxyz#14396)
63bec10 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@Rjected
chore: remove unused arbitrary dep from optimism-primitives (paradigm…
0d64c40 
…xyz#14392)
@VeerChaurasia @mattsse
Add helper trait (paradigmxyz#14394)
c9ea423 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@elijahhampton @VeerChaurasia @mattsse
Decode raw conditional correctly (paradigmxyz#14397)
2ba54bf 
Co-authored-by: VeerChaurasia <veerchaurasia2005@gmail.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@mattsse
feat: add reth-op crate (paradigmxyz#14401)
09a6aab
@fgimenez
feat(engine): use Hash Builder as a fallback to the Sparse Trie on ne…
c4cb3f0 
…wPayload (paradigmxyz#14387)
@fgimenez
feat(bin, engine): make state root task default (paradigmxyz#14371)
0f5d601
@blombern
fix(validation-rpc): validate against parent, not latest (paradigmxyz…
3d1883d 
…#14405)
18aaddy and others added 24 commits February 14, 2025 13:03
@18aaddy
refactor(trie): struct for passing hash and tree masks in sparse trie (…
8c2bcf1 
…paradigmxyz#14468)
@Rjected @shekhirin
feat(trie): add DecodedAccountProof and DecodedMultiProof (paradigmxy…
713182d 
…z#14425)

Co-authored-by: Alexey Shekhirin <5773434+shekhirin@users.noreply.github.com>
@shekhirin
chore(root): state root task and sparse trie task logs (paradigmxyz#1…
9579ea9 
…4495)
@DaniPopes
chore(trie): small cleanups (paradigmxyz#14496)
fe745ea
@Rjected
perf: do not fetch proofs for selfdestructed accounts (paradigmxyz#14486
ab4b176 
)
@shekhirin
feat(evm, root): pass state change source to state hook (paradigmxyz#…
b6198b1 
…14494)
@emhane
chore(deps): Replace derive_more::Error with thiserror::Error (pa…
cacaad1 
…radigmxyz#14501)
@ryanschneider
fix(mev): Fix issues in mev_simBundle. (paradigmxyz#14502)
16c3c5b
@programskillforverification @mattsse
Add serde-bincode-compat for receipt (paradigmxyz#14399)
113a87b 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@cakevm
chore: add Uniswap Labs bootnodes (paradigmxyz#14507)
0e087ae
@emhane
feat(l2-withdrawals): consensus rules (paradigmxyz#14308)
9c1988b
@fgimenez @mattsse
feat(op, txpool): add additional update routine for conditionals (par…
e4c8e47 
…adigmxyz#14497)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@mattsse
feat: reexport reth-trie with trie feature (paradigmxyz#14513)
8123d6b
@klkvr
feat: use SealedHeader in ChainSpec (paradigmxyz#14514)
0f4914a
@caglaryucekaya
refactor: replace into bound with standalone function (paradigmxyz#14512
cb615cf 
)
@programskillforverification
feat: Extend Maybeconditional with helper fn (paradigmxyz#14511)
22badc8
@mattsse
fix: use correct table types on drop (paradigmxyz#14519)
b7f173f
@PoulavBhowmick03
Removed weird ProviderError variants (paradigmxyz#14518)
07e8360
@github-actions @github-merge-queue @mattsse
chore(deps): weekly cargo update (paradigmxyz#14522)
a96bc61 
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@greged93
update fork base commit
aae5a3a
@greged93
fix: codebase updates
90519fd 
Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>
@greged93
refactor: clean features + fix udeps
d443fdd 
Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>
@greged93
refactor: bump revm to v56
f406159 
Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>
@greged93
test: fix scroll tests
be78b78 
Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>
@codspeed-hq CodSpeed HQ
Copy link

codspeed-hq bot commented Feb 17, 2025 •
edited
Loading

CodSpeed Performance Report

Merging #157 will not alter performance

Comparing chore-merge-upstream-a96bc6110 (bf031a1) with scroll (a337c97)

Summary

✅ 77 untouched benchmarks

@greged93
refactor: fix book lint issue
bf031a1 
Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>
@greged93 greged93 mentioned this pull request Feb 18, 2025
Closed
frisitano
frisitano approved these changes Feb 19, 2025
View reviewed changes
Copy link
Collaborator

@frisitano frisitano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! LGTM

@frisitano frisitano merged commit 1832140 into scroll Feb 19, 2025
47 checks passed
@frisitano frisitano deleted the chore-merge-upstream-a96bc6110 branch February 19, 2025 07:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frisitano frisitano frisitano approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.