Skip to content
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

base rollup tweaks #111

Merged
merged 1 commit into from
Mar 28, 2023
Merged

base rollup tweaks #111

merged 1 commit into from
Mar 28, 2023

Conversation

dbanks12
Copy link
Contributor

Description

Please provide a paragraph or two giving a summary of the change, including relevant motivation and context.

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.
  • There are no circuit changes, OR specifications in /specs have been updated.
  • There are no circuit changes, OR a cryptographer has been assigned for review.
  • I've updated any terraform that needs updating (e.g. environment variables) for deployment.
  • The branch has been rebased against the head of its merge target.
  • I'm happy for the PR to be merged at the reviewer's next convenience.
  • New functions, classes, etc. have been documented according to the doxygen comment format. Classes and structs must have @brief describing the intended functionality.
  • If existing code has been modified, such documentation has been added or updated.

Note
If you are updating the submodule, please make sure you do it in its own special PR and avoid making changes to the submodule as a part of other PRs.
To update a submodule, you can run the following commands:

$ git submodule update --recursive

Alternatively, you can select a particular commit in barretenberg/aztec3 that you wish to point to:

$ cd barretenberg
$ git pull origin aztec3        # This will point to the latest commit in `barretenberg/aztec3`
$ git checkout <commit_hash>    # Use this if you wish to point to a particular commit.
$ cd ..
$ git add . && git commit -m <commit_msg>
$ git push

@dbanks12 dbanks12 requested a review from Maddiaa0 March 28, 2023 12:51
Copy link
Member

@Maddiaa0 Maddiaa0 left a comment

Choose a reason for hiding this comment

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

lgtm, merge when passing

@Maddiaa0 Maddiaa0 merged commit b11bc0e into md/base_rollup Mar 28, 2023
@Maddiaa0 Maddiaa0 deleted the db/base_rollup_tweaks branch March 28, 2023 12:56
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants