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.

Sign up for GitHub

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

Jump to bottom

Merge defi-bridge-project into master (dependent CMake pj support, rollup/ removal, kesha's bigfield fix) #123

Merged
merged 41 commits into from
Feb 7, 2023
Merged

Merge defi-bridge-project into master (dependent CMake pj support, rollup/ removal, kesha's bigfield fix) #123

merged 41 commits into from
Feb 7, 2023

Conversation

dbanks12
Copy link
Contributor

@dbanks12 dbanks12 commented Feb 6, 2023 •
edited
Loading

Description

First large merge from dbp to master since repo split

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 /markdown/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.

dbanks12 and others added 17 commits January 24, 2023 21:01
@dbanks12
Fix to bootstrap.sh after move into submodule (#1)
07e62f6 
* Updated bootstrap now that bberg may be a submodule, and now that cpp subdir exists

* fix gitignore, wasnt properly ignoring cpp/build*

* fix the barretenberg cpp formatting pre-commit hook now that barretenberg iss its own repo and may be a submodule
@charlielye @dbanks12
Contrived change.
33e0b2d
@charlielye @dbanks12
Revert "Contrived change."
f4a7e85 
This reverts commit 68aff9c.
@charlielye @dbanks12
Revert "Revert "Contrived change.""
e1d5577 
This reverts commit 3eee2fd.
@charlielye @dbanks12
Introduce cpp to paths.
1c58e01
@charlielye @dbanks12
More cpp path.
57991a2
@charlielye @dbanks12
Target x86-64 arch so we're compatible with rosetta emulation on m1 m…
1744ff8 
…acs.
@charlielye @dbanks12
Target skylake but without avx.
f2276d3
@charlielye @dbanks12
Fix indent.
b31bd7e
@Rumata888 @dbanks12
Fixing fuzzer build (#14)
31c3d20
@ludamad @ludamad0 @dbanks12
Elide sig check on 'merge' join-split proofs (#42)
3b6bc9b 
* Elide sig check on 'merge' join-split proofs

* README.md: Mention bootstrap.sh directory

* join_split: simplify from feedback

* Update join_split_circuit.cpp

* Update join_split_circuit.cpp

* constants.hpp: redo vk hashes

Co-authored-by: ludamad <adam@aztecprotocol.com>
@ludamad @ludamad0 @dbanks12
join_split: Require same account flag for 'merge' (#70)
e5e51ba 
* fix(join_split): Check account flag. Fixes #66

* fix(constants): redo verification keys

Co-authored-by: ludamad <adam@aztecprotocol.com>
@dbanks12
Add cmake logic to support building of dependent C++/WASM projects (#54)
4bd6d08 
* cmake updates to support dependent projects (native + wasm)

* nothing should depend on constants from `rollup/`

* use `cmake --build <dir> --parallel`  everywhere instead of -j with nprocs

* forward all bootstrap args to cmake with --target prefix for each. Use cleaner subshell instead of cd'ing back up after ignition in bootstrap.

* allow dependent project to set WASI_SDK_PREFIX and have it be used in wasm-linux-clang.cmake

* update readme to use cmake
@dbanks12
Removed all files in rollup/ not necessary for join split tests
1733b72
@dbanks12
dockerfile, script, and ci changes now that rollup contents are gone …
a1f7d02 
…except join split
@dbanks12
remove more unused code from rollup/js dir
c58691b
@dbanks12
attempt at merging dbp into master
856a374
@dbanks12 dbanks12 self-assigned this Feb 6, 2023
dbanks12 and others added 9 commits February 6, 2023 22:08
@dbanks12
manually merged in rollup removal while that pr is in progress
e3c2025
@dbanks12
fix badly merged config.yml
1ee0794
@dbanks12
fix bad schnorr merge
c17fc52
@dbanks12
remove dbp schnorr change and js test changes before merge into master
a592714
@dbanks12
add blake 3 to executables in aztec cmakelists
db63525
@dbanks12
revert dbp schnorr test changes
93ffb50
@dbanks12
Removing all rollup/ contents except join-split as example (#124)
b62ef79 
* Removed all files in rollup/ not necessary for join split tests, renamed to join_split_example

* dockerfile, script, and ci changes now that rollup contents are gone except join split

* remove more unused code from rollup/js dir

* removed standard example

* rename rollup directory to join_split_example

* filter out longer join split tests (leave only one full proof test in) for CI. fix bb-tests

* fix dockerfile now that rollup executables were removed

* rename rollup namespace to join_split_example

* add rollup notes tests back into bb-tests

* remove duplicated js test from bb-tests

* Removing non-join-split constants as per recommendation here https://github.com/AztecProtocol/barretenberg/pull/124\#discussion_r1098698470
@dbanks12
remove vk constants from join-split
b253642
@dbanks12
merge dbp after rollup removal intomaster-merge branch
0928de5
suyash67
suyash67 approved these changes Feb 7, 2023
View reviewed changes
Copy link
Contributor

@suyash67 suyash67 left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@dbanks12 dbanks12 marked this pull request as ready for review February 7, 2023 17:39
@dbanks12 dbanks12 changed the title Draft: Merge defi-bridge-project into master Merge defi-bridge-project into master (dependent CMake pj support, rollup/ removal, kesha's bigfield fix) Feb 7, 2023
@dbanks12 dbanks12 merged commit ed84dc6 into master Feb 7, 2023
@dbanks12 dbanks12 deleted the db/merging-dbp-into-master branch February 7, 2023 18:13
@Rumata888 Rumata888 mentioned this pull request Jun 26, 2023
Merged
10 tasks
ludamad added a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 22, 2023
@dbanks12 @charlielye
@Rumata888 @ludamad @ludamad0
Merge defi-bridge-project into master (dependent CMake pj support, ro…
2e8b6fb 
…llup/ removal, kesha's bigfield fix) (AztecProtocol/barretenberg#123)

* Target skylake but without avx.

* Fix indent.

* Fixing fuzzer build (AztecProtocol/barretenberg#14)

* Add cmake logic to support building of dependent C++/WASM projects (AztecProtocol/barretenberg#54)

* cmake updates to support dependent projects (native + wasm)

* nothing should depend on constants from `rollup/`

* use `cmake --build <dir> --parallel`  everywhere instead of -j with nprocs

* forward all bootstrap args to cmake with --target prefix for each. Use cleaner subshell instead of cd'ing back up after ignition in bootstrap.

* allow dependent project to set WASI_SDK_PREFIX and have it be used in wasm-linux-clang.cmake

* update readme to use cmake

* Removed all files in rollup/ not necessary for join split tests

* dockerfile, script, and ci changes now that rollup contents are gone except join split

* remove more unused code from rollup/js dir

* removed standard example

* rename rollup directory to join_split_example

* bigfield fix

* filter out longer join split tests (leave only one full proof test in) for CI. fix bb-tests

* fix dockerfile now that rollup executables were removed

* rename rollup namespace to join_split_example

* add blake 3 to executables/libraries in aztec cmakelists

* Removing non-join-split constants as per recommendation here https://github.com/AztecProtocol/barretenberg/pull/124\#discussion_r1098698470

* remove vk constants from join-split

---------

Co-authored-by: Charlie Lye <karl.lye@gmail.com>
Co-authored-by: Innokentii Sennovskii <isennovskiy@gmail.com>
Co-authored-by: Adam Domurad <adam.domurad@gmail.com>
Co-authored-by: ludamad <adam@aztecprotocol.com>
ludamad added a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 24, 2023
@dbanks12 @charlielye
@Rumata888 @ludamad @ludamad0
Merge defi-bridge-project into master (dependent CMake pj support, ro…
df9278e 
…llup/ removal, kesha's bigfield fix) (AztecProtocol/barretenberg#123)

* Target skylake but without avx.

* Fix indent.

* Fixing fuzzer build (AztecProtocol/barretenberg#14)

* Add cmake logic to support building of dependent C++/WASM projects (AztecProtocol/barretenberg#54)

* cmake updates to support dependent projects (native + wasm)

* nothing should depend on constants from `rollup/`

* use `cmake --build <dir> --parallel`  everywhere instead of -j with nprocs

* forward all bootstrap args to cmake with --target prefix for each. Use cleaner subshell instead of cd'ing back up after ignition in bootstrap.

* allow dependent project to set WASI_SDK_PREFIX and have it be used in wasm-linux-clang.cmake

* update readme to use cmake

* Removed all files in rollup/ not necessary for join split tests

* dockerfile, script, and ci changes now that rollup contents are gone except join split

* remove more unused code from rollup/js dir

* removed standard example

* rename rollup directory to join_split_example

* bigfield fix

* filter out longer join split tests (leave only one full proof test in) for CI. fix bb-tests

* fix dockerfile now that rollup executables were removed

* rename rollup namespace to join_split_example

* add blake 3 to executables/libraries in aztec cmakelists

* Removing non-join-split constants as per recommendation here https://github.com/AztecProtocol/barretenberg/pull/124\#discussion_r1098698470

* remove vk constants from join-split

---------

Co-authored-by: Charlie Lye <karl.lye@gmail.com>
Co-authored-by: Innokentii Sennovskii <isennovskiy@gmail.com>
Co-authored-by: Adam Domurad <adam.domurad@gmail.com>
Co-authored-by: ludamad <adam@aztecprotocol.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@suyash67 suyash67 suyash67 approved these changes

@codygunton codygunton Awaiting requested review from codygunton

Assignees

@dbanks12 dbanks12

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dbanks12 @suyash67 @charlielye @Rumata888 @ludamad