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 3f9816e1c #55

Merged
merged 97 commits into from
Nov 29, 2024
Merged

Chore merge upstream 3f9816e1c #55

merged 97 commits into from
Nov 29, 2024

Conversation

frisitano
Copy link
Collaborator

Overview

This PR merges upstream main into scroll. Below we can see the paths that could not be automatically merged:

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   Cargo.lock
        both modified:   crates/e2e-test-utils/src/lib.rs
        both modified:   crates/engine/invalid-block-hooks/src/witness.rs
        both modified:   crates/optimism/evm/src/execute.rs
        both modified:   crates/optimism/node/Cargo.toml
        both modified:   crates/primitives/src/transaction/mod.rs
        both modified:   crates/revm/Cargo.toml
        both modified:   crates/rpc/rpc-eth-api/src/helpers/pending_block.rs
        both modified:   crates/rpc/rpc-eth-types/src/simulate.rs
        both modified:   crates/storage/provider/Cargo.toml
        both modified:   crates/storage/provider/src/writer/mod.rs
        both modified:   crates/trie/common/Cargo.toml
        both modified:   crates/trie/db/Cargo.toml
        both modified:   crates/trie/trie/Cargo.toml
        both modified:   examples/custom-beacon-withdrawals/src/main.rs
        both modified:   testing/testing-utils/Cargo.toml

