chore: backports for v4-devnet-2.patch-4#21013
Merged
Merged
Conversation
…network (backport #21000) (#21004) ## Summary Backport of #21000 to v4. ### Commit 1: Cherry-pick with conflict markers Applied PR #21000 diff to v4. The `start_node.ts` import section has conflict markers where the `AztecAddress` import could not be cleanly applied (the surrounding import context differs between `next` and `v4` — v4 has additional imports like `RegistryContract`, `sleep`, `EthAddress` that were removed on `next`). ### Commit 2: Resolve conflict Added `import { AztecAddress } from '@aztec/stdlib/aztec-address'` in the correct location for v4 and removed the conflict markers. Original PR by @mverzilli.
Collaborator
Flakey Tests🤖 says: This CI run detected 3 tests that failed, but were tolerated due to a .test_patterns.yml entry. |
mverzilli
changed the title
alexghr
approved these changes
Mar 3, 2026
mverzilli
added a commit
that referenced
this pull request
Mar 4, 2026
Forward port of changes introduced in #21013
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.
Includes: