Chore scroll merge upstream abc4ff977 #93

frisitano · 2024-12-18T21:49:58Z

This PR merges upstream. I have put Poseidon hashing behind a poseidon feature flag as bn254 lib it is not no-std. CI is failing as we have added new types to the test vectors, the CI logs say this is expected and we can ignore it. It is passing locally.

…#13097)

…#13098)

Co-authored-by: Alexey Shekhirin <[email protected]>

…yz#13071) Co-authored-by: Roman Krasiuk <[email protected]>

Co-authored-by: dkathiriya <[email protected]> Co-authored-by: Matthias Seitz <[email protected]>

…xyz#13104)

…3096)

…13105)

…t` (paradigmxyz#13084)

Co-authored-by: Matthias Seitz <[email protected]>

)

…ives (paradigmxyz#13115)

…digmxyz#13117)

…paradigmxyz#13119)

…::Primitives` (paradigmxyz#13044)

… reth's `Account` (paradigmxyz#13126)

…aradigmxyz#13411)

)

…upstream-abc4ff977

frisitano · 2024-12-23T10:11:28Z

Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified:   .github/assets/check_wasm.sh
deleted by them: .github/workflows/deny.yml
both modified:   .github/workflows/hive.yml
both modified:   Cargo.lock
both modified:   Cargo.toml
both modified:   bin/reth/src/commands/debug_cmd/build_block.rs
both modified:   bin/reth/src/commands/debug_cmd/in_memory_merkle.rs                                                                                                                                                          [0/1985]
both modified:   crates/blockchain-tree/src/blockchain_tree.rs
both modified:   crates/blockchain-tree/src/chain.rs
both modified:   crates/chain-state/src/in_memory.rs
both modified:   crates/chain-state/src/memory_overlay.rs
both modified:   crates/engine/invalid-block-hooks/src/witness.rs
both modified:   crates/engine/tree/src/tree/mod.rs
both modified:   crates/engine/tree/src/tree/root.rs
both modified:   crates/engine/util/src/reorg.rs
both modified:   crates/ethereum/evm/src/execute.rs
both modified:   crates/evm/Cargo.toml
both modified:   crates/evm/execution-types/src/execution_outcome.rs
both modified:   crates/evm/src/either.rs
both modified:   crates/evm/src/execute.rs
both modified:   crates/evm/src/metrics.rs
both modified:   crates/evm/src/noop.rs
both modified:   crates/evm/src/test_utils.rs
both modified:   crates/net/dns/Cargo.toml
both modified:   crates/net/dns/src/resolver.rs
both modified:   crates/net/network/src/transactions/validation.rs
both modified:   crates/optimism/consensus/Cargo.toml
both modified:   crates/optimism/evm/src/execute.rs
both modified:   crates/optimism/payload/src/builder.rs
both modified:   crates/primitives-traits/Cargo.toml
both modified:   crates/primitives-traits/src/account.rs
both modified:   crates/primitives/Cargo.toml
both modified:   crates/primitives/src/alloy_compat.rs
both modified:   crates/primitives/src/receipt.rs
both modified:   crates/primitives/src/traits.rs
both modified:   crates/primitives/src/transaction/mod.rs
both modified:   crates/primitives/src/transaction/pooled.rs
both modified:   crates/revm/Cargo.toml
both modified:   crates/revm/src/test_utils.rs
both modified:   crates/revm/src/witness.rs
both modified:   crates/rpc/rpc-eth-api/src/helpers/pending_block.rs
both modified:   crates/rpc/rpc-eth-types/src/cache/db.rs
both modified:   crates/rpc/rpc-eth-types/src/simulate.rs
both modified:   crates/rpc/rpc/src/debug.rs
both modified:   crates/rpc/rpc/src/validation.rs
both modified:   crates/storage/db-api/Cargo.toml
both modified:   crates/storage/provider/src/providers/blockchain_provider.rs
both modified:   crates/storage/provider/src/providers/bundle_state_provider.rs
both modified:   crates/storage/provider/src/providers/database/mod.rs
both modified:   crates/storage/provider/src/providers/database/provider.rs
both modified:   crates/storage/provider/src/providers/state/historical.rs
both modified:   crates/storage/provider/src/providers/state/latest.rs
both modified:   crates/storage/provider/src/test_utils/mock.rs
both modified:   crates/storage/provider/src/test_utils/mod.rs
both modified:   crates/storage/provider/src/test_utils/noop.rs
both modified:   crates/storage/provider/src/writer/mod.rs
both modified:   crates/storage/storage-api/src/state.rs
both modified:   crates/storage/storage-api/src/storage.rs
both modified:   crates/storage/storage-api/src/trie.rs
both modified:   crates/trie/common/Cargo.toml
both modified:   crates/trie/common/src/account.rs
both modified:   crates/trie/db/src/prefix_set.rs
both modified:   crates/trie/db/src/state.rs
both modified:   crates/trie/trie/src/state.rs
both modified:   examples/custom-beacon-withdrawals/src/main.rs
both modified:   examples/db-access/src/main.rs

greged93

1 nit and 1 small question

crates/primitives-traits/src/account.rs

crates/primitives/src/receipt.rs

greged93

lgtm!

rkrasiuk and others added 30 commits December 3, 2024 12:39

