Update to glwss and [email protected]

JoinColony · Oct 27, 2022 · 7442def · 7442def
1 parent 3a0eccb
commit 7442def
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 30 deletions.
diff --git a/docs/api/classes/Colony.md b/docs/api/classes/Colony.md
@@ -38,7 +38,7 @@ ___
 
 ### SupportedVersions
 
-▪ `Static` **SupportedVersions**: (``8`` \| ``9``)[]
+▪ `Static` **SupportedVersions**: ``10``[]
 
 The currently supported Colony version. If a Colony is not on this version it has to be upgraded.
 If this is not an option, Colony SDK might throw errors at certain points. Usage of ColonyJS is advised in these cases
@@ -215,7 +215,7 @@ Will throw if teamId does not exist
 
 | Name | Type | Description |
 | :------ | :------ | :------ |
-| `teamId` | `BigNumberish` | The teamId to get the team information for FIXME: get the type somehow |
+| `teamId` | `BigNumberish` | The teamId to get the team information for |
 
 #### Returns
 

diff --git a/docs/api/classes/MotionCreator.md b/docs/api/classes/MotionCreator.md
@@ -16,7 +16,7 @@ You can find an instance of this under `colony.ext.motions.create`
 | Name | Type |
 | :------ | :------ |
 | `colony` | [`Colony`](Colony.md) |
-| `votingReputationClient` | `VotingReputationClientV4` |
+| `votingReputationClient` | `VotingReputationClientV7` |
 
 ## Methods
 

diff --git a/docs/api/classes/VotingReputation.md b/docs/api/classes/VotingReputation.md
@@ -94,7 +94,7 @@ You can - at any point in the lifecycle inspect the current state of a Motion. U
 | Name | Type |
 | :------ | :------ |
 | `colony` | [`Colony`](Colony.md) |
-| `votingReputationClient` | `VotingReputationClientV4` |
+| `votingReputationClient` | `VotingReputationClientV7` |
 
 ## Properties
 

diff --git a/docs/api/enums/Extension.md b/docs/api/enums/Extension.md
@@ -10,12 +10,42 @@ Extension contract names
 
 ___
 
+### EvaluatedExpenditure
+
+• **EvaluatedExpenditure** = ``"EvaluatedExpenditure"``
+
+___
+
+### IVotingReputation
+
+• **IVotingReputation** = ``"IVotingReputation"``
+
+___
+
 ### OneTxPayment
 
 • **OneTxPayment** = ``"OneTxPayment"``
 
 ___
 
