Remove Gundb and generate MACI key from wallet signature

.github/workflows/finalize-round.yml

@@ -9,6 +9,7 @@ env:
   NETWORK: "arbitrum-goerli"
   COORDINATOR_ETH_PK: ${{ secrets.ARBITRUM_GOERLI_COORDINATOR_WALLET_PRIVATE_KEY }}
   COORDINATOR_PK: ${{ secrets.ARBITRUM_GOERLI_COORDINATOR_MACI_PRIVATE_KEY }}
+  JSONRPC_HTTP_URL: ${{ secrets.JSONRPC_HTTP_URL }}
 
 jobs:
   finalize:
@@ -46,7 +47,7 @@ jobs:
         # tally and finalize
         cd contracts
         yarn hardhat run --network "${NETWORK}" scripts/tally.ts
-        yarn hardhat run --network "${NETWORK}" scripts/finalize.ts
         curl --location --request POST 'https://api.pinata.cloud/pinning/pinFileToIPFS' \
           --header "Authorization: Bearer ${{ secrets.PINATA_JWT }}" \
           --form 'file=@"tally.json"'
+        JSONRPC_HTTP_URL=${{env.JSONRPC_HTTP_URL}} yarn hardhat run --network "${NETWORK}" scripts/finalize.ts

.github/workflows/test-scripts.yml

@@ -1,6 +1,7 @@
 name: Hardhat script tests
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - 'contracts/scripts/**'

README.md

