@maci-protocol/website 0.0.0-ci.eb89f0b → 0.0.0-ci.ebb44e9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. package/docusaurus.config.ts +2 -2
  2. package/package.json +12 -12
  3. package/versioned_docs/version-v0.x/quadratic-vote-tallying-circuit.md +16 -16
  4. package/versioned_docs/version-v3.x/core-concepts/maci-keys.md +1 -1
  5. package/versioned_docs/version-v3.x/core-concepts/poll-types.md +31 -7
  6. package/versioned_docs/version-v3.x/core-concepts/polls.md +31 -7
  7. package/versioned_docs/version-v3.x/core-concepts/spec.md +8 -8
  8. package/versioned_docs/version-v3.x/core-concepts/workflow.md +1 -1
  9. package/versioned_docs/version-v3.x/guides/compile-circuits.md +31 -15
  10. package/versioned_docs/version-v3.x/guides/integrating.md +1 -1
  11. package/versioned_docs/version-v3.x/guides/sdk.md +121 -0
  12. package/versioned_docs/version-v3.x/guides/testing/testing-in-detail.md +1 -1
  13. package/versioned_docs/version-v3.x/guides/testing/testing-introduction.md +34 -2
  14. package/versioned_docs/version-v3.x/guides/troubleshooting.md +51 -6
  15. package/versioned_docs/version-v3.x/quick-start.md +24 -16
  16. package/versioned_docs/version-v3.x/resources.md +1 -0
  17. package/versioned_docs/version-v3.x/security/trusted-setup.md +35 -35
  18. package/versioned_docs/version-v3.x/supported-networks/costs.md +725 -0
  19. package/versioned_docs/version-v3.x/supported-networks/deployed-contracts.md +8 -8
  20. package/versioned_docs/version-v3.x/supported-networks/supported-networks.md +16 -0
  21. package/versioned_docs/version-v3.x/technical-references/smart-contracts/MACI.md +2 -2
  22. package/versioned_docs/version-v3.x/technical-references/smart-contracts/MessageProcessor.md +1 -1
  23. package/versioned_docs/version-v3.x/technical-references/smart-contracts/Params.md +2 -2
  24. package/versioned_docs/version-v3.x/technical-references/smart-contracts/Poll.md +1 -1
  25. package/versioned_docs/version-v3.x/technical-references/smart-contracts/PollFactory.md +1 -1
  26. package/versioned_docs/version-v3.x/technical-references/smart-contracts/Tally.md +2 -2
  27. package/versioned_docs/version-v3.x/technical-references/smart-contracts/VkRegistry.md +4 -4
  28. package/versioned_docs/version-v3.x/technical-references/technical-references.md +8 -8
  29. package/versioned_docs/version-v3.x/technical-references/zk-snark-circuits/processMessages.md +7 -3
  30. package/versioned_docs/version-v3.x/technical-references/zk-snark-circuits/setup.md +3 -3
  31. package/versioned_docs/version-v3.x/technical-references/zk-snark-circuits/tallyVotes.md +3 -3
  32. package/versioned_docs/version-v3.x/technical-references/zk-snark-circuits/utilities.md +2 -2
  33. package/versioned_docs/version-v3.x/technical-references/zk-snark-circuits/zk-snark-circuits.md +3 -3
@@ -46,7 +46,7 @@ async function getConfig(): Promise<Config> {
46
46
  routeBasePath: "docs/",
47
47
  sidebarPath: "./sidebars.ts",
48
48
  editUrl: ({ versionDocsDirPath, docPath }) =>
49
- `${GITHUB_URL}/edit/dev/website/${versionDocsDirPath}/${docPath}`,
49
+ `${GITHUB_URL}/edit/dev/apps/website/${versionDocsDirPath}/${docPath}`,
50
50
  remarkPlugins: [remarkMath],
51
51
  rehypePlugins: [rehypeKatex],
52
52
  includeCurrentVersion: false,
@@ -59,7 +59,7 @@ async function getConfig(): Promise<Config> {
59
59
  blog: {
60
60
  showReadingTime: true,
61
61
 
62
- editUrl: ({ blogDirPath, blogPath }) => `${GITHUB_URL}/edit/dev/website/${blogDirPath}/${blogPath}`,
62
+ editUrl: ({ blogDirPath, blogPath }) => `${GITHUB_URL}/edit/dev/apps/website/${blogDirPath}/${blogPath}`,
63
63
  remarkPlugins: [remarkMath],
64
64
  rehypePlugins: [rehypeKatex],
65
65
  onUntruncatedBlogPosts: "ignore",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@maci-protocol/website",
3
- "version": "0.0.0-ci.eb89f0b",
3
+ "version": "0.0.0-ci.ebb44e9",
4
4
  "private": false,
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -21,11 +21,11 @@
21
21
  "types": "tsc -p tsconfig.json --noEmit"
22
22
  },
23
23
  "dependencies": {
24
- "@docusaurus/core": "^3.7.0",
25
- "@docusaurus/preset-classic": "^3.7.0",
26
- "@docusaurus/theme-classic": "^3.7.0",
27
- "@docusaurus/theme-common": "^3.7.0",
28
- "@easyops-cn/docusaurus-search-local": "^0.49.1",
24
+ "@docusaurus/core": "^3.8.1",
25
+ "@docusaurus/preset-classic": "^3.8.1",
26
+ "@docusaurus/theme-classic": "^3.8.1",
27
+ "@docusaurus/theme-common": "^3.8.1",
28
+ "@easyops-cn/docusaurus-search-local": "^0.51.0",
29
29
  "@mdx-js/react": "^3.1.0",
30
30
  "clsx": "^2.1.1",
31
31
  "docusaurus-plugin-image-zoom": "^3.0.1",
@@ -38,11 +38,11 @@
38
38
  "remark-math": "^6.0.0"
39
39
  },
40
40
  "devDependencies": {
41
- "@docusaurus/module-type-aliases": "^3.7.0",
42
- "@docusaurus/tsconfig": "^3.7.0",
43
- "@docusaurus/types": "^3.7.0",
44
- "@types/node": "^22.15.8",
45
- "@types/react": "^19.1.2",
41
+ "@docusaurus/module-type-aliases": "^3.8.1",
42
+ "@docusaurus/tsconfig": "^3.8.1",
43
+ "@docusaurus/types": "^3.8.1",
44
+ "@types/node": "^24.0.3",
45
+ "@types/react": "^19.1.8",
46
46
  "ts-node": "^10.9.2",
47
47
  "typescript": "^5.8.3"
48
48
  },
@@ -61,5 +61,5 @@
61
61
  "engines": {
62
62
  "node": ">=18.0"
63
63
  },
64
- "gitHead": "2f14979eea13a7fa94af48ad270832fdaf95c152"
64
+ "gitHead": "b4863ef769205fddf83c2b4aca9cedd8924f7e43"
65
65
  }
@@ -35,25 +35,25 @@ The MACI contract's `quadraticVoteTally()` function should verify a proof create
35
35
 
36
36
  ## Inputs
37
37
 
38
- | Pseudocode name | zk-SNARK input type | Description | Set by |
39
- | ----------------------------- | ------------------- | ---------------------------------------------------------------------------------------------------------- | ----------- |
40
- | `fullStateRoot` | Public | The final Merkle root of the state tree | Contract |
41
- | `fullStateTreeDepth` | Hardcoded | The depth of the state tree | Contract |
42
- | `intermediateStateTreeDepth` | Hardcoded | The depth of the intermediate state tree | Contract |
43
- | `intermediateStateRoot` | Public | The intermediate Merkle root generated by the given state leaves | Contract |
44
- | `intermediatePathElements[k]` | Private | The Merkle path elements from `intermediateStateRoot` to `stateRoot`. | Coordinator |
45
- | `intermediatePathIndex` | Public | The Merkle path index from `intermediateStateRoot` to `stateRoot`. | Contract |
46
- | `currentResults[n]` | Private | The vote tally of all prior batches of state leaves | Coordinator |
47
- | `currentResultsSalt` | Private | A random value to hash with the vote tally for state leaves up to the current batch | Coordinator |
48
- | `currentResultsCommitment` | Public | The salted commitment of the values in `currentResults` | Contract |
49
- | `newResultsCommitment` | Public | The salted commitment of the vote tally for this batch of leaves plus the vote tally from `currentResults` | Contract |
50
- | `salt` | Private | A random value to hash with the culmulate vote tally for this batch of state leaves | Coordinator |
51
- | `stateLeaves[m][p]` | Private | The batch of leaves of the state tree to tally. | Coordinator |
52
- | `voteLeaves[m][n]` | Private | The vote leaves for each user in this batch of state leaves. | Coordinator |
38
+ | Pseudocode name | zk-SNARK input type | Description | Set by |
39
+ | ------------------------------- | ------------------- | ---------------------------------------------------------------------------------------------------------- | ----------- |
40
+ | `fullStateRoot` | Public | The final Merkle root of the state tree | Contract |
41
+ | `fullStateTreeDepth` | Hardcoded | The depth of the state tree | Contract |
42
+ | `tallyProcessingStateTreeDepth` | Hardcoded | The depth of the intermediate state tree | Contract |
43
+ | `intermediateStateRoot` | Public | The intermediate Merkle root generated by the given state leaves | Contract |
44
+ | `intermediatePathElements[k]` | Private | The Merkle path elements from `intermediateStateRoot` to `stateRoot`. | Coordinator |
45
+ | `intermediatePathIndex` | Public | The Merkle path index from `intermediateStateRoot` to `stateRoot`. | Contract |
46
+ | `currentResults[n]` | Private | The vote tally of all prior batches of state leaves | Coordinator |
47
+ | `currentResultsSalt` | Private | A random value to hash with the vote tally for state leaves up to the current batch | Coordinator |
48
+ | `currentResultsCommitment` | Public | The salted commitment of the values in `currentResults` | Contract |
49
+ | `newResultsCommitment` | Public | The salted commitment of the vote tally for this batch of leaves plus the vote tally from `currentResults` | Contract |
50
+ | `salt` | Private | A random value to hash with the culmulate vote tally for this batch of state leaves | Coordinator |
51
+ | `stateLeaves[m][p]` | Private | The batch of leaves of the state tree to tally. | Coordinator |
52
+ | `voteLeaves[m][n]` | Private | The vote leaves for each user in this batch of state leaves. | Coordinator |
53
53
 
54
54
  `n` is the number of options in `voteOptionTree`.
55
55
  `m` is the number of state leaves in this batch.
56
- `k` is `fullStateTreeDepth - intermediateStateTreeDepth`
56
+ `k` is `fullStateTreeDepth - tallyProcessingStateTreeDepth`
57
57
  `p` is the message length
58
58
 
59
59
  A result commitment is the hash of a Merkle root of all the vote leaves, and a salt. For instance:
@@ -78,7 +78,7 @@ Serialized, these will look like **macipk.0e5194a54562ea4d440ac6a0049a41d4b600e3
78
78
  After successfully [installing](/docs/quick-start#installation) MACI, you can easily generate your MACI key pair by running:
79
79
 
80
80
  ```bash
81
- pnpm run generateMaciKeyPair
81
+ pnpm run generate-maci-keypair
82
82
  ```
83
83
 
84
84
  This command will create the necessary public and private keys required for running various MACI operations.
@@ -5,25 +5,25 @@ sidebar_label: Poll types
5
5
  sidebar_position: 9
6
6
  ---
7
7
 
8
- MACI allows to conduct polls in both a quadratic voting and non quadratic voting fashion. One should be aware that the only distinction between the two happens when messages are processed and votes tallied. On top of that, the Tally smart contract has been split into two different ones, with the non quadratic voting version one being slightly smaller, due to the need of one less function.
8
+ MACI allows to conduct polls in both a quadratic voting and non quadratic voting fashion. One should be aware that the only distinction between the two happens when messages are processed and votes tallied. On top of that, the Tally smart contract has been split into two different ones, with the non quadratic voting version one being slightly smaller, due to the need of one less function. Additionally, there is a variation of non quadratic voting that allows participants to cast their entire voice credit balance for a single option only.
9
9
 
10
10
  This document will explain how to use each of these options. Hardhat tasks are the currently recommended way to deploy contracts and run polls but you can also use the MACI cli.
11
11
 
12
12
  ## Quadratic Voting
13
13
 
14
- MACI has always worked with quadratic voting. Users signing up to MACI are assigned a number of voice credits based on certain conditions (enforced by the [initial voice credit proxy contract](https://github.com/privacy-scaling-explorations/maci/blob/dev/contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol)), and after each vote, the number of voice credits is reduced by the square of the weight of the vote casted. For instance, if the vote weight is 5, a user must have at least 25 voice credits to cast the vote.
14
+ MACI has always worked with quadratic voting. Users signing up to MACI are assigned a number of voice credits based on certain conditions (enforced by the [initial voice credit proxy contract](https://github.com/privacy-scaling-explorations/maci/blob/dev/packages/contracts/contracts/initialVoiceCreditProxy/ConstantInitialVoiceCreditProxy.sol)), and after each vote, the number of voice credits is reduced by the square of the weight of the vote casted. For instance, if the vote weight is 5, a user must have at least 25 voice credits to cast the vote.
15
15
 
16
16
  To run a poll with quadratic voting, the coordinator must deploy the Poll with the mode set to quadratic voting.
17
17
 
18
18
  ### Using Hardhat tasks
19
19
 
20
- In the deploy-config.json file set the `useQuadraticVoting` value to **true**.
20
+ In the deploy-config.json file set the `mode` value to **qv**.
21
21
 
22
22
  ```json
23
23
  "Poll": {
24
24
  "pollDuration": 604800,
25
25
  "coordinatorPublicKey": "macipk",
26
- "useQuadraticVoting": true
26
+ "mode": "qv"
27
27
  }
28
28
  ```
29
29
 
@@ -37,17 +37,41 @@ pnpm deploy-poll:NETWORK
37
37
 
38
38
  The non quadratic voting option is a new feature that has been added to MACI with the v1.2 release. It allows to conduct polls without the quadratic voting mechanism. This means that the number of voice credits is not reduced by the square of the weight of the vote casted. This option is useful for polls where the quadratic voting mechanism is not necessary, and it is also slightly cheaper for coordinators to tally votes, as there are less checks required in the Tally smart contract.
39
39
 
40
- To run a poll with non quadratic voting, the coordinator must set the `useQuadraticVoting` parameter to `false` when creating the MACI instance. This will make the MACI instance use the `TallyNonQv` smart contract, which is a smaller version of the `Tally` smart contract, as it does not require the checks for the quadratic voting mechanism.
40
+ To run a poll with non quadratic voting, the coordinator must set the `mode` parameter to `non-qv` when creating the MACI instance. This will make the MACI instance use the `TallyNonQv` smart contract, which is a smaller version of the `Tally` smart contract, as it does not require the checks for the quadratic voting mechanism.
41
41
 
42
42
  ### Using Hardhat tasks
43
43
 
44
- In the deploy-config.json file set the `useQuadraticVoting` value to **false**.
44
+ In the deploy-config.json file set the `mode` value to **non-qv**.
45
45
 
46
46
  ```json
47
47
  "Poll": {
48
48
  "pollDuration": 604800,
49
49
  "coordinatorPublicKey": "macipk",
50
- "useQuadraticVoting": false
50
+ "mode": "non-qv"
51
+ }
52
+ ```
53
+
54
+ Then run the task to create a poll:
55
+
56
+ ```bash
57
+ pnpm deploy-poll:NETWORK
58
+ ```
59
+
60
+ ## Full Credits Voting
61
+
62
+ Full Credits Voting is a new feature introduced in MACI v3. This voting mode disables the quadratic voting mechanism and requires participants to allocate their entire voice credit balance to a single option. Unlike quadratic voting, where the cost of votes increases quadratically with the number of votes cast, Full Credits Voting uses a linear model: participants spend all their available voice credits on one chosen option. No splitting across multiple options is allowed. This option is useful for polls where the quadratic voting mechanism is not necessary and where it's important to ensure voters fully commit to a single choice—eliminating fragmented or spread-out voting behavior. It also offers a slight cost advantage for coordinators, as tallying is more efficient with fewer checks required in the Tally smart contract.
63
+
64
+ To run a poll full credits voting, the coordinator must set the `mode` parameter to `full` when creating the MACI instance. This will make the MACI instance use the `TallyNonQv` smart contract, which is a smaller version of the `Tally` smart contract, as it does not require the checks for the quadratic voting mechanism.
65
+
66
+ ### Using Hardhat tasks
67
+
68
+ In the deploy-config.json file set the `mode` value to **full**.
69
+
70
+ ```json
71
+ "Poll": {
72
+ "pollDuration": 604800,
73
+ "coordinatorPublicKey": "macipk",
74
+ "mode": "full"
51
75
  }
52
76
  ```
53
77
 
@@ -11,7 +11,7 @@ Currently, you can configure the following parameters for a poll:
11
11
 
12
12
  - Poll duration, in the form of a unix timestamp for start and end times. This allows polls to be scheduled to start at a certain time, and run for a certain amount of time.
13
13
  - Vote option - how many vote options are allowed for a poll.
14
- - Vote mode - quadratic or non quadratic voting. One should be aware that the only distinction between the two happens when messages are processed and votes tallied.
14
+ - Vote mode - quadratic, non quadratic, full credits voting. One should be aware that the only distinction between them happens when messages are processed and votes tallied.
15
15
  - Policy - the Excubiae policy that will be used to gate access to the poll.
16
16
  - Initial voice credit proxy - the initial voice credit proxy that will be used to assign voice credits to voters.
17
17
  - Relayer - the list of addresses that will be able to relay messages on behalf of other users (for now this is recommended to be the coordinator only)
@@ -34,19 +34,19 @@ The full configuration for a poll looks like this:
34
34
 
35
35
  ## Quadratic Voting
36
36
 
37
- MACI has always worked with quadratic voting. Users joining a Poll are assigned a number of voice credits based on certain conditions (enforced by the [initial voice credit proxy contract](https://github.com/privacy-scaling-explorations/maci/blob/dev/contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol)), and after each vote, the number of voice credits is reduced by the square of the weight of the vote casted. For instance, if the vote weight is 5, a user must have at least 25 voice credits to cast the vote.
37
+ MACI has always worked with quadratic voting. Users joining a Poll are assigned a number of voice credits based on certain conditions (enforced by the [initial voice credit proxy contract](https://github.com/privacy-scaling-explorations/maci/blob/dev/packages/contracts/contracts/initialVoiceCreditProxy/ConstantInitialVoiceCreditProxy.sol)), and after each vote, the number of voice credits is reduced by the square of the weight of the vote casted. For instance, if the vote weight is 5, a user must have at least 25 voice credits to cast the vote.
38
38
 
39
39
  To run a poll with quadratic voting, the coordinator must deploy the Poll with the mode set to quadratic voting.
40
40
 
41
41
  ### Using Hardhat tasks
42
42
 
43
- In the deploy-config.json file set the `useQuadraticVoting` value to **true**.
43
+ In the deploy-config.json file set the `mode` value to **qv**.
44
44
 
45
45
  ```json
46
46
  "Poll": {
47
47
  [...]
48
48
  "coordinatorPublicKey": "macipk",
49
- "useQuadraticVoting": true
49
+ "mode": "qv"
50
50
  }
51
51
  ```
52
52
 
@@ -60,17 +60,41 @@ pnpm deploy-poll:NETWORK
60
60
 
61
61
  The non quadratic voting option is a new feature that has been added to MACI with the v1.2 release. It allows to conduct polls without the quadratic voting mechanism. This means that the number of voice credits is not reduced by the square of the weight of the vote casted. This option is useful for polls where the quadratic voting mechanism is not necessary, and it is also slightly cheaper for coordinators to tally votes, as there are less checks required in the Tally smart contract.
62
62
 
63
- To run a poll with non quadratic voting, the coordinator must set the `useQuadraticVoting` parameter to `false` when creating the MACI instance.
63
+ To run a poll with non quadratic voting, the coordinator must set the `mode` parameter to `non-qv` when creating the MACI instance.
64
64
 
65
65
  ### Using Hardhat tasks
66
66
 
67
- In the deploy-config.json file set the `useQuadraticVoting` value to **false**.
67
+ In the deploy-config.json file set the `mode` value to **non-qv**.
68
68
 
69
69
  ```json
70
70
  "Poll": {
71
71
  [...]
72
72
  "coordinatorPublicKey": "macipk",
73
- "useQuadraticVoting": false
73
+ "mode": "non-qv"
74
+ }
75
+ ```
76
+
77
+ Then run the task to create a poll:
78
+
79
+ ```bash
80
+ pnpm deploy-poll:NETWORK
81
+ ```
82
+
83
+ ## Full Credits Voting
84
+
85
+ Full Credits Voting is a new feature introduced in MACI v3. This voting mode disables the quadratic voting mechanism and requires participants to allocate their entire voice credit balance to a single option. Unlike quadratic voting, where the cost of votes increases quadratically with the number of votes cast, Full Credits Voting uses a linear model: participants spend all their available voice credits on one chosen option. No splitting across multiple options is allowed. This option is useful for polls where the quadratic voting mechanism is not necessary and where it's important to ensure voters fully commit to a single choice—eliminating fragmented or spread-out voting behavior. It also offers a slight cost advantage for coordinators, as tallying is more efficient with fewer checks required in the Tally smart contract.
86
+
87
+ To run a poll with full credits voting, the coordinator must set the `mode` parameter to `full` when creating the MACI instance.
88
+
89
+ ### Using Hardhat tasks
90
+
91
+ In the deploy-config.json file set the `mode` value to **full**.
92
+
93
+ ```json
94
+ "Poll": {
95
+ [...]
96
+ "coordinatorPublicKey": "macipk",
97
+ "mode": "full"
74
98
  }
75
99
  ```
76
100
 
@@ -580,7 +580,7 @@ Please note that MACI requires the coordinator to generate proofs on an x86 mach
580
580
 
581
581
  ### 6.1. Message processing circuit
582
582
 
583
- The message processing circuit, defined in `circuits/circom/processMessages.circom`, allows the coordinator to prove that they have correctly applied each message in reverse order, in a consecutive batch of `5 ^ messageBatchDepth` messages to the respective state leaf within the state tree.
583
+ The message processing circuit, defined in `circuits/circom/coordinator/qv/MessageProcessor.circom`, allows the coordinator to prove that they have correctly applied each message in reverse order, in a consecutive batch of `5 ^ messageBatchDepth` messages to the respective state leaf within the state tree.
584
584
 
585
585
  #### Parameters
586
586
 
@@ -747,15 +747,15 @@ The final tally should be:
747
747
  2. Total voice credits per vote option: `[3, 9, 19, 33, 26]`
748
748
  3. Total spent voice credits: `66`
749
749
 
750
- The coordinator uses the ballot tallying circuit (`tallyVotes.circom`) to generate proofs that they have correctly computed the tally. As there are many ballots to tally, each proof only computes the tally for a batch of ballots. Each proof is chained to the previous one such that each proof is also a proof of knowledge of the preimage of the previous tally commitment.
750
+ The coordinator uses the ballot tallying circuit (`VoteTally.circom`) to generate proofs that they have correctly computed the tally. As there are many ballots to tally, each proof only computes the tally for a batch of ballots. Each proof is chained to the previous one such that each proof is also a proof of knowledge of the preimage of the previous tally commitment.
751
751
 
752
752
  #### Parameters
753
753
 
754
- | Parameter | Description |
755
- | --------------------- | ----------------------------------------------------------------------------------------------------------------------- |
756
- | `stateTreeDepth` | Depth of the state tree, this value must be equal to `10` |
757
- | `intStateTreeDepth` | Depth of the intermediate state tree, `5 ** intStateTreeDepth` is the batch size |
758
- | `voteOptionTreeDepth` | Depth of the vote option tree, this must be the same value passed to the `deployPoll()` contract function of `MACI.sol` |
754
+ | Parameter | Description |
755
+ | ------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
756
+ | `stateTreeDepth` | Depth of the state tree, this value must be equal to `10` |
757
+ | `tallyProcessingStateTreeDepth` | Depth of the intermediate state tree, `5 ** tallyProcessingStateTreeDepth` is the batch size |
758
+ | `voteOptionTreeDepth` | Depth of the vote option tree, this must be the same value passed to the `deployPoll()` contract function of `MACI.sol` |
759
759
 
760
760
  #### Input signals
761
761
 
@@ -809,7 +809,7 @@ $\mathsf{poseidon_3}([tc_r, tc_t, tc_p])$
809
809
 
810
810
  1. That the coordinator knows the preimage of `sbCommitment` (see above)
811
811
  2. That `index` is less than or equal to `totalSignups`
812
- 3. That each ballot in `ballots` is in a member of the ballot tree with the Merkle root `ballotRoot` at indices `batchStartIndex` to `batchStartIndex + (5 ** intStateTreeDepth)`
812
+ 3. That each ballot in `ballots` is in a member of the ballot tree with the Merkle root `ballotRoot` at indices `batchStartIndex` to `batchStartIndex + (5 ** tallyProcessingStateTreeDepth)`
813
813
  4. That each set of votes (`votes[i]`) has the Merkle root $blt_r$ whose value equals `ballots[i][1]`
814
814
  5. That the tally is valid, which is:
815
815
  - That the sum of votes per vote option is correct
@@ -133,7 +133,7 @@ The `MessageProcessor` contract will send the proof to a separate verifier contr
133
133
 
134
134
  #### Tally Results
135
135
 
136
- Finally, once all messages have been processed, the coordinator tallies the votes of the valid messages (off-chain). The coordinator creates a zk-SNARK proving that the valid messages in the state tree (proved in Process Messages step) contain votes that sum to the given tally result. Then, they call [`Tally.tallyVotes()`](/docs/technical-references/smart-contracts/solidity-docs/Tally#tallyvotes) with a hash of the correct tally results and the zk-SNARK proof. Similarly to the processMessages function, the `tallyVotes` function will send the proof to a verifier contract to ensure that it is valid.
136
+ Finally, once all messages have been processed, the coordinator tallies the votes of the valid messages (off-chain). The coordinator creates a zk-SNARK proving that the valid messages in the state tree (proved in Process Messages step) contain votes that sum to the given tally result. Then, they call [`Tally.tallyVotes()`](/docs/technical-references/smart-contracts/solidity-docs/Tally#tallyvotes) with a hash of the correct tally results and the zk-SNARK proof. Similarly to the `processMessages` function, the `tallyVotes` function will send the proof to a verifier contract to ensure that it is valid.
137
137
 
138
138
  <!-- "hash of the correct tally results" - so are the final results actually put on chain? or just a hash?? -->
139
139
 
@@ -77,25 +77,25 @@ Remember that if on a ARM64 chip, you will not be able to compile the c++ witnes
77
77
 
78
78
  ### Configure circomkit
79
79
 
80
- Edit `circuits/circom/circuits` to include the circuits you would like to compile. This comes already configured with the two main coordinator circuits, in both qv and non qv variants, as well as the client side circuit. The parameters are designed to support testing use cases:
80
+ Edit `circuits/circom/circuits` to include the circuits you would like to compile. This comes already configured with the main coordinator circuits, in qv, non qv and full credits variants, as well as the client side circuit. The parameters are designed to support testing use cases:
81
81
 
82
82
  ```json
83
83
  {
84
84
  "PollJoining_10_test": {
85
- "file": "./anon/voter/PollJoining",
85
+ "file": "./voter/PollJoining",
86
86
  "template": "PollJoining",
87
87
  "params": [10],
88
88
  "pubs": ["nullifier", "stateRoot", "pollPublicKey", "pollId"]
89
89
  },
90
90
  "PollJoined_10_test": {
91
- "file": "./anon/voter/PollJoined",
91
+ "file": "./voter/PollJoined",
92
92
  "template": "PollJoined",
93
93
  "params": [10],
94
94
  "pubs": ["stateRoot"]
95
95
  },
96
- "ProcessMessages_10-20-2_test": {
97
- "file": "./core/qv/processMessages",
98
- "template": "ProcessMessages",
96
+ "MessageProcessorQv_10-20-2_test": {
97
+ "file": "./coordinator/qv/MessageProcessor",
98
+ "template": "MessageProcessorQv",
99
99
  "params": [10, 20, 2],
100
100
  "pubs": [
101
101
  "totalSignups",
@@ -109,9 +109,9 @@ Edit `circuits/circom/circuits` to include the circuits you would like to compil
109
109
  "voteOptions"
110
110
  ]
111
111
  },
112
- "ProcessMessagesNonQv_10-20-2_test": {
113
- "file": "./core/non-qv/processMessages",
114
- "template": "ProcessMessagesNonQv",
112
+ "MessageProcessorNonQv_10-20-2_test": {
113
+ "file": "./coordinator/non-qv/MessageProcessor",
114
+ "template": "MessageProcessorNonQv",
115
115
  "params": [10, 20, 2],
116
116
  "pubs": [
117
117
  "totalSignups",
@@ -125,15 +125,31 @@ Edit `circuits/circom/circuits` to include the circuits you would like to compil
125
125
  "voteOptions"
126
126
  ]
127
127
  },
128
- "TallyVotes_10-1-2_test": {
129
- "file": "./core/qv/tallyVotes",
130
- "template": "TallyVotes",
128
+ "ProcessMessagesFull_10-20-2_test": {
129
+ "file": "./coordinator/non-qv/MessageProcessor",
130
+ "template": "MessageProcessorFull",
131
+ "params": [10, 20, 2],
132
+ "pubs": [
133
+ "totalSignups",
134
+ "index",
135
+ "batchEndIndex",
136
+ "currentSbCommitment",
137
+ "newSbCommitment",
138
+ "outputBatchHash",
139
+ "actualStateTreeDepth",
140
+ "coordinatorPublicKeyHash",
141
+ "voteOptions"
142
+ ]
143
+ },
144
+ "VoteTallyQv_10-1-2_test": {
145
+ "file": "./coordinator/qv/VoteTally",
146
+ "template": "VoteTallyQv",
131
147
  "params": [10, 1, 2],
132
148
  "pubs": ["index", "totalSignups", "sbCommitment", "currentTallyCommitment", "newTallyCommitment"]
133
149
  },
134
- "TallyVotesNonQv_10-1-2_test": {
135
- "file": "./core/non-qv/tallyVotes",
136
- "template": "TallyVotesNonQv",
150
+ "VoteTallyNonQv_10-1-2_test": {
151
+ "file": "./coordinator/non-qv/VoteTally",
152
+ "template": "VoteTallyNonQv",
137
153
  "params": [10, 1, 2],
138
154
  "pubs": ["index", "totalSignups", "sbCommitment", "currentTallyCommitment", "newTallyCommitment"]
139
155
  }
@@ -43,7 +43,7 @@ function signUp(PublicKey memory _publicKey, bytes memory _signUpPolicyData) pub
43
43
 
44
44
  ## InitialVoiceCreditProxy
45
45
 
46
- If you'd like to extend the functionality of how votes are distributed among users, you need to extend [InitialVoiceCreditProxy](https://github.com/privacy-scaling-explorations/maci/blob/dev/contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol) contract. You can see our [basic example](https://github.com/privacy-scaling-explorations/maci/blob/dev/contracts/contracts/initialVoiceCreditProxy/ConstantInitialVoiceCreditProxy.sol) how it's implemented for constant distribution.
46
+ If you'd like to extend the functionality of how votes are distributed among users, you'll need to build you own initial voice credit proxy contract by following the [IInitialVoiceCreditProxy interface](https://github.com/privacy-scaling-explorations/maci/blob/dev/packages/contracts/contracts/interfaces/IInitialVoiceCreditProxy.sol). You can see our [basic example](https://github.com/privacy-scaling-explorations/maci/blob/dev/packages/contracts/contracts/initialVoiceCreditProxy/ConstantInitialVoiceCreditProxy.sol) how it's implemented for constant distribution.
47
47
 
48
48
  ```ts
49
49
  contract ConstantInitialVoiceCreditProxy is InitialVoiceCreditProxy {
@@ -0,0 +1,121 @@
1
+ ---
2
+ title: MACI SDK
3
+ description: How to use the MACI SDK
4
+ sidebar_label: MACI SDK
5
+ sidebar_position: 6
6
+ ---
7
+
8
+ In this guide we will be looking at how to use the MACI SDK to interact with the MACI protocol.
9
+
10
+ ## Installation
11
+
12
+ ```bash
13
+ npm install @maci-protocol/sdk
14
+ ```
15
+
16
+ ## Browser compatibility
17
+
18
+ As the SDK imports functions from the `@maci-protocol/contracts` package which uses hardhat, certain functionality is not browser compatible.
19
+ However, all it takes to use browser compatible functions is to import from `@maci-protocol/sdk/browser`.
20
+
21
+ As an example, we can import the `signUp` function from the `@maci-protocol/sdk/browser` package.
22
+
23
+ ```typescript
24
+ import { signUp } from "@maci-protocol/sdk/browser";
25
+ ```
26
+
27
+ Let's take a look at an example of how to use the `joinPoll` function to register a user to a poll.
28
+
29
+ ### JoinPoll
30
+
31
+ This step is required to register a user to a specific poll for which they want to vote. In short, it requires the user to generate a zk-SNARK proof that they know the private key to a public key registered to the MACI contract (proving they passed the initial gatekeeping requirements). This forces them to join with the same MACI key to each poll, greatly increasing the value of the key. Should they have been allowed to join with a throwaway key, they could simply sell their key for polls they do not care about.
32
+
33
+ **How does the flow look like?**
34
+
35
+ 1. Reconstruct the MACI state tree by pulling all public keys from the MACI contract (events from RPC or from Subgraph)
36
+ 2. Generate a merkle tree inclusion proof for the user's public key
37
+ 3. Generate a zk-SNARK proof that the user knows the private key to the public key in the merkle tree inclusion proof
38
+ 4. Call the `joinPoll` function on the Poll smart contract
39
+
40
+ **How to use the SDK for this?**
41
+
42
+ > This example is browser specific, as it uses the `@maci-protocol/sdk/browser` package and WASM for witness generation
43
+
44
+ Option 1: Use the `joinPoll` function from the `@maci-protocol/sdk/browser` package.
45
+
46
+ 1. Download the `pollJoining` zk artifacts using [downloadPollJoiningArtifactsBrowser](https://github.com/privacy-scaling-explorations/maci/blob/dev/packages/sdk/ts/proof/download.ts#L46)
47
+
48
+ ```typescript
49
+ import { downloadPollJoiningArtifactsBrowser } from "@maci-protocol/sdk/browser";
50
+
51
+ const artifacts = await downloadPollJoiningArtifactsBrowser({
52
+ testing: true,
53
+ stateTreeDepth: 10,
54
+ });
55
+ ```
56
+
57
+ 2. Use the `joinPoll` function to join the poll
58
+
59
+ ```typescript
60
+ import { joinPoll } from "@maci-protocol/sdk/browser";
61
+
62
+ const joinedPollData = await joinPoll({
63
+ maciAddress: PUBLIC_MACI_ADDRESS,
64
+ privateKey: maciKeypair.privateKey.serialize(),
65
+ signer,
66
+ pollId,
67
+ inclusionProof,
68
+ pollJoiningZkey: artifacts.zKey as unknown as string,
69
+ pollWasm: artifacts.wasm as unknown as string,
70
+ sgDataArg: DEFAULT_SG_DATA,
71
+ ivcpDataArg: DEFAULT_IVCP_DATA,
72
+ blocksPerBatch: 1000,
73
+ });
74
+ ```
75
+
76
+ This is not really efficient, as we are using the user RPC to fetch events, which can be quite slow and prone to errors. A better approach is to use a Subgraph to fetch the events.
77
+
78
+ Option 2: Fetch the MACI keys using a subgraph and reconstruct the state tree locally.
79
+
80
+ 1. Deploy the subgraph - instructions [here](/guides/subgraph)
81
+ 2. Fetch the MACI keys
82
+
83
+ ```typescript
84
+ import { MaciSubgraph } from "@maci-protocol/sdk/browser";
85
+
86
+ const subgraph = new MaciSubgraph("https://api.studio.thegraph.com/query/x/maci/version/latest");
87
+
88
+ const keys = await subgraph.getKeys();
89
+ ```
90
+
91
+ 3. Generate the merkle tree
92
+
93
+ ```typescript
94
+ import { generateSignUpTreeFromKeys } from "@maci-protocol/sdk/browser";
95
+
96
+ const signUpTree = generateSignUpTreeFromKeys(keys);
97
+ ```
98
+
99
+ 4. Generate the inclusion proof - you will need to know the index of the user's public key in the merkle tree
100
+
101
+ ```typescript
102
+ const inclusionProof = signUpTree.generateProof(publicKeyIndex);
103
+ ```
104
+
105
+ 5. Generate the zk-SNARK proof and join the poll
106
+
107
+ ```typescript
108
+ import { joinPoll } from "@maci-protocol/sdk/browser";
109
+
110
+ const joinedPollData = await joinPoll({
111
+ maciAddress: PUBLIC_MACI_ADDRESS,
112
+ privateKey: maciKeypair.privateKey.serialize(),
113
+ signer,
114
+ pollId,
115
+ inclusionProof,
116
+ pollJoiningZkey: artifacts.zKey as unknown as string,
117
+ pollWasm: artifacts.wasm as unknown as string,
118
+ sgDataArg: DEFAULT_SG_DATA,
119
+ ivcpDataArg: DEFAULT_IVCP_DATA,
120
+ });
121
+ ```
@@ -162,7 +162,7 @@ The core package contains a number of tests that are used to verify that the cor
162
162
 
163
163
  These tests interact with the crypto and dombinobjs packages, where mock data comes from. Their main goal is to ensure that the core functions work as expected, and that the state is as expected after a series of operations.
164
164
 
165
- Currently, there is a blend of e2e and unit tests, where e2e tests are used to verify that the entire MACI local processing works as expected (users signup, publish votes, messages are processed and finally these votes are tallied). Unit tests on the other hand are used to verify that the core functions work as expected, such as `processMessage` and `tallyVotes`. You will find them in separate files, with e2e being [here](https://github.com/privacy-scaling-explorations/maci/blob/dev/core/ts/__tests__/e2e.test.ts) and unit tests in the other files.
165
+ Currently, there is a blend of e2e and unit tests, where e2e tests are used to verify that the entire MACI local processing works as expected (users signup, publish votes, messages are processed and finally these votes are tallied). Unit tests on the other hand are used to verify that the core functions work as expected, such as `MessageProcessor` and `VoteTally`. You will find them in separate files, with e2e being [here](https://github.com/privacy-scaling-explorations/maci/blob/dev/core/ts/__tests__/e2e.test.ts) and unit tests in the other files.
166
166
 
167
167
  ### Domainobjs/Crypto tests
168
168
 
@@ -53,6 +53,32 @@ To run Contracts only tests, run:
53
53
  pnpm run test
54
54
  ```
55
55
 
56
+ To run e2e tests for hardhat tasks for `contracts` using the in-memory hardhat network:
57
+
58
+ ```bash
59
+ pnpm run test:hardhat
60
+ ```
61
+
62
+ You can update the `deploy-config.json` file to change policies or other deployment settings used by the test.
63
+
64
+ You can enhance test reporting and gas cost estimation by adding the following variables to your `.env` file:
65
+
66
+ ```bash
67
+ # CoinMarkerCap api key for prices (gas reporter)
68
+ COINMARKETCAP_API_KEY=
69
+ # Gas price for gas reporter
70
+ # Allows you to manually specify the gas price (e.g. 3 gwei)
71
+ GAS_REPORTER_PRICE=
72
+ ```
73
+
74
+ These variables are used by `hardhat-gas-reporter` to show cost estimates for gas usage in the test reports.
75
+
76
+ If you would like to run these E2E tests against a different [supported networks](/docs/supported-networks/), you can override the network like this:
77
+
78
+ ```bash
79
+ pnpm exec hardhat test --network {NETWORK} ./tests/e2e/hardhatTasks.test.ts
80
+ ```
81
+
56
82
  ### Circuits
57
83
 
58
84
  To test the circuits, from the main `maci/` directory, run:
@@ -71,10 +97,10 @@ or download them. Please remember to not use these testing `.zkey` files in prod
71
97
 
72
98
  ### Download `.zkey` files or the witness generation binaries
73
99
 
74
- MACI has two main zk-SNARK circuits, `processMessages` and `tallyVotes`.
100
+ MACI has two main zk-SNARK circuits, `MessageProcessor` and `VoteTally`.
75
101
 
76
102
  :::info
77
- The `processMessages` and `tallyVotes` circuits are also provided in a non-quadratic voting (non-QV) version. Currently these new versions have not undergone a trusted setup ceremony.
103
+ The `MessageProcessor` and `VoteTally` circuits are also provided in a non-quadratic voting (non-QV) and in a full credits voting (full) versions. Currently these new versions have not undergone a trusted setup ceremony.
78
104
  :::
79
105
 
80
106
  Each circuit is parameterised and there should be one
@@ -151,6 +177,12 @@ To run e2e tests with normal voting (not quadratic voting):
151
177
  pnpm run test:e2e-non-qv
152
178
  ```
153
179
 
180
+ To run e2e tests with full credits voting (full):
181
+
182
+ ```bash
183
+ pnpm run test:e2e-full
184
+ ```
185
+
154
186
  To run integration tests:
155
187
 
156
188
  ```bash