feat: merge-train/fairies#23804
Merged
Merged
Conversation
Fixes [F-694](https://linear.app/aztec-labs/issue/F-694/handshake-registry-store-a-delivery-mode-on-handshakenote) - New `mode: u8` field on `HandshakeNote` - For the mode I went with a simple `u8` and constant identifiers to represent the valid modes. We could switch to a new type, this just will require some extra serialization and type scaffolding. Happy to do that in this PR or file a follow-up. Made [F-706](https://linear.app/aztec-labs/issue/F-706/replace-handshakenote-mode-u8-with-a-typed-delivery-mode-shared-in) for now as a follow-up. --------- Co-authored-by: Nicolas Chamo <nicolas@chamo.com.ar>
No issue, fixes confusing CI errors I ran into on #23796 when the `aztec_sublib` oracle version was not updated http://ci.aztec-labs.com/83a883aee887f12c: <details><summary>Details</summary> <p> ``` 17:46:29 17:46:29 ● e2e_blacklist_token_contract transfer public › failure cases › transfer from a blacklisted account 17:46:29 17:46:29 TypeError: Cannot read properties of undefined (reading 'check') 17:46:29 17:46:29 22 | 17:46:29 23 | afterEach(async () => { 17:46:29 > 24 | await t.tokenSim.check(); 17:46:29 | ^ 17:46:29 25 | }); 17:46:29 26 | 17:46:29 27 | it('transfer less than balance', async () => { 17:46:29 17:46:29 at Object.check (e2e_blacklist_token_contract/transfer_public.test.ts:24:22) 17:46:29 17:46:29 ● e2e_blacklist_token_contract transfer public › failure cases › transfer to a blacklisted account 17:46:29 17:46:29 Simulation error: Incompatible private environment version: The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr. See https://docs.aztec.network/errors/8 (expected oracle major version 28, got 27) 17:46:29 17:46:29 at ContractClassRegistry.publish 17:46:29 at MultiCallEntrypoint.entrypoint 17:46:29 17:46:29 Cause: 17:46:29 Incompatible private environment version: The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr. See https://docs.aztec.network/errors/8 (expected oracle major version 28, got 27) 17:46:29 17:46:29 85 | if (major !== ORACLE_VERSION_MAJOR) { 17:46:29 86 | const hint = major > ORACLE_VERSION_MAJOR ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.'; 17:46:29 > 87 | throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${ORACLE_VERSION_MAJOR}, got ${major})`); 17:46:29 | ^ 17:46:29 88 | } 17:46:29 89 | this.contractOracleVersion = { 17:46:29 90 | major, 17:46:29 17:46:29 at PrivateExecutionOracle.assertCompatibleOracleVersion (../../pxe/dest/contract_function_simulator/oracle/utility_execution_oracle.js:87:19) ``` </p> </details> We are told there is an oracle mismatch, but there is nothing to indicate it is in the aztec-nr sublib as I had already updated the actual aztec-nr version constant. The error also only comes about at runtime in an e2e test. We should be able to error out in the pre-existing `check_oracle_version` scripts for pxe/txe.
Collaborator
Author
|
🤖 Auto-merge enabled after 4 hours of inactivity. This PR will be merged automatically once all checks pass. |
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
4 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.
BEGIN_COMMIT_OVERRIDE
feat(aztec-nr): Add a delivery mode to handshake notes (#23783)
fix(pxe): enforce full field consumption at oracle boundaries (#23802)
chore(ci): Static oracle version check (#23805)
END_COMMIT_OVERRIDE