Skip to content

Commit f2a6b66

Browse files
committed
chore: re-organise monorepo
1 parent a0448eb commit f2a6b66

File tree

737 files changed

+339
-782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

737 files changed

+339
-782
lines changed

.dockerignore

-90
This file was deleted.

.eslintignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ build
55
typechain-types
66
.eslintrc.js
77
commitlint.config.js
8-
subgraph/generated
8+
apps/subgraph/generated

.gitattributes

-1
This file was deleted.

.github/workflows/circuit-build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ jobs:
5151
5252
- name: Build circuits
5353
run: pnpm run build-test-circuits-wasm
54-
working-directory: circuits
54+
working-directory: packages/circuits
5555

5656
- name: Test circuits
5757
run: pnpm run test
58-
working-directory: circuits
58+
working-directory: packages/circuits

.github/workflows/contracts-build.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,4 @@ jobs:
3535
3636
- name: Test
3737
run: pnpm run test
38-
working-directory: contracts
39-
env:
40-
OP_RPC_URL: ${{ secrets.OP_RPC_URL }}
38+
working-directory: packages/contracts

.github/workflows/core-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
3636
- name: Test
3737
run: pnpm run test
38-
working-directory: core
38+
working-directory: packages/core

.github/workflows/crypto-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
3636
- name: Test
3737
run: pnpm run test
38-
working-directory: crypto
38+
working-directory: packages/crypto

.github/workflows/domainobjs-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ jobs:
3636
- name: Test
3737
run: |
3838
pnpm run test
39-
working-directory: domainobjs
39+
working-directory: packages/domainobjs

.github/workflows/hardhat-tasks.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
3232
- name: Run hardhat fork
3333
run: |
34-
cd contracts
34+
cd packages/contracts
3535
pnpm run hardhat &
3636
sleep 5
3737
@@ -41,10 +41,10 @@ jobs:
4141
4242
- name: hardhat tasks
4343
run: |
44-
cd contracts
4544
cp ./deploy-config-example.json ./deploy-config.json
4645
pnpm deploy:localhost
4746
pnpm deploy-poll:localhost
47+
working-directory: packages/contracts
4848

4949
- name: Stop Hardhat
5050
if: always()

.github/workflows/nightly-ceremony.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
4747
- name: Run hardhat fork
4848
run: |
49-
cd contracts
49+
cd packages/contracts
5050
pnpm run hardhat &
5151
5252
- name: Download rapidsnark (1c137)

.github/workflows/nightly.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
- name: Run hardhat fork
4949
run: |
50-
cd contracts
50+
cd packages/contracts
5151
pnpm run hardhat &
5252
5353
- name: Download rapidsnark (1c137)
@@ -64,7 +64,7 @@ jobs:
6464
6565
- name: Create zkeys folder
6666
run: |
67-
cd cli
67+
cd packages/cli
6868
mkdir -p zkeys
6969
7070
- name: Compile Circuits And Generate zkeys

.github/workflows/reusable-e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
run: |
8989
pnpm run hardhat &
9090
sleep 5
91-
working-directory: contracts
91+
working-directory: packages/contracts
9292

9393
- name: ${{ matrix.command }}
9494
run: pnpm run ${{ matrix.command }}

.github/workflows/slither.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
fail-on: none
4242
ignore-compile: true
4343
node-version: 20
44-
target: "contracts/"
44+
target: "packages/contracts/"
4545

4646
- name: Upload SARIF file
4747
uses: github/codeql-action/upload-sarif@v3

.github/workflows/subgraph-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
3636
- name: Test
3737
run: pnpm run test
38-
working-directory: subgraph
38+
working-directory: apps/subgraph

.gitignore

+23-25
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
1-
circuits/params/*
2-
cli/proofs
3-
cli/proofs.json
4-
cli/zkeys
5-
cli/maci_keys.tar.gz
1+
packages/circuits/params/*
2+
packages/cli/proofs
3+
packages/cli/proofs.json
4+
packages/cli/zkeys
5+
packages/cli/maci_keys.tar.gz
66
*.zkey
77
*.r1cs
88
*.sym
99

1010

1111
solc
1212
*.ptau
13-
cli/tally.json
13+
packages/cli/tally.json
1414
**/test_tally.json
1515
**/tally.json
16-
integrationTests/test_tally.json
17-
integrationTests/artifacts/**
16+
packages/integrationTests/test_tally.json
17+
packages/integrationTests/artifacts/**
1818
deployedAddresses.json
1919
.etherlime-store
2020
**/build/
21-
circuits/build
22-
circuits/circom/test.bak
21+
packages/circuits/build
22+
packages/circuits/circom/test.bak
2323

24-
cli/artifacts
25-
contracts/artifacts
26-
contracts/compiled
27-
cli/cache
28-
contracts/cache
29-
typechain-types/
24+
packages/cli/artifacts
25+
packages/contracts/artifacts
26+
packages/contracts/compiled
27+
packages/cli/cache
28+
packages/contracts/cache
29+
packages/contracts/typechain-types/
30+
**/cache
3031

3132
node_modules
3233
blake2sdef.json
@@ -144,15 +145,12 @@ typings/
144145

145146
# docker related
146147
**/data/
147-
cli/output.json
148-
cli/processinput.json
149-
cli/tallyinput.json
150-
cli/contractAddresses.json
151-
cli/contractAddresses.old.json
148+
packages/cli/output.json
149+
packages/cli/processinput.json
150+
packages/cli/tallyinput.json
151+
packages/cli/contractAddresses.json
152+
packages/cli/contractAddresses.old.json
152153

153-
circuits/circom/test
154-
155-
# mdBook rendered files
156-
publish
154+
packages/circuits/circom/test
157155

158156
**/ts/__benchmarks__/results/**

.prettierignore

+8-7
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ pnpm-lock.yaml
1010
CHANGELOG.md
1111
CODEOWNERS
1212
.eslintignore
13-
circuits/ts/verifier_groth16.sol
14-
website/.docusaurus/
15-
website/src/pages/solidity-docs/index.md
13+
packages/circuits/ts/verifier_groth16.sol
14+
apps/website/.docusaurus/
15+
apps/website/src/pages/solidity-docs/index.md
1616
**/deployed-contracts.json
1717
**/deploy-config.json
18-
subgraph/generated
19-
subgraph/templates/*.yaml
20-
subgraph/subgraph.yaml
21-
18+
apps/subgraph/generated
19+
apps/subgraph/templates/*.yaml
20+
apps/subgraph/subgraph.yaml
21+
**/zkeys
22+
**/typedoc

README.md

+1

subgraph/.eslintrc.js apps/subgraph/.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const path = require("path");
22

33
module.exports = {
44
root: true,
5-
extends: ["../.eslintrc.js"],
5+
extends: ["../../.eslintrc.js"],
66
parser: "@typescript-eslint/parser",
77
parserOptions: {
88
project: path.resolve(__dirname, "./tsconfig.json"),
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

subgraph/tsconfig.json apps/subgraph/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extend": "./node_modules/@graphprotocol/graph-ts/tsconfig.json",
2+
"extend": ["./node_modules/@graphprotocol/graph-ts/tsconfig.json"],
33
"compilerOptions": {
44
"outDir": "./build",
55
"strictNullChecks": true,

website/.eslintrc.js apps/website/.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const fs = require("fs");
22
const path = require("path");
33

4-
const prettierConfig = fs.readFileSync(path.resolve(__dirname, "../.prettierrc"), "utf8");
4+
const prettierConfig = fs.readFileSync(path.resolve(__dirname, "../../.prettierrc"), "utf8");
55
const prettierOptions = JSON.parse(prettierConfig);
66
const isProduction = process.env.NODE_ENV === "production";
77

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

website/src/scripts/setupSolidityDocs.ts apps/website/src/scripts/setupSolidityDocs.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const solidityDocDir = path.resolve(
99
"../../versioned_docs/version-v2.x/developers-references/smart-contracts/solidity-docs",
1010
);
1111
// the origin folder (from the contracts package)
12-
const sourceDir = path.resolve(__dirname, "../../../contracts/docs");
12+
const sourceDir = path.resolve(__dirname, "../../../packages/contracts/docs");
1313

1414
/**
1515
* Currently, Solidity docgen generates the same heading for all files.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)