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

Cl/tx aux data #115

Closed
wants to merge 5 commits into from
Closed

Cl/tx aux data #115

wants to merge 5 commits into from

Conversation

charlielye
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.
  • 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.

@benesjan
Copy link
Contributor

I just rebased this on master and then everything worked. I didn't want to force push to your branch in case I messed up something so I pushed the rebase branch to janv/tx_aux_data. The new PR is here so I will close this one.

@benesjan benesjan closed this Mar 29, 2023
@benesjan benesjan deleted the cl/tx_aux_data branch March 29, 2023 16:25
@benesjan benesjan restored the cl/tx_aux_data branch March 29, 2023 16:26
@benesjan benesjan deleted the cl/tx_aux_data branch March 29, 2023 16:49
ludamad pushed a commit that referenced this pull request Apr 14, 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]>
ludamad pushed a commit that referenced this pull request Apr 17, 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]>
ludamad pushed a commit that referenced this pull request Apr 17, 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]>
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