-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
feat(base): insert commitments and contracts into end trees #116
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
Maddiaa0
changed the title
Base circuit: insert commitments and contracts into end trees
feat(base): insert commitments and contracts into end trees
Mar 28, 2023
Maddiaa0
requested changes
Mar 28, 2023
cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
Outdated
Show resolved
Hide resolved
cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
Outdated
Show resolved
Hide resolved
Maddiaa0
reviewed
Mar 28, 2023
LHerskind
reviewed
Mar 28, 2023
cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
Outdated
Show resolved
Hide resolved
cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
Outdated
Show resolved
Hide resolved
cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
Outdated
Show resolved
Hide resolved
cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
Outdated
Show resolved
Hide resolved
cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
Outdated
Show resolved
Hide resolved
cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
Outdated
Show resolved
Hide resolved
cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
Outdated
Show resolved
Hide resolved
cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
Outdated
Show resolved
Hide resolved
Maddiaa0
added a commit
that referenced
this pull request
Mar 28, 2023
* add basic contract deployment test for private kernel * chore(base_rollup): scaffold * feat(base_rollup): scaffold * fix(base_rollup): var name changes * feat(base_rollup): historical subtree membership checks * feat(merge_rollup) merge rollup types * clean(merge): clean types and scaffold * refactor(merge): seperate merge and base rollup * fix(base): rename messup * clean(merge): pr review * initial test setup * fix: paths and prints * deleted deps * minor tweaks * fix(merge|base): aggregation object naming issue * fix: change interface of base rollup * fix witness init * fix(ts): update bindings (#108) * refactor(merge): seperate merge and base rollup * initial test setup * fix(ts-bindings): reduce roots to calldatahash * fix: remove prover id * fix: base rollup pub inputs ts tests * remove deps * rm gtest * fix: scuffed rebase * fix: scuffed rebase cont. * fix: update tests --------- Co-authored-by: cheethas <[email protected]> Co-authored-by: LHerskind <[email protected]> * fix(ts): update incorrect constant parity * fix(base): update vk pointer handling (#111) * fix: bb update * fix: update head * fix:(base): remove subtrees from interface (#110) * update inputs and outputs of base per new miro dg * update types and bindings * fix ts bindings for base * Adding tests for base rollup + sha256 (#114) * tests: tiny tests added * fix: insert zero-leaf in contract + use sha256 + change calldata hash -> 2 fields * fix: run tests in ci + remove log * fix: fix tests * fix: fix comments * fix: better comment * feat(base): insert commitments and contracts into end trees (#116) * insert commitments and contracts into end trees * fix merkle membership refactoring * add new root to snapshot * fix per pr comments * update ts constants * fix per pr comments * fix: Update rollup sha256 input + add test with "meaningful" input (#118) * feat(base): nullifier tree impl (#119) * chore(bb): update branch * feat: impl nullifier logic * fix(base): naming and miscalculations * fix: update subtree sibling path depth constants * fix: more nits --------- Co-authored-by: cheethas <[email protected]> --------- Co-authored-by: dbanks12 <[email protected]> Co-authored-by: cheethas <[email protected]> Co-authored-by: LHerskind <[email protected]> Co-authored-by: David Banks <[email protected]> Co-authored-by: Rahul Kothari <[email protected]> Co-authored-by: Lasse Herskind <[email protected]>
iAmMichaelConnor
pushed a commit
that referenced
this pull request
Mar 29, 2023
* add basic contract deployment test for private kernel * chore(base_rollup): scaffold * feat(base_rollup): scaffold * fix(base_rollup): var name changes * feat(base_rollup): historical subtree membership checks * feat(merge_rollup) merge rollup types * clean(merge): clean types and scaffold * refactor(merge): seperate merge and base rollup * fix(base): rename messup * clean(merge): pr review * initial test setup * fix: paths and prints * deleted deps * minor tweaks * fix(merge|base): aggregation object naming issue * fix: change interface of base rollup * fix witness init * fix(ts): update bindings (#108) * refactor(merge): seperate merge and base rollup * initial test setup * fix(ts-bindings): reduce roots to calldatahash * fix: remove prover id * fix: base rollup pub inputs ts tests * remove deps * rm gtest * fix: scuffed rebase * fix: scuffed rebase cont. * fix: update tests --------- Co-authored-by: cheethas <[email protected]> Co-authored-by: LHerskind <[email protected]> * fix(ts): update incorrect constant parity * minor fixes * fix(base): update vk pointer handling (#111) * fix: bb update * fix: update head * fix:(base): remove subtrees from interface (#110) * update inputs and outputs of base per new miro dg * update types and bindings * fix ts bindings for base * update kernel interfaces with sim * fix new kernel interface * fix circuit cbind * Adding tests for base rollup + sha256 (#114) * tests: tiny tests added * fix: insert zero-leaf in contract + use sha256 + change calldata hash -> 2 fields * fix: run tests in ci + remove log * fix: fix tests * fix: fix comments * fix: better comment * private kernel test doing actual proving * feat(base): insert commitments and contracts into end trees (#116) * insert commitments and contracts into end trees * fix merkle membership refactoring * add new root to snapshot * fix per pr comments * update ts constants * fix per pr comments * fixing base rollup test * fix: Update rollup sha256 input + add test with "meaningful" input (#118) * base test cbind fixed * remove old comment * add cbind tests to base rollup * fix unintentional changes * cbind tests for base rollup with some commented out checks --------- Co-authored-by: cheethas <[email protected]> Co-authored-by: LHerskind <[email protected]> Co-authored-by: Maddiaa <[email protected]> Co-authored-by: Rahul Kothari <[email protected]> Co-authored-by: Lasse Herskind <[email protected]>
LHerskind
added a commit
that referenced
this pull request
Mar 29, 2023
* add basic contract deployment test for private kernel * chore(base_rollup): scaffold * feat(base_rollup): scaffold * fix(base_rollup): var name changes * feat(base_rollup): historical subtree membership checks * feat(merge_rollup) merge rollup types * clean(merge): clean types and scaffold * refactor(merge): seperate merge and base rollup * fix(base): rename messup * clean(merge): pr review * initial test setup * fix: paths and prints * deleted deps * minor tweaks * fix(merge|base): aggregation object naming issue * fix: change interface of base rollup * fix witness init * fix(ts): update bindings (#108) * refactor(merge): seperate merge and base rollup * initial test setup * fix(ts-bindings): reduce roots to calldatahash * fix: remove prover id * fix: base rollup pub inputs ts tests * remove deps * rm gtest * fix: scuffed rebase * fix: scuffed rebase cont. * fix: update tests --------- Co-authored-by: cheethas <[email protected]> Co-authored-by: LHerskind <[email protected]> * fix(ts): update incorrect constant parity * minor fixes * fix(base): update vk pointer handling (#111) * fix: bb update * fix: update head * fix:(base): remove subtrees from interface (#110) * update inputs and outputs of base per new miro dg * update types and bindings * fix ts bindings for base * update kernel interfaces with sim * fix new kernel interface * fix circuit cbind * Adding tests for base rollup + sha256 (#114) * tests: tiny tests added * fix: insert zero-leaf in contract + use sha256 + change calldata hash -> 2 fields * fix: run tests in ci + remove log * fix: fix tests * fix: fix comments * fix: better comment * private kernel test doing actual proving * feat(base): insert commitments and contracts into end trees (#116) * insert commitments and contracts into end trees * fix merkle membership refactoring * add new root to snapshot * fix per pr comments * update ts constants * fix per pr comments * fixing base rollup test * fix: Update rollup sha256 input + add test with "meaningful" input (#118) * base test cbind fixed * remove old comment * add cbind tests to base rollup * fix unintentional changes * cbind tests for base rollup with some commented out checks * better dummy kernel * fix: enable asan, fix bug * cbind for dummy kernel * print cleanup --------- Co-authored-by: cheethas <[email protected]> Co-authored-by: LHerskind <[email protected]> Co-authored-by: Maddiaa <[email protected]> Co-authored-by: Rahul Kothari <[email protected]> Co-authored-by: Lasse Herskind <[email protected]> Co-authored-by: ludamad <[email protected]>
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
Please provide a paragraph or two giving a summary of the change, including relevant motivation and context.
Checklist:
/specs
have been updated.@brief
describing the intended functionality.