Merge branch 'develop'

Author: RomeroYang

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.4.0] - 20220104
+
+* bump polkadot-js/api v7.1.1
+* speed up connection with connectAll()
+* add heart beat & reconnect
+* add TokenBalanceData.type
+* add aggregatedAssetsWidget support
+
 ## [0.3.8] - 20211126
 
 * bump polkadot-js/api v6.9.2

js_api/dist/main.js

@@ -24,10 +24,10 @@
     "build-dev": "webpack --mode development"
   },
   "resolutions": {
-    "@polkadot/api": "^6.9.2"
+    "@polkadot/api": "^7.1.1"
   },
   "dependencies": {
-    "@polkadot/api": "^6.9.2",
+    "@polkadot/api": "^7.1.1",
     "@polkadot/extension-dapp": "^0.40.3",
     "@polkadot/ui-shared": "0.86.7",
     "@walletconnect/client": "2.0.0-alpha.26",

js_api/package.json

@@ -17,12 +17,19 @@ function send(path: string, data: any) {
 }
 send("log", "main js loaded");
 (<any>window).send = send;
+
+async function connectAll(nodes: string[]) {
+  return Promise.race(nodes.map(node => connect([node])));
+}
+
 /**
  * connect to a specific node.
  *
  * @param {string} nodeEndpoint
  */
 async function connect(nodes: string[]) {
+  (<any>window).api = undefined;
+  
   return new Promise(async (resolve, reject) => {
     const wsProvider = new WsProvider(nodes);
     try {
@@ -34,10 +41,17 @@ async function connect(nodes: string[]) {
           [`${STATEMINE_GENESIS}-504`]: localMetadata["statemine"],
         },
       });
-      (<any>window).api = res;
-      const url = nodes[(<any>res)._options.provider.__private_16_endpointIndex];
-      send("log", `${url} wss connected success`);
-      resolve(url);
+      if (!(<any>window).api) {
+        (<any>window).api = res;
+        const url = nodes[(<any>res)._options.provider.__private_16_endpointIndex];
+        send("log", `${url} wss connected success`);
+        resolve(url);
+      } else {
+        res.disconnect();
+        const url = nodes[(<any>res)._options.provider.__private_16_endpointIndex];
+        send("log", `${url} wss success and disconnected`);
+        resolve(url);
+      }
     } catch (err) {
       send("log", `connect failed`);
       wsProvider.disconnect();
@@ -54,6 +68,7 @@ const test = async () => {
 const settings = {
   test,
   connect,
+  connectAll,
   subscribeMessage,
   getNetworkConst,
   getNetworkProperties,

js_api/src/index.ts

@@ -49,7 +49,7 @@ function _extractRewards(
       avgCount++;
     }
 
-    labels.push(era.toHuman());
+    labels.push(era.toString());
     rewardSet.push(reward);
     avgSet.push((avgCount ? Math.ceil((total * 100) / avgCount) : 0) / 100);
     slashSet.push(slash);
@@ -70,7 +70,7 @@ function _extractPoints(points: any[]) {
 
   points.forEach(({ era, points }) => {
     total += points.toNumber();
-    labels.push(era.toHuman());
+    labels.push(era.toString());
 
     if (points.gtn(0)) {
       avgCount++;
@@ -104,7 +104,7 @@ function _extractStake(exposures: any[]) {
     }
 
     avgSet.push((avgCount ? Math.ceil((total * 100) / avgCount) : 0) / 100);
-    labels.push(era.toHuman());
+    labels.push(era.toString());
     cliSet.push(cli);
     expSet.push(exp);
   });