Resolve merge conflict with master by kamilchodola · Pull Request #10595 · NethermindEth/nethermind

kamilchodola · 2026-02-20T18:58:24Z

Summary

Merges latest master into fix/large-rpc-buffers (PR Try using stream to avoid large buffers allocations in kestrel #9411) and resolves the conflict in Startup.cs
Master refactored the inline request processing block into ProcessJsonRpcRequestCoreAsync. The CountingStreamPipeWriter(ctx.Response.Body) change from this PR is now applied inside that extracted method instead of in the old inline location.

Test plan

Verify JSON-RPC responses work correctly with the stream-based writer
CI passes

* calculator * state reader * masternode voting contract * fix * abi json * working load test * test * test * test getCandidates * cleanup * format * remove var * format * review comments * implement calculate rewards base flow and get signing txs * implement rewards per signer and distribution calculations * implement getCadidateOwner * refactors and add comments to the code * add block signer contract address to the configuration spec * implement reward module tests * implement hook for reward calculation in hotstuff pipeline * refactor and format * format * fix xdc test * wire IRewardClaculator in ConfigureContainer in XdcTestBlockchain * address review comments and add unit test with precalculated xdc reward values * add missing dependencies in Xdc module * fix resolving contract addresses from spec * fix error with WorldState after merge * add comments for reward tests with link to original source --------- Co-authored-by: ak88 <anders.holmbjerg@hotmail.com> Co-authored-by: ak88 <anders@nethermind.io>

* add potential fix * nit: improve config description

* Skip SST file size checks when MaxOpenFiles is specified * Add config option, skip SST checks on MacOS if not configured otherwise * Remove obvious comment

…ation (#9970) * Update EvmPooledMemory.cs * Update src/Nethermind/Nethermind.Evm/EvmPooledMemory.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/Nethermind/Nethermind.Evm/EvmPooledMemory.cs * Update src/Nethermind/Nethermind.Evm/EvmPooledMemory.cs --------- Co-authored-by: Lukasz Rozmej <lukasz.rozmej@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Should update child if parent has empty keccak as well * Combine conditions

* Improve hash quality * formatting * Update src/Nethermind/Nethermind.Core/Extensions/SpanExtensions.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Keep HexConvert.ToUInt64 as it handles both base 10 and 16 automatically.

…10024) * fix: ensure eth_getBlockByNumber enforces canonical block retrieval * fix tests * address comment * apply suggestion

Co-authored-by: rubo <rubo@users.noreply.github.com>

…ting test (#10086) Update BlockTreeTests.cs

* Drop eth66 and eth67 support * Fix tests * test * bump versions * Fix E2ESyncTests failures when isPostMerge=false - remove eth/69 from default capabilities (#10103) * Initial plan * Remove eth/69 from default capabilities - added dynamically by MergePlugin Co-authored-by: benaadams <1142958+benaadams@users.noreply.github.com> * Fix test expecting eth/69 as highest default protocol version Co-authored-by: benaadams <1142958+benaadams@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: benaadams <1142958+benaadams@users.noreply.github.com> * fix --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: benaadams <1142958+benaadams@users.noreply.github.com>

* Add Address recovery from PublicKey to KeccakCache * Improve comments * Feedback

…0106)

* Update to UInt256 version 1.4.0 * Fix some div zero

…0104)

Update IEraAdminRpcModule.cs

Update BlockTreeTests.cs

…10070) Update SimpleConsoleLogManager.cs

* optimize eth_gasPrice using kth algorithm * fix: review nethermind --------- Co-authored-by: weixie.cui <weixie.cui@okg.com>

* Don't queue prunes * Add delay * Add Delay reasoning comment

* refactor: simplify Avx2 branches for UInt256 shuffles * Update EvmStack.cs

…10109)

* Ignore claude config in git * Ignore claude config in git

github-actions · 2026-02-20T19:11:48Z

EXPB Benchmark Comparison

Run: View workflow run

Scenario: nethermind-halfpath-superblocks-pr-9411-resolve-conflict-delay0s

Metric	PR	Master (cached)	Delta PR vs Master
AVG (ms)	1528.176400	1512.850900	+1.01%
MEDIAN (ms)	1155.195000	1161.835000	-0.57%
P90 (ms)	2633.45	2601.96	+1.21%
P95 (ms)	2928.89	2818.91	+3.90%
P99 (ms)	4228.38	4168.85	+1.43%
MIN (ms)	760.73	756.13	+0.61%
MAX (ms)	4509.54	4600.79	-1.98%

MarekM25 · 2026-02-20T19:48:54Z

wtf 74k line PR?

… fix Tests show CountingPipeWriter accumulates entire multi-MB responses in pipe buffers (LOH allocation issue) while CountingStreamPipeWriter flushes incrementally in small chunks. Includes correctness tests verifying both paths produce byte-identical output.

kamilchodola · 2026-02-20T20:14:07Z

wtf 74k line PR?

it is simply master merge and conflict fix but done as PR as i dont want to push directly onto Łukasz branch
Also added tests proving that it helps

Head-to-head tests measuring UnflushedBytes (peak internal buffer) during serialization. PipeWriter grows to full response size while StreamPipeWriter stays bounded at ~26 bytes via auto-flush.

