Merge pull request #141 from w3f/identity-hash

Prepare identity info hash for `provideJudgement`

charts/polkadot-registrar-watcher/Chart.yaml

@@ -1,5 +1,5 @@
 description: Polkadot Watcher
 name: polkadot-registrar-watcher
-version: v0.3.33
-appVersion: v0.3.33
+version: v0.4.0
+appVersion: v0.4.0
 apiVersion: v2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "polkadot-registrar-watcher",
-  "version": "0.3.33",
+  "version": "0.4.0",
   "description": "Registrar",
   "repository": "[email protected]:w3f/polkadot-registrar-watcher.git",
   "author": "W3F Infrastructure Team <[email protected]>",
@@ -18,7 +18,7 @@
     "start": "node ./dist/index.js start"
   },
   "dependencies": {
-    "@polkadot/api": "^9.2.2",
+    "@polkadot/api": "^9.4.2",
     "@types/ws": "^7.2.7",
     "@w3f/config": "^0.1.1",
     "@w3f/logger": "^0.4.3",

src/messageCenter.ts

@@ -48,7 +48,7 @@ export class WsMessageCenter {
 
       if(data['event'] == 'judgementResult'){
         const judgementResult: WsJudgementResult = data['data']
-        await this.subscriber.handleTriggerExtrinsicJudgement(judgementResult.judgement,judgementResult.address)
+        await this.subscriber.handleTriggerExtrinsicJudgement(judgementResult.judgement,judgementResult.address, judgementResult.verified)
       }
 
       if(data['event'] == 'pendingJudgementsRequest'){

src/subscriber/ISubscriber.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/interface-name-prefix */
 
-import { WsChallengeRequest, WsChallengeUnrequest, WsPendingChallengesResponse, WsAck, WsDisplayNameResponse } from "../types";
+import { WsChallengeRequest, WsChallengeUnrequest, WsPendingChallengesResponse, WsAck, WsDisplayNameResponse, WsVerifiedField } from "../types";
 
 export interface ISubscriber{
   start(): Promise<void>;
@@ -9,5 +9,5 @@ export interface ISubscriber{
   setJudgementGivenHandler(handler: (request: WsAck) => void ): void;
   getAllOurPendingWsChallengeRequests(): Promise<WsPendingChallengesResponse>;
   getAllDisplayNames(): Promise<WsDisplayNameResponse>;
-  handleTriggerExtrinsicJudgement(result: string,address: string): Promise<boolean>;
+  handleTriggerExtrinsicJudgement(result: string, address: string, verified: Array<WsVerifiedField>): Promise<boolean>;
 }

src/subscriber/subscriber.ts

@@ -3,14 +3,15 @@ import { SessionIndex, Registration, IdentityInfo, Event } from '@polkadot/types
 import { Logger } from '@w3f/logger';
 import { Text } from '@polkadot/types/primitive';
 import {
-    InputConfig, JudgementResult, WsChallengeRequest, WsChallengeUnrequest, WsPendingChallengesResponse, WsAck, WsDisplayNameResponse
+    InputConfig, JudgementResult, WsChallengeRequest, WsChallengeUnrequest, WsPendingChallengesResponse, WsAck, WsDisplayNameResponse, WsVerifiedField
 } from '../types';
 import { Option } from '@polkadot/types'
 import fs from 'fs'
 import { KeyringPair, KeyringPair$Json } from '@polkadot/keyring/types';
 import {Keyring} from '@polkadot/keyring'
 import { buildWsChallengeRequest, buildWsChallengeUnrequest, isJudgementGivenEvent, isJudgementUnrequested, isClaimChallengeCompliant, isJudgementRequestedEvent, isIdentityClearedEvent, extractJudgementInfoFromEvent, extractIdentityInfoFromEvent, buildWsChallengeRequestData, isIdentitySetEvent, buildJudgementGivenAck, extractRegistrationEntry, isDataPresent, isJudgementsFieldDisplayNamesCompliant, delay } from "../utils";
 import { ISubscriber } from './ISubscriber'
+import { IU8a } from '@polkadot/types-codec/types';
 
 export class Subscriber implements ISubscriber {
     private chain: Text;
@@ -258,7 +259,54 @@ export class Subscriber implements ISubscriber {
       return await this.api.query.identity.identityOf(accountId)
     }
 
-    public handleTriggerExtrinsicJudgement = async (judgementResult: string, target: string): Promise<boolean> => {
+    private _verifyOnchainMatch = async (target: string, verified: Array<WsVerifiedField>): Promise<IU8a> => {
+      // Fetch the full identity from chain. Unwrapping on a `None` value would
+      // indicate a bug since the target is checked in
+      // `handleTriggerExtrinsicJudgement`.
+      const info = (await this._getIdentity(target)).unwrap().info;
+
+      // Check if the verified values match the on-chain identity.
+      for (const field of verified) {
+        switch (field.accountTy) {
+          case "legal_name":
+            if (field.value != info.legal.toHuman()) {
+              throw new Error("Verified legal name does not mache on-chain value");
+            }
+            break;
+          case "display_name":
+            if (field.value != info.display.toHuman()) {
+              throw new Error("Verified display name does not mache on-chain value");
+            }
+            break;
+          case "email":
+            if (field.value != info.email.toHuman()) {
+              throw new Error("Verified email does not mache on-chain value");
+            }
+            break;
+          case "twitter":
+            if (field.value != info.twitter.toHuman()) {
+              throw new Error("Verified twitter does not mache on-chain value");
+            }
+            break;
+          case "matrix":
+            if (field.value != info.riot.toHuman()) {
+              throw new Error("Verified matrix does not mache on-chain value");
+            }
+            break;
+          case "web":
+            if (field.value != info.web.toHuman()) {
+              throw new Error("Verified web does not mache on-chain value");
+            }
+            break;
+          default:
+            throw new Error(`Verified unsupported entries: ${field.accountTy}`);
+        }
+      }
+
+      return info.hash;
+    }
+
+    public handleTriggerExtrinsicJudgement = async (judgementResult: string, target: string, verified: Array<WsVerifiedField>): Promise<boolean> => {
 
       if( ! await this._isAccountIdWaitingOurJudgement(target) ){
         this.logger.info(`the account id ${target} is not present in the pending judgment request set for our registrar...`)
@@ -272,10 +320,12 @@ export class Subscriber implements ISubscriber {
       try {
 
         if(judgementResult == JudgementResult[JudgementResult.erroneous] ){
-          await this.triggerExtrinsicErroneous(target)
+          const identityHash = await this._verifyOnchainMatch(target,verified)
+          await this.triggerExtrinsicErroneous(target, identityHash)
         }
         else if(judgementResult == JudgementResult[JudgementResult.reasonable] ){
-          await this.triggerExtrinsicReasonable(target)
+          const identityHash = await this._verifyOnchainMatch(target,verified)
+          await this.triggerExtrinsicReasonable(target, identityHash)
         }
 
         // the transaction has been successfully transmitted
@@ -288,17 +338,17 @@ export class Subscriber implements ISubscriber {
 
     }
 
-    public triggerExtrinsicReasonable = async (target: string): Promise<void> => {
-      await this._triggerExtrinsicProvideJudgement(target,{Reasonable: true})
+    public triggerExtrinsicReasonable = async (target: string, identityHash: IU8a): Promise<void> => {
+      await this._triggerExtrinsicProvideJudgement(target,{Reasonable: true}, identityHash)
     }
 
-    public triggerExtrinsicErroneous = async (target: string): Promise<void> =>{
-      await this._triggerExtrinsicProvideJudgement(target,{Erroneous: true})
+    public triggerExtrinsicErroneous = async (target: string, identityHash: IU8a): Promise<void> =>{
+      await this._triggerExtrinsicProvideJudgement(target,{Erroneous: true}, identityHash)
     }
 
-    protected _triggerExtrinsicProvideJudgement = async (target: string, judgement: {Reasonable: boolean} | {Erroneous: boolean} ): Promise<void> =>{      
-      const extrinsic = this.api.tx.identity.provideJudgement(this.registrarIndex,target,judgement)
-      const txHash = await extrinsic.signAndSend(this.registrarAccount)
+    protected _triggerExtrinsicProvideJudgement = async (target: string, judgement: {Reasonable: boolean} | {Erroneous: boolean} , identityHash: IU8a): Promise<void> =>{
+      const extrinsic = this.api.tx.identity.provideJudgement(this.registrarIndex,target,judgement, identityHash);
+      const txHash = await extrinsic.signAndSend(this.registrarAccount);
       this.logger.info(`Judgement Submitted with hash ${txHash}`);
     }
 

src/subscriber/subscriberProxy.ts

@@ -1,6 +1,7 @@
 import { Logger } from "@w3f/logger";
 import { InputConfig } from "../types";
 import { Subscriber } from "./subscriber";
+import { IU8a } from '@polkadot/types-codec/types';
 
 export class SubscriberProxy extends Subscriber {
 
@@ -14,9 +15,9 @@ export class SubscriberProxy extends Subscriber {
       this.registrarPrimaryAccount = cfg.registrar.proxy.primaryAccount
     }
 
-  protected _triggerExtrinsicProvideJudgement = async (target: string, judgement: {Reasonable: boolean} | {Erroneous: boolean} ): Promise<void> =>{     
+  protected _triggerExtrinsicProvideJudgement = async (target: string, judgement: {Reasonable: boolean} | {Erroneous: boolean}, identityHash: IU8a ): Promise<void> =>{     
 
-    const call = this.api.tx.identity.provideJudgement(this.registrarIndex,target,judgement)
+    const call = this.api.tx.identity.provideJudgement(this.registrarIndex,target,judgement,identityHash)
     const extrinsic = this.api.tx.proxy.proxy(this.registrarPrimaryAccount, null, call)
     const txHash = await extrinsic.signAndSend(this.registrarAccount)
     this.logger.info(`Judgement Submitted with hash ${txHash}`);

src/subscriber/subscriberProxy2Levels.ts

@@ -1,6 +1,7 @@
 import { Logger } from "@w3f/logger";
 import { InputConfig } from "../types";
 import { Subscriber } from "./subscriber";
+import { IU8a } from '@polkadot/types-codec/types';
 
 export class SubscriberProxy2Levels extends Subscriber {
 
@@ -16,9 +17,9 @@ export class SubscriberProxy2Levels extends Subscriber {
       this.registrarPrimaryAccount = cfg.registrar.proxy2Levels.primaryAccount
     }
 
-  protected _triggerExtrinsicProvideJudgement = async (target: string, judgement: {Reasonable: boolean} | {Erroneous: boolean} ): Promise<void> =>{     
+  protected _triggerExtrinsicProvideJudgement = async (target: string, judgement: {Reasonable: boolean} | {Erroneous: boolean}, identityHash: IU8a ): Promise<void> =>{     
 
-    const call = this.api.tx.identity.provideJudgement(this.registrarIndex,target,judgement)
+    const call = this.api.tx.identity.provideJudgement(this.registrarIndex,target,judgement,identityHash)
     const callMidlle = this.api.tx.proxy.proxy(this.registrarPrimaryAccount, null, call)
     const extrinsic = this.api.tx.proxy.proxy(this.registrarMiddleAccount, null, callMidlle)
     const txHash = await extrinsic.signAndSend(this.registrarAccount)

src/types.ts

@@ -95,6 +95,12 @@ export interface WsChallengeResponse {
 export interface WsJudgementResult{
   address: string;
   judgement: string;
+  verified: Array<WsVerifiedField>;
+}
+
+export interface WsVerifiedField {
+  accountTy: string;
+  value: string;
 }
 
 export interface WsChallengeUnrequest {