subgraph handling of recipient registry change events

clrfund · Jan 23, 2024 · 9b8dc2d · 9b8dc2d
1 parent db6de00
commit 9b8dc2d
Show file tree

Hide file tree

Showing 10 changed files with 336 additions and 208 deletions.
diff --git a/contracts/tasks/index.ts b/contracts/tasks/index.ts
@@ -7,3 +7,4 @@ import './verifyUserRegistry'
 import './pubkey'
 import './loadUsers'
 import './exportRound'
+import './setRecipientRegistry'
diff --git a/contracts/tasks/setRecipientRegistry.ts b/contracts/tasks/setRecipientRegistry.ts
@@ -3,111 +3,26 @@
  *
  * Sample usage:
  *
- *  yarn hardhat set-recipient-registry --network <network> \
- *    --clrfund <clrfund contract address> \
- *    [--type <user registry type>] \
- *    [--registry <user registry address> ] \
- *    [--context <brightid context> ] \
- *    [--verifier <brightid verifier address> ] \
- *    [--sponsor <brightid sponsor contract address> ]
+ *  yarn hardhat set-recipient-registry --clrfund <clrfund address> --type optimistic --network <network>
  *
- * Valid user registry types are simple, brightid, merkle, storage
- *
- * Verifier is the brightid node verifier address.
- * Clrfund's brightId node is in the ethSigningAddress field from https://brightid.clr.fund
+ *  Valid recipient registry types are simple, brightid, merkle, storage
  *
  */
 
 import { task } from 'hardhat/config'
-import { BigNumber, Contract, utils } from 'ethers'
-import { HardhatEthersHelpers } from '@nomiclabs/hardhat-ethers/types'
+import { parseUnits } from 'ethers'
 import {
   deployRecipientRegistry,
   challengePeriodSeconds,
 } from '../utils/deployment'
 
-async function getDepositInUnits(
-  clrfundContract: Contract,
-  ethers: HardhatEthersHelpers,
-  deposit: string
-): Promise<BigNumber> {
-  let depositInUnits = BigNumber.from(0)
-  try {
-    const token = await clrfundContract.nativeToken()
-    const tokenContract = await ethers.getContractAt('ERC20', token)
-    const decimals = await tokenContract.decimals()
-    depositInUnits = utils.parseUnits(deposit, decimals)
-  } catch (e) {
-    console.log('Error formatting deposit amount ' + (e as Error).message)
-    console.log('Set deposit to 0')
-  }
-
-  return depositInUnits
-}
-
-/**
- * Set the token address in the ClrFund contract
- *
- * @param clrfundContract ClrFund contract
- * @param registryType The user registry type, e.g brightid, simple, merkle, snapshot
- * @param registryAddress The user registry address to set in ClrFund
- * @param ethers the hardhat ethers handle
- */
-async function setRecipientRegistry({
-  clrfundContract,
-  registryType,
-  registryAddress,
-  deposit,
-  challengePeriod,
-  ethers,
-}: {
-  clrfundContract: Contract
-  registryType?: string
-  registryAddress?: string
-  deposit: string
-  challengePeriod: string
-  ethers: HardhatEthersHelpers
-}) {
-  let recipientRegistryAddress = registryAddress
-  if (!recipientRegistryAddress) {
-    const recipientRegistryType = registryType || ''
-    const [signer] = await ethers.getSigners()
-    console.log(`Deploying recipient registry by: ${signer.address}`)
-
-    const controller = clrfundContract.address
-    const depositInUnits = await getDepositInUnits(
-      clrfundContract,
-      ethers,
-      deposit
-    )
-    const registry = await deployRecipientRegistry({
-      type: recipientRegistryType,
-      controller,
-      deposit: depositInUnits,
-      challengePeriod,
-      ethers,
-    })
-    recipientRegistryAddress = registry.address
-  }
-
-  const tx = await clrfundContract.setRecipientRegistry(
-    recipientRegistryAddress
-  )
-  await tx.wait()
-
-  console.log(
-    `Recipient registry (${registryType}): ${recipientRegistryAddress}`
-  )
-  console.log(`Recipient registry set at tx: ${tx.hash}`)
-}
-
 task('set-recipient-registry', 'Set the recipient registry in ClrFund')
   .addParam('clrfund', 'The ClrFund contract address')
   .addOptionalParam(
     'type',
     'The recipient registry type, e.g simple, optimistic'
   )
-  .addOptionalParam('registry', 'The user registry contract address')
+  .addOptionalParam('registry', 'The recipient registry to set to')
   .addOptionalParam(
     'deposit',
     'The base deposit for the optimistic registry',
@@ -125,13 +40,36 @@ task('set-recipient-registry', 'Set the recipient registry in ClrFund')
     ) => {
       const clrfundContract = await ethers.getContractAt('ClrFund', clrfund)
 
-      await setRecipientRegistry({
-        clrfundContract: clrfundContract,
-        registryType: type,
-        registryAddress: registry,
-        deposit,
-        challengePeriod,
-        ethers,
-      })
+      const recipientRegistryType = type || ''
+      let recipientRegistryAddress = registry
+      if (!recipientRegistryAddress) {
+        const [signer] = await ethers.getSigners()
+        console.log(`Deploying recipient registry by: ${signer.address}`)
+
+        const token = await clrfundContract.nativeToken()
+        const tokenContract = await ethers.getContractAt('ERC20', token)
+        const decimals = await tokenContract.decimals()
+        const depositInUnits = parseUnits(deposit, decimals)
+
+        const controller = await clrfundContract.getAddress()
+        const registry = await deployRecipientRegistry({
+          type: recipientRegistryType,
+          controller,
+          deposit: depositInUnits,
+          challengePeriod,
+          ethers,
+        })
+        recipientRegistryAddress = await registry.getAddress()
+      }
+
+      const tx = await clrfundContract.setRecipientRegistry(
+        recipientRegistryAddress
+      )
+      await tx.wait()
+
+      console.log(
+        `Recipient registry (${recipientRegistryType}): ${recipientRegistryAddress}`
+      )
+      console.log(`Recipient registry set at tx: ${tx.hash}`)
     }
   )