chore: merge upstream v2.2.0 into develop-v2.2#185
Draft
chee-chyuan wants to merge 91 commits into
Draft
Conversation
Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com> Co-authored-by: Amp <amp@ampcode.com>
…#23668) Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com> Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: Soubhik Singha Mahapatra <soubhiksmp2004@gmail.com>
…23667) Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com> Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com> Co-authored-by: Amp <amp@ampcode.com>
…s (#23802) Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de> Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: Amp <amp@ampcode.com> Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Co-authored-by: Amp <amp@ampcode.com>
# Conflicts: # .github/workflows/lint.yml # Cargo.lock # Cargo.toml # crates/engine/tree/src/tree/mod.rs # crates/engine/tree/src/tree/payload_validator.rs # crates/net/network/src/transactions/config.rs # crates/net/network/src/transactions/constants.rs # crates/net/network/src/transactions/mod.rs # crates/node/core/src/args/engine.rs # crates/node/core/src/args/network.rs # crates/stages/api/src/pipeline/mod.rs # crates/storage/provider/src/providers/consistent.rs # crates/storage/provider/src/providers/database/provider.rs # crates/storage/provider/src/providers/state/historical.rs # crates/transaction-pool/src/traits.rs # deny.toml # docs/vocs/docs/pages/cli/reth/node.mdx
Update Cargo.lock to pin reth-core git deps to the correct commit on v0.3.1-v2 (version 0.3.1) and apply nightly fmt fixes. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…r type - HistoricalStateProviderRef::new now takes changeset_cache (3rd arg) - Add with_pipeline_consistency to HistoricalStateProvider impl block - Fix let block_number → let mut block_number in history_by_block_hash - Use MemoryBoundedReceiver for transaction_events (keep reannounce timer) - Update all callsites to pass ChangesetCache Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Add missing block_timestamp field to TransactionSource::Block in rpc-eth-api - Add missing decoded_bal field to ExecutionEnv initializer in payload_validator - Remove extra None arg from spawn_caching_with call in payload_processor - Fix overlay_factory/provider_builder type mismatches in payload_validator - Fix history_by_block_number call to use provider_factory instead of DatabaseProvider - Remove unused InsertBlockValidationError import in engine tree mod.rs - Remove redundant clones in payload_validator (provider_factory, overlay_builder) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges upstream v2.2.0 into the BNB chain fork.
Conflict resolutions:
bnb-chain/reth-core.git), updated branch tov0.3.1-v2sigp/discv5enable_proof_v2/min_blocks_for_pipeline_runwith upstream's BAL flags (suppress_persistence_during_build,bal_parallel_*)tx_channel_memory_limit_bytespipeline_consistencyapproach + added upstream'sPhantomData<N>andStorageSettingsCacheBlockExecutionErrorhandling andoverlay_factoryapproachinsert_blobwith upstream'sget_blobs_for_versioned_hashes_v4