Skip to content

resolve conflicts: #24561 fix(txe): align tagging strategy oracle with PXE #24877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PhilWindle wants to merge 1 commit into
base: fwd-port-24561
Choose a base branch
from
+0 −3
Open

resolve conflicts: #24561 fix(txe): align tagging strategy oracle with PXE #24877

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions docs/docs-developers/docs/resources/migration_notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Aztec is in active development. Each version may introduce breaking changes that

## TBD

<<<<<<< HEAD
## 5.0.1

### [Aztec.nr] History note nullification helpers renamed and restricted to own-contract notes
Expand Down Expand Up @@ -55,8 +54,6 @@ The persisted tagging stores now key every entry by the self-describing `<kind>:

**Impact**: On upgrade your local PXE state is reset. You must re-register accounts and re-sync from genesis. Wallets should surface a "your local state was reset, please re-register accounts and re-sync" path.

=======
>>>>>>> 6dd127124d (fix(txe): align tagging strategy oracle with PXE (#24561))
### [Aztec.nr] `TestEnvironmentOptions::with_tagging_secret_strategy` replaced

`TestEnvironmentOptions::with_tagging_secret_strategy` is now `with_default_tag_secret_strategy_all_modes` for tests
Expand Down
Loading