Fellow members fetching

README.md

@@ -237,6 +237,7 @@ rules:
     users:
       - user-1
       - user-2
+    rank: 2
     countAuthor: true
     allowedToSkipRule:
       teams:
@@ -256,9 +257,13 @@ It has the same parameters as a normal rule:
 	- **Optional**: Defaults to 1.
 	- Must be greater than the number of users available (you cannot request 5 approvals from a team of 4 users)
 - **teams**: An array of team *slugs* that need to review this file.
-	- *Optional if **users** is defined*.
+	- *Optional if **rank** or **users** are defined*.
 - **users**: An array of the GitHub usernames of the users who need to review this file. 
-	- *Optional if **teams** is defined*.
+	- *Optional if **teams** or **rank** are defined*.
+- **rank**: A number defining the minimum [rank a fellow](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fkusama.api.onfinality.io%2Fpublic-ws#/fellowship) needs to have to approve this PR.
+	-  *Optional if **teams** or **users** are defined*.
+	- If it is set to rank 3, it will need the approval of a fellow of rank 3 or higher to pass.
+		- The username is fetched [from the additional field](https://github.com/polkadot-fellows/runtimes/issues/7) in the identity of the fellows. If it is null, the fellow’s review won’t count towards the required approval.
 - **countAuthor**: If the pull request author should be considered as an approval.
 	- If the author belongs to the list of approved users (either by team or by users) his approval will be counted (requiring one less approvals in total).
 	- ** Optional**: Defaults to `false`
@@ -303,9 +308,13 @@ rules:
 			- **Optional**: Defaults to 1.
 			- Must be greater than the number of users available (you cannot request 5 approvals from a team of 4 users)
 		- **teams**: An array of team *slugs* that need to review this file.
-			- *Optional if **users** is defined*.
+			- *Optional if **rank** or **users** are defined*.
 		- **users**: An array of the GitHub usernames of the users who need to review this file. 
-			- *Optional if **teams** is defined*.
+			- *Optional if **teams** or **rank** are defined*.
+		- **rank**: A number defining the minimum [rank a fellow](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fkusama.api.onfinality.io%2Fpublic-ws#/fellowship) needs to have to approve this PR.
+			-  *Optional if **teams** or **users** are defined*.
+			- If it is set to rank 3, it will need the approval of a fellow of rank 3 or higher to pass.
+				- The username is fetched [from the additional field](https://github.com/polkadot-fellows/runtimes/issues/7) in the identity of the fellows. If it is null, the fellow’s review won’t count towards the required approval.
 ##### Or rule logic
 This is a rule that has at least two available options of reviewers and needs **at least one group to approve**.
 
@@ -381,4 +390,4 @@ To deploy a new version you need to update two files:
 
 When a commit is pushed to the main branch and the versions have changed, the system will automatically tag the commit and release a new package with such version.
 
-You can find all the available versions in the [release section](./releases).
+You can find all the available versions in the [release section](../releases).

jest.config.js

@@ -1,2 +1,7 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = { preset: "ts-jest", testEnvironment: "node", testMatch: [__dirname + "/src/**/test/**/*.test.ts"] };
+module.exports = {
+  preset: "ts-jest",
+  testEnvironment: "node",
+  testTimeout: 8_000,
+  testMatch: [__dirname + "/src/**/test/**/*.test.ts"],
+};

package.json

@@ -38,6 +38,7 @@
     "@actions/core": "^1.10.0",
     "@actions/github": "^5.1.1",
     "@eng-automation/js": "^1.0.2",
+    "@polkadot/api": "^10.9.1",
     "joi": "^17.10.0",
     "yaml": "^2.3.2"
   }

src/github/teams.ts

@@ -1,13 +1,4 @@
-import { ActionLogger, GitHubClient } from "./types";
-
-/**
- * Interface for the acquisition of members of a team.
- * As we may be using blockchain instead of GitHub teams, let's wrap the functionality inside a interface
- */
-export interface TeamApi {
-  /** Returns all the GitHub account's logins which belong to a given team. */
-  getTeamMembers(teamName: string): Promise<string[]>;
-}
+import { ActionLogger, GitHubClient, TeamApi } from "./types";
 
 /**
  * Implementation of the TeamApi interface using GitHub teams

src/github/types.ts

@@ -1,5 +1,14 @@
 import type { GitHub } from "@actions/github/lib/utils";
 
+/**
+ * Interface for the acquisition of members of a team.
+ * As we may be using blockchain instead of GitHub teams, let's wrap the functionality inside a interface
+ */
+export interface TeamApi {
+  /** Returns all the GitHub account's logins which belong to a given team. */
+  getTeamMembers(teamName: string): Promise<string[]>;
+}
+
 export interface ActionLogger {
   debug(message: string): void;
   info(message: string): void;

src/index.ts

@@ -6,6 +6,7 @@ import { PullRequest } from "@octokit/webhooks-types";
 import { GitHubChecksApi } from "./github/check";
 import { PullRequestApi } from "./github/pullRequest";
 import { GitHubTeamsApi } from "./github/teams";
+import { PolkadotFellows } from "./polkadot/fellows";
 import { ActionRunner } from "./runner";
 import { generateCoreLogger } from "./util";
 
@@ -63,7 +64,9 @@ const teamApi = new GitHubTeamsApi(getOctokit(inputs.teamApiToken), repo.owner,
 
 const checks = new GitHubChecksApi(getOctokit(inputs.teamApiToken), pr, logger, actionId);
 
-const runner = new ActionRunner(api, teamApi, checks, logger);
+const fellows = new PolkadotFellows(logger);
+
+const runner = new ActionRunner(api, teamApi, fellows, checks, logger);
 
 runner
   .runAction(inputs)

src/polkadot/fellows.ts

@@ -0,0 +1,108 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+import { ApiPromise, WsProvider } from "@polkadot/api";
+
+import { ActionLogger, TeamApi } from "../github/types";
+
+type FellowData = { address: string; rank: number };
+
+export class PolkadotFellows implements TeamApi {
+  private fellowsCache: Map<string, number> = new Map<string, number>();
+
+  constructor(private readonly logger: ActionLogger) {}
+
+  async fetchAllFellows(): Promise<Map<string, number>> {
+    let api: ApiPromise;
+    this.logger.debug("Connecting to collective parachain");
+    // we connect to the collective rpc node
+    const wsProvider = new WsProvider("wss://polkadot-collectives-rpc.polkadot.io");
+    api = await ApiPromise.create({ provider: wsProvider });
+    try {
+      // We fetch all the members
+      const membersObj = await api.query.fellowshipCollective.members.entries();
+
+      // We iterate over the fellow data and convert them into usable values
+      const fellows: FellowData[] = [];
+      for (const [key, rank] of membersObj) {
+        // @ts-ignore
+        const [address]: [string] = key.toHuman();
+        fellows.push({ address, ...(rank.toHuman() as object) } as FellowData);
+      }
+      this.logger.debug(JSON.stringify(fellows));
+
+      // Once we obtained this information, we disconnect this api.
+      await api.disconnect();
+
+      this.logger.debug("Connecting to relay parachain.");
+      // We connect to the relay chain
+      api = await ApiPromise.create({ provider: new WsProvider("wss://rpc.polkadot.io") });
+
+      // We iterate over the different members and extract their data
+      const users: Map<string, number> = new Map<string, number>();
+      for (const fellow of fellows) {
+        this.logger.debug(`Fetching identity of '${fellow.address}', rank: ${fellow.rank}`);
+        const fellowData = (await api.query.identity.identityOf(fellow.address)).toHuman() as
+          | Record<string, unknown>
+          | undefined;
+
+        // If the identity is null, we ignore it.
+        if (!fellowData) {
+          this.logger.debug("Identity is null. Skipping");
+          continue;
+        }
+
+        // @ts-ignore
+        const additional = fellowData.info.additional as [{ Raw: string }, { Raw: string }][] | undefined;
+
+        // If it does not have additional data (GitHub handle goes here) we ignore it
+        if (!additional || additional.length < 1) {
+          this.logger.debug("Additional data is null. Skipping");
+          continue;
+        }
+
+        for (const additionalData of additional) {
+          const [key, value] = additionalData;
+          // We verify that they have an additional data of the key "github"
+          // If it has a handle defined, we push it into the array
+          if (key?.Raw && key?.Raw === "github" && value?.Raw && value?.Raw.length > 0) {
+            this.logger.debug(`Found handles: '${value.Raw}'`);
+            // We add it to the array and remove the @ if they add it to the handle
+            users.set(value.Raw.replace("@", ""), fellow.rank);
+          }
+        }
+      }
+
+      this.logger.info(`Found users: ${JSON.stringify(Array.from(users.entries()))}`);
+
+      return users;
+    } catch (error) {
+      this.logger.error(error as Error);
+      throw error;
+    } finally {
+      await api.disconnect();
+    }
+  }
+
+  async getTeamMembers(ranking: string): Promise<string[]> {
+    const requiredRank = Number(ranking);
+    this.logger.info(`Fetching members of rank '${requiredRank}' or higher`);
+
+    if (this.fellowsCache.size < 1) {
+      this.logger.debug("Cache not found. Fetching fellows.");
+      this.fellowsCache = await this.fetchAllFellows();
+    }
+    const users: string[] = [];
+    for (const [user, rank] of this.fellowsCache) {
+      if (rank >= requiredRank) {
+        users.push(user);
+      }
+    }
+
+    if (users.length === 0) {
+      throw new Error(`Found no members of rank ${requiredRank} or higher. Please see debug logs`);
+    }
+
+    this.logger.info(`GitHub members of rank '${requiredRank}' or higher are: ${users.join(",")}`);
+
+    return users;
+  }
+}

src/rules/types.ts

@@ -5,7 +5,7 @@ export enum RuleTypes {
   AndDistinct = "and-distinct",
 }
 
-export type Reviewers = { users?: string[]; teams?: string[]; min_approvals: number };
+export type Reviewers = { users?: string[]; teams?: string[]; rank?: number; min_approvals: number };
 
 export interface Rule {
   name: string;

src/rules/validator.ts

@@ -10,6 +10,7 @@ import { AndRule, BasicRule, ConfigurationFile, Reviewers, Rule, RuleTypes } fro
 const reviewersObj = {
   users: Joi.array().items(Joi.string()).optional().empty(null),
   teams: Joi.array().items(Joi.string()).optional().empty(null),
+  rank: Joi.number().optional().min(1).empty(null),
 };
 
 const reviewerConditionObj = { ...reviewersObj, min_approvals: Joi.number().min(1).default(1) };
@@ -34,20 +35,20 @@ const ruleSchema = Joi.object<Rule & { type: string }>().keys({
  */
 export const generalSchema = Joi.object<ConfigurationFile>().keys({
   rules: Joi.array<ConfigurationFile["rules"]>().items(ruleSchema).unique("name").required(),
-  preventReviewRequests: Joi.object().keys(reviewersObj).optional().or("users", "teams"),
+  preventReviewRequests: Joi.object().keys(reviewersObj).optional().or("users", "teams", "rank"),
 });
 
 /** Basic rule schema
  * This rule is quite simple as it only has the min_approvals field and the required reviewers
  */
 export const basicRuleSchema = Joi.object<BasicRule>()
   .keys({ ...reviewerConditionObj, countAuthor: Joi.boolean().default(false) })
-  .or("users", "teams");
+  .or("users", "teams", "rank");
 
 /** As, with the exception of basic, every other schema has the same structure, we can recycle this */
 export const otherRulesSchema = Joi.object<AndRule>().keys({
   reviewers: Joi.array<AndRule["reviewers"]>()
-    .items(Joi.object<Reviewers>().keys(reviewerConditionObj).or("users", "teams"))
+    .items(Joi.object<Reviewers>().keys(reviewerConditionObj).or("users", "teams", "rank"))
     .min(2)
     .required(),
   countAuthor: Joi.boolean().default(false),

src/runner.ts

@@ -4,8 +4,7 @@ import { parse } from "yaml";
 import { Inputs } from ".";
 import { GitHubChecksApi } from "./github/check";
 import { PullRequestApi } from "./github/pullRequest";
-import { TeamApi } from "./github/teams";
-import { ActionLogger, CheckData } from "./github/types";
+import { ActionLogger, CheckData, TeamApi } from "./github/types";
 import { AndDistinctRule, ConfigurationFile, Reviewers, Rule } from "./rules/types";
 import { validateConfig, validateRegularExpressions } from "./rules/validator";
 import { caseInsensitiveEqual, concatArraysUniquely } from "./util";
@@ -37,6 +36,7 @@ export class ActionRunner {
   constructor(
     private readonly prApi: PullRequestApi,
     private readonly teamApi: TeamApi,
+    private readonly polkadotApi: TeamApi,
     private readonly checks: GitHubChecksApi,
     private readonly logger: ActionLogger,
   ) {}
@@ -472,6 +472,12 @@ export class ActionRunner {
         users.add(user);
       }
     }
+    if (reviewers.rank) {
+      const members = await this.polkadotApi.getTeamMembers(reviewers.rank.toString());
+      for (const member of members) {
+        users.add(member);
+      }
+    }
 
     return Array.from(users);
   }

src/test/fellows.test.ts

@@ -0,0 +1,30 @@
+/* eslint-disable @typescript-eslint/unbound-method */
+import { mock, mockClear, MockProxy } from "jest-mock-extended";
+
+import { ActionLogger, TeamApi } from "../github/types";
+import { PolkadotFellows } from "../polkadot/fellows";
+
+describe("CAPI test", () => {
+  let fellows: TeamApi;
+  let logger: MockProxy<ActionLogger>;
+
+  beforeEach(() => {
+    logger = mock<ActionLogger>();
+    fellows = new PolkadotFellows(logger);
+  });
+
+  test("Should fetch fellows", async () => {
+    const members = await fellows.getTeamMembers("2");
+    expect(members.length).toBeGreaterThan(0);
+  });
+
+  test("Should cache fellows", async () => {
+    const members = await fellows.getTeamMembers("2");
+    expect(members.length).toBeGreaterThan(0);
+    expect(logger.debug).toHaveBeenCalledWith("Connecting to collective parachain");
+    mockClear(logger);
+    const members2 = await fellows.getTeamMembers("2");
+    expect(members2.length).toBeGreaterThan(0);
+    expect(logger.debug).not.toHaveBeenCalledWith("Connecting to collective parachain");
+  });
+});

src/test/index.test.ts

@@ -6,8 +6,8 @@ import { join } from "path";
 
 import { GitHubChecksApi } from "../github/check";
 import { PullRequestApi } from "../github/pullRequest";
-import { GitHubTeamsApi, TeamApi } from "../github/teams";
-import { ActionLogger, GitHubClient } from "../github/types";
+import { GitHubTeamsApi } from "../github/teams";
+import { ActionLogger, GitHubClient, TeamApi } from "../github/types";
 import { ActionRunner, RuleReport } from "../runner";
 
 type ReportName =
@@ -83,7 +83,7 @@ describe("Integration testing", () => {
     api = new PullRequestApi(client, pr, logger, "");
     teams = new GitHubTeamsApi(client, "org", logger);
     checks = new GitHubChecksApi(client, pr, logger, "example");
-    runner = new ActionRunner(api, teams, checks, logger);
+    runner = new ActionRunner(api, teams, mock<TeamApi>(), checks, logger);
 
     // @ts-ignore problem with the type being mocked
     client.rest.repos.getContent.mockResolvedValue({ data: { content: Buffer.from(config, "utf-8") } });

src/test/rules/andDistinct.test.ts

@@ -5,8 +5,7 @@ import { mock, MockProxy } from "jest-mock-extended";
 
 import { GitHubChecksApi } from "../../github/check";
 import { PullRequestApi } from "../../github/pullRequest";
-import { TeamApi } from "../../github/teams";
-import { ActionLogger } from "../../github/types";
+import { ActionLogger, TeamApi } from "../../github/types";
 import { AndDistinctRule } from "../../rules/types";
 import { ActionRunner } from "../../runner";
 
@@ -16,7 +15,7 @@ describe("'AndDistinctRule' rule parsing", () => {
   let teamsApi: MockProxy<TeamApi>;
   beforeEach(() => {
     api = mock<PullRequestApi>();
-    runner = new ActionRunner(api, teamsApi, mock<GitHubChecksApi>(), mock<ActionLogger>());
+    runner = new ActionRunner(api, teamsApi, mock<TeamApi>(), mock<GitHubChecksApi>(), mock<ActionLogger>());
   });
   test("should get minimal config", async () => {
     api.getConfigFile.mockResolvedValue(`

src/test/rules/andRule.test.ts

@@ -5,8 +5,7 @@ import { mock, MockProxy } from "jest-mock-extended";
 
 import { GitHubChecksApi } from "../../github/check";
 import { PullRequestApi } from "../../github/pullRequest";
-import { TeamApi } from "../../github/teams";
-import { ActionLogger } from "../../github/types";
+import { ActionLogger, TeamApi } from "../../github/types";
 import { AndRule } from "../../rules/types";
 import { ActionRunner } from "../../runner";
 
@@ -16,7 +15,7 @@ describe("'And' rule parsing", () => {
   let teamsApi: MockProxy<TeamApi>;
   beforeEach(() => {
     api = mock<PullRequestApi>();
-    runner = new ActionRunner(api, teamsApi, mock<GitHubChecksApi>(), mock<ActionLogger>());
+    runner = new ActionRunner(api, teamsApi, mock<TeamApi>(), mock<GitHubChecksApi>(), mock<ActionLogger>());
   });
   test("should get minimal config", async () => {
     api.getConfigFile.mockResolvedValue(`