From 0c970a92ce54c92745b62490f68fec293379e749 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Sat, 2 Sep 2023 20:48:56 +0100 Subject: [PATCH] chore: sync bb master (#1947) Ran: ``` ./scripts/git_subrepo.sh pull circuits/cpp/barretenberg git checkout origin/master -- .gitmodules ``` # Checklist: Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge. - [ ] If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag. - [ ] I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code. - [ ] Every change is related to the PR description. - [ ] I have [linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) this pull request to relevant issues (if any exist). --- cpp/bootstrap.sh | 6 ++++-- cpp/src/barretenberg/bb/main.cpp | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cpp/bootstrap.sh b/cpp/bootstrap.sh index e9f41cba24..869bbc9c88 100755 --- a/cpp/bootstrap.sh +++ b/cpp/bootstrap.sh @@ -8,8 +8,10 @@ rm -rf ./build-wasm # Install formatting git hook. HOOKS_DIR=$(git rev-parse --git-path hooks) # The pre-commit script will live in a barretenberg-specific hooks directory -# Find it based on the current working directory. -echo "cd $(pwd)/cpp && ./format.sh staged" > $HOOKS_DIR/pre-commit +# Find it based on the script directory. +# TODO(AD) it is a bit unintuitive that bootstrap sets one up for a barretenberg-oriented workflow +SCRIPT_PWD=`pwd` # fix: capture pwd instead of writing into script +echo "cd $SCRIPT_PWD && ./format.sh staged" > $HOOKS_DIR/pre-commit chmod +x $HOOKS_DIR/pre-commit # Determine system. diff --git a/cpp/src/barretenberg/bb/main.cpp b/cpp/src/barretenberg/bb/main.cpp index 1f2ae5c165..35365ada13 100644 --- a/cpp/src/barretenberg/bb/main.cpp +++ b/cpp/src/barretenberg/bb/main.cpp @@ -16,7 +16,7 @@ using namespace barretenberg; // based on memory constraints for UltraPlonk. // However, since this CLI does not use WASM, we can increase the // size. -uint32_t MAX_CIRCUIT_SIZE = 1 << 23; +uint32_t MAX_CIRCUIT_SIZE = 1 << 22; std::string CRS_PATH = "./crs"; bool verbose = false; @@ -333,4 +333,4 @@ int main(int argc, char* argv[]) std::cerr << err.what() << std::endl; return 1; } -} \ No newline at end of file +}