@@ -174,7 +174,6 @@ to run `yarn test` or `yarn test:contracts`.
   - [Vuelidate](https://vuelidate-next.netlify.app/)
   - [Vue js modal](http://vue-js-modal.yev.io/)
   - [Ethers](https://docs.ethers.io/v5/)
-  - [Gun](https://gun.eco/docs/)
 
 ### Visual Studio Code
 

contracts/contracts/FundingRound.sol

@@ -19,7 +19,7 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice
   using SafeERC20 for ERC20;
 
   // Constants
-  uint256 private constant MAX_VOICE_CREDITS = 10 ** 9;  // MACI allows 2 ** 32 voice credits max
+  uint256 private constant MAX_VOICE_CREDITS = 10 ** 9;   // MACI allows 2 ** 32 voice credits max
   uint256 private constant MAX_CONTRIBUTION_AMOUNT = 10 ** 4;  // In tokens
   uint256 private constant ALPHA_PRECISION = 10 ** 18; // to account for loss of precision in division
   uint8   private constant LEAVES_PER_NODE = 5; // leaves per node of the tally result tree

contracts/e2e/index.ts

@@ -4,23 +4,23 @@ import { use, expect } from 'chai'
 import { solidity } from 'ethereum-waffle'
 import { BigNumber, Contract, Signer, Wallet } from 'ethers'
 import { genProofs, proveOnChain } from 'maci-cli'
-import { Keypair } from 'maci-domainobjs'
+import { Keypair, createMessage, Message, PubKey } from '@clrfund/maci-utils'
 
 import { UNIT } from '../utils/constants'
 import { getEventArg } from '../utils/contracts'
 import {
   deployContract,
   deployMaciFactory,
   deployPoseidon,
+  CIRCUITS,
 } from '../utils/deployment'
 import { getIpfsHash } from '../utils/ipfs'
 import {
   MaciParameters,
-  createMessage,
   addTallyResultsBatch,
   getRecipientClaimData,
 } from '../utils/maci'
-import { CIRCUITS } from '../utils/deployment'
+import { sha256 } from 'ethers/lib/utils'
 
 use(solidity)
 
@@ -296,8 +296,8 @@ describe('End-to-end Tests', function () {
     // Submit messages
     for (const contribution of contributions) {
       const contributor = contribution.signer
-      const messages = []
-      const encPubKeys = []
+      const messages: Message[] = []
+      const encPubKeys: PubKey[] = []
       let nonce = 1
 
       // Change key
@@ -346,6 +346,66 @@ describe('End-to-end Tests', function () {
     expect(claims[2]).to.equal(UNIT.mul(58).div(10))
   })
 
+  it('should allocate funds correctly when users change keys using signature hash', async () => {
+    const contributions = await makeContributions([
+      UNIT.mul(8).div(10),
+      UNIT.mul(8).div(10),
+    ])
+    // Submit messages
+    for (const contribution of contributions) {
+      const contributor = contribution.signer
+      const messages: Message[] = []
+      const encPubKeys: PubKey[] = []
+      let nonce = 1
+
+      // Change key
+      const signature = await contributor.signMessage('hello world')
+      const hash = sha256(signature)
+      const newContributorKeypair = Keypair.createFromSignatureHash(hash, 1)
+      const [message, encPubKey] = createMessage(
+        contribution.stateIndex,
+        contribution.keypair,
+        newContributorKeypair,
+        coordinatorKeypair.pubKey,
+        null,
+        null,
+        nonce
+      )
+      messages.push(message)
+      encPubKeys.push(encPubKey)
+      nonce += 1
+
+      // Spend voice credits on both recipients
+      for (const recipientIndex of [1, 2]) {
+        const voiceCredits = contribution.voiceCredits.div(2)
+        const [message, encPubKey] = createMessage(
+          contribution.stateIndex,
+          newContributorKeypair,
+          null,
+          coordinatorKeypair.pubKey,
+          recipientIndex,
+          voiceCredits,
+          nonce
+        )
+        messages.push(message)
+        encPubKeys.push(encPubKey)
+        nonce += 1
+      }
+
+      await fundingRound.connect(contributor).submitMessageBatch(
+        messages.reverse().map((msg) => msg.asContractParam()),
+        encPubKeys.reverse().map((key) => key.asContractParam())
+      )
+    }
+
+    await provider.send('evm_increaseTime', [maciParameters.signUpDuration])
+    await provider.send('evm_increaseTime', [maciParameters.votingDuration])
+    const { tally, claims } = await finalizeRound()
+    expect(tally.totalVoiceCredits.spent).to.equal('160000')
+    expect(claims[1]).to.equal(UNIT.mul(58).div(10))
+    expect(claims[2]).to.equal(UNIT.mul(58).div(10))
+  })
+
   it('should allocate funds correctly if not all voice credits are spent', async () => {
     const contributions = await makeContributions([
       UNIT.mul(8).div(10),
@@ -357,8 +417,8 @@ describe('End-to-end Tests', function () {
       const contributor = contribution.signer
       const voiceCredits = contribution.voiceCredits.div(4)
       let nonce = 1
-      const messages = []
-      const encPubKeys = []
+      const messages: Message[] = []
+      const encPubKeys: PubKey[] = []
 
       for (const recipientIndex of [1, 2]) {
         const [message, encPubKey] = createMessage(
@@ -399,8 +459,8 @@ describe('End-to-end Tests', function () {
       [2, contribution.voiceCredits.div(2)],
       [1, contribution.voiceCredits.div(2)],
     ]
-    const messages = []
-    const encPubKeys = []
+    const messages: Message[] = []
+    const encPubKeys: PubKey[] = []
     let nonce = 1
     for (const [recipientIndex, voiceCredits] of votes) {
       const [message, encPubKey] = createMessage(
@@ -458,8 +518,8 @@ describe('End-to-end Tests', function () {
       [1, ZERO],
       [2, contribution.voiceCredits],
     ]
-    const messages = []
-    const encPubKeys = []
+    const messages: Message[] = []
+    const encPubKeys: PubKey[] = []
     let nonce = 1
     for (const [recipientIndex, voiceCredits] of votes) {
       const [message, encPubKey] = createMessage(
@@ -526,8 +586,8 @@ describe('End-to-end Tests', function () {
       ],
     ]
     for (const batch of votes) {
-      const messages = []
-      const encPubKeys = []
+      const messages: Message[] = []
+      const encPubKeys: PubKey[] = []
       let nonce = 1
       for (const [recipientIndex, voiceCredits] of batch) {
         const [message, encPubKey] = createMessage(
@@ -587,8 +647,8 @@ describe('End-to-end Tests', function () {
     let encPubKey
 
     // Vote for recipient 1 for a bribe immediately after signup
-    const messageBatch1 = []
-    const encPubKeyBatch1 = []
+    const messageBatch1: Message[] = []
+    const encPubKeyBatch1: PubKey[] = []
     ;[message, encPubKey] = createMessage(
       contribution.stateIndex,
       contribution.keypair,
@@ -619,8 +679,8 @@ describe('End-to-end Tests', function () {
 
     // Wait for signup period to end to override votes
     await provider.send('evm_increaseTime', [maciParameters.signUpDuration])
-    const messageBatch2 = []
-    const encPubKeyBatch2 = []
+    const messageBatch2: Message[] = []
+    const encPubKeyBatch2: PubKey[] = []
     // Change key
     const newContributorKeypair = new Keypair()
     ;[message, encPubKey] = createMessage(

contracts/hardhat.config.ts

@@ -14,6 +14,7 @@ dotenv.config()
 const GAS_LIMIT = 20000000
 const WALLET_MNEMONIC = process.env.WALLET_MNEMONIC
 const WALLET_PRIVATE_KEY = process.env.WALLET_PRIVATE_KEY
+const WALLET_PRIVATE_KEY_2 = process.env.WALLET_PRIVATE_KEY_2
 
 let accounts
 if (WALLET_MNEMONIC) {
@@ -23,6 +24,10 @@ if (WALLET_PRIVATE_KEY) {
   accounts = [WALLET_PRIVATE_KEY]
 }
 
+if (WALLET_PRIVATE_KEY_2) {
+  accounts = [...accounts, WALLET_PRIVATE_KEY_2]
+}
+
 const config: HardhatUserConfig = {
   networks: {
     hardhat: {

contracts/package.json

@@ -28,6 +28,8 @@
     "solidity-rlp": "2.0.3"
   },
   "devDependencies": {
+    "@clrfund/maci-utils": "^0.0.1",
+    "@ethereum-waffle/mock-contract": "^3.4.4",
     "@kleros/gtcr-encoder": "^1.4.0",
     "@nomiclabs/hardhat-ethers": "^2.2.1",
     "@nomiclabs/hardhat-etherscan": "^3.1.4",
@@ -36,10 +38,10 @@
     "@types/chai": "^4.2.11",
     "@types/mocha": "^7.0.2",
     "@types/node": "^13.9.2",
-    "@typescript-eslint/eslint-plugin": "^2.34.0",
-    "@typescript-eslint/parser": "^2.34.0",
+    "@typescript-eslint/eslint-plugin": "5.48.2",
+    "@typescript-eslint/parser": "5.48.2",
     "chai": "^4.2.0",
-    "eslint": "^6.8.0",
+    "eslint": "7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "ethereum-waffle": "^3.4.4",
     "ethers": "^5.7.2",
@@ -48,10 +50,9 @@
     "ipfs-only-hash": "^2.0.1",
     "maci-cli": "0.9.4",
     "maci-crypto": "~0.9.1",
-    "maci-domainobjs": "~0.9.1",
     "solhint": "^3.3.2",
     "ts-generator": "^0.0.8",
     "ts-node": "^8.8.1",
-    "typescript": "^3.8.3"
+    "typescript": "4.1.2"
   }
 }

contracts/scripts/contribute.ts

@@ -1,6 +1,6 @@
 import fs from 'fs'
 import { ethers } from 'hardhat'
-import { Keypair } from 'maci-domainobjs'
+import { Keypair } from '@clrfund/maci-utils'
 
 import { UNIT } from '../utils/constants'
 import { getEventArg } from '../utils/contracts'

contracts/scripts/deployRound.ts

@@ -1,6 +1,6 @@
 import { ethers } from 'hardhat'
 import { Contract, utils } from 'ethers'
-import { Keypair } from 'maci-domainobjs'
+import { Keypair } from '@clrfund/maci-utils'
 
 import { deployMaciFactory } from '../utils/deployment'
 import { getEventArg } from '../utils/contracts'

contracts/scripts/deployTestRound.ts

@@ -1,6 +1,6 @@
 import fs from 'fs'
 import { ethers } from 'hardhat'
-import { Keypair } from 'maci-domainobjs'
+import { Keypair } from '@clrfund/maci-utils'
 
 import { UNIT } from '../utils/constants'
 import { getEventArg } from '../utils/contracts'

contracts/scripts/generate-key.ts

@@ -1,4 +1,4 @@
-import { Keypair } from 'maci-domainobjs'
+import { Keypair } from '@clrfund/maci-utils'
 
 async function main() {
   const keypair = new Keypair()

contracts/scripts/vote.ts

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import { ethers } from 'hardhat'
 import { BigNumber } from 'ethers'
-import { PrivKey, Keypair } from 'maci-domainobjs'
+import { PrivKey, Keypair } from '@clrfund/maci-utils'
 
 import { createMessage } from '../utils/maci'
 

contracts/tasks/cancelRound.ts

@@ -2,7 +2,7 @@ import { task } from 'hardhat/config'
 
 task('cancel-round', 'Cancel the current round')
   .addParam('factory', 'The funding round factory contract address')
-  .setAction(async ({ factory }, { network, ethers }) => {
+  .setAction(async ({ factory }, { ethers }) => {
     const [deployer] = await ethers.getSigners()
     console.log('deployer', deployer.address)
     const fundingRoundFactory = await ethers.getContractAt(