AnkushinDaniil and others added 30 commits December 30, 2025 18:06

feat(abi): add support for fixed-size array element types (#10025)

0b7641e

Use baseblock for tree visitor (#10066)

14d4a39

Surge: Fix Profitabilty Check Bypass (#10020)

9229706

* add potential fix * nit: improve config description

Skip SST file size checks when MaxOpenFiles is specified (#10002)

9ee5539

* Skip SST file size checks when MaxOpenFiles is specified * Add config option, skip SST checks on MacOS if not configured otherwise * Remove obvious comment

Update file header templates (#10077)

6778204

Should update child if parent has empty keccak as well (#10073)

75a6d97

* Should update child if parent has empty keccak as well * Combine conditions

Improve FastHash quality (#10082)

9cf0d07

* Improve hash quality * formatting * Update src/Nethermind/Nethermind.Core/Extensions/SpanExtensions.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

refactor: replace HexConvert.ToUInt256 with UInt256.Parse (#10085)

3921649

Keep HexConvert.ToUInt64 as it handles both base 10 and 16 automatically.

fix: ensure eth_getBlockByNumber enforces canonical block retrieval (#…

891d79d

…10024) * fix: ensure eth_getBlockByNumber enforces canonical block retrieval * fix tests * address comment * apply suggestion

Auto-update fast sync settings (#10089)

64e7f38

Co-authored-by: rubo <rubo@users.noreply.github.com>

fix: correct assertion variables in Cleans_invalid_blocks_before_star…

2ae8737

…ting test (#10086) Update BlockTreeTests.cs

fix(network): shutdown rlpx executor group (#10087)

18b62a1

feat (gas policy): add ConsumeCodeCopyGas method (#10068)

0417aa4

Add Address recovery from PublicKey to KeccakCache (#10003)

f2217da

* Add Address recovery from PublicKey to KeccakCache * Improve comments * Feedback

refactor: remove unused Destroy change type from storage provider (#1…

4d7e0b3

…0106)

Update to UInt256 version 1.4.0 (#10107)

519aa4c

* Update to UInt256 version 1.4.0 * Fix some div zero

chore: remove debug-only keccak keys from proof call storage test (#1…

62f7230

…0104)

fix: use parameter name in BloomStorage null check (#10096)

ab9414e

fix: correct ExampleResponse for admin_importHistory method (#10097)

1e80301

Update IEraAdminRpcModule.cs

fix: remove redundant blockInfosDb assertions (#10099)

0e8ec6e

Update BlockTreeTests.cs

perf: reuse SimpleConsoleLogger instance in SimpleConsoleLogManager (#…

7514d24

…10070) Update SimpleConsoleLogManager.cs

optimize eth_gasPrice using kth algorithm (#10100)

c748ed2

* optimize eth_gasPrice using kth algorithm * fix: review nethermind --------- Co-authored-by: weixie.cui <weixie.cui@okg.com>

Don't queue prunes (#10112)

9d52d38

* Don't queue prunes * Add delay * Add Delay reasoning comment

refactor: simplify Avx2 branches for UInt256 shuffles (#10111)

5f11732

* refactor: simplify Avx2 branches for UInt256 shuffles * Update EvmStack.cs

fix(kute): prevent null label crash in Prometheus metrics reporter (#…

49ee006

…10109)

Fix #10068 regression (#10116)

e96d4ec

Git/ignore claude config (#10118)

6cd4afa

* Ignore claude config in git * Ignore claude config in git

github-actions bot added configuration database dependencies Pull requests that update a dependency file devops docs evm network optimism rocksdb rpc snap sync state+storage sync taiko related to the taiko alethia rollup tools trie xdc labels Feb 20, 2026

kamilchodola added the reproducible-benchmark label Feb 20, 2026

Rewrite tests with peak buffer measurement proving PR #9411 benefit

33f9151

Head-to-head tests measuring UnflushedBytes (peak internal buffer) during serialization. PipeWriter grows to full response size while StreamPipeWriter stays bounded at ~26 bytes via auto-flush.

kamilchodola marked this pull request as ready for review February 27, 2026 15:30

kamilchodola requested review from LukaszRozmej, MarekM25 and rubo as code owners February 27, 2026 15:30

kamilchodola requested a review from a team February 27, 2026 15:30

kamilchodola merged commit 2dca372 into fix/large-rpc-buffers Feb 27, 2026
71 of 73 checks passed

kamilchodola deleted the pr-9411-resolve-conflict branch February 27, 2026 15:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Resolve merge conflict with master#10595

Resolve merge conflict with master#10595
kamilchodola merged 646 commits intofix/large-rpc-buffersfrom
pr-9411-resolve-conflict

kamilchodola commented Feb 20, 2026

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

MarekM25 commented Feb 20, 2026

Uh oh!

kamilchodola commented Feb 20, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

Conversation

kamilchodola commented Feb 20, 2026

Summary

Test plan

Uh oh!

github-actions bot commented Feb 20, 2026

EXPB Benchmark Comparison

Uh oh!

MarekM25 commented Feb 20, 2026

Uh oh!

kamilchodola commented Feb 20, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants