Implement the registerWithDCAP api call to be used by Crust Sworker.

Note: When the Crust-API talks to Crust Mainnet for the entrynetwork registration, we re-use the sworker.registerWithDeauthChain extrinsic in the Crust Mainnet, so that we don't need to change the mainnet code.

Author: wuhaixian1984

docs/api.md

@@ -166,6 +166,34 @@ Response:
 }
 ```
 
+#### Register with decentralized auth chain as sWorker
+
+Request:
+
+```shell
+curl --request POST 'http://localhost:56666/api/v1/swork/registerWithDCAP' \
+--header 'Content-Type: application/json' \
+--header 'password: 123456' \
+--data-raw '{
+  "who" : "0xa6efa374700f8640b777bc92c77d34447c5588d7eb7c4ec984323c7db0983009",
+  "code" : "0x34633130383435666561376230353433646264333965656236626434376434623735383131663565356435313666353164623263373564343439353961633761",
+  "pubkey" : "0x3061376637646531626635303538636161366239363661346435303738326139663261656137393536313735303234373734373136343264636433623132313363386562643663303162633737333062613432353563373938316463656437626432343464633735323063353936303534663031323361383833346333313139",
+  "pubkeys" : ["0x328846691dd2401b2a62b123daea0e6f626cb4919dc560797645d26e3273a57a",  "0x2ec91af63632573a5b051376cdeb79730261e696117e68c67aa298d519f0c77c"],
+  "sig" : "1f9ddc0ec3cb13c6b779924e78ebf4036c6c063a691649a18955f871feeac36a3204ee0c88a26249cfb9702ccb69e4e3d8de7720f1cdf185fbc24351a8c4e548",
+  "sigs" :  ["0x08c8b9c428add1c886d3c7485b36c2b3eea61c74a651e162ec2c53af7f97b67422a0b70d4b4e2eba35a6c01ccdd95a40527f9e9670ef8f1a109a43648479218a",
+    "0x1831dd101ed60ce5193a5b9ad95cc4792b735490f36398c4e2536ca7c9d88945bb40636f2313a0906b24f9e46dd2ba4c18c8a0fd772caa1b878af9398deb0a89"]
+  "backup" : "{\"address\":\"5FqazaU79hjpEMiWTWZx81VjsYFst15eBuSBKdQLgQibD7CX\",\"encoded\":\"0xc81537c9442bd1d3f4985531293d88f6d2a960969a88b1cf8413e7c9ec1d5f4955adf91d2d687d8493b70ef457532d505b9cee7a3d2b726a554242b75fb9bec7d4beab74da4bf65260e1d6f7a6b44af4505bf35aaae4cf95b1059ba0f03f1d63c5b7c3ccbacd6bd80577de71f35d0c4976b6e43fe0e1583530e773dfab3ab46c92ce3fa2168673ba52678407a3ef619b5e14155706d43bd329a5e72d36\",\"encoding\":{\"content\":[\"pkcs8\",\"sr25519\"],\"type\":\"xsalsa20-poly1305\",\"version\":\"2\"},\"meta\":{\"name\":\"Yang1\",\"tags\":[],\"whenCreated\":1580628430860}}"
+}'
+```
+
+Response:
+
+```json
+{
+    "status": "success",
+}
+```
+
 #### Send sWorker work report
 
 Request:

package.json

@@ -13,8 +13,8 @@
     "fix": "gts fix"
   },
   "dependencies": {
-    "@crustio/type-definitions": "1.1.0",
-    "@polkadot/api": "4.2.2-4",
+    "@crustio/type-definitions": "1.3.0",
+    "@polkadot/api": "6.0.5", 
     "body-parser": "^1.19.0",
     "connect-timeout": "^1.9.0",
     "express": "^4.17.1",

src/index.ts

@@ -59,6 +59,7 @@ app.get('/api/v1/market/file', services.market.file);
 
 // Post routes
 app.post('/api/v1/swork/identity', services.swork.register);
+app.post('/api/v1/swork/registerWithDCAP', services.swork.registerWithDCAP);
 app.post('/api/v1/swork/workreport', services.swork.reportWorks);
 
 // Error handler

src/services/chain.ts

@@ -20,7 +20,7 @@ export async function blockHash(api: ApiPromise, bn: number) {
 
 export async function health(api: ApiPromise) {
   logger.info('⛓ [chain]: Query system health');
-  const h = await api.rpc.system.health();
+  const h = (await api.rpc.system.health()) as any;
   const ch: CrustHealth = {
     isSyncing: h.isSyncing.isTrue,
     peers: h.peers.toNumber(),
@@ -29,9 +29,9 @@ export async function health(api: ApiPromise) {
 
   // HEALTH PATCH: This is for the poor syncing process
   if (!ch.isSyncing) {
-    const h_before = await header(api);
+    const h_before = (await header(api)) as any;
     await sleep(3000);
-    const h_after = await header(api);
+    const h_after = (await header(api)) as any;
     if (h_before.number.toNumber() + 1 < h_after.number.toNumber()) {
       ch.isSyncing = true;
     }

src/services/index.ts

@@ -2,7 +2,7 @@ import {Request, Response, NextFunction} from 'express';
 import {ApiPromise, WsProvider} from '@polkadot/api';
 import {typesBundleForPolkadot} from '@crustio/type-definitions';
 import {blockHash, header, health} from './chain';
-import {register, reportWorks, workReport, code, identity} from './swork';
+import {register, reportWorks, workReport, code, identity, registerWithDCAP } from './swork';
 import {file} from './market';
 import {loadKeyringPair, resHandler, withApiReady} from './util';
 import {logger} from '../log';
@@ -39,7 +39,7 @@ export const getApi = (): ApiPromise => {
 export const chain = {
   header: (_: Request, res: Response, next: NextFunction) => {
     withApiReady(async (api: ApiPromise) => {
-      const h = await header(api);
+      const h = (await header(api)) as any;
       res.json({
         number: h.number,
         hash: h.hash,
@@ -65,6 +65,12 @@ export const swork = {
       await resHandler(register(api, krp, req), res);
     }, next);
   },
+  registerWithDCAP: (req: Request, res: Response, next: NextFunction) => {
+    withApiReady(async (api: ApiPromise) => {
+      const krp = loadKeyringPair(req);
+      await resHandler(registerWithDCAP(api, krp, req), res);
+    }, next);
+  },
   reportWorks: (req: Request, res: Response, next: NextFunction) => {
     withApiReady(async (api: ApiPromise) => {
       const krp = loadKeyringPair(req);

src/services/swork.ts

@@ -23,7 +23,27 @@ export async function register(
     '0x' + req.body['sig']
   );
 
-  return handleSworkTxWithLock(async () => sendTx(tx, krp));
+  return handleSworkTxWithLock(async () => sendTx(api, tx, krp));
+}
+
+export async function registerWithDCAP(
+  api: ApiPromise,
+  krp: KeyringPair,
+  req: Request
+) {
+  logger.info(`⚙️ [swork]: Call register With DCAP with ${JSON.stringify(req.body)}`);
+  // Re-use the registerWithDeauthChain extrinsic in the Crust Mainnet, so that we don't need to change
+  // the mainnet code. 
+  const tx = api.tx.swork.registerWithDeauthChain(
+    req.body['who'],
+    req.body['code'],
+    req.body['pubkeys'],
+    req.body['sigs'],
+    req.body['pubkey'],
+    req.body['sig']
+  );
+
+  return handleSworkTxWithLock(async () => sendTx(api, tx, krp));
 }
 
 export async function reportWorks(
@@ -57,7 +77,7 @@ export async function reportWorks(
   );
 
   let txRes = queryToObj(
-    await handleSworkTxWithLock(async () => sendTx(tx, krp))
+    await handleSworkTxWithLock(async () => sendTx(api, tx, krp))
   );
 
   // Double confirm of tx status

src/services/util.ts

@@ -8,6 +8,7 @@ import {SubmittableExtrinsic} from '@polkadot/api/promise/types';
 import {timeout} from 'promise-timeout';
 import {TxRes, getApi} from './index';
 import {logger} from '../log';
+import {ApiPromise, WsProvider} from '@polkadot/api';
 
 const txLocker = {swork: false};
 /**
@@ -24,7 +25,11 @@ export function loadKeyringPair(req: Request): KeyringPair {
   return krp;
 }
 
-export async function sendTx(tx: SubmittableExtrinsic, krp: KeyringPair) {
+export async function sendTx(
+  api: ApiPromise,
+  tx: SubmittableExtrinsic,
+  krp: KeyringPair
+) {
   return new Promise((resolve, reject) => {
     tx.signAndSend(krp, ({events = [], status}) => {
       logger.info(
@@ -40,19 +45,19 @@ export async function sendTx(tx: SubmittableExtrinsic, krp: KeyringPair) {
       if (status.isInBlock) {
         events.forEach(({event: {data, method, section}}) => {
           if (section === 'system' && method === 'ExtrinsicFailed') {
-            const [dispatchError] = data as unknown as ITuple<[DispatchError]>;
+            const [dispatchError] = (data as unknown) as ITuple<[DispatchError]>;
             const result: TxRes = {
               status: 'failed',
               message: dispatchError.type,
             };
             // Can get detail error info
             if (dispatchError.isModule) {
               const mod = dispatchError.asModule;
-              const error = getApi().registry.findMetaError(
+              const error = api.registry.findMetaError(
                 new Uint8Array([mod.index.toNumber(), mod.error.toNumber()])
               );
               result.message = `${error.section}.${error.name}`;
-              result.details = error.documentation.join('');
+              result.details = error.docs.join('');
             }
 
             logger.info(