Skip to content

Commit

Permalink
Adding foundation to bb.js (AztecProtocol/barretenberg#274)
Browse files Browse the repository at this point in the history
* cleaning up bb.js deps

* update bb structure to use workspaces

* remove foundation .yarn/cache

* chore: don't bundle .yalc

* Update readme

* chore: modularize bb (AztecProtocol/barretenberg#271)

* chore: modularize ts

* chore: reformat

* merge

* remove yalc

* Unbundle tsbuildinfo

---------

Co-authored-by: ludamad <domuradical@gmail.com>
Co-authored-by: ludamad <adam.domurad@gmail.com>
  • Loading branch information
3 people authored Mar 27, 2023
1 parent bd3dc38 commit a360b48
Show file tree
Hide file tree
Showing 202 changed files with 7,264 additions and 4,257 deletions.
5 changes: 5 additions & 0 deletions circuits/cpp/barretenberg/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
.vscode
result
node_modules
.yarn/cache
.yarn/install-state.gz
ts/dest
.tsbuildinfo
3 changes: 3 additions & 0 deletions circuits/cpp/barretenberg/.gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "foundation"]
path = foundation
url = git@github.com:AztecProtocol/foundation.git

Large diffs are not rendered by default.

873 changes: 873 additions & 0 deletions circuits/cpp/barretenberg/.yarn/releases/yarn-3.4.1.cjs

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions circuits/cpp/barretenberg/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'

# note that pnp is used in CI
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-3.4.1.cjs
1 change: 1 addition & 0 deletions circuits/cpp/barretenberg/PROJECT
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
barretenberg.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ template <typename Composer> class stdlib_uint : public testing::Test {
}
};

EXPECT_EQ(expected, a.get_value());
EXPECT_EQ(uint256_t(expected), a.get_value());
auto prover = composer.create_prover();
auto verifier = composer.create_verifier();
plonk::proof proof = prover.construct_proof();
Expand Down
1 change: 1 addition & 0 deletions circuits/cpp/barretenberg/foundation
Submodule foundation added at 003b3a
27 changes: 27 additions & 0 deletions circuits/cpp/barretenberg/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "@aztec/barretenberg-workspace",
"packageManager": "yarn@3.4.1",
"private": true,
"scripts": {
"docs": "typedoc --out docs/dist && cd docs && yarn serve",
"test": "cd ts && yarn test",
"build": "cd foundation && yarn && yarn build && cd ../ts && yarn build",
"formatting": "cd ts && yarn formatting",
"formatting:fix": "cd ts && yarn formatting:fix"
},
"workspaces": [
"ts",
"foundation"
],
"prettier": "@aztec/foundation/prettier",
"devDependencies": {
"eslint": "^8.21.0",
"eslint-config-prettier": "^8.8.0",
"prettier": "^2.7.1",
"typedoc": "^0.23.26",
"typescript": "^4.9.5"
},
"comments": {
"purpose": "Workspace for barretenberg/ts. Provides dependencies, while allowing ts/ to be cleanly symlinked."
}
}
2 changes: 1 addition & 1 deletion circuits/cpp/barretenberg/ts/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require('@rushstack/eslint-patch/modern-module-resolution');

module.exports = {
extends: ['@aztec/eslint-config'],
extends: ['@aztec/foundation/eslint'],
parserOptions: { tsconfigRootDir: __dirname },
};
6 changes: 0 additions & 6 deletions circuits/cpp/barretenberg/ts/.gitignore

This file was deleted.

99 changes: 0 additions & 99 deletions circuits/cpp/barretenberg/ts/.yalc/@aztec/eslint-config/index.js

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions circuits/cpp/barretenberg/ts/.yalc/@aztec/log/.eslintrc.cjs

This file was deleted.

1 change: 0 additions & 1 deletion circuits/cpp/barretenberg/ts/.yalc/@aztec/log/.tsbuildinfo

This file was deleted.

16 changes: 0 additions & 16 deletions circuits/cpp/barretenberg/ts/.yalc/@aztec/log/Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion circuits/cpp/barretenberg/ts/.yalc/@aztec/log/README.md

This file was deleted.

11 changes: 0 additions & 11 deletions circuits/cpp/barretenberg/ts/.yalc/@aztec/log/dest/index.d.ts

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions circuits/cpp/barretenberg/ts/.yalc/@aztec/log/dest/index.js

This file was deleted.

Loading

0 comments on commit a360b48

Please sign in to comment.