update contribute and vote scripts to make many contributions and votes

Author: pettinarip

Diff for: contracts/scripts/contribute.ts

@@ -1,13 +1,28 @@
 import fs from 'fs'
+import { Wallet } from 'ethers'
 import { ethers } from 'hardhat'
 import { Keypair } from 'maci-domainobjs'
 
 import { UNIT } from '../utils/constants'
 import { getEventArg } from '../utils/contracts'
 
 async function main() {
-  const [, , , , , , , , , , , , contributor1, contributor2] =
-    await ethers.getSigners()
+  // const [, , , , , , , , , , , , contributor1, contributor2, contributor3] =
+  //   await ethers.getSigners()
+
+  const contributor1 = new Wallet(
+    process.env.CONTRIBUTOR_PK_1!,
+    ethers.provider
+  )
+  const contributor2 = new Wallet(
+    process.env.CONTRIBUTOR_PK_2!,
+    ethers.provider
+  )
+  const contributor3 = new Wallet(
+    process.env.CONTRIBUTOR_PK_3!,
+    ethers.provider
+  )
+
   const state = JSON.parse(fs.readFileSync('state.json').toString())
   const fundingRound = await ethers.getContractAt(
     'FundingRound',
@@ -21,7 +36,7 @@ async function main() {
   const contributionAmount = UNIT.mul(16).div(10)
   state.contributors = {}
 
-  for (const contributor of [contributor1, contributor2]) {
+  for (const contributor of [contributor1, contributor2, contributor3]) {
     const contributorAddress = await contributor.getAddress()
     const contributorKeypair = new Keypair()
     const tokenAsContributor = token.connect(contributor)

Diff for: contracts/scripts/vote.ts

@@ -1,19 +1,33 @@
 import fs from 'fs'
 import { ethers } from 'hardhat'
-import { BigNumber } from 'ethers'
+import { BigNumber, Wallet } from 'ethers'
 import { PrivKey, Keypair } from 'maci-domainobjs'
 
 import { createMessage } from '../utils/maci'
 
 async function main() {
-  const [, , , , , , , , , , , , contributor1, contributor2] =
-    await ethers.getSigners()
+  // const [, , , , , , , , , , , , contributor1, contributor2, contributor3] =
+  //   await ethers.getSigners()
+
+  const contributor1 = new Wallet(
+    process.env.CONTRIBUTOR_PK_1!,
+    ethers.provider
+  )
+  const contributor2 = new Wallet(
+    process.env.CONTRIBUTOR_PK_2!,
+    ethers.provider
+  )
+  const contributor3 = new Wallet(
+    process.env.CONTRIBUTOR_PK_3!,
+    ethers.provider
+  )
+
   const state = JSON.parse(fs.readFileSync('state.json').toString())
   const coordinatorKeyPair = new Keypair(
     PrivKey.unserialize(state.coordinatorPrivKey)
   )
 
-  for (const contributor of [contributor1, contributor2]) {
+  for (const contributor of [contributor1, contributor2, contributor3]) {
     const contributorAddress = await contributor.getAddress()
     const contributorData = state.contributors[contributorAddress]
     const contributorKeyPair = new Keypair(
@@ -37,8 +51,11 @@ async function main() {
     encPubKeys.push(encPubKey.asContractParam())
     nonce += 1
     // Vote
-    for (const recipientIndex of [1, 2]) {
-      const votes = BigNumber.from(contributorData.voiceCredits).div(4)
+    const recipients = [1, 2, 3, 4, 5, 6, 7]
+    for (const recipientIndex of recipients) {
+      const votes = BigNumber.from(contributorData.voiceCredits).div(
+        recipients.length
+      )
       const [message, encPubKey] = createMessage(
         contributorData.stateIndex,
         newContributorKeypair,
@@ -58,10 +75,21 @@ async function main() {
       state.fundingRound,
       contributor
     )
-    await fundingRoundAsContributor.submitMessageBatch(
+
+    const tx = await fundingRoundAsContributor.submitMessageBatch(
       messages.reverse(),
-      encPubKeys.reverse()
+      encPubKeys.reverse(),
+      {
+        gasLimit: 20000000,
+      }
     )
+    try {
+      await tx.wait()
+    } catch (err) {
+      console.log('error!', err)
+      return
+    }
+
     console.log(`Contributor ${contributorAddress} voted.`)
   }
 }