Skip to content

Commit c865e58

Browse files
asdacapclaude
andcommitted
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>
2 parents 2b4d706 + e301cc4 commit c865e58

303 files changed

Lines changed: 7474 additions & 8414 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@
3838
/src/Nethermind/Nethermind.Sockets @LukaszRozmej @benaadams
3939
/src/Nethermind/Nethermind.Specs @smartprogrammer93
4040
/src/Nethermind/Nethermind.State @LukaszRozmej @benaadams @asdacap @flcl42 @damian-orzechowski
41-
/src/Nethermind/Nethermind.StateComposition @daniilankusin
42-
/src/Nethermind/Nethermind.StateComposition.Test @daniilankusin
41+
/src/Nethermind/Nethermind.StateDiff.Core @daniilankusin
42+
/src/Nethermind/Nethermind.StateDiffsWriter @daniilankusin
43+
/src/Nethermind/Nethermind.StateDiffsWriter.Test @daniilankusin
4344
/src/Nethermind/Nethermind.Stateless* @rubo @LukaszRozmej
4445
/src/Nethermind/Nethermind.Synchronization @LukaszRozmej @benaadams @asdacap @flcl42 @marcindsobczak
4546
/src/Nethermind/Nethermind.Taiko @smartprogrammer93 @dipkakwani

.github/workflows/claude-review.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ jobs:
146146
147147
Set `mergeable: false` in the structured output if any Critical, High, or Medium findings exist that have not been explicitly acknowledged with rationale in prior PR comments. Otherwise `mergeable: true`.
148148
claude_args: |
149+
--model opus
149150
--allowedTools "mcp__github_inline_comment__create_inline_comment,Bash(gh:*),WebFetch"
150151
--json-schema '{"type":"object","properties":{"mergeable":{"type":"boolean","description":"False if any Critical, High, or Medium findings remain unresolved and unexplained"},"critical_count":{"type":"integer"},"high_count":{"type":"integer"},"medium_count":{"type":"integer"},"summary":{"type":"string"}},"required":["mergeable","critical_count","high_count","medium_count","summary"]}'
151152
@@ -161,6 +162,7 @@ jobs:
161162
with:
162163
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
163164
claude_args: |
165+
--model opus
164166
--allowedTools "Bash(gh:*),WebFetch"
165167
166168
# After a successful review, read the structured verdict from the previous step and

.github/workflows/sync-master-validation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ jobs:
7878
;;
7979
esac
8080
81-
# Filter testnet-matrix.json to master-validation chains only
82-
MASTER_CHAINS='["mainnet","gnosis","op-mainnet"]'
81+
# master-validation chains; op-mainnet dropped to cut Linode cost (kept in sync-supported-chains)
82+
MASTER_CHAINS='["mainnet","gnosis"]'
8383
8484
matrix=$(cat scripts/config/testnet-matrix.json | jq \
8585
--argjson chains "$MASTER_CHAINS" \
-35 Bytes
Binary file not shown.
37 Bytes
Binary file not shown.
-19 Bytes
Binary file not shown.
-16 Bytes
Binary file not shown.
-28 Bytes
Binary file not shown.
2 Bytes
Binary file not shown.
-37 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)