cherry-pick: from release/3.4 to main by AskAlexSharov · Pull Request #20658 · erigontech/erigon

AskAlexSharov · 2026-04-18T14:02:53Z

Cherry-pick from release/3.4 to main:

[r3.4] db/state: fix MaxStep using MinTxNum in DomainRoTx.prune #20635 db/state: fix MaxStep using MinTxNum in DomainRoTx.prune
dbg.SaveHeapProfileNearOOMPeriodically() call in all sub-commands #20639 dbg.SaveHeapProfileNearOOMPeriodically() call in all sub-commands
blk-range: wrong logs #20571 blk-range: wrong logs
merge: set merge workers to 1. because all components already support own parallel-bulding #20565 merge: set merge workers to 1
simplify user-visible logs #20576 simplify user-visible logs
cp related PRs for "don't query in db, what is in files" #20518 cp related PRs for "don't query in db, what is in files"
teach: Unwind beyond data in snapshots not allowed #20517 teach: Unwind beyond data in snapshots not allowed
rpc: use synctest for TestClientCancelHTTP to fix CI flakiness #20368 rpc: use synctest for TestClientCancelHTTP to fix CI flakiness
logs: move some Info logs to Debug level (to simplify logs for Users) #20329 logs: move some Info logs to Debug level
cp: stageloop, execmodule: add ERIGON_IN_MEM_HISTORY env flag for in-mem history reads (#20245) #20262 stageloop, execmodule: add ERIGON_IN_MEM_HISTORY env flag for in-mem history reads

Cherry-pick of #20609 to release/3.4 Co-authored-by: bendertherobert <bendertherobert@gmail.com>

…20639)

``` [INFO] [04-15|05:15:50.145] [integrity] StateRootVerifyByHistory blks/s=0.5 checked=3.72k/2.48k windows=1860/2488 blkRange=1-24.87M ``` `checked` overflow

