use ethers v6

clrfund · Jan 18, 2024 · 8224941 · 8224941
1 parent 2af42d0
commit 8224941
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 11 deletions.
diff --git a/.github/workflows/cancel-round.yml b/.github/workflows/cancel-round.yml
@@ -3,7 +3,7 @@ name: Cancel current round
 on: workflow_dispatch
 
 env:
-  NODE_VERSION: 16.x
+  NODE_VERSION: 18.x
   SUBGRPAH_URL: "https://api.thegraph.com/subgraphs/name/clrfund/clrfund-arbitrum-goerli"
   WALLET_PRIVATE_KEY: ${{ secrets.ARBITRUM_GOERLI_COORDINATOR_WALLET_PRIVATE_KEY }}
 

diff --git a/.github/workflows/create-version.yml b/.github/workflows/create-version.yml
@@ -12,7 +12,7 @@ on:
         - major
 
 env:
-  NODE_VERSION: 16.x
+  NODE_VERSION: 18.x
   VITE_CLRFUND_FACTORY_ADDRESS: "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707"
   VITE_ETHEREUM_API_CHAINID: 1
   VITE_ETHEREUM_API_URL: "dummy"

diff --git a/.github/workflows/finalize-round.yml b/.github/workflows/finalize-round.yml
@@ -13,13 +13,15 @@ on:
         default: 'yuetloo/clrfund-dev'
 
 env:
-  NODE_VERSION: 16.x
+  NODE_VERSION: 18.x
   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 }}
   ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY_ARBITRUM }}
   ETHERSCAN_URL: "https://api-goerli.arbiscan.io"
+  CIRCUIT_TYPE: micro
+  ZKEYS_DOWNLOAD_SCRIPT: "download-6-8-2-3.sh"
 
 jobs:
   finalize:
@@ -47,7 +49,7 @@ jobs:
     - name: Download batch 64 params
       run: |
         ls -la $GITHUB_WORKSPACE
-        $GITHUB_WORKSPACE/.github/scripts/download-batch64-params.sh
+        $GITHUB_WORKSPACE/monorepo/.github/scripts/${ZKEYS_DOWNLOAD_SCRIPT}
     - name: Build
       run: |
         # use https to avoid error: unable to connect to github.com

diff --git a/.github/workflows/test-scripts.yml b/.github/workflows/test-scripts.yml
@@ -8,7 +8,8 @@ on:
       - '.github/workflows/test-scripts.yml'
 
 env:
-  NODE_VERSION: 16.x
+  NODE_VERSION: 18.x
+  ZKEYS_DOWNLOAD_SCRIPT: "download-6-8-2-3.sh"
 
 jobs:
   script-tests:
@@ -56,7 +57,7 @@ jobs:
         path: monorepo
     - name: Download batch 64 params
       run: |
-        $GITHUB_WORKSPACE/monorepo/.github/scripts/download-6-8-2-3.sh
+        $GITHUB_WORKSPACE/monorepo/.github/scripts/${ZKEYS_DOWNLOAD_SCRIPT}
     - name: Build CLR
       run: |
         cd monorepo

diff --git a/contracts/cli/newRound.ts b/contracts/cli/newRound.ts
@@ -87,12 +87,12 @@ async function main(args: any) {
     })
 
     const setUserRegistryTx = await clrfundContract.setUserRegistry(
-      userRegistryContract.address
+      userRegistryContract.target
     )
 
     await setUserRegistryTx.wait()
     console.log(
-      `New ${args.userRegistryType} user registry: ${userRegistryContract.address}`
+      `New ${args.userRegistryType} user registry: ${userRegistryContract.target}`
     )
   }
 

diff --git a/contracts/tasks/verifyAll.ts b/contracts/tasks/verifyAll.ts
@@ -51,12 +51,27 @@ async function verifyClrFund(clrfund: Contract, run: any): Promise<string> {
   }
 }
 
+async function verifyFundingRoundFactory(
+  clrfund: Contract,
+  run: any
+): Promise<string> {
+  try {
+    const address = await clrfund.roundFactory()
+    if (address !== ZERO_ADDRESS) {
+      await run('verify:verify', { address })
+    }
+    return SUCCESS
+  } catch (error) {
+    return (error as Error).message
+  }
+}
+
 async function verifyRecipientRegistry(
-  factory: Contract,
+  clrfund: Contract,
   run: any
 ): Promise<string> {
   try {
-    const address = await factory.recipientRegistry()
+    const address = await clrfund.recipientRegistry()
     if (address !== ZERO_ADDRESS) {
       await run('verify-recipient-registry', { address })
     }
@@ -101,7 +116,12 @@ async function verifyMaci(maciAddress: string, run: any): Promise<string> {
 
 async function verifyTally(tally: Contract, run: any): Promise<string> {
   try {
-    const constructorArguments = await Promise.all([tally.verifier()])
+    const constructorArguments = await Promise.all([
+      tally.verifier(),
+      tally.vkRegistry(),
+      tally.poll(),
+      tally.mp(),
+    ])
     await run('verify:verify', { address: tally.target, constructorArguments })
     return SUCCESS
   } catch (error) {
@@ -198,6 +218,8 @@ task('verify-all', 'Verify all clrfund contracts')
       if (sponsor) {
         await verifyContract('Sponsor', sponsor, run, results)
       }
+      status = await verifyFundingRoundFactory(clrfundContract, run)
+      results.push({ name: 'Funding Round Factory', status })
 
       const roundAddress = await clrfundContract.getCurrentRound()
       if (roundAddress !== ZERO_ADDRESS) {

diff --git a/contracts/tasks/verifyMaci.ts b/contracts/tasks/verifyMaci.ts
@@ -14,8 +14,13 @@ task('verify-maci', 'Verify a MACI contract')
     const maci = await ethers.getContractAt('MACI', maciAddress)
     const constructorArguments = await Promise.all([
       maci.pollFactory(),
+      maci.messageProcessorFactory(),
+      maci.tallyFactory(),
+      maci.subsidyFactory(),
       maci.signUpGatekeeper(),
       maci.initialVoiceCreditProxy(),
+      maci.topupCredit(),
+      maci.stateTreeDepth(),
     ])
 
     console.log('Verifying the MACI contract', maciAddress)