Merge pull request #539 from clrfund/feature/recipient-email

Add email form for recipient registration
clrfund · Aug 11, 2022 · 8915a0e · 8915a0e
2 parents 5d07d96 + f80f857
commit 8915a0e
Show file tree

Hide file tree

Showing 62 changed files with 1,490 additions and 6,131 deletions.
diff --git a/contracts/contracts/recipientRegistry/UniversalRecipientRegistry.sol b/contracts/contracts/recipientRegistry/UniversalRecipientRegistry.sol
diff --git a/contracts/scripts/deployRecipientRegistry.ts b/contracts/scripts/deployRecipientRegistry.ts
@@ -6,7 +6,7 @@ import { RecipientRegistryFactory } from '../utils/recipient-registry-factory'
  * Deploy a new recipient registry.
  * The following environment variables must be set to run the script
  *
- * RECIPIENT_REGISTRY_TYPE - default is simple, values can be simple, optimistic, universal
+ * RECIPIENT_REGISTRY_TYPE - default is simple, values can be simple, optimistic
  * FUNDING_ROUND_FACTORY_ADDRESS - address of the funding round factory
  * WALLET_PRIVATE_KEY - private key of the account that will fund this transaction
  * JSONRPC_HTTP_URL - URL to connect to the node
@@ -19,8 +19,13 @@ import { RecipientRegistryFactory } from '../utils/recipient-registry-factory'
 async function main() {
   const recipientRegistryType = process.env.RECIPIENT_REGISTRY_TYPE || 'simple'
   const fundingRoundFactoryAddress = process.env.FUNDING_ROUND_FACTORY_ADDRESS
-  const challengePeriodDuration = process.env.CHALLENGE_PERIOD_IN_SECONDS || 300
-  const baseDeposit = process.env.BASE_DEPOSIT || UNIT.div(10).toString()
+  let challengePeriodDuration = '0'
+  let baseDeposit = '0'
+
+  if (recipientRegistryType === 'optimistic') {
+    challengePeriodDuration = process.env.CHALLENGE_PERIOD_IN_SECONDS || '300'
+    baseDeposit = process.env.BASE_DEPOSIT || UNIT.div(10).toString()
+  }
 
   if (!fundingRoundFactoryAddress) {
     console.log('Environment variable FUNDING_ROUND_FACTORY_ADDRESS not set')
@@ -35,9 +40,9 @@ async function main() {
   console.log('*******************')
   console.log(`Deploying a new ${recipientRegistryType} recipient registry!`)
   console.log(` challenge period in seconds: ${challengePeriodDuration}`)
-  console.log(` baseDeposit ${baseDeposit}`)
-  console.log(` fundingRoundFactoryAddress ${fundingRoundFactoryAddress}`)
-  console.log(` fundingRoundFactoryOwner ${factoryOwner}`)
+  console.log(` baseDeposit: ${baseDeposit}`)
+  console.log(` fundingRoundFactoryAddress: ${fundingRoundFactoryAddress}`)
+  console.log(` fundingRoundFactoryOwner: ${factoryOwner}`)
   const [deployer] = await ethers.getSigners()
 
   const recipientRegistry = await RecipientRegistryFactory.deploy(

diff --git a/contracts/scripts/deployTestRound.ts b/contracts/scripts/deployTestRound.ts
@@ -113,7 +113,6 @@ async function main() {
   const RecipientRegistryName: Record<string, string> = {
     simple: 'SimpleRecipientRegistry',
     optimistic: 'OptimisticRecipientRegistry',
-    universal: 'UniversalRecipientRegistry',
   }
   const recipientRegistryAddress = await factory.recipientRegistry()
   const recipientRegistryName = RecipientRegistryName[recipientRegistryType]