…rt own parallel-bulding (#20565) compression and accessors: support parallel-building means we don't need multiple `merge_workers` usually closing: #20560

we need it because we're already doing out-of-order prune of domains. So need this protection. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Alex Sharov <AskAlexSharov@gmail.com>

Replace real TCP connections with in-memory net.Pipe-based listener for the HTTP cancel test, wrapped in synctest.Test for deterministic fake-time execution. The test now runs in ~0s instead of timing out on slow CI runners. WebSocket cancel test keeps real TCP due to complex goroutine shutdown dependencies incompatible with synctest's bubble requirements. err: ``` [WARN] [04-07|01:51:47.496] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:47.496] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:47.497] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:47.507] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:47.507] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:47.507] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:47.510] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:47.510] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:47.510] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:47.512] [rpc] served method=test_returnError reqid=1 err=testError errdata="testError data" [WARN] [04-07|01:51:47.513] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:47.513] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:47.513] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:47.515] [rpc] served method=no_such_method reqid=3 err="the method no_such_method does not exist/is not available" [WARN] [04-07|01:51:47.516] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:47.516] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:47.516] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:47.517] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:47.517] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:47.518] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:47.519] [rpc] served method=eth_subscribe reqid=1 err="no \"foo_bar\" subscription in eth namespace" [WARN] [04-07|01:51:47.519] [rpc] served method=eth_subscribe reqid=2 err="no \"foo_bar\" subscription in eth namespace" [WARN] [04-07|01:51:47.520] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:47.520] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:47.520] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:47.523] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:47.523] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:47.524] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:47.527] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:47.527] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:47.527] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:47.563] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:47.563] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:47.563] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:56.015] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:56.015] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:56.015] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:56.019] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:56.019] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:56.019] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:56.103] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:56.103] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:56.103] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:51:58.107] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:51:58.107] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:51:58.107] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.735] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.735] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.735] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.737] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.737] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.737] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.737] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.737] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.737] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.738] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.738] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.738] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.740] [rpc] served method=unknown_method reqid=2 err="the method unknown_method does not exist/is not available" [WARN] [04-07|01:52:32.741] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.741] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.741] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.743] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.743] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.743] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.744] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.744] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.744] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.745] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.745] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.745] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.746] [rpc] served method=test_echo reqid=2 err="missing value for required argument 0" [WARN] [04-07|01:52:32.746] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.747] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.747] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.748] [rpc] served method=test_echo reqid=2 err="missing value for required argument 0" [WARN] [04-07|01:52:32.748] [rpc] served method=test_echo reqid=2 err="missing value for required argument 1" [WARN] [04-07|01:52:32.750] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.750] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.750] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.751] [rpc] served method=test_echo reqid=3 err="non-array args" [WARN] [04-07|01:52:32.751] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.751] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.751] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.752] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.752] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.752] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.753] [rpc] served method=invalid_method reqid=2 err="the method invalid_method does not exist/is not available" [WARN] [04-07|01:52:32.754] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.754] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.754] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.754] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.754] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.755] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.755] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.755] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.755] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.757] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.757] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.757] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.758] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.758] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.758] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.760] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.760] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.760] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:32.771] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:32.771] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:32.771] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:44.363] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:44.363] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:44.363] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:44.363] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:44.363] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:44.363] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 [WARN] [04-07|01:52:44.363] Cannot register RPC callback [invalidRets1] - error must the last return value [WARN] [04-07|01:52:44.363] Cannot register RPC callback [invalidRets2] - error must the last return value [WARN] [04-07|01:52:44.363] Cannot register RPC callback [invalidRets3] - maximum 2 return values are allowed, got 3 --- FAIL: TestClientCancelWebsocket (1.00s) panic: read tcp 127.0.0.1:59236->127.0.0.1:33899: read: connection reset by peer [recovered, repanicked] goroutine 66 [running]: testing.tRunner.func1.2({0x117cd40, 0xc000059720}) /opt/hostedtoolcache/go/1.25.8/x64/src/testing/testing.go:1872 +0x419 testing.tRunner.func1() /opt/hostedtoolcache/go/1.25.8/x64/src/testing/testing.go:1875 +0x683 panic({0x117cd40?, 0xc000059720?}) /opt/hostedtoolcache/go/1.25.8/x64/src/runtime/panic.go:783 +0x132 github.com/erigontech/erigon/rpc.httpTestClient(0xc000324180, {0x11fcef1, 0x2}, 0xc000059120) /home/runner/work/erigon/erigon/rpc/client_test.go:619 +0x6b9 github.com/erigontech/erigon/rpc.testClientCancel({0x11fcef1, 0x2}, 0xc000102e00, {0x136dd10, 0xc000300c60}) /home/runner/work/erigon/erigon/rpc/client_test.go:206 +0x256 github.com/erigontech/erigon/rpc.TestClientCancelWebsocket(0xc000102e00) /home/runner/work/erigon/erigon/rpc/client_test.go:166 +0x58 testing.tRunner(0xc000102e00, 0x1241000) /opt/hostedtoolcache/go/1.25.8/x64/src/testing/testing.go:1934 +0x21d created by testing.(*T).Run in goroutine 1 /opt/hostedtoolcache/go/1.25.8/x64/src/testing/testing.go:1997 +0x9d3 goroutine 1 [chan receive]: testing.tRunner.func1() /opt/hostedtoolcache/go/1.25.8/x64/src/testing/testing.go:1891 +0x9ad testing.tRunner(0xc00037e1c0, 0xc000053ae0) /opt/hostedtoolcache/go/1.25.8/x64/src/testing/testing.go:1940 +0x256 testing.runTests(0xc00035c3c0, {0x198f6a0, 0x28, 0x28}, {0x0?, 0x4bba45?, 0x1999960?}) /opt/hostedtoolcache/go/1.25.8/x64/src/testing/testing.go:2475 +0x96d testing.(*M).Run(0xc00037a140) /opt/hostedtoolcache/go/1.25.8/x64/src/testing/testing.go:2337 +0xed5 main.main() _testmain.go:129 +0x165 goroutine 37 [chan receive]: ```

…#20329)

…mem history reads (#20245) (#20262) Cherry-pick of #20245 to `release/3.4`. **Conflict resolution**: `execution/execmodule/executor.go` doesn't exist in `release/3.4` (the `PipelineExecutor` abstraction was introduced in `main` after the branch point). The equivalent change — adding the `ERIGON_IN_MEM_HISTORY` env flag and wiring it to `SetInMemHistoryReads` — was applied to `execution/stagedsync/stageloop/stageloop.go` which is the relevant call site in `release/3.4`.

AskAlexSharov and others added 9 commits April 18, 2026 20:42

[r3.4] db/state: fix MaxStep using MinTxNum in DomainRoTx.prune (#20635)

fdad4c3

Cherry-pick of #20609 to release/3.4 Co-authored-by: bendertherobert <bendertherobert@gmail.com>

dbg.SaveHeapProfileNearOOMPeriodically() call in all sub-commands (#…

6cde7d8

…20639)

blk-range: wrong logs (#20571)

f6a85a6

``` [INFO] [04-15|05:15:50.145] [integrity] StateRootVerifyByHistory blks/s=0.5 checked=3.72k/2.48k windows=1860/2488 blkRange=1-24.87M ``` `checked` overflow

merge: set merge workers to 1. because all components already suppo…

0845708

…rt own parallel-bulding (#20565) compression and accessors: support parallel-building means we don't need multiple `merge_workers` usually closing: #20560

simplify user-visible logs (#20576)

1bb1a55

teach: Unwind beyond data in snapshots not allowed (#20517)

6bf62ea

logs: move some Info logs to Debug level (to simplify logs for Users) (…

3d4f591

…#20329)

AskAlexSharov requested review from Giulio2002, antonis19, awskii, canepat, lupin012, mh0lt, sudeepdino008, taratorio and yperbasis as code owners April 18, 2026 14:02

AskAlexSharov force-pushed the alex/cp_r34_fixes_35 branch from 4739a96 to 9431a69 Compare April 18, 2026 14:46

Merge remote-tracking branch 'origin/main' into alex/cp_r34_fixes_35

ca7607d

AskAlexSharov enabled auto-merge April 19, 2026 01:09

AskAlexSharov changed the title ~~cherry-pick 10 commits from release/3.4 to main~~ cherry-pick: from release/3.4 to main Apr 19, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cherry-pick: from release/3.4 to main#20658

cherry-pick: from release/3.4 to main#20658
AskAlexSharov wants to merge 11 commits intomainfrom
alex/cp_r34_fixes_35

AskAlexSharov commented Apr 18, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

AskAlexSharov commented Apr 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

AskAlexSharov commented Apr 18, 2026 •

edited

Loading