From c2f97000c52f1696cf67056fdbe7ecbc912f1736 Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 14 Dec 2021 13:37:29 -0300 Subject: [PATCH 01/26] add configs for arbitrum deploy --- contracts/hardhat.config.ts | 5 +++++ contracts/package.json | 1 + subgraph/config/arbitrum.json | 6 ++++++ subgraph/package.json | 1 + 4 files changed, 13 insertions(+) create mode 100644 subgraph/config/arbitrum.json diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts index b159f0bcc..60f1d806a 100644 --- a/contracts/hardhat.config.ts +++ b/contracts/hardhat.config.ts @@ -43,6 +43,11 @@ const config: HardhatUserConfig = { url: process.env.RINKARBY_JSONRPC_HTTP_URL || 'http://127.0.0.1:8545', accounts: { mnemonic: WALLET_MNEMONIC }, }, + arbitrum: { + url: + process.env.ARBITRUM_JSONRPC_HTTP_URL || 'https://arb1.arbitrum.io/rpc', + accounts: { mnemonic: WALLET_MNEMONIC }, + }, }, paths: { artifacts: 'build/contracts', diff --git a/contracts/package.json b/contracts/package.json index 779699612..93cb21fa4 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -7,6 +7,7 @@ "build": "hardhat compile", "node": "hardhat node --port 18545 --hostname 0.0.0.0", "deploy:local": "yarn clean && yarn build && hardhat run --network localhost scripts/deploy.ts", + "deploy:arbitrum": "hardhat run --network arbitrum scripts/deployRound.ts", "deployTestRound:local": "hardhat run --network localhost scripts/deployTestRound.ts", "contribute:local": "hardhat run --network localhost scripts/contribute.ts", "vote:local": "hardhat run --network localhost scripts/vote.ts", diff --git a/subgraph/config/arbitrum.json b/subgraph/config/arbitrum.json new file mode 100644 index 000000000..8f72d1d1f --- /dev/null +++ b/subgraph/config/arbitrum.json @@ -0,0 +1,6 @@ +{ + "network": "arbitrum-one", + "address": "0x2e89494a8fE02891511a43f7877b726787E0C160", + "factoryStartBlock": 3461582, + "recipientRegistryStartBlock": 3461582 +} diff --git a/subgraph/package.json b/subgraph/package.json index 77585e068..66ed7fcec 100644 --- a/subgraph/package.json +++ b/subgraph/package.json @@ -15,6 +15,7 @@ "private": true, "scripts": { "prepare:hardhat": "mustache config/hardhat.json subgraph.template.yaml > subgraph.yaml", + "prepare:arbitrum": "mustache config/arbitrum.json subgraph.template.yaml > subgraph.yaml", "prepare:arbitrum-rinkeby": "mustache config/arbitrum-rinkeby.json subgraph.template.yaml > subgraph.yaml", "prepare:xdai": "mustache config/xdai.json subgraph.template.yaml > subgraph.yaml", "codegen": "graph codegen", From d3a863f6f65b67472c2cc3afd44861caaec0e7e0 Mon Sep 17 00:00:00 2001 From: Sam Richards Date: Tue, 14 Dec 2021 11:02:38 -0800 Subject: [PATCH 02/26] Add KYC explanations --- vue-app/src/components/CriteriaModal.vue | 8 +++-- vue-app/src/plugins/round/criteria.ts | 6 ++-- vue-app/src/views/AboutContributors.vue | 5 +++ vue-app/src/views/AboutHowItWorks.vue | 3 ++ vue-app/src/views/AboutRecipients.vue | 42 ++++++++++++++++++------ 5 files changed, 49 insertions(+), 15 deletions(-) diff --git a/vue-app/src/components/CriteriaModal.vue b/vue-app/src/components/CriteriaModal.vue index 8c09a3eb0..6bc1db690 100644 --- a/vue-app/src/components/CriteriaModal.vue +++ b/vue-app/src/components/CriteriaModal.vue @@ -11,10 +11,14 @@

- For this pilot round, {{ operator }} members will remove any projects - that don't meet the round criteria. So read carefully! In later rounds + The registry admin ({{ operator }}) will remove any projects that + don't meet the round criteria. So read carefully! In later rounds we're hoping that this review process can be done by the community.

+

+ Learn more about the project application process in our + recipient guide. +

Contributor guide

+

+ An overview of how things work as a contributor so you can learn what to + expect throughout the duration of a funding round. +

Get funds on {{ chain.label }}

You'll need some {{ chain.currency }} on {{ chain.label }} in order to @@ -97,6 +101,7 @@ import { ChainInfo } from '@/plugins/Web3/constants/chains' @Component({ components: { Links } }) export default class AboutContributors extends Vue { + // TODO: update to new getter get nativeTokenSymbol(): string { const { nativeTokenSymbol } = this.$store.state.currentRound return nativeTokenSymbol diff --git a/vue-app/src/views/AboutHowItWorks.vue b/vue-app/src/views/AboutHowItWorks.vue index d8a514564..e44470204 100644 --- a/vue-app/src/views/AboutHowItWorks.vue +++ b/vue-app/src/views/AboutHowItWorks.vue @@ -149,6 +149,7 @@ import Links from '@/components/Links.vue' @Component({ components: { Links } }) export default class AboutHowItWorks extends Vue { + // TODO: should we hardcode defaults instead of TBD for our round? get contributionPhaseDays(): number | string { if (this.$store.state.currentRound) { const { signUpDeadline, startTime } = this.$store.state.currentRound @@ -161,6 +162,7 @@ export default class AboutHowItWorks extends Vue { return MAX_CONTRIBUTION_AMOUNT } + // TODO: should we hardcode defaults instead of TBD for our round? get maxRecipients(): number | string { return this.$store.state?.currentRound?.maxRecipients || 'TBD' } @@ -169,6 +171,7 @@ export default class AboutHowItWorks extends Vue { return this.$store.state?.currentRound?.nativeTokenSymbol } + // TODO: should we hardcode defaults instead of TBD for our round? get reallocationPhaseDays(): number | string { if (this.$store.state.currentRound) { const { signUpDeadline, votingDeadline } = this.$store.state.currentRound diff --git a/vue-app/src/views/AboutRecipients.vue b/vue-app/src/views/AboutRecipients.vue index 617907126..0157d638d 100644 --- a/vue-app/src/views/AboutRecipients.vue +++ b/vue-app/src/views/AboutRecipients.vue @@ -1,6 +1,10 @@