klkvr and others added 30 commits November 25, 2024 10:50
@klkvr
feat: make more block types generic (paradigmxyz#12812)
dcaa06a
@syjn99
chore: make CanonicalInMemoryState generic over sealed header and blo…
caac226 
…ck (paradigmxyz#12835)
@shekhirin
feat(trie): sparse trie methods for trie task integration (paradigmxy…
04dd005 
…z#12720)
@klkvr
feat: ChainStorageReader (paradigmxyz#12836)
863c523
@klkvr
feat: enforce relations between block parts on NodePrimitives (paradi…
9f37d40 
…gmxyz#12846)
@shekhirin
perf(engine): sparse trie calculation for state root task (paradigmxy…
6b088bd 
…z#12843)
@shekhirin
test(trie): use proof nodes helper (paradigmxyz#12848)
e2c42ae
@klkvr
feat: add Block AT to BlockReader (paradigmxyz#12837)
c44e11b
@klkvr
refactor: isolate BlockchainTree setup in DefaultEngineLauncher (p…
8e4a917 
…aradigmxyz#12852)
@vcastellm
docs: clarify installation guide NVMe term (paradigmxyz#12853)
b96c0d9
@klkvr
refactor: unify logic for writing headers (paradigmxyz#12858)
404f8f8
@tcoratger
trie: add unit tests for nibbles (paradigmxyz#12758)
82eb383
@kien-rise
feat: add pending_transactions_max in trait TransactionPool (paradigm…
96d61dd 
…xyz#12856)
@rkrasiuk
chore(trie): move prefix sets to reth_trie_common (paradigmxyz#12860)
fae44bf
@mattsse
test: enable op prim arbitrary in e2e test-utils (paradigmxyz#12862)
13cd77c
@mattsse
chore: relax mempool impl (paradigmxyz#12865)
9d2e04c
@rkrasiuk
chore(trie): introduce serde feature on reth-trie-common (paradig…
aa0a114 
…mxyz#12864)
@mattsse
chore: add encodable to pooled recovered (paradigmxyz#12866)
1b4048e
@mattsse
feat: use Pooled type for get_pooled_transaction_element in pool trait (
a28fa24 
paradigmxyz#12867)
@mattsse
chore: add helper for encoded (paradigmxyz#12868)
334ccd0
@stevencartavia @mattsse
feat: emit node event when inserted executed block (paradigmxyz#12726)
dab63e6 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
@mattsse
feat: make PooledTransactionsElementEcRecovered generic over transact…
b34fb78 
…ion (paradigmxyz#12869)
@klkvr
feat: NodePrimitivesProvider (paradigmxyz#12855)
26fc701
@rkrasiuk
chore(trie): move trie updates to reth-trie-common (paradigmxyz#12863)
2dc9288
@rkrasiuk
dep(trie): remove reth-trie dep from reth-trie-sparse (paradigmxy…
2b4fa3b 
…z#12872)
@rkrasiuk
chore(trie): remove todo comment (paradigmxyz#12875)
c19b8e1
@mattsse
feat: use pooled AT for get_pooled_transactions (paradigmxyz#12876)
2776310
@htiennv
chore: make OrderedSealedBlock generic over header and body types (pa…
2840b6f 
…radigmxyz#12830)
@shekhirin
deps: bump sysinfo (paradigmxyz#12874)
b6d6bf5
@rkrasiuk
feat(trie): StorageRootProvider::storage_multiproof (paradigmxyz#12879
a0f99df 
)
rkrasiuk and others added 22 commits November 28, 2024 12:12
@rkrasiuk
perf: use alloy hash map in trie related code (paradigmxyz#12956)
c274462
@mattsse
chore: make op-node-testing- leaner (paradigmxyz#12958)
1d5bd46
@rkrasiuk
fix(trie): always create empty storage multiproofs (paradigmxyz#12915)
eac02d9
@shekhirin
feat(engine): use SparseStateTrie::update_account in state root task (
8589503 
paradigmxyz#12960)
@mattsse
chore: make ethereum-node deps leaner (paradigmxyz#12963)
1210fd9
@rkrasiuk
perf(trie): avoid update reallocation & track wiped (paradigmxyz#12929)
8c86d63
@rkrasiuk
perf(tree): keep storage trie around for updates (paradigmxyz#12971)
e1b25c8
@hoank101
feat: generic data primitives EngineApiEvent (paradigmxyz#12964)
55b758a
@mattsse
feat: integrate type specific engine validator in tree service (parad…
cca6372 
…igmxyz#12952)
@lean-apple
refactor(tx-pool): add enum InvalidKind to mark_invalid (paradigm…
9f20ebc 
…xyz#12845)
@fgimenez
chore(engine): remove uneeded if (paradigmxyz#12974)
ca72d45
@mattsse
fix: cap request gas limit in eth estimate (paradigmxyz#12970)
8e19455
@mattsse
ci: ignore ethereum crates for testing (paradigmxyz#12976)
856dc7d
@rkrasiuk
fix(tree): account info on state update in root task (paradigmxyz#12978)
29d84e4
@mattsse
chore: lower tmp ban duration for trusted or static peers (paradigmxy…
aea5613 
…z#12961)
@shekhirin
fix(engine): fetched proof targets in state root task (paradigmxyz#12983
ae395e8 
)
@rkrasiuk
perf(trie): init hashed storage only on existing **changed** slots (p…
da53d76 
…aradigmxyz#12980)
@klkvr
fix: correctly poll NetworkState (paradigmxyz#12973)
793fc23
@klkvr
fix: disable state root calculation for eth_simulateV1 (paradigmxyz#1…
9fe459e 
…2993)
@klkvr
feat: integrate generic primitives into pruner (paradigmxyz#12995)
3f9816e
@frisitano
chore: merge upstrea
733f60f
@frisitano
fix: add updated fork.yaml
a1a9046
@frisitano frisitano changed the base branch from main to scroll November 29, 2024 07:14
Thegaram
Thegaram approved these changes Nov 29, 2024
View reviewed changes
Copy link

@Thegaram Thegaram left a comment

Choose a reason for hiding this comment

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

Looks good. Please do not squash when merging.

@Thegaram Thegaram merged commit fbf8e9e into scroll Nov 29, 2024
40 checks passed
@Thegaram Thegaram deleted the chore-merge-upstream-3f9816e1c branch November 29, 2024 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@greged93 greged93 greged93 approved these changes

@Thegaram Thegaram Thegaram 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.