Commit c865e58
Merge branch 'master' into flat/simpler-long-finality
Resolves conflicts from master #12172 (FlatDB persistence edge cases from
the signed/unsigned type unification), which touched the same files the
long-finality work refactored:
- CompactionSchedule / ICompactionSchedule: adopt master's
NextFullCompactionAfter(in StateId) signature and PreGenesis->block-0
anchoring; keep the branch's force-persist-backstop rationale comment and
the extra persisted-snapshot boundary predicates.
- PersistenceManager.DetermineSnapshotAction: port master's two fixes onto
the branch's two-phase persist/convert logic — replace the
latest-below-persisted Debug.Assert with a warn-and-continue, and use
SaturatingSub so a deep reorg can't underflow the in-memory depth. Update
the surviving NextFullCompactionAfter callsite to pass the StateId.
- PersistenceManagerTests: keep the branch's DetermineSnapshotAction tuple
API and test names; port master's two regression tests, adapted to that
API — genesis-first persist from a fresh DB, and the no-underflow guard.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>303 files changed
Lines changed: 7474 additions & 8414 deletions
File tree
- .github
- workflows
- src/Nethermind
- Chains
- Nethermind.Blockchain.Test
- Nethermind.Blockchain
- Receipts
- Synchronization
- Tracing
- Nethermind.Config
- Nethermind.Consensus.AuRa
- InitializationSteps
- Nethermind.Consensus/Processing
- Nethermind.Core
- Messages
- Threading
- Nethermind.EraE.Test
- Export
- Nethermind.EraE/Export
- Nethermind.Evm.Benchmark
- Nethermind.Evm.Test
- CodeAnalysis
- Tracing
- Nethermind.Evm
- CodeAnalysis
- GasPolicy
- Instructions
- TransactionProcessing
- Nethermind.Facade.Test
- Simulate
- Nethermind.Facade
- Find
- Simulate
- Nethermind.Grpc/Servers
- Nethermind.Init
- Modules
- Steps/Migrations
- Nethermind.JsonRpc.Benchmark
- Nethermind.JsonRpc.Test
- Modules
- Eth
- Nethermind.JsonRpc
- Modules
- Admin
- DebugModule
- Eth
- FeeHistory
- Nethermind.Merge.AuRa.Test
- Nethermind.Merge.AuRa
- Nethermind.Merge.Plugin.Test
- Nethermind.Merge.Plugin
- GC
- Nethermind.Network.Discovery.Test
- Discv4
- Kademlia
- Discv5
- Nethermind.Network.Discovery
- Discv4
- Kademlia
- Messages
- Serializers
- Discv5
- Kademlia
- Handlers
- Kademlia
- Nethermind.Network.Dns.Test
- Nethermind.Network.Dns
- Nethermind.Network.Enr.Test
- Nethermind.Network.Enr
- Nethermind.Network.Stats/Model
- Nethermind.Network.Test
- P2P/Subprotocols/Eth/V62
- Stats
- Nethermind.Network/P2P
- Subprotocols/Eth
- V62
- Messages
- V68
- Nethermind.Optimism.Test/Rpc
- Nethermind.Optimism/Rpc
- Nethermind.Runner.Test
- Nethermind.Runner
- configs
- Nethermind.Shutter.Test
- Nethermind.Shutter
- Nethermind.State.Flat.Test
- Nethermind.State.Flat
- Nethermind.StateComposition.Test
- Diff
- Helpers
- Rpc
- Service
- Snapshots
- Visitors
- Nethermind.StateComposition
- Data
- Diff
- Rpc
- Service
- Snapshots
- Visitors
- Nethermind.StateDiff.Core
- Data
- Diff
- Nethermind.StateDiffsWriter.Test
- Data
- Service
- Storage
- Nethermind.StateDiffsWriter
- Data
- Service
- Storage
- Nethermind.State
- Nethermind.Synchronization.Test
- FastBlocks
- Nethermind.Synchronization/FastBlocks
- Nethermind.TxPool.Test
- Nethermind.TxPool
- tools/Evm/T8n/JsonConverters
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
42 | | - | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
43 | 44 | | |
44 | 45 | | |
45 | 46 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
146 | 146 | | |
147 | 147 | | |
148 | 148 | | |
| 149 | + | |
149 | 150 | | |
150 | 151 | | |
151 | 152 | | |
| |||
161 | 162 | | |
162 | 163 | | |
163 | 164 | | |
| 165 | + | |
164 | 166 | | |
165 | 167 | | |
166 | 168 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | | - | |
82 | | - | |
| 81 | + | |
| 82 | + | |
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
| |||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 commit comments