Skip to content

feat(noir): update to noir master#903

Merged
sirasistant merged 10 commits into
masterfrom
arv/noir_master_rebased
Jun 26, 2023
Merged

feat(noir): update to noir master#903
sirasistant merged 10 commits into
masterfrom
arv/noir_master_rebased

Conversation

@sirasistant

@sirasistant sirasistant commented Jun 23, 2023

Copy link
Copy Markdown
Contributor

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:

  • I have reviewed my diff in github, line by line.
  • Every change is related to the PR description.
  • I have linked this pull request to the issue(s) that it resolves.
  • There are no unexpected formatting changes, superfluous debug logs, or commented-out code.
  • The branch has been merged or rebased against the head of its merge target.
  • I'm happy for the PR to be merged at the reviewer's next convenience.

@sirasistant sirasistant changed the title noir master tests (WIP) noir master tests Jun 23, 2023
@sirasistant sirasistant changed the title (WIP) noir master tests feat(noir): update to noir master Jun 26, 2023
@sirasistant sirasistant marked this pull request as ready for review June 26, 2023 08:49
"@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",

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

* The format for fields on the ACVM.
*/
export type ACVMField = `0x${string}`;
export type ACVMField = string;

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

acvm-simulator now has type definitions for fields and witnesses, so we update them here for them to match.

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,

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

serialization now follows user-defined ordering in structs

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the todo not be updated then? Atop of writeInputs there was a todo for ordering and sorting on noir side.

- Install the noir branch needed for A3 backend (`aztec3` at the moment)
```
noirup --branch aztec3-hacky
noirup --branch aztec3

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remember to noirup to the aztec3 branch!

@sirasistant sirasistant enabled auto-merge (squash) June 26, 2023 08:55
@sirasistant sirasistant merged commit 4777601 into master Jun 26, 2023
@sirasistant sirasistant deleted the arv/noir_master_rebased branch June 26, 2023 10:50
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.

3 participants