From 5c4e67c3503061c20c5f0e80b36af4d10056995b Mon Sep 17 00:00:00 2001 From: Raul Glogovetan Date: Tue, 19 Oct 2021 22:09:02 +0300 Subject: [PATCH 1/3] Update: `colonyNetwork` submodule to latest develop --- src/lib/colonyNetwork | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/colonyNetwork b/src/lib/colonyNetwork index 73cedb6943..b9073593fa 160000 --- a/src/lib/colonyNetwork +++ b/src/lib/colonyNetwork @@ -1 +1 @@ -Subproject commit 73cedb6943f495a026fbf0a10f241a75be007d2e +Subproject commit b9073593fa5a829335c0a02074fdfcf4edc4abb9 From 71da410a69cd80ea74cad45ade1842434a10cce7 Mon Sep 17 00:00:00 2001 From: Raul Glogovetan Date: Wed, 20 Oct 2021 01:09:06 +0300 Subject: [PATCH 2/3] Update: `colonyJS` to the latest beta branch release --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 682354f320..bd295d30ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "dependencies": { "@apollo/client": "^3.0.2", - "@colony/colony-js": "^4.1.0-beta.7", + "@colony/colony-js": "^4.1.0-beta.8", "@colony/redux-promise-listener": "^1.2.0", "@formatjs/intl-pluralrules": "^1.5.7", "@formatjs/intl-relativetimeformat": "^4.5.14", @@ -5086,9 +5086,9 @@ } }, "node_modules/@colony/colony-js": { - "version": "4.1.0-beta.7", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-4.1.0-beta.7.tgz", - "integrity": "sha512-FaAKWqbIwX/U9b0UGQnbXgUjHg5rI9KdUC8y+1mx6mlooLacmcwL0oSeTTQs3LyY/l+n1Td+YxTNbm+pp42aHg==", + "version": "4.1.0-beta.8", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-4.1.0-beta.8.tgz", + "integrity": "sha512-vy0qjWHtmqU5gOqtGQ+x0OQjQ4h6NASKLqHhhdSk15ZG94ivrPP7iD9DmktWlxymH1vn/mePdDxHZOSeWUsNcg==", "dependencies": { "isomorphic-fetch": "^2.2.1", "lodash.isequal": "^4.5.0" @@ -62345,9 +62345,9 @@ } }, "@colony/colony-js": { - "version": "4.1.0-beta.7", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-4.1.0-beta.7.tgz", - "integrity": "sha512-FaAKWqbIwX/U9b0UGQnbXgUjHg5rI9KdUC8y+1mx6mlooLacmcwL0oSeTTQs3LyY/l+n1Td+YxTNbm+pp42aHg==", + "version": "4.1.0-beta.8", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-4.1.0-beta.8.tgz", + "integrity": "sha512-vy0qjWHtmqU5gOqtGQ+x0OQjQ4h6NASKLqHhhdSk15ZG94ivrPP7iD9DmktWlxymH1vn/mePdDxHZOSeWUsNcg==", "requires": { "isomorphic-fetch": "^2.2.1", "lodash.isequal": "^4.5.0" diff --git a/package.json b/package.json index 466c67a861..9102e8d89e 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ }, "dependencies": { "@apollo/client": "^3.0.2", - "@colony/colony-js": "^4.1.0-beta.7", + "@colony/colony-js": "^4.1.0-beta.8", "@colony/redux-promise-listener": "^1.2.0", "@formatjs/intl-pluralrules": "^1.5.7", "@formatjs/intl-relativetimeformat": "^4.5.14", From 1c7b2e95bde74e19901324a838fbe5e7836cbc75 Mon Sep 17 00:00:00 2001 From: Raul Glogovetan Date: Wed, 20 Oct 2021 01:11:19 +0300 Subject: [PATCH 3/3] Refactor: resolvers to get reputation without proofs --- src/data/resolvers/colony.ts | 7 +++---- src/data/resolvers/motions.ts | 4 +++- src/data/resolvers/user.ts | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/data/resolvers/colony.ts b/src/data/resolvers/colony.ts index bb148d685d..aa1f10166e 100644 --- a/src/data/resolvers/colony.ts +++ b/src/data/resolvers/colony.ts @@ -263,10 +263,9 @@ export const colonyResolvers = ({ domainId || ROOT_DOMAIN_ID, ); - const { reputationAmount } = await colonyClient.getReputation( - skillId, - AddressZero, - ); + const { + reputationAmount, + } = await colonyClient.getReputationWithoutProofs(skillId, AddressZero); return reputationAmount.toString(); }, diff --git a/src/data/resolvers/motions.ts b/src/data/resolvers/motions.ts index 95fc35e0d6..c494de3df1 100644 --- a/src/data/resolvers/motions.ts +++ b/src/data/resolvers/motions.ts @@ -191,7 +191,9 @@ export const motionsResolvers = ({ rootHash, } = await votingReputationClient.getMotion(motionId); const { skillId } = await colonyClient.getDomain(domainId); - const { reputationAmount } = await colonyClient.getReputation( + const { + reputationAmount, + } = await colonyClient.getReputationWithoutProofs( skillId, userAddress, rootHash, diff --git a/src/data/resolvers/user.ts b/src/data/resolvers/user.ts index 506dc2708a..432257cdd4 100644 --- a/src/data/resolvers/user.ts +++ b/src/data/resolvers/user.ts @@ -46,7 +46,7 @@ const getUserReputation = async ( */ domainId === COLONY_TOTAL_BALANCE_DOMAIN_ID ? ROOT_DOMAIN_ID : domainId, ); - const { reputationAmount } = await colonyClient.getReputation( + const { reputationAmount } = await colonyClient.getReputationWithoutProofs( skillId, address, rootHash,