chore(evm): migrate execution errors back to thiserror (paradigmxyz…

bedc68e

…#13097)

chore(trie): exclude blinded providers from Debug impl (paradigmxyz…

e4c0f19

…#13098)

feat: add miner rpc bindings (paradigmxyz#13099)

1404073

perf(engine): do not clone proof targets (paradigmxyz#13061)

a8feec8

fix(trie): short circuit leaf removal if missing (paradigmxyz#12988)

0aa4701

Co-authored-by: Alexey Shekhirin <[email protected]>

feat: impl noop miner api endpoint (paradigmxyz#13102)

ca3d989

fix(trie): do not persist root branch nodes in sparse trie (paradigmx…

61cb3de

…yz#13071) Co-authored-by: Roman Krasiuk <[email protected]>

introduce tableset and impl for tables enum (paradigmxyz#12617)

8f61af0

Co-authored-by: dkathiriya <[email protected]> Co-authored-by: Matthias Seitz <[email protected]>

chore: move sparse errors to reth-execution-errors (paradigmxyz#13101)

39f936e

feat(custom-tables): don't record metrics for custom tables (paradigm…

6baf519

…xyz#13104)

perf(validate-tx-pool): fast non-allocating is_local (paradigmxyz#1…

7008ac2

…3096)

feat: make InvalidBlockHook generic over NodePrimitives (paradigmxyz#…

9d5e159

…13105)

chore: propagate network primitives to on_command, `on_network_even…

64c6343

…t` (paradigmxyz#13084)

chore(trie): make Debug impl work for any provider (paradigmxyz#13107)

e4c7fac

Introduce HashedPostStateProvider (paradigmxyz#12607)

886471d

Co-authored-by: Matthias Seitz <[email protected]>

feat: Add Transaction AT to ConfigureEvm (paradigmxyz#13106)

0fcc6cf

feat: make import_transactions use network generics (paradigmxyz#13110

35cfd41

)

chore: remove redundant enum (paradigmxyz#13113)

e9484b2

feat: make TransactionsManager Future impl generic over NetworkPrimit…

601e8b9

…ives (paradigmxyz#13115)

feat: use generic CapabilityMessage everywhere (paradigmxyz#13116)

bdfbcab

chore: propagate network primitives generic to EthStream usages (para…

c6add45

…digmxyz#13117)

chore: relax rpc bounds (paradigmxyz#13100)

8a00d2d

chore: bound most NetworkBuilder methods by NetworkPrimitives generic (…

d164e3e

…paradigmxyz#13119)

refactor: pending block construction (paradigmxyz#13109)

4e73bb0

chore: remove TransactionSignedNoHash (paradigmxyz#13120)

5c07669

chore(ci): fix hive patch (paradigmxyz#13123)

c060df9

refactor(sdk): complete generic impl for PersistenceService over `N…

025885f

…::Primitives` (paradigmxyz#13044)

feat: make PoolInner functions pub (paradigmxyz#13124)

8d1a332

perf: avoid cloning bytecode when converting revm's &AccountInfo to…

53243a2

… reth's `Account` (paradigmxyz#13126)

Fix typos in documentation (paradigmxyz#13094)

589fc2a

Rjected and others added 23 commits December 16, 2024 11:24

feat: introduce OpNetworkPrimitives (paradigmxyz#13335)

8b647d6

perf: rm redundant lookup (paradigmxyz#13398)

37ca547

chore(engine): log about finished state updates in state root task (p…

ce4e35c

…aradigmxyz#13411)

chore(engine): state root task debug logs (paradigmxyz#13415)

cdf2904

chore: move database to FullNodeTypes (paradigmxyz#13414)

82f21a3

chore: bump alloy 0.8.1 (paradigmxyz#13418)

952eeae

Add holocene mainnet time (paradigmxyz#13419)

03649f2

chore(ci): update hive rpc-compat expected failures (paradigmxyz#13424)

dc7818c

fix: call bundle recursion (paradigmxyz#13425)

30d48cc

fix(root): send error on failure to retrieve provider (paradigmxyz#13426

abc4ff9

)

Merge remote-tracking branch 'upstream/main' into chore-scroll-merge-…

7206ec0

…upstream-abc4ff977

update fork base commit

4278138

fix: lint

4119327

Merge remote-tracking branch 'origin/scroll' into chore-scroll-merge-…

85418ec

…upstream-abc4ff977

fix: lint

9dc7af0

feature gate poseidon-bn254 in reth-scroll-primitives

828af14

rename posiedon module to hash

99ee778

make poseidon hash module private

75015c6

fix lints

c96ab65

fix lints

471764a

fix lints

7186038

fix lints

448acbb

fix lints

b42d9a0

frisitano requested a review from greged93 December 20, 2024 19:32

greged93 reviewed Dec 23, 2024

View reviewed changes

crates/primitives-traits/src/account.rs Show resolved Hide resolved

crates/primitives/src/receipt.rs Show resolved Hide resolved

greged93 approved these changes Dec 23, 2024

View reviewed changes

frisitano mentioned this pull request Dec 23, 2024

Include l1_fee in rlp encoding of Receipt #102

Open

frisitano merged commit 5b55f0c into scroll Dec 23, 2024
42 of 44 checks passed

frisitano deleted the chore-scroll-merge-upstream-abc4ff977 branch December 23, 2024 12:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Chore scroll merge upstream abc4ff977 #93

Chore scroll merge upstream abc4ff977 #93

frisitano commented Dec 18, 2024 •

edited

Loading

frisitano commented Dec 23, 2024

greged93 left a comment

greged93 left a comment

Chore scroll merge upstream abc4ff977 #93

Chore scroll merge upstream abc4ff977 #93

Conversation

frisitano commented Dec 18, 2024 • edited Loading

frisitano commented Dec 23, 2024

greged93 left a comment

Choose a reason for hiding this comment

greged93 left a comment

Choose a reason for hiding this comment

frisitano commented Dec 18, 2024 •

edited

Loading