From 5f7f63acdd8a6c6ca0aa5acb8580b4ba37c6bbc9 Mon Sep 17 00:00:00 2001 From: yuetloo Date: Mon, 11 Jul 2022 14:56:31 -0400 Subject: [PATCH 1/7] update doc to recommend runing the clrfund instance on Linux --- docs/admin.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin.md b/docs/admin.md index fb23e1bb2..cb34541ae 100644 --- a/docs/admin.md +++ b/docs/admin.md @@ -1,6 +1,6 @@ # Running clr.fund instance on Goerli -This document describes deployment and administration of clr.fund contracts using [hardhat console](https://hardhat.org/guides/hardhat-console.html). +This document describes deployment and administration of clr.fund contracts using [hardhat console](https://hardhat.org/guides/hardhat-console.html) on the Linux platform. For example, to start a hardhat console configured for the Goerli network: From 7d5d91699f1c996a8d72f77ecc6d801dbfc38e7c Mon Sep 17 00:00:00 2001 From: yuetloo Date: Thu, 14 Jul 2022 12:03:19 -0400 Subject: [PATCH 2/7] fix breadcrumb alignment --- vue-app/src/App.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vue-app/src/App.vue b/vue-app/src/App.vue index f9d3ff55e..acfb0f6ae 100644 --- a/vue-app/src/App.vue +++ b/vue-app/src/App.vue @@ -12,12 +12,12 @@
- +
Date: Thu, 21 Jul 2022 11:21:26 -0400 Subject: [PATCH 3/7] move recipient button to drop down menu --- vue-app/src/components/NavBar.vue | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/vue-app/src/components/NavBar.vue b/vue-app/src/components/NavBar.vue index 3b5c4934a..690b568e6 100644 --- a/vue-app/src/components/NavBar.vue +++ b/vue-app/src/components/NavBar.vue @@ -8,13 +8,6 @@ />
- - Manage Recipients -
Date: Thu, 21 Jul 2022 15:22:24 -0400 Subject: [PATCH 4/7] add accepted status to recipient registry --- vue-app/src/api/recipient-registry-optimistic.ts | 6 +++++- vue-app/src/views/RecipientRegistry.vue | 15 ++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/vue-app/src/api/recipient-registry-optimistic.ts b/vue-app/src/api/recipient-registry-optimistic.ts index 11c2296ab..fcedfc0b9 100644 --- a/vue-app/src/api/recipient-registry-optimistic.ts +++ b/vue-app/src/api/recipient-registry-optimistic.ts @@ -13,6 +13,7 @@ import { provider, ipfsGatewayUrl, recipientRegistryPolicy } from './core' import { Project } from './projects' import sdk from '@/graphql/sdk' import { Recipient } from '@/graphql/API' +import { hasDateElapsed } from '@/utils/dates' export interface RegistryInfo { deposit: BigNumber @@ -65,6 +66,7 @@ enum RequestTypeCode { export enum RequestStatus { Submitted = 'Needs review', + Accepted = 'Accepted', Rejected = 'Rejected', Executed = 'Live', Removed = 'Removed', @@ -198,7 +200,9 @@ export async function getRequests( transactionHash: recipient.requestResolvedHash || recipient.requestSubmittedHash, type: RequestType[RequestTypeCode[requestType]], - status: RequestStatus.Submitted, + status: hasDateElapsed(acceptanceDate) + ? RequestStatus.Accepted + : RequestStatus.Submitted, acceptanceDate, recipientId: recipient.id, recipient: recipient.recipientAddress, diff --git a/vue-app/src/views/RecipientRegistry.vue b/vue-app/src/views/RecipientRegistry.vue index 558666596..3a73eef9a 100644 --- a/vue-app/src/views/RecipientRegistry.vue +++ b/vue-app/src/views/RecipientRegistry.vue @@ -106,17 +106,14 @@
-->
@@ -212,6 +209,10 @@ export default class RecipientRegistryView extends Vue { return request.status === RequestStatus.Submitted } + isAccepted(request: Request): boolean { + return request.status === RequestStatus.Accepted + } + isRejected(request: Request): boolean { return request.status === RequestStatus.Rejected } @@ -227,10 +228,6 @@ export default class RecipientRegistryView extends Vue { ) } - isChallengePeriodOver(request: Request): boolean { - return Date.now() > request.acceptanceDate.toMillis() - } - async approve(request: Request): Promise { const { recipientRegistryAddress, currentUser } = this.$store.state const signer = currentUser.walletProvider.getSigner() From f112734e84f97549978f53a5a76de8de4dd8a505 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Jul 2022 01:04:33 +0000 Subject: [PATCH 5/7] Bump terser from 4.6.7 to 4.8.1 Bumps [terser](https://github.com/terser/terser) from 4.6.7 to 4.8.1. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/yarn.lock b/yarn.lock index aaaa9c56d..d72ca8d30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5840,7 +5840,12 @@ buffer-fill@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= -buffer-from@^1.0.0, buffer-from@^1.1.1: +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer-from@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== @@ -17999,18 +18004,10 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" -source-map-support@^0.5.11, source-map-support@^0.5.17, source-map-support@^0.5.19: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-support@^0.5.13, source-map-support@^0.5.6, source-map-support@~0.5.12: - version "0.5.16" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" - integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== +source-map-support@^0.5.11, source-map-support@^0.5.13, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@~0.5.12: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -18672,19 +18669,10 @@ terser-webpack-plugin@^2.3.6: terser "^4.6.12" webpack-sources "^1.4.3" -terser@^4.1.2: - version "4.6.7" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz#478d7f9394ec1907f0e488c5f6a6a9a2bad55e72" - integrity sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g== - dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" - -terser@^4.6.12: - version "4.8.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" - integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== +terser@^4.1.2, terser@^4.6.12: + version "4.8.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" + integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== dependencies: commander "^2.20.0" source-map "~0.6.1" From e3a36a7786413e54f94cd164ee7127ae87ceae41 Mon Sep 17 00:00:00 2001 From: yuetloo Date: Wed, 17 Aug 2022 18:12:19 -0400 Subject: [PATCH 6/7] detect gunDB user already being created warning --- vue-app/src/App.vue | 8 +++++++- vue-app/src/api/gun.ts | 15 ++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/vue-app/src/App.vue b/vue-app/src/App.vue index acfb0f6ae..2e4be17f5 100644 --- a/vue-app/src/App.vue +++ b/vue-app/src/App.vue @@ -129,7 +129,13 @@ export default class App extends Vue { if (!this.$web3.user) return // Connect & auth to gun db - await this.$store.dispatch(LOGIN_USER, this.$web3.user) + try { + await this.$store.dispatch(LOGIN_USER, this.$web3.user) + } catch (error) { + /* eslint-disable-next-line no-console */ + console.error(error) + return + } this.$store.commit(SET_CURRENT_USER, this.$web3.user) this.$store.dispatch(LOAD_USER_INFO) diff --git a/vue-app/src/api/gun.ts b/vue-app/src/api/gun.ts index 41995252d..640c8908a 100644 --- a/vue-app/src/api/gun.ts +++ b/vue-app/src/api/gun.ts @@ -7,6 +7,11 @@ import { gunPeers } from './core' import { LOGIN_MESSAGE } from './user' import { md5 } from '@/utils/crypto' +const GUN_WARNINGS = new Set([ + 'User already created!', + 'User is already being created or authenticated!', +]) + interface GunSchema { data: { [key: string]: string } } @@ -26,19 +31,19 @@ export async function loginUser( const password = encryptionKey await new Promise((resolve, reject) => { user.create(username, password, (ack) => { - if (ack.ok === 0 || ack.err === 'User already created!') { - resolve() + if (ack.ok === 0 || GUN_WARNINGS.has(ack.err)) { + resolve(0) } else { - reject() + reject('Error creating user in GunDB.') } }) }) await new Promise((resolve, reject) => { user.auth(username, password, (ack) => { if (ack.err) { - reject() + reject('Error authenticating user in GunDB.') } else { - resolve() + resolve(0) } }) }) From 1a6010f7c9ae3c13de130be764443cc7795920f3 Mon Sep 17 00:00:00 2001 From: yuetloo Date: Mon, 29 Aug 2022 16:26:46 -0400 Subject: [PATCH 7/7] bump version to 1.1.0 --- contracts/package.json | 2 +- subgraph/package.json | 2 +- vue-app/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/package.json b/contracts/package.json index 91844b566..22d97b8dd 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,6 +1,6 @@ { "name": "@clrfund/contracts", - "version": "1.0.0", + "version": "1.1.0", "license": "GPL-3.0", "scripts": { "hardhat": "hardhat", diff --git a/subgraph/package.json b/subgraph/package.json index 052596575..1611da7e6 100644 --- a/subgraph/package.json +++ b/subgraph/package.json @@ -1,6 +1,6 @@ { "name": "@clrfund/subgraph", - "version": "1.0.0", + "version": "1.1.0", "repository": "https://github.com/clrfund/monorepo/subgraph", "keywords": [ "clr.fund", diff --git a/vue-app/package.json b/vue-app/package.json index f86df88cf..fd896c6ef 100644 --- a/vue-app/package.json +++ b/vue-app/package.json @@ -1,6 +1,6 @@ { "name": "@clrfund/vue-app", - "version": "1.0.0", + "version": "1.1.0", "private": true, "scripts": { "gun": "gun --host localhost",