Skip to content

Commit

Permalink
chore: sync bb master (#1947)
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
kevaundray authored and AztecBot committed Sep 2, 2023
1 parent 41e028d commit 0c970a9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions cpp/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/barretenberg/bb/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -333,4 +333,4 @@ int main(int argc, char* argv[])
std::cerr << err.what() << std::endl;
return 1;
}
}
}

0 comments on commit 0c970a9

Please sign in to comment.