@maci-protocol/website 0.0.0-ci.0bef05d → 0.0.0-ci.0c66f42

package/LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Barry WhiteHat, Kendrick Tan, Kobi Gurkan, Kirill Goncharov
-Cory Dickson, Han Jian, Chih-Cheng Liang, and Koh Wei Jie
+Copyright (c) 2025 Ethereum Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/blog/2024-02-28-maci-v1.2.0.md

@@ -106,7 +106,7 @@ For those looking to contribute directly, report bugs, or offer feedback, our [G
 
 For practical implementation insights, review our docs as well as the [clr.fund](https://github.com/clrfund/monorepo/) and [QF](https://github.com/quadratic-gardens/qfi) repositories as reference implementations. Both are quadratic funding implementations, a mechanism which otherwise is highly susceptible to collusion and bribery. Most notably, clr.fund is already working on integrating MACI v1.2.0, after having used v0.x until now. You can follow their development effort under this [GitHub branch](https://github.com/clrfund/monorepo/tree/feat/maci-v1).
 
-For any other questions or feedback, please reach out to us via [PSE's Discord](https://discord.com/invite/sF5CT5rzrR), in our [`#🗳️-maci` channel](https://https//discord.com/channels/943612659163602974/1164613809730748507). We're excited to connect and collaborate with you!
+For any other questions or feedback, please reach out to us via [PSE's Discord](https://discord.com/invite/sF5CT5rzrR), in our [`#🗳️-maci` channel](https://discord.com/channels/943612659163602974/1164613809730748507). We're excited to connect and collaborate with you!
 
 ## References
 

package/blog/2024-08-10-maci-v2.md

@@ -84,7 +84,7 @@ For those looking to contribute directly, report bugs, or offer feedback, our [G
 
 For practical implementation insights, review our docs as well as the [clr.fund](https://github.com/clrfund/monorepo/), [Allo Stack with MACI](https://github.com/gitcoinco/MACI_QF), and [maci-platform](https://github.com/privacy-scaling-explorations/maci-platform) repositories as reference implementations. The first two integrations are quadratic funding implementations, a mechanism which otherwise is highly susceptible to collusion and bribery.
 
-For any other questions or feedback, please reach out to us via [PSE's Discord](https://discord.com/invite/sF5CT5rzrR), in our [`#🗳️-maci` channel](https://https//discord.com/channels/943612659163602974/1164613809730748507). We're excited to connect and collaborate with you!
+For any other questions or feedback, please reach out to us via [PSE's Discord](https://discord.com/invite/sF5CT5rzrR), in our [`#🗳️-maci` channel](https://discord.com/channels/943612659163602974/1164613809730748507). We're excited to connect and collaborate with you!
 
 ## References
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maci-protocol/website",
-  "version": "0.0.0-ci.0bef05d",
+  "version": "0.0.0-ci.0c66f42",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -41,7 +41,7 @@
     "@docusaurus/module-type-aliases": "^3.7.0",
     "@docusaurus/tsconfig": "^3.7.0",
     "@docusaurus/types": "^3.7.0",
-    "@types/node": "^22.14.1",
+    "@types/node": "^22.15.8",
     "@types/react": "^19.1.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
@@ -61,5 +61,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "2b18e370edea4dfb301502ce357e2e9adeb8e4ca"
+  "gitHead": "fd9706322f18b8c738a757ca6184dc450c0d824e"
 }

package/src/pages/roadmap.md

@@ -8,14 +8,14 @@ description: An outline of the 2024 MACI team & product roadmap
 _This public roadmap is part of our core team's efforts to make our work more accessible and to foster more collaboration from our open source community. We plan to re-assess & iterate on our roadmap over time, and will update this document when we do._
 
 :::info
-This document aims to outline the 2024 MACI roadmap. Our roadmap is under constant discussion and evolution (e.g. see our [Q1](/blog/2024-team-roadmap) and [Q2](/blog/2024-q2-roadmap) updates) but we try our best to maintain this page to provide a high-level overview. Please join the conversation in our [latest GitHub discussion](https://github.com/privacy-scaling-explorations/maci/discussions/1381) if you have feedback!
+This document aims to outline the 2025 MACI roadmap. Our roadmap is under constant discussion and evolution (e.g. see our [high level 2025 roadmap](/blog/2025-roadmap) updates) but we try our best to maintain this page to provide a high-level overview. Please join the conversation in our [discord server](https://discord.com/invite/sF5CT5rzrR) if you have feedback!
 
-**Last updated: 2024-04-16**
+**Last updated: 2025-04-23**
 :::
 
 ## Team description
 
-The MACI core team is a small collaborative engineering team building various projects within [Privacy & Scaling Explorations (PSE)](https://pse.dev/). Our sustained focus is on MACI: an on-chain voting protocol that provides greatly increased collusion resistance & privacy. We also allocate a significant portion of our time to support the practical adoption of this technology by supporting community leaders to run democratic governance and public funding initiatives, like Quadratic Voting (QV), Quadratic Funding (QF), and Retroactive Public Goods Funding (RPGF) grant rounds.
+The MACI core team is a small collaborative engineering team building various projects within [Privacy & Scaling Explorations (PSE)](https://pse.dev/). Our sustained focus is on MACI: an on-chain voting protocol that provides greatly increased collusion resistance & privacy. We also allocate a portion of our time to support the practical adoption of this technology by supporting community leaders to run democratic governance and public funding initiatives, like Quadratic Voting (QV), Quadratic Funding (QF), and Retroactive Public Goods Funding (RPGF) grant rounds.
 
 ## MACI mission & vision
 
@@ -29,8 +29,8 @@ Short term, our vision is to empower developers to build with MACI to create col
 
 1. ~~2021: MACI integrated by an ecosystem project~~ (✅, [clr.fund](https://github.com/clrfund/monorepo/))
 2. ~~2023: MACI integrated by a PSE project~~ (✅, [QF](https://github.com/privacy-scaling-explorations/qf))
-3. 2024: MACI integrated by an additional external project
-4. 2025: MACI used by multiple DAOs for governance applications & QF integrations
+3. ~~2024: MACI integrated by an additional external project~~ (✅, [PriVote](https://github.com/PriVote-Project), [Gitcoin](https://github.com/gitcoinco/MACI_QF))
+4. 2025: MACI used by multiple DAOs for governance applications
 5. 2028: MACI used in smaller municipal elections (counties, provinces, etc)
 6. 2030: MACI used in national elections
 
@@ -38,110 +38,69 @@ Short term, our vision is to empower developers to build with MACI to create col
 
 1. ~~2021: release MACI v1.0~~ (✅)
 2. ~~2023: build technical feasibility for 10K concurrent voters on the platform~~ (✅)
-3. 2024 Q1: release MACI v1.2, with revamped documentation & educational resource
-4. 2026: build technical feasibility for 100K concurrent voters on the platform
-5. 2028: build technical feasibility for 1M concurrent voters on the platform
+3. 2024:
 
-# 2024 workstreams
+- ~~Q1: release MACI v1.2, with revamped documentation & educational resource~~ (✅)
+- ~~Q3: release MACI v2.0, with cleaner code and improved UX~~ (✅)
 
-_To achieve our mission, we’re focused on 4 major workstreams that comprise our roadmap._
+4. 2025: release MACI v3.0, with new features for a more scalable and flexible platform
+5. 2026: build technical feasibility for 100K concurrent voters on the platform
+6. 2028: build technical feasibility for 1M concurrent voters on the platform
 
-## 1) MACI Developer Experience (DX)
+# 2025 workstreams
 
-~_50% of team’s total bandwidth_
+In 2025, we are focusing on several initiatives to support the practical adoption of MACI.
 
-We believe that MACI is only useful to the extent that people use MACI & build on MACI.
+## 1) MACI v3.0
 
-Despite the power of MACI, not a single project has yet integrated MACI v1.x in a production environment. We view this as a failure, and we want to fix this. **The goal of this workstream is to make MACI as easy to understand and easy to integrate as possible.**
+This new version comes with features that have been requested in the past, such as polls being more customisable, in terms of voice credits assigned to voters, and gatekeeping mechanisms.
 
-### Initiatives within this workstream:
+At a high level, the new features/improvements are:
 
-- Implement & release a MACI v1.2 ([#856](https://github.com/privacy-scaling-explorations/maci/issues/856))
-  - Refactor the codebase for improved quality, readability & modularity
-  - Add code comments (with [TypeDoc](https://typedoc.org/) & [NatSpec](https://docs.soliditylang.org/en/latest/natspec-format.html)) to improve productivity
-  - Improve tooling (e.g. cross-platform support) for ease of integration & performance
-- Improve/create documentation for developer onboarding & education
-  - Revamp documentation stack (via Docusaurus) with versioning & additional resources
-  - Voter & coordinator guides to understand full poll lifecycle
-- Build app templates & tutorials that can serve as reference implementations
+- Custom voice credits per poll
+- Custom gatekeeping per poll
+- Replacement of vote merkle trees for more efficient hash-chains
+- Offchain voting via MACI's relayer service
 
-**References**
+## 2) Coordinator Service
 
-- [MACI v1.2 Refactoring Plan](https://github.com/privacy-scaling-explorations/maci/issues/856)
-- [MACI development team sprint board](https://github.com/orgs/privacy-scaling-explorations/projects/40)
-- [MACI v1.1.1 refactor milestone](https://github.com/privacy-scaling-explorations/maci/milestone/5)
+The coordinator service is a service to automate MACI coordinator functionality. This includes:
 
-## 2) MACI Community Engagement
+- Contract deployment
+- Subgraph deploying
+- Proof generation
+- Proof and results submission
 
-_~15% of team’s total bandwidth_
+This service exposes a REST API, as well as some Websocket endpoints (for proof generation only). Our goal is to release an efficient and easy to use service that can be used by any application that builds atop of MACI.
 
-We want to proactively support adoption of MACI. **We’ll create an open source community where integrations & contributions are actively encouraged!**
+## 3) Integration with DAO's tooling provider
 
-This workstream relates closely to improving DX but focuses on areas that will require active maintenance, support & engagement from our team vs. improving code, documentation & educational resources that will be available online 24/7/365.
+As an effort to support DAO governance, and help solve their issues with bribery and collusion, MACI is focusing on integrating with DAO's tooling providers.
 
-The hope here is that close interactions with integration developers & Ethereum community members will help us gather insightful user feedback so that we iterate faster to improve MACI as a product. We’ll be rolling out an agile scrum development workflow that should allow us to rapidly respond to input from the community to guide our roadmap & product direction.
+To start with, MACI is integrating with [Aragon](https://aragon.org/) by building a voting [plugin](https://github.com/privacy-scaling-explorations/maci-voting-plugin).
 
-### Initiatives within this workstream:
+In the future, we plan to continue working with other partners such as [Agora](https://www.agora.xyz/), and help them offer DAOs secure and private voting.
 
-- Allocate team bandwidth to be available to respond to the community
-  - Support MACI integrations (starting with [clr.fund](http://clr.fund/) v1.x integration)
-  - Revamp GitHub repo maintenance ([MACI GH processes](https://github.com/privacy-scaling-explorations/maci/issues/757))
-  - Establish & respond to public channels ([Discord](https://discord.com/invite/sF5CT5rzrR), [Twitter](https://twitter.com/zkMACI))
-- Proactively engage with the ecosystem to identify collaboration opportunities (conference talks, hackathon bounties, social media)
-- Update our development processes to quickly react to user needs & input
+## 4) Coordinator decentralisation
 
-## 3) Quadratic Funding Experiments
+It's no secret that one of MACI long standing issues has having a centralised coordinator. They are able to see all of the votes in cleartext, which allows them to collude with bribers themselves, as well as voters. As we look to tackle use cases such as DAO governance where large quantities of money are involved in proposals, we need to ensure that collusion between the coordinator and voters/bribers is reduced. This can be accomplished in several ways:
 
-_~30% of team’s total bandwidth_
+- Use Multi Party Computation (MPC)
+- Use Homomorphic Encryption (HE)
+- Use a Trusted Execution Environment (TEE)
 
-We’re building technical infrastructure, operational expertise & a network of communities to create a scalable way to enable community organizers to run QF rounds. The mission of our QF project has been to serve as a reference implementation on how to integrate MACI as well as support the practical adoption of this community-funding technology.
-
-[Read more about our QF initiatives here](https://qf.pse.dev/about).
-
-### 2024 goal
-
-- Help run 12 QF/QV rounds
-
-### Initiatives within this workstream:
-
-- Build an evaluation framework of QF rounds, to increase our sophistication around how we measure success
-- Landscape analysis of QF & capital-allocation projects to better understand how our efforts fit in within the broader ecosystem
-- Update & expand our [QF website](https://qf.pse.dev/), with public launch to generate inbound interest
-- Explore community collaboration opportunities (running QF rounds)
-- Exploring project collaboration opportunities (supporting MACI/QF integrations)
-
-**References**
-
-- [GitHub](https://github.com/privacy-scaling-explorations/qf)
-- [Website](https://qf.pse.dev/)
+We plan to research the best approach and start the implementation within the year.
 
 ## Future R&D
 
 While not prioritized as an upcoming workstream, we think it’s worth calling out important areas of research & development that we’re excited to work on in the future:
 
-### MACI Coordinator Service
-
-- The primary responsibility of the Coordinator Service will be to:
-  - offload and automate the tasks performed by the human coordinator
-  - minimize proving time by parallelizing SNARK proof generation and making MACI easier to adopt
-- [GitHub repo](https://github.com/privacy-scaling-explorations/maci-coordinator)
-
-### QF stack
-
-- To serve as a reference implementation on how to integrate MACI as well as support the practical adoption of this community-funding technology.
-- Improvements
-  - Support QF (as of now only supports QV functionality)
-  - Make it easier for operators to run rounds
-  - Make it easier for end users to use
-- [GitHub repo](https://github.com/privacy-scaling-explorations/qf)
-
 ### MACI improvements
 
-- Unconditional Voter Privacy (e.g. [ElGamal Key Change Mechanism](https://github.com/privacy-scaling-explorations/maci/issues/796))
 - Scaling explorations, like SNARK Folding Schemes (e.g. [Nova integration](https://github.com/privacy-scaling-explorations/maci/issues/904))
 - Different matching mechanisms (e.g. [Group Wise Matching in Quadratic Funding](https://github.com/privacy-scaling-explorations/maci/issues/905))
-- Gas-less MACI for voters
-- Gas efficiency
+- Re-implementation of previously removed features such as [Topup](https://github.com/privacy-scaling-explorations/maci/issues/1384) and [Subsidy](https://github.com/privacy-scaling-explorations/maci/issues/1348)
+- [Benchmarks](https://github.com/privacy-scaling-explorations/maci/issues/1197) for the whole stack
 
 ## Feedback
 

package/static/img/circuits/MACI-Circuits.excalidraw

@@ -1189,7 +1189,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "Ka6q_sOFuLWnYbQS69ZUD",
-      "originalText": "currentPerVOSpentVoiceCredits",
+      "originalText": "currentPerVoteOptionSpentVoiceCredits",
       "lineHeight": 1.25,
       "baseline": 43
     },
@@ -1259,7 +1259,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "FFbwZ9KFPAsGY6MsR7hzw",
-      "originalText": "currentPerVOSpentVoiceCreditsRootSalt",
+      "originalText": "currentPerVoteOptionSpentVoiceCreditsRootSalt",
       "lineHeight": 1.25,
       "baseline": 43
     },
@@ -1399,7 +1399,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "P8MkdLX2TZ0mzOyGUENvn",
-      "originalText": "newPerVOSpentVoiceCreditsRootSalt",
+      "originalText": "newPerVoteOptionSpentVoiceCreditsRootSalt",
       "lineHeight": 1.25,
       "baseline": 43
     },
@@ -2549,11 +2549,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "QuinCheckRoot",
+      "text": "QuinaryCheckRoot",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "_LzZ_0ySFRhMabKhKEY5g",
-      "originalText": "QuinCheckRoot",
+      "originalText": "QuinaryCheckRoot",
       "lineHeight": 1.25,
       "baseline": 18
     },
@@ -6673,11 +6673,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "Create a component \n(QuinLeafExists) to \nbe used to verify if \na leaf exists in a \nquinary tree of \ndepth k",
+      "text": "Create a component \n(QuinaryLeafExists) to \nbe used to verify if \na leaf exists in a \nquinary tree of \ndepth k",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "U1TgqoQPYFJ-IpYJH1YPi",
-      "originalText": "Create a component (QuinLeafExists) to be used to verify if a leaf exists in a quinary tree of depth k",
+      "originalText": "Create a component (QuinaryLeafExists) to be used to verify if a leaf exists in a quinary tree of depth k",
       "lineHeight": 1.25,
       "baseline": 143
     },
@@ -6743,11 +6743,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "Create a component \n(QuinGeneratePathIndices)\nto generate the indices of\nthe path from a leaf to \nthe root of a quinary \ntree with a depth of k",
+      "text": "Create a component \n(QuinaryGeneratePathIndices)\nto generate the indices of\nthe path from a leaf to \nthe root of a quinary \ntree with a depth of k",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "orVHz7nJqEs72nf3bbdnO",
-      "originalText": "Create a component (QuinGeneratePathIndices) to generate the indices of the path from a leaf to the root of a quinary tree with a depth of k",
+      "originalText": "Create a component (QuinaryGeneratePathIndices) to generate the indices of the path from a leaf to the root of a quinary tree with a depth of k",
       "lineHeight": 1.25,
       "baseline": 143
     },
@@ -9103,7 +9103,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "YmzPJYWprUZQljBOVqXpA",
-      "originalText": "currentPerVOSpentVoiceCredits (array of len 5 ** voteOptionTreeDepth)",
+      "originalText": "currentPerVoteOptionSpentVoiceCredits (array of len 5 ** voteOptionTreeDepth)",
       "lineHeight": 1.25,
       "baseline": 93
     },
@@ -9173,7 +9173,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "RhVKxQeKIVq3XFFbQdqOz",
-      "originalText": "currentPerVOSpentVoiceCreditsRootSalt",
+      "originalText": "currentPerVoteOptionSpentVoiceCreditsRootSalt",
       "lineHeight": 1.25,
       "baseline": 43
     },
@@ -9243,7 +9243,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "xJQ2p5b5ivfhgaFnfz4zB",
-      "originalText": "newPerVOSpentVoiceCreditsRootSalt",
+      "originalText": "newPerVoteOptionSpentVoiceCreditsRootSalt",
       "lineHeight": 1.25,
       "baseline": 43
     },
@@ -9313,7 +9313,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "0HQ9uPXuwUodD7cUlnZvz",
-      "originalText": "newPerVOSpentVoiceCredits (array of len 5 ** voteOptionTreeDepth)",
+      "originalText": "newPerVoteOptionSpentVoiceCredits (array of len 5 ** voteOptionTreeDepth)",
       "lineHeight": 1.25,
       "baseline": 68
     },
@@ -9449,11 +9449,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "use QuinCheckRoot and\npass all items in the \ncurrentResults array \nas leaves",
+      "text": "use QuinaryCheckRoot and\npass all items in the \ncurrentResults array \nas leaves",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "IX3IZOFFnhQHnB0YR0Bv_",
-      "originalText": "use QuinCheckRoot and pass all items in the currentResults array as leaves",
+      "originalText": "use QuinaryCheckRoot and pass all items in the currentResults array as leaves",
       "lineHeight": 1.25,
       "baseline": 93
     },
@@ -9887,11 +9887,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "use QuinCheckRoot and\npass all items in \ncurrentPerVOSpentVoice\nCredits",
+      "text": "use QuinaryCheckRoot and\npass all items in \ncurrentPerVOSpentVoice\nCredits",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "UH_pzDK5btI67K5tIpJcD",
-      "originalText": "use QuinCheckRoot and pass all items in currentPerVOSpentVoiceCredits",
+      "originalText": "use QuinaryCheckRoot and pass all items in currentPerVoteOptionSpentVoiceCredits",
       "lineHeight": 1.25,
       "baseline": 93
     },
@@ -10447,11 +10447,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "use QuinCheckRoot and\npass all items in \nnewResults",
+      "text": "use QuinaryCheckRoot and\npass all items in \nnewResults",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "t5C6u4jkasHqnjO2tWH5N",
-      "originalText": "use QuinCheckRoot and pass all items in newResults",
+      "originalText": "use QuinaryCheckRoot and pass all items in newResults",
       "lineHeight": 1.25,
       "baseline": 68
     },
@@ -11103,11 +11103,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "use QuinCheckRoot and\npass all items in \ncurrentPerVOSpentVoice\nCredits",
+      "text": "use QuinaryCheckRoot and\npass all items in \ncurrentPerVOSpentVoice\nCredits",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "7r_7R5GsIuz_WZCd0FXJ-",
-      "originalText": "use QuinCheckRoot and pass all items in currentPerVOSpentVoiceCredits",
+      "originalText": "use QuinaryCheckRoot and pass all items in currentPerVoteOptionSpentVoiceCredits",
       "lineHeight": 1.25,
       "baseline": 93
     },
@@ -26149,11 +26149,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "QuinSelector",
+      "text": "QuinarySelector",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "KM37UhqGRX02_32yEZ2Yd",
-      "originalText": "QuinSelector",
+      "originalText": "QuinarySelector",
       "lineHeight": 1.25,
       "baseline": 18
     },
@@ -28203,11 +28203,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "3. use QuinSelector  to \nget the item at position\ni - \nSafeGreaterThan.output",
+      "text": "3. use QuinarySelector  to \nget the item at position\ni - \nSafeGreaterThan.output",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "ssreY_O_CPwIczz4kfc1O",
-      "originalText": "3. use QuinSelector  to get the item at position i - SafeGreaterThan.output",
+      "originalText": "3. use QuinarySelector  to get the item at position i - SafeGreaterThan.output",
       "lineHeight": 1.25,
       "baseline": 93
     },
@@ -28603,7 +28603,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "Z-HG6ZrP082-nOCFy1YgN",
-      "originalText": "4. Inner loop through all items and pass them to QuinSelector as inputs \nThe last item will be zero (position numItems)",
+      "originalText": "4. Inner loop through all items and pass them to QuinarySelector as inputs \nThe last item will be zero (position numItems)",
       "lineHeight": 1.25,
       "baseline": 118
     },
@@ -28861,11 +28861,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "6. Use a Mux component to select either the output of\nthe QuinSelector component or the leaf, based on the \ncheck above (i == index)",
+      "text": "6. Use a Mux component to select either the output of\nthe QuinarySelector component or the leaf, based on the \ncheck above (i == index)",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "D8_CUeG0Uc4pAC4eGOc3i",
-      "originalText": "6. Use a Mux component to select either the output of the QuinSelector component or the leaf, based on the check above (i == index)",
+      "originalText": "6. Use a Mux component to select either the output of the QuinarySelector component or the leaf, based on the check above (i == index)",
       "lineHeight": 1.25,
       "baseline": 68
     },
@@ -30065,11 +30065,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "pass leaves as input \nto QuinCheckRoot",
+      "text": "pass leaves as input \nto QuinaryCheckRoot",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "jKT_vEvWHQ69qEoDNFX-p",
-      "originalText": "pass leaves as input to QuinCheckRoot",
+      "originalText": "pass leaves as input to QuinaryCheckRoot",
       "lineHeight": 1.25,
       "baseline": 43
     },
@@ -30135,11 +30135,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "2. Check whether the\n Merkle path is valid\nusing QuinLeafExists",
+      "text": "2. Check whether the\n Merkle path is valid\nusing QuinaryLeafExists",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "adR0SNf4bBfWWL43KZ-VF",
-      "originalText": "2. Check whether the  Merkle path is valid using QuinLeafExists",
+      "originalText": "2. Check whether the  Merkle path is valid using QuinaryLeafExists",
       "lineHeight": 1.25,
       "baseline": 68
     },
@@ -30401,7 +30401,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "jnCqO_Kng7pfOz-pguNHV",
-      "originalText": "wire each index and each element in the path to QuinLeafExists",
+      "originalText": "wire each index and each element in the path to QuinaryLeafExists",
       "lineHeight": 1.25,
       "baseline": 93
     },
@@ -30527,11 +30527,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "QuinGeneratePathIndices",
+      "text": "QuinaryGeneratePathIndices",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "GW-hi-qav0ueA8sR-M5Ik",
-      "originalText": "QuinGeneratePathIndices",
+      "originalText": "QuinaryGeneratePathIndices",
       "lineHeight": 1.25,
       "baseline": 18
     },
@@ -32253,7 +32253,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "bSA55On1arxFx17gCZtu1",
-      "originalText": "pass the batch path indices generated using QuinGeneratePathIndices (index is the batchStartIndex)",
+      "originalText": "pass the batch path indices generated using QuinaryGeneratePathIndices (index is the batchStartIndex)",
       "lineHeight": 1.25,
       "baseline": 118
     },
@@ -34681,7 +34681,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "1fLeQ-eWvRjbp-sQ1_cB3",
-      "originalText": "5. Get the path indices (to locate the leaf in the quinary tree) using QuinGeneratePathIndices",
+      "originalText": "5. Get the path indices (to locate the leaf in the quinary tree) using QuinaryGeneratePathIndices",
       "lineHeight": 1.25,
       "baseline": 93
     },
@@ -34751,7 +34751,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "W3DYw37cCcJuxiN1FgpDq",
-      "originalText": "6. Generate a Merkle proof for the leaf using QuinTreeInclusionProof",
+      "originalText": "6. Generate a Merkle proof for the leaf using QuinaryTreeInclusionProof",
       "lineHeight": 1.25,
       "baseline": 68
     },
@@ -34821,7 +34821,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "JHcNIMtzJsmlJl0UNRBY7",
-      "originalText": "7. Extract the root from QuinTreeInclusionProof and wire to the output signal newStateRoot",
+      "originalText": "7. Extract the root from QuinaryTreeInclusionProof and wire to the output signal newStateRoot",
       "lineHeight": 1.25,
       "baseline": 93
     },
@@ -37587,7 +37587,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "DAdZGk6TuI5kqqPswL_r5",
-      "originalText": "4. Generate path indices for the state tree and the state index (QuinGeneratePathIndices)",
+      "originalText": "4. Generate path indices for the state tree and the state index (QuinaryGeneratePathIndices)",
       "lineHeight": 1.25,
       "baseline": 143
     },
@@ -37735,7 +37735,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "C6UUKyYdFcnudu5ifYFSE",
-      "originalText": "1. hash the state leaf\n2. pass the hash as leaf to QuinTreeInclusionProof\n3. pass the path indices and the path elements\n4. currentStateRoot == QuinTreeInclusionProof.root",
+      "originalText": "1. hash the state leaf\n2. pass the hash as leaf to QuinaryTreeInclusionProof\n3. pass the path indices and the path elements\n4. currentStateRoot == QuinaryTreeInclusionProof.root",
       "lineHeight": 1.25,
       "baseline": 168
     },
@@ -37931,11 +37931,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "1. hash the ballot\n2. use QuinTreeInclusionProof to \ngenerate the root and proof by \npassing the hashed ballot, the path \nelements and the path indicess\n3. check that the currentBallotRoot\nmatches the output root of the \nabove steps",
+      "text": "1. hash the ballot\n2. use QuinaryTreeInclusionProof to \ngenerate the root and proof by \npassing the hashed ballot, the path \nelements and the path indicess\n3. check that the currentBallotRoot\nmatches the output root of the \nabove steps",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "90l8-9LYOX0ns9PTVavyf",
-      "originalText": "1. hash the ballot\n2. use QuinTreeInclusionProof to generate the root and proof by passing the hashed ballot, the path elements and the path indicess\n3. check that the currentBallotRoot matches the output root of the above steps",
+      "originalText": "1. hash the ballot\n2. use QuinaryTreeInclusionProof to generate the root and proof by passing the hashed ballot, the path elements and the path indicess\n3. check that the currentBallotRoot matches the output root of the above steps",
       "lineHeight": 1.25,
       "baseline": 193
     },
@@ -38477,11 +38477,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "5. Generate root using QuinTreeInclusionProof\nleaf = currentVoteWeight\npass the path indices generated at the step\nabove\npass the pathElements which were the circuit \ninputs",
+      "text": "5. Generate root using QuinaryTreeInclusionProof\nleaf = currentVoteWeight\npass the path indices generated at the step\nabove\npass the pathElements which were the circuit \ninputs",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "AoZnLeeF6isDjqVc1garh",
-      "originalText": "5. Generate root using QuinTreeInclusionProof\nleaf = currentVoteWeight\npass the path indices generated at the step above\npass the pathElements which were the circuit inputs",
+      "originalText": "5. Generate root using QuinaryTreeInclusionProof\nleaf = currentVoteWeight\npass the path indices generated at the step above\npass the pathElements which were the circuit inputs",
       "lineHeight": 1.25,
       "baseline": 143
     },
@@ -38787,11 +38787,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "use QuinTreeInclusionProof:\n- leaf will be newVoteweight if the \nmessage was valid or the current \nvoteWeight\n- path indices were calculated \nbefore in step 7.4\n- path elements are the inputs",
+      "text": "use QuinaryTreeInclusionProof:\n- leaf will be newVoteweight if the \nmessage was valid or the current \nvoteWeight\n- path indices were calculated \nbefore in step 7.4\n- path elements are the inputs",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "B4RctsUugu9ROp0z1fHxz",
-      "originalText": "use QuinTreeInclusionProof:\n- leaf will be newVoteweight if the message was valid or the current voteWeight\n- path indices were calculated before in step 7.4\n- path elements are the inputs",
+      "originalText": "use QuinaryTreeInclusionProof:\n- leaf will be newVoteweight if the message was valid or the current voteWeight\n- path indices were calculated before in step 7.4\n- path elements are the inputs",
       "lineHeight": 1.25,
       "baseline": 168
     },
@@ -38913,7 +38913,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "t_JxpP8YPj8nNbxhYpDZB",
-      "originalText": "if the message was valid then the root will be the output of the QuinTreeInclusionProof.root otherwise it will be the original root (decided using Mux1)",
+      "originalText": "if the message was valid then the root will be the output of the QuinaryTreeInclusionProof.root otherwise it will be the original root (decided using Mux1)",
       "lineHeight": 1.25,
       "baseline": 118
     },
@@ -39163,11 +39163,11 @@
       "locked": false,
       "fontSize": 20,
       "fontFamily": 1,
-      "text": "generate the new root starting from \nthis leaf using QuinTreeInclusionProof",
+      "text": "generate the new root starting from \nthis leaf using QuinaryTreeInclusionProof",
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "L5mW9SvPnDqoLTaGRA-81",
-      "originalText": "generate the new root starting from this leaf using QuinTreeInclusionProof",
+      "originalText": "generate the new root starting from this leaf using QuinaryTreeInclusionProof",
       "lineHeight": 1.25,
       "baseline": 43
     },
@@ -39569,7 +39569,7 @@
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "4jJHqRtHbkjYY60KaoOne",
-      "originalText": "generate the new root starting from this leaf using QuinTreeInclusionProof",
+      "originalText": "generate the new root starting from this leaf using QuinaryTreeInclusionProof",
       "lineHeight": 1.25,
       "baseline": 68
     },