fix: resolve merge conflicts from v4 into v4-next#22276
Merged
Conversation
#21998) ## Summary Backport of #21988 to v4. Adds full transaction validation (via `TxValidator`) to txs retrieved from the tx file store and node RPC sources, replacing the previous hash-only validation. This ensures downloaded txs are validated with the same rigor as txs received via p2p. ## Cherry-pick details - **Commit 1**: Raw cherry-pick with conflict markers in `yarn-project/p2p/src/client/factory.ts` - **Commit 2**: Conflict resolution — simplified import to only include functions used in this file The conflict was minor: the v4 branch had a single-line import while `next` had a multi-line import block with additional unused imports (`createCheckAllowedSetupCalls`, `getDefaultAllowedSetupFunctions`). Resolved by importing only the two functions actually used. ## Verification - Build passes (`yarn build`) - All related tests pass: - `p2p/src/services/tx_collection/tx_source.test.ts` (3/3) - `p2p/src/services/tx_file_store/tx_file_store.test.ts` (17/17) - `foundation/src/collection/array.test.ts` (61/61) ClaudeBox log: https://claudebox.work/s/9c69d8936952bb70?run=1 --------- Co-authored-by: Alex Gherghisan <alexghr@users.noreply.github.com>
…ckport #21999) (#22005) ## Summary Backport of #21999 to v4. Renames `BlockProposalHandler` to `ProposalHandler` and adds checkpoint proposal handling, so non-validator nodes with blob upload capability can validate checkpoint proposals and upload blobs to the filestore. The validator client now delegates checkpoint validation and blob upload to the `ProposalHandler` instead of doing it inline. ## Conflicts Resolved - **proposal_handler.ts**: Import conflict — added new imports (`accumulateCheckpointOutHashes`, `CheckpointProposalCore`, `MerkleTreeId`) needed for checkpoint handling. - **validator.ts**: Two conflicts around signature validation and fee modifier checks that were moved to `ProposalHandler`. Used v4's `slotNumber` variable name instead of `proposalSlotNumber` from next. - **validator.test.ts**: Added new HA peer test from the PR. ## Build Fix - Hoisted `validatorPrivateKeys` from `beforeEach` scope to `describe` scope in `validator.test.ts` so the new test can access it. ClaudeBox log: https://claudebox.work/s/bd9a0060cbf1923d?run=1 --------- Co-authored-by: Santiago Palladino <santiago@aztec-labs.com>
…e-please version (#21984) ## Summary Since we've stopped using release-please, the `deploy-staging-public` workflow was broken — it read the version from `.release-please-manifest.json` and waited for a tag matching that exact version. This PR removes the release-please manifest dependency and instead: - Polls for **any valid semver tag** at HEAD using `ci3/semver check` - If multiple semver tags exist, picks the highest using `ci3/semver sort` ## Changes The updated workflow is in `.github-new/workflows/deploy-staging-public.yml` and needs to be moved to `.github/workflows/deploy-staging-public.yml` before merging. - Removed the "Read version from manifest" step entirely - Replaced the tag-matching grep with `ci3/semver check` validation - Uses `ci3/semver sort` to pick the highest tag when multiple exist ClaudeBox log: https://claudebox.work/s/43c486478ab3e16b?run=1
## Summary The `testnet_compatibility` and `mainnet_compatibility` tests were only running on PRs targeting branches matching `^v[0-9]+$` (e.g. `v4`). This missed three other critical branches: - `backport-to-v4-staging` - `v4-next` - `backport-to-v4-next` This caused a compatibility break on staging-public (4.2.0-aztecnr.2 bricking nodes due to block header shape changes between 4.1 and 4.2) to go undetected. ## Fix Expanded the regex in `yarn-project/bootstrap.sh` to: ``` ^(v[0-9]+(-next)?|backport-to-v[0-9]+-(staging|next))$ ``` This matches all four required branch patterns while still excluding `next`, `master`, and other non-release branches. ClaudeBox log: https://claudebox.work/s/dd9d82043dbc175f?run=1
Adapted block_store.ts for v4 branch structure: - Kept v4's inline previous-checkpoint-block extraction (no getPreviousCheckpointBlock helper) - Used checkpoints[0] reference instead of firstCheckpointNumber for post-skip correctness - Only included skipOrUpdateAlreadyStoredCheckpoints method (the actual fix) - Dropped getPreviousCheckpointBlock and validateCheckpointBlocks refactors from next
…2252) (#22257) ## Summary Backport of #22252 to v4. Fixes a mainnet issue where an L1 reorg moved a checkpoint to a different L1 block, causing the archiver to re-discover it and crash with `InitialCheckpointNumberNotSequentialError` in an infinite loop. When `addCheckpoints` receives a checkpoint that's already stored, it now: - **Accepts it** if the archive root matches (same content, just different L1 block) - **Updates the L1 metadata** (block number, timestamp, hash) and attestations - **Throws** if the archive root doesn't match (content mismatch — genuine conflict) ## Conflict Resolution Cherry-pick had one conflict in `block_store.ts`: - v4 uses inline code for extracting previous checkpoint block data; `next` refactored this into a `getPreviousCheckpointBlock()` helper. Kept v4's inline approach but updated to use `checkpoints[0]` reference (correct after potential skip of already-stored checkpoints). - Only ported `skipOrUpdateAlreadyStoredCheckpoints` method (the fix). Dropped `getPreviousCheckpointBlock` and `validateCheckpointBlocks` refactors that exist on `next` but not v4. ## Test Results - 176 passed in `kv_archiver_store.test.ts` - 33 passed in `archiver-sync.test.ts` (includes new `handles L1 reorg that moves a checkpoint to a later L1 block` test) - Build, format pass ClaudeBox log: https://claudebox.work/s/21a4c138364df1ef?run=1
BEGIN_COMMIT_OVERRIDE fix: run compatibility tests on all v4-related branches (#22149) END_COMMIT_OVERRIDE
AztecBot
added
ci-draft
PhilWindle
approved these changes
Apr 2, 2026
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
3 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.
Summary
Resolves merge conflicts in
sync/v4-into-v4-next-20260402-121022branch (merge from v4 into v4-next).Three conflicts resolved:
yarn-project/p2p/src/client/factory.ts: Import conflict — combined both sides to includecreateCheckAllowedSetupCalls,createTxValidatorForReqResponseReceivedTxs,createTxValidatorForTransactionsEnteringPendingTxPool, andgetDefaultAllowedSetupFunctionsyarn-project/validator-client/src/validator.test.ts(type): Used v4'sReturnType<typeof generatePrivateKey>[]over inline0x${string}[]for consistency with the importedgeneratePrivateKeyyarn-project/validator-client/src/validator.test.ts(method name): UsedgetProposalHandler()which matches the actual method defined invalidator.tsClaudeBox log: https://claudebox.work/s/24854bae46b9a696?run=2