chore: re-organise monorepo

.eslintignore

@@ -5,4 +5,4 @@ build
 typechain-types
 .eslintrc.js
 commitlint.config.js
-subgraph/generated
+apps/subgraph/generated

.github/workflows/circuit-build.yml

@@ -51,8 +51,8 @@ jobs:
 
       - name: Build circuits
         run: pnpm run build-test-circuits-wasm
-        working-directory: circuits
+        working-directory: packages/circuits
 
       - name: Test circuits
         run: pnpm run test
-        working-directory: circuits
+        working-directory: packages/circuits

.github/workflows/contracts-build.yml

@@ -35,6 +35,4 @@ jobs:
 
       - name: Test
         run: pnpm run test
-        working-directory: contracts
-        env:
-          OP_RPC_URL: ${{ secrets.OP_RPC_URL }}
+        working-directory: packages/contracts

.github/workflows/core-build.yml

@@ -35,4 +35,4 @@ jobs:
 
       - name: Test
         run: pnpm run test
-        working-directory: core
+        working-directory: packages/core

.github/workflows/crypto-build.yml

@@ -35,4 +35,4 @@ jobs:
 
       - name: Test
         run: pnpm run test
-        working-directory: crypto
+        working-directory: packages/crypto

.github/workflows/domainobjs-build.yml

@@ -36,4 +36,4 @@ jobs:
       - name: Test
         run: |
           pnpm run test
-        working-directory: domainobjs
+        working-directory: packages/domainobjs

.github/workflows/hardhat-tasks.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: Run hardhat fork
         run: |
-          cd contracts
+          cd packages/contracts
           pnpm run hardhat &
           sleep 5
 
@@ -41,10 +41,10 @@ jobs:
 
       - name: hardhat tasks
         run: |
-          cd contracts
           cp ./deploy-config-example.json ./deploy-config.json
           pnpm deploy:localhost
           pnpm deploy-poll:localhost
+        working-directory: packages/contracts
 
       - name: Stop Hardhat
         if: always()

.github/workflows/nightly-ceremony.yml

@@ -46,7 +46,7 @@ jobs:
 
       - name: Run hardhat fork
         run: |
-          cd contracts
+          cd packages/contracts
           pnpm run hardhat &
 
       - name: Download rapidsnark (1c137)

.github/workflows/nightly.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Run hardhat fork
         run: |
-          cd contracts
+          cd packages/contracts
           pnpm run hardhat &
 
       - name: Download rapidsnark (1c137)
@@ -64,7 +64,7 @@ jobs:
 
       - name: Create zkeys folder
         run: |
-          cd cli
+          cd packages/cli
           mkdir -p zkeys
 
       - name: Compile Circuits And Generate zkeys

.github/workflows/reusable-e2e.yml

@@ -88,7 +88,7 @@ jobs:
         run: |
           pnpm run hardhat &
           sleep 5
-        working-directory: contracts
+        working-directory: packages/contracts
 
       - name: ${{ matrix.command }}
         run: pnpm run ${{ matrix.command }}

.github/workflows/slither.yml

@@ -41,7 +41,7 @@ jobs:
           fail-on: none
           ignore-compile: true
           node-version: 20
-          target: "contracts/"
+          target: "packages/contracts/"
 
       - name: Upload SARIF file
         uses: github/codeql-action/upload-sarif@v3

.github/workflows/subgraph-build.yml

@@ -35,4 +35,4 @@ jobs:
 
       - name: Test
         run: pnpm run test
-        working-directory: subgraph
+        working-directory: apps/subgraph

.gitignore

@@ -1,32 +1,33 @@
-circuits/params/*
-cli/proofs
-cli/proofs.json
-cli/zkeys
-cli/maci_keys.tar.gz
+packages/circuits/params/*
+packages/cli/proofs
+packages/cli/proofs.json
+packages/cli/zkeys
+packages/cli/maci_keys.tar.gz
 *.zkey
 *.r1cs
 *.sym
 
 
 solc
 *.ptau
-cli/tally.json
+packages/cli/tally.json
 **/test_tally.json
 **/tally.json
-integrationTests/test_tally.json
-integrationTests/artifacts/**
+packages/integrationTests/test_tally.json
+packages/integrationTests/artifacts/**
 deployedAddresses.json
 .etherlime-store
 **/build/
-circuits/build
-circuits/circom/test.bak
+packages/circuits/build
+packages/circuits/circom/test.bak
 
-cli/artifacts
-contracts/artifacts
-contracts/compiled
-cli/cache
-contracts/cache
-typechain-types/
+packages/cli/artifacts
+packages/contracts/artifacts
+packages/contracts/compiled
+packages/cli/cache
+packages/contracts/cache
+packages/contracts/typechain-types/
+**/cache
 
 node_modules
 blake2sdef.json
@@ -144,15 +145,12 @@ typings/
 
 # docker related
 **/data/
-cli/output.json
-cli/processinput.json
-cli/tallyinput.json
-cli/contractAddresses.json
-cli/contractAddresses.old.json
+packages/cli/output.json
+packages/cli/processinput.json
+packages/cli/tallyinput.json
+packages/cli/contractAddresses.json
+packages/cli/contractAddresses.old.json
 
-circuits/circom/test
-
-# mdBook rendered files
-publish
+packages/circuits/circom/test
 
 **/ts/__benchmarks__/results/**

.prettierignore

@@ -10,12 +10,13 @@ pnpm-lock.yaml
 CHANGELOG.md
 CODEOWNERS
 .eslintignore
-circuits/ts/verifier_groth16.sol
-website/.docusaurus/
-website/src/pages/solidity-docs/index.md
+packages/circuits/ts/verifier_groth16.sol
+apps/website/.docusaurus/
+apps/website/src/pages/solidity-docs/index.md
 **/deployed-contracts.json
 **/deploy-config.json
-subgraph/generated
-subgraph/templates/*.yaml
-subgraph/subgraph.yaml
-
+apps/subgraph/generated
+apps/subgraph/templates/*.yaml
+apps/subgraph/subgraph.yaml
+**/zkeys
+**/typedoc

README.md

@@ -24,6 +24,7 @@ Below you can find a list of the packages included in this repository.
 | [maci-crypto][crypto-package]                     | [![NPM Package][crypto-npm-badge]][crypto-npm-link]                     | [![Actions Status][crypto-actions-badge]][crypto-actions-link]                     |
 | [maci-domainobjs][domainobjs-package]             | [![NPM Package][domainobjs-npm-badge]][domainobjs-npm-link]             | [![Actions Status][domainobjs-actions-badge]][domainobjs-actions-link]             |
 | [maci-integrationTests][integrationTests-package] | [![NPM Package][integrationTests-npm-badge]][integrationTests-npm-link] | [![Actions Status][integrationTests-actions-badge]][integrationTests-actions-link] |
+| [maci-subgraph][subgraph-package]                 | [![NPM Package][subgraph-npm-badge]][subgraph-npm-link]                 | [![Actions Status][subgraph-actions-badge]][subgraph-actions-link]                 |
 
 ## Development and testing
 

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

@@ -2,7 +2,7 @@ const path = require("path");
 
 module.exports = {
   root: true,
-  extends: ["../.eslintrc.js"],
+  extends: ["../../.eslintrc.js"],
   parser: "@typescript-eslint/parser",
   parserOptions: {
     project: path.resolve(__dirname, "./tsconfig.json"),

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

@@ -1,5 +1,5 @@
 {
-  "extend": "./node_modules/@graphprotocol/graph-ts/tsconfig.json",
+  "extend": ["./node_modules/@graphprotocol/graph-ts/tsconfig.json"],
   "compilerOptions": {
     "outDir": "./build",
     "strictNullChecks": true,

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

@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
 
-const prettierConfig = fs.readFileSync(path.resolve(__dirname, "../.prettierrc"), "utf8");
+const prettierConfig = fs.readFileSync(path.resolve(__dirname, "../../.prettierrc"), "utf8");
 const prettierOptions = JSON.parse(prettierConfig);
 const isProduction = process.env.NODE_ENV === "production";
 

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

@@ -9,7 +9,7 @@ const solidityDocDir = path.resolve(
   "../../versioned_docs/version-v2.x/developers-references/smart-contracts/solidity-docs",
 );
 // the origin folder (from the contracts package)
-const sourceDir = path.resolve(__dirname, "../../../contracts/docs");
+const sourceDir = path.resolve(__dirname, "../../../packages/contracts/docs");
 
 /**
  * Currently, Solidity docgen generates the same heading for all files.