Skip to content

Conversation

@greged93
Copy link
Collaborator

@greged93 greged93 commented Jun 13, 2025

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
        both modified:   .github/assets/check_wasm.sh
        both modified:   .github/workflows/release.yml
        both modified:   Cargo.lock
        both modified:   Cargo.toml
        both modified:   Cross.toml
        both added:      Dockerfile.x86_64-pc-windows-gnu
        both modified:   Makefile
        deleted by them: crates/e2e-test-utils/src/testsuite/actions.rs
        both modified:   crates/e2e-test-utils/src/testsuite/mod.rs
        both modified:   crates/engine/tree/src/tree/mod.rs
        both modified:   crates/engine/tree/src/tree/payload_processor/mod.rs
        both modified:   crates/engine/tree/src/tree/payload_processor/prewarm.rs
        both modified:   crates/engine/tree/src/tree/precompile_cache.rs
        both added:      crates/engine/tree/src/tree/state.rs
        both modified:   crates/ethereum/node/src/node.rs
        both modified:   crates/ethereum/reth/Cargo.toml
        both modified:   crates/net/eth-wire-types/src/primitives.rs
        both modified:   crates/net/network/src/fetch/mod.rs
        both modified:   crates/net/network/src/manager.rs
        both modified:   crates/net/network/src/message.rs
        both modified:   crates/net/network/src/network.rs
        both modified:   crates/net/network/src/session/active.rs
        both modified:   crates/net/network/src/state.rs
        both modified:   crates/node/builder/src/launch/engine.rs
        both modified:   crates/node/builder/src/rpc.rs
        both modified:   crates/node/core/src/cli/config.rs
        both modified:   crates/optimism/node/src/engine.rs
        both modified:   crates/optimism/node/src/node.rs
        both modified:   crates/optimism/payload/src/builder.rs
        both modified:   crates/optimism/reth/Cargo.toml
        both modified:   crates/optimism/rpc/src/error.rs
        both modified:   crates/optimism/rpc/src/eth/mod.rs
        both modified:   crates/optimism/rpc/src/eth/transaction.rs
        both modified:   crates/primitives-traits/src/extended.rs
        both modified:   crates/ress/provider/src/lib.rs
        both modified:   crates/rpc/rpc-eth-api/src/helpers/block.rs
        both modified:   crates/rpc/rpc-eth-api/src/helpers/fee.rs
        both modified:   crates/rpc/rpc-eth-types/src/gas_oracle.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/static_file/jar.rs
        both modified:   crates/storage/provider/src/providers/static_file/manager.rs
        both modified:   crates/storage/provider/src/test_utils/mock.rs
        both modified:   crates/storage/storage-api/src/chain.rs
        both modified:   crates/transaction-pool/src/identifier.rs
        both modified:   crates/transaction-pool/src/pool/mod.rs
        both modified:   deny.toml
        both added:      examples/custom-node/src/evm/builder.rs
        both added:      examples/custom-node/src/evm/mod.rs
        deleted by them: examples/custom-node/src/network.rs
        both modified:   examples/custom-node/src/pool.rs
        both modified:   examples/custom-node/src/primitives/tx.rs
        both modified:   testing/ef-tests/src/cases/blockchain_test.rs

mattsse and others added 30 commits May 18, 2025 17:02
…rom the extended transaction envelope in the `custom_node` example (paradigmxyz#16381)
klkvr and others added 20 commits June 6, 2025 23:18
Signed-off-by: Gregory Edison <[email protected]>
Signed-off-by: Gregory Edison <[email protected]>
@codspeed-hq
Copy link

codspeed-hq bot commented Jun 13, 2025

CodSpeed Performance Report

Merging #241 will not alter performance

Comparing chore-merge-upstream-41ed7e0b7 (4f65e30) with scroll (4d7529e)

Summary

✅ 77 untouched benchmarks

greged93 added 2 commits June 14, 2025 14:24
Signed-off-by: Gregory Edison <[email protected]>
Signed-off-by: Gregory Edison <[email protected]>
@greged93 greged93 requested a review from frisitano June 14, 2025 16:03
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.

lgtm

@greged93 greged93 merged commit 64b5cf3 into scroll Jun 16, 2025
48 checks passed
@greged93 greged93 deleted the chore-merge-upstream-41ed7e0b7 branch June 16, 2025 10:28
greged93 added a commit that referenced this pull request Jun 16, 2025
greged93 added a commit that referenced this pull request Jun 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.