+### StakedExpenditure
+
+• **StakedExpenditure** = ``"StakedExpenditure"``
+
+___
+
+### StreamingPayments
+
+• **StreamingPayments** = ``"StreamingPayments"``
+
+___
+
+### TokenSupplier
+
+• **TokenSupplier** = ``"TokenSupplier"``
+
+___
+
 ### VotingReputation
 
 • **VotingReputation** = ``"VotingReputation"``

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.6.2",
   "license": "GPL-3.0-only",
   "dependencies": {
-    "@colony/colony-js": "^5.1.7",
+    "@colony/colony-js": "^5.3.0-beta.1",
     "@urql/core": "^2.5.0",
     "cross-fetch": "^3.1.5",
     "fetch-retry": "^5.0.2",

diff --git a/src/ColonyNetwork/Colony.ts b/src/ColonyNetwork/Colony.ts
@@ -1,12 +1,12 @@
 import {
-  ColonyClientV8,
-  ColonyClientV9,
+  ColonyClientV10,
   SignerOrProvider,
   Id,
   Extension,
 } from '@colony/colony-js';
 
 import {
+  ColonyDataTypes,
   ColonyFundsClaimed_address_uint256_uint256_EventObject,
   // eslint-disable-next-line max-len
   ColonyFundsMovedBetweenFundingPots_address_uint256_uint256_uint256_address_EventObject,
@@ -28,7 +28,7 @@ import { ColonyToken } from './ColonyToken';
 import { ColonyNetwork } from './ColonyNetwork';
 import { VotingReputation } from './VotingReputation';
 
-export type SupportedColonyClient = ColonyClientV8 | ColonyClientV9;
+export type SupportedColonyClient = ColonyClientV10;
 export type SupportedColonyMethods = SupportedColonyClient['functions'];
 export interface SupportedExtensions {
   motions?: VotingReputation;
@@ -38,7 +38,7 @@ export class Colony {
   /** The currently supported Colony version. If a Colony is not on this version it has to be upgraded.
    * If this is not an option, Colony SDK might throw errors at certain points. Usage of ColonyJS is advised in these cases
    */
-  static SupportedVersions: (8 | 9)[] = [8, 9];
+  static SupportedVersions: 10[] = [10];
 
   private colonyClient: SupportedColonyClient;
 
@@ -219,10 +219,12 @@ export class Colony {
    * @remarks Will throw if teamId does not exist
    *
    * @param teamId The teamId to get the team information for
-   * FIXME: get the type somehow
+   *
    * @returns A Team object
    */
-  async getTeam(teamId: BigNumberish) {
+  async getTeam(
+    teamId: BigNumberish,
+  ): Promise<ColonyDataTypes.DomainStructOutput> {
     const teamCount = await this.colonyClient.getDomainCount();
     if (teamCount.lt(teamId)) {
       throw new Error(`Team with id ${teamId} does not exist`);

diff --git a/src/ColonyNetwork/ColonyNetwork.ts b/src/ColonyNetwork/ColonyNetwork.ts
@@ -70,10 +70,7 @@ export class ColonyNetwork {
   async getColony(address: string): Promise<Colony> {
     const colonyClient = await this.networkClient.getColonyClient(address);
 
-    if (
-      colonyClient.clientVersion !== Colony.SupportedVersions[0] &&
-      colonyClient.clientVersion !== Colony.SupportedVersions[1]
-    ) {
+    if (colonyClient.clientVersion !== Colony.SupportedVersions[0]) {
       throw new Error(
         `The version of this Colony ${colonyClient.clientVersion} is not supported by Colony SDK. Please update your Colony`,
       );

diff --git a/src/ColonyNetwork/MotionCreator.ts b/src/ColonyNetwork/MotionCreator.ts
@@ -5,7 +5,7 @@ import {
   Extension,
   ColonyRole,
   getPermissionProofs,
-  getExtensionPermissionProofs,
+  getMultiPermissionProofs,
   getChildIndex,
 } from '@colony/colony-js';
 
@@ -166,14 +166,16 @@ export class MotionCreator {
       Extension.OneTxPayment,
     );
 
-    const [extensionPDID, extensionCSI] = await getExtensionPermissionProofs(
+    const [extensionPDID, extensionCSI] = await getMultiPermissionProofs(
       colonyClient,
       setTeamId,
+      [ColonyRole.Funding, ColonyRole.Administration],
       oneTxClient.address,
     );
-    const [userPDID, userCSI] = await getExtensionPermissionProofs(
+    const [userPDID, userCSI] = await getMultiPermissionProofs(
       colonyClient,
       setTeamId,
+      [ColonyRole.Funding, ColonyRole.Administration],
     );
 
     const encodedAction = oneTxClient.interface.encodeFunctionData(

diff --git a/src/ColonyNetwork/VotingReputation.ts b/src/ColonyNetwork/VotingReputation.ts
@@ -2,11 +2,11 @@ import {
   Extension,
   Id,
   MotionState,
-  Motion,
-  VotingReputationClientV4,
+  VotingReputationClientV7,
 } from '@colony/colony-js';
 
 import {
+  VotingReputationDataTypes,
   MotionEventSetEventObject,
   MotionFinalizedEventObject,
   MotionStakedEventObject,
@@ -25,8 +25,8 @@ export enum Vote {
   Yay,
 }
 
-export type SupportedVotingReputationClient = VotingReputationClientV4;
-export const SUPPORTED_VOTING_REPUTATION_VERSION = 4;
+export type SupportedVotingReputationClient = VotingReputationClientV7;
+export const SUPPORTED_VOTING_REPUTATION_VERSION = 7;
 
 type ReputationData = Awaited<
   ReturnType<SupportedColonyClient['getReputation']>
@@ -285,7 +285,10 @@ export class VotingReputation {
    *
    * @returns The minimum stake amount
    */
-  async getMinStake(motion: Motion, vote: Vote) {
+  async getMinStake(
+    motion: VotingReputationDataTypes.MotionStructOutput,
+    vote: Vote,
+  ) {
     // skillRep is the amount of reputation in the domain the motion was created in
     // at the time the motion was created
     const {