docs: add doc entries for new maci version (currently being developed)

add docs for maci v1.3-alpha, which will include changes to the protocol and thus allow to keep the
docs for version up to 1.2 untouched and available for users who want a stable MACI version.

.gitignore

@@ -13,7 +13,6 @@ solc
 cli/tally.json
 **/test_tally.json
 **/tally.json
-**/subsidy.json
 integrationTests/test_tally.json
 integrationTests/artifacts/**
 deployedAddresses.json

circuits/README.md

@@ -9,7 +9,6 @@ The main circuits are:
 
 - `processMessages.circom`
 - `tallyVotes.circom`
-- (optional) `subsidy.circom`
 
 The rest of the circuits are utilities templates that are required for the main circuits to work correctly. These include utilities such as float math, conversion of private keys, and Poseidon hashing/encryption.
 

cli/package.json

@@ -30,7 +30,6 @@
     "test:ceremony": "ts-mocha --exit tests/ceremony-params/ceremonyParams.test.ts",
     "test:e2e": "ts-mocha --exit tests/e2e/e2e.test.ts",
     "test:e2e-non-qv": "ts-mocha --exit tests/e2e/e2e.nonQv.test.ts",
-    "test:e2e-subsidy": "ts-mocha --exit tests/e2e/e2e.subsidy.test.ts",
     "test:keyChange": "ts-mocha --exit tests/e2e/keyChange.test.ts",
     "test:unit": "nyc ts-mocha --exit tests/unit/*.test.ts",
     "test:airdrop": "nyc ts-mocha --exit tests/unit/airdrop.test.ts",

contracts/deploy-config-example.json

@@ -29,7 +29,6 @@
     "Poll": {
       "pollDuration": 30,
       "coordinatorPubkey": "macipk.9a59264310d95cfd8eb7083aebeba221b5c26e77427f12b7c0f50bc1cc35e621",
-      "subsidyEnabled": false,
       "useQuadraticVoting": true
     }
   }

website/.gitignore

@@ -19,6 +19,9 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-versioned_docs/version-v1.x/solidity-docs
-versioned_docs/version-v1.x/typedoc
+versioned_docs/version-v1.2/solidity-docs
+versioned_docs/version-v1.2/typedoc
+versioned_docs/version-v1.3_alpha/typedoc/
+versioned_docs/version-v1.3_alpha/solidity-docs/
+
 typedoc

website/src/scripts/setupSolidityDocs.ts

@@ -4,7 +4,7 @@ import path from "path";
 import { copyDirectory, insertIndexPage } from "./utils";
 
 // where to move the solidity doc files over
-const solidityDocDir = path.resolve(__dirname, "../../versioned_docs/version-v1.x/solidity-docs");
+const solidityDocDir = path.resolve(__dirname, "../../versioned_docs/version-v1.3_alpha/solidity-docs");
 // the origin folder (from the contracts package)
 const sourceDir = path.resolve(__dirname, "../../../contracts/docs");
 

website/versioned_docs/version-v1.x/cli.md → website/versioned_docs/version-v1.2/cli.md

@@ -66,7 +66,7 @@ Public key: macipk.946c756cb8588f7169d37e23a98b92051359d64321cf7372a75757b5e9d55
 Private key: macisk.08a06aef74c7f6a6f73704e30677418731bc738500f4e6c63dbfe41af8d6719c
 ```
 
-### Generate MACI keys
+### Generate MACI keys
 
 You can generate MACI keys using the following cli utility.
 

website/versioned_docs/version-v1.x/installation.md → website/versioned_docs/version-v1.2/installation.md

@@ -113,12 +113,6 @@ Edit `circuits/circom/circuits` to include the circuits you would like to compil
     "template": "TallyVotesNonQv",
     "params": [10, 1, 2],
     "pubs": ["inputHash"]
-  },
-  "SubsidyPerBatch_10-1-2_test": {
-    "file": "subsidy",
-    "template": "SubsidyPerBatch",
-    "params": [10, 1, 2],
-    "pubs": ["inputHash"]
   }
 }
 ```