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

chore: tsconfig deduplication #142

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
4a4eb75
chore: refactor tsconfig layout
ludamad Mar 30, 2023
53f73c0
chore: refactor tsconfig layout
ludamad Mar 30, 2023
62b7f09
chore: package.json deriver
ludamad Mar 30, 2023
be02af8
Fix jest
ludamad Mar 30, 2023
47fd8e2
Post refactor fixes
ludamad Mar 30, 2023
255345f
Merge remote-tracking branch 'origin/master' into adam/chore/tsconfig…
ludamad Mar 30, 2023
6ef74f5
Revert circuits
ludamad Mar 30, 2023
dfd43de
chore: refactor after tsconfig changes
ludamad Mar 31, 2023
5eea69c
Merge remote-tracking branch 'origin/master' into adam/chore/tsconfig…
ludamad Mar 31, 2023
3aff266
chore: update tsconfig to tsconfig.dest.json
ludamad Mar 31, 2023
81518b0
chore: revert circuits
ludamad Mar 31, 2023
b4e936f
chore: prepare script
ludamad Mar 31, 2023
ca26a6f
Intermediate commit
ludamad Mar 31, 2023
3d7be9b
chore: Fix all package builds
ludamad Mar 31, 2023
f6bd9b0
Merge branch 'master' into adam/chore/tsconfig-refactor-2
ludamad Mar 31, 2023
1f1fdb2
Run yarn prepare
ludamad Mar 31, 2023
563aa2f
Merge remote-tracking branch 'origin/adam/chore/tsconfig-refactor-2' …
ludamad Mar 31, 2023
f9edc48
chore: revert circuits
ludamad Mar 31, 2023
55c3d88
Fix acir
ludamad Mar 31, 2023
177ad30
add missing tsconfig.dest.json files
ludamad Mar 31, 2023
176fcae
Update
ludamad Mar 31, 2023
a93d92a
Fixes
ludamad Mar 31, 2023
2bdf990
Fixes
ludamad Mar 31, 2023
fb550cc
Fix merge
ludamad Mar 31, 2023
4e31b51
Fix merge
ludamad Mar 31, 2023
7a9c899
Fix merge
ludamad Mar 31, 2023
f1f0d22
Fix merge
ludamad Mar 31, 2023
19f3df6
Fix merge
ludamad Mar 31, 2023
8487a12
Fix merge
ludamad Mar 31, 2023
fcc7a09
Fix merge
ludamad Mar 31, 2023
931708d
Fix merge
ludamad Mar 31, 2023
c415be5
Fix merge
ludamad Mar 31, 2023
fd7624c
Fix merge
ludamad Mar 31, 2023
bf828a3
Fix merge
ludamad Mar 31, 2023
a237ff8
Fix merge
ludamad Mar 31, 2023
6223166
Fix merge
ludamad Mar 31, 2023
9e9e5af
Fix merge
ludamad Mar 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
# AZTEC 3 Monorepo

The Aztec 3 system consists of the following sub projects.
To update dependencies, do

- `acir-simulator`
- `archiver`
- `aztec-cli`
- `aztec-rpc`
- `aztec.js`
- `ethereum.js`
- `kernel-prover`
- `key-store`
- `l1-contracts`
- `l2-block`
- `p2p`
- `prover-client`
- `aztec-node`
- `sequencer-client`
- `tx`
- yarn prepare
from the root folder. This updates tsconfig.dest.json project references, package.json and the build_manifest.json file, all by scanning local project imports ("@aztec/circuits.js" e.g.).
Note this only handles imports to @aztec/\* packages.
238 changes: 187 additions & 51 deletions build_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,44 @@
"aztec3-circuits-wasm-linux-clang": {
"buildDir": "circuits/cpp",
"dockerfile": "dockerfiles/Dockerfile.wasm-linux-clang",
"rebuildPatterns": ["^circuits/"],
"rebuildPatterns": [
"^circuits/"
],
"dependencies": []
},
"circuits-x86_64-linux-clang": {
"buildDir": "circuits",
"dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang",
"rebuildPatterns": ["^circuits/"],
"rebuildPatterns": [
"^circuits/"
],
"dependencies": []
},
"circuits-x86_64-linux-clang-assert": {
"buildDir": "circuits",
"dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang-assert",
"rebuildPatterns": ["^circuits/"],
"rebuildPatterns": [
"^circuits/"
],
"dependencies": []
},
"circuits-x86_64-linux-gcc": {
"buildDir": "circuits",
"dockerfile": "dockerfiles/Dockerfile.x86_64-linux-gcc",
"rebuildPatterns": ["^circuits/"],
"rebuildPatterns": [
"^circuits/"
],
"dependencies": []
},
"l1-contracts": {
"buildDir": "l1-contracts",
"dockerfile": "Dockerfile",
"rebuildPatterns": ["^l1-contracts/"],
"dependencies": []
"rebuildPatterns": [
"^l1-contracts/"
],
"dependencies": [
"ethereum.js"
]
},
"yarn-project-base": {
"buildDir": "yarn-project",
Expand All @@ -42,153 +54,277 @@
"buildDir": "yarn-project",
"projectDir": "yarn-project/acir-simulator",
"dockerfile": "acir-simulator/Dockerfile",
"rebuildPatterns": ["^yarn-project/acir-simulator/"],
"dependencies": ["yarn-project-base", "circuits.js"]
"rebuildPatterns": [
"^yarn-project/acir-simulator/"
],
"dependencies": [
"circuits.js",
"noir-contracts"
]
},
"archiver": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/archiver",
"dockerfile": "archiver/Dockerfile",
"rebuildPatterns": ["^yarn-project/archiver/"],
"dependencies": ["foundation", "ethereum.js", "l1-contracts", "l2-block"]
"rebuildPatterns": [
"^yarn-project/archiver/"
],
"dependencies": [
"ethereum.js",
"l1-contracts",
"l2-block",
"foundation"
]
},
"aztec-cli": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/aztec-cli",
"dockerfile": "aztec-cli/Dockerfile",
"rebuildPatterns": ["^yarn-project/aztec-cli/"],
"dependencies": ["aztec.js"]
"rebuildPatterns": [
"^yarn-project/aztec-cli/"
],
"dependencies": []
},
"aztec-rpc": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/aztec-rpc",
"dockerfile": "aztec-rpc/Dockerfile",
"rebuildPatterns": ["^yarn-project/aztec-rpc/"],
"dependencies": ["aztec-node"]
"rebuildPatterns": [
"^yarn-project/aztec-rpc/"
],
"dependencies": [
"circuits.js",
"tx",
"foundation",
"aztec-node",
"acir-simulator",
"kernel-prover",
"barretenberg.js",
"noir-contracts",
"l2-block"
]
},
"aztec.js": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/aztec.js",
"dockerfile": "aztec.js/Dockerfile",
"rebuildPatterns": ["^yarn-project/aztec.js/"],
"dependencies": ["aztec-rpc"]
"rebuildPatterns": [
"^yarn-project/aztec.js/"
],
"dependencies": [
"aztec-rpc",
"circuits.js",
"noir-contracts",
"foundation"
]
},
"barretenberg.js": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/barretenberg.js",
"dockerfile": "aztec.js/Dockerfile",
"rebuildPatterns": ["^yarn-project/barretenberg.js/"],
"dependencies": []
"dockerfile": "barretenberg.js/Dockerfile",
"rebuildPatterns": [
"^yarn-project/barretenberg.js/"
],
"dependencies": [
"foundation"
]
},
"circuits.js": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/circuits.js",
"dockerfile": "circuits.js/Dockerfile",
"rebuildPatterns": [
"^yarn-project/circuits.js/"
],
"dependencies": [
"foundation"
]
},
"end-to-end": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/end-to-end",
"dockerfile": "end-to-end/Dockerfile",
"rebuildPatterns": ["^yarn-project/end-to-end/"],
"dependencies": ["aztec.js", "noir-contracts"]
"rebuildPatterns": [
"^yarn-project/end-to-end/"
],
"dependencies": [
"aztec-node",
"ethereum.js",
"aztec.js",
"foundation",
"noir-contracts",
"l1-contracts"
]
},
"docs": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/docs",
"dockerfile": "docs/Dockerfile",
"rebuildPatterns": [
"^yarn-project/docs/"
],
"dependencies": []
},
"ethereum.js": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/ethereum.js",
"dockerfile": "ethereum.js/Dockerfile",
"rebuildPatterns": ["^yarn-project/ethereum.js/"],
"dependencies": ["foundation"]
"rebuildPatterns": [
"^yarn-project/ethereum.js/"
],
"dependencies": []
},
"foundation": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/foundation",
"dockerfile": "foundation/Dockerfile",
"rebuildPatterns": ["^yarn-project/foundation/"],
"dependencies": ["yarn-project-base"]
"rebuildPatterns": [
"^yarn-project/foundation/"
],
"dependencies": []
},
"kernel-prover": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/kernel-prover",
"dockerfile": "kernel-prover/Dockerfile",
"rebuildPatterns": ["^yarn-project/kernel-prover/"],
"dependencies": ["acir-simulator"]
"rebuildPatterns": [
"^yarn-project/kernel-prover/"
],
"dependencies": [
"acir-simulator"
]
},
"key-store": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/key-store",
"dockerfile": "key-store/Dockerfile",
"rebuildPatterns": ["^yarn-project/key-store/"],
"dependencies": ["foundation"]
"rebuildPatterns": [
"^yarn-project/key-store/"
],
"dependencies": []
},
"l2-block": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/l2-block",
"dockerfile": "l2-block/Dockerfile",
"rebuildPatterns": ["^yarn-project/l2-block/"],
"dependencies": ["foundation"]
"rebuildPatterns": [
"^yarn-project/l2-block/"
],
"dependencies": [
"circuits.js",
"foundation",
"l1-contracts"
]
},
"merkle-tree": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/merkle-tree",
"dockerfile": "merkle-tree/Dockerfile",
"rebuildPatterns": ["^yarn-project/merkle-tree/"],
"dependencies": ["foundation", "barretenberg.js"]
"rebuildPatterns": [
"^yarn-project/merkle-tree/"
],
"dependencies": [
"barretenberg.js",
"foundation"
]
},
"noir-contracts": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/noir-contracts",
"dockerfile": "noir-contracts/Dockerfile",
"rebuildPatterns": ["^yarn-project/noir-contracts/"],
"dependencies": ["foundation"]
"rebuildPatterns": [
"^yarn-project/noir-contracts/"
],
"dependencies": []
},
"p2p": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/p2p",
"dockerfile": "p2p/Dockerfile",
"rebuildPatterns": ["^yarn-project/p2p/"],
"dependencies": ["foundation", "l2-block"]
"rebuildPatterns": [
"^yarn-project/p2p/"
],
"dependencies": [
"tx",
"foundation",
"l2-block",
"circuits.js"
]
},
"prover-client": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/prover-client",
"dockerfile": "prover-client/Dockerfile",
"rebuildPatterns": ["^yarn-project/prover-client/"],
"dependencies": ["yarn-project-base"]
"rebuildPatterns": [
"^yarn-project/prover-client/"
],
"dependencies": []
},
"aztec-node": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/aztec-node",
"dockerfile": "aztec-node/Dockerfile",
"rebuildPatterns": ["^yarn-project/aztec-node/"],
"rebuildPatterns": [
"^yarn-project/aztec-node/"
],
"dependencies": [
"ethereum.js",
"foundation",
"l1-contracts",
"tx",
"archiver",
"world-state",
"l2-block",
"p2p",
"world-state",
"sequencer-client",
"ethereum.js"
"merkle-tree"
]
},
"sequencer-client": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/sequencer-client",
"dockerfile": "sequencer-client/Dockerfile",
"rebuildPatterns": ["^yarn-project/sequencer-client/"],
"rebuildPatterns": [
"^yarn-project/sequencer-client/"
],
"dependencies": [
"foundation",
"world-state",
"archiver",
"ethereum.js",
"l1-contracts",
"l2-block",
"foundation",
"circuits.js",
"tx",
"p2p",
"l2-block"
"world-state",
"barretenberg.js"
]
},
"tx": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/tx",
"dockerfile": "tx/Dockerfile",
"rebuildPatterns": ["^yarn-project/tx/"],
"dependencies": ["circuits.js", "l2-block"]
"rebuildPatterns": [
"^yarn-project/tx/"
],
"dependencies": [
"l2-block",
"foundation"
]
},
"world-state": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/world-state",
"dockerfile": "world-state/Dockerfile",
"rebuildPatterns": ["^yarn-project/world-state/"],
"dependencies": ["foundation", "merkle-tree", "l2-block"]
"rebuildPatterns": [
"^yarn-project/world-state/"
],
"dependencies": [
"l2-block",
"merkle-tree",
"foundation",
"circuits.js",
"barretenberg.js"
]
}
}
}
Loading