feat(noir): update to noir master #903
Merged
Conversation
This file contains 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
sirasistant
changed the title
sirasistant
commented
Jun 26, 2023
| @@ -35,8 +35,7 @@ | |||
| "@aztec/merkle-tree": "workspace:^", | |||
| "@aztec/noir-contracts": "workspace:^", | |||
| "@aztec/types": "workspace:^", | |||
| "@noir-lang/aztec_backend_wasm": "github:joss-aztec/barretenberg_browser_stopgap_wasm_build#f2e10698dfa11cd46f7373cec1ed6184b0505f1e", | |||
| "@noir-lang/noir_util_wasm": "github:joss-aztec/noir_util_wasm#7dc410f4b4c00b9cfa9e726ae7fca3a3a4a237c5", | |||
| "acvm-simulator": "github:sirasistant/acvm-simulator-wasm#180bc5bec8b79034e9e3a508a959cac3fe801ed1", | |||
There was a problem hiding this comment.
acvm-simulator is still not released officially so we're manually building and releasing it here. When the current version is live on npm, we will get it from there.
sirasistant
commented
Jun 26, 2023
|
|
||
| /** | ||
| * The format for fields on the ACVM. | ||
| */ | ||
| export type ACVMField = `0x${string}`; | ||
| export type ACVMField = string; |
There was a problem hiding this comment.
acvm-simulator now has type definitions for fields and witnesses, so we update them here for them to match.
sirasistant
commented
Jun 26, 2023
Comment on lines
+255
to
+263
| this.callContext.portalContractAddress, | ||
| this.callContext.isDelegateCall, | ||
| this.callContext.isStaticCall, | ||
| this.callContext.isContractDeployment, | ||
|
|
||
| this.context.historicRoots.privateDataTreeRoot, | ||
| this.context.historicRoots.nullifierTreeRoot, | ||
| this.context.historicRoots.contractTreeRoot, | ||
| this.context.historicRoots.l1ToL2MessagesTreeRoot, |
There was a problem hiding this comment.
serialization now follows user-defined ordering in structs
There was a problem hiding this comment.
Should the todo not be updated then? Atop of writeInputs there was a todo for ordering and sorting on noir side.
sirasistant
commented
Jun 26, 2023
| ``` | ||
| noirup --branch aztec3-hacky | ||
| noirup --branch aztec3 |
There was a problem hiding this comment.
remember to noirup to the aztec3 branch!
LeilaWang
approved these changes
Jun 26, 2023
This was referenced Jul 25, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This PR moves from the aztec3-hacky branch of noir to the aztec3 branch of noir that is just noir master but doesn't serialize circuit keys to the noir artifact. Noir master uses pedersen plookup commitments so this has been updated in the code.
After this PR is merged, we can start using pedersen generators and removing various hacks done for it to work on the hacky version of noir.
Checklist: