Skip to content

chore: merge v4 into v4-next (resolve conflicts)#21710

Open
AztecBot wants to merge 5 commits intov4-nextfrom
sync/v4-into-v4-next-20260317-215059
Open

chore: merge v4 into v4-next (resolve conflicts)#21710
AztecBot wants to merge 5 commits intov4-nextfrom
sync/v4-into-v4-next-20260317-215059

Conversation

@AztecBot
Copy link
Collaborator

This PR was created because merging v4 into v4-next resulted in conflicts.

Please resolve the conflicts and merge this PR to keep v4-next up to date.

This PR was auto-generated by the pull-v4-into-v4-next workflow.

AztecBot and others added 5 commits March 17, 2026 15:26
BEGIN_COMMIT_OVERRIDE
fix(aztec-nr): return Option from decode functions and fix event
commitment capacity (backport #21264) (#21360)
fix: backport #21271 — handle bad note lengths on
compute_note_hash_and_nullifier (#21364)
fix: not reusing tags of partially reverted txs (#20817)
chore: revert accidental backport of #20817 (#21583)
feat: Implement commit all and revert all for world state checkpoints
(#21532)
cherry-pick: fix: dependabot alerts (#21531)
fix: dependabot alerts (backport #21531 to v4) (#21592)
fix: backport #21443 — Don't update state if we failed to execute
sufficient transactions (v4) (#21610)
chore: Fix msgpack serialisation (#21612)
fix(p2p): fall back to maxTxsPerCheckpoint for per-block tx validation
(#21605)
chore: merge v4 into backport-to-v4-staging (#21618)
fix(revert): avm sim uses event loop again (#21138) (#21630)
fix(e2e): remove historic/finalized block checks from epochs_multiple
test (#21642)
fix: clamp finalized block to oldest available in world-state (#21643)
fix: skip handleChainFinalized when block is behind oldest available
(#21656)
chore: demote finalized block skip log to trace (#21661)
fix: off-by-1 in getBlockHashMembershipWitness archive snapshot
(backport #21648) (#21663)
fix: capture txs not available error reason in proposal handler (#21670)
chore: add L1 inclusion time to stg public (#21665)
END_COMMIT_OVERRIDE

---------

Co-authored-by: Jan Beneš <janbenes1234@gmail.com>
Co-authored-by: PhilWindle <60546371+PhilWindle@users.noreply.github.com>
Co-authored-by: Phil Windle <philip.windle@gmail.com>
Co-authored-by: Santiago Palladino <santiago@aztecprotocol.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: ludamad <adam.domurad@gmail.com>
Co-authored-by: Alex Gherghisan <alexghr@users.noreply.github.com>
change ordering for `lastBlock` case when creating a checkpoint
proposal, so that we first sign the last block and then the checkpoint
…ons (A-683) (#21686)

Remove early return in for...of loop that caused only the first contract
class's functions to be stored when multiple classes had broadcasts in
the same block.

Fixes https://linear.app/aztec-labs/issue/A-683
BEGIN_COMMIT_OVERRIDE
fix: HA deadlock for last block edge case (#21690)
fix: process all contract classes in storeBroadcastedIndividualFunctions
(A-683) (#21686)
END_COMMIT_OVERRIDE
@AztecBot
Copy link
Collaborator Author

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-221042 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot
Copy link
Collaborator Author

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-222554 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot
Copy link
Collaborator Author

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-224718 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot
Copy link
Collaborator Author

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-230040 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot
Copy link
Collaborator Author

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-231643 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot
Copy link
Collaborator Author

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-234342 has been created. Please resolve conflicts there or close this PR and use the new branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants