bump polkadot-js/api v5.0.1

polkawallet-io · Jul 16, 2021 · 2aeaddb · 2aeaddb
1 parent 0996e11
commit 2aeaddb
Show file tree

Hide file tree

Showing 8 changed files with 195 additions and 315 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [0.2.5] - 20210716
+
+* bump polkadot-js/api v5.0.1
+* add TokenBalanceData.locked & TokenBalanceData.reserved
+
 ## [0.2.4] - 20210706
 
 * fix DApp webView double-callback bug

diff --git a/js_api/dist/main.js b/js_api/dist/main.js
diff --git a/js_api/package.json b/js_api/package.json
@@ -24,12 +24,12 @@
     "build-dev": "webpack -d --mode development"
   },
   "resolutions": {
-    "@polkadot/api": "^4.17.1"
+    "@polkadot/api": "^5.0.1"
   },
   "dependencies": {
-    "@polkadot/api": "^4.17.1",
-    "@polkadot/ui-shared": "0.82.1",
-    "@polkadot/extension-dapp": "^0.38.7",
+    "@polkadot/api": "^5.0.1",
+    "@polkadot/ui-shared": "0.84.1",
+    "@polkadot/extension-dapp": "^0.39.1",
     "@walletconnect/client": "2.0.0-alpha.26",
     "bn.js": "^5.1.2",
     "oo7-substrate": "^0.8.0",

diff --git a/js_api/src/constants/networkSpect.ts b/js_api/src/constants/networkSpect.ts
@@ -1,4 +1,4 @@
-import networks from "@polkadot/networks";
+import { allNetworks } from "@polkadot/networks";
 import { assert } from "@polkadot/util";
 
 const colors = {
@@ -111,7 +111,7 @@ export const NETWORK_LIST = Object.freeze(Object.assign({}, SUBSTRATE_NETWORK_LI
 export const defaultNetworkKey = SubstrateNetworkKeys.KUSAMA;
 
 function getGenesis(name: string): string {
-  const network = networks.find(({ network }) => network === name);
+  const network = allNetworks.find(({ network }) => network === name);
   assert(network && network.genesisHash[0], `Unable to find genesisHash for ${name}`);
   return network.genesisHash[0];
 }

diff --git a/js_api/src/service/account.ts b/js_api/src/service/account.ts
@@ -16,25 +16,17 @@ let keyring = new Keyring({ ss58Format: 0, type: "sr25519" });
 async function genIcons(addresses: string[]) {
   return addresses.map((i) => {
     const circles = polkadotIcon(i, { isAlternative: false })
-      .map(
-        ({ cx, cy, fill, r }) =>
-          `<circle cx='${cx}' cy='${cy}' fill='${fill}' r='${r}' />`
-      )
+      .map(({ cx, cy, fill, r }) => `<circle cx='${cx}' cy='${cy}' fill='${fill}' r='${r}' />`)
       .join("");
-    return [
-      i,
-      `<svg viewBox='0 0 64 64' xmlns='http://www.w3.org/2000/svg'>${circles}</svg>`,
-    ];
+    return [i, `<svg viewBox='0 0 64 64' xmlns='http://www.w3.org/2000/svg'>${circles}</svg>`];
   });
 }
 
 /**
  * Get svg icons of pubKeys.
  */
 async function genPubKeyIcons(pubKeys: string[]) {
-  const icons = await genIcons(
-    pubKeys.map((key) => keyring.encodeAddress(hexToU8a(key), 2))
-  );
+  const icons = await genIcons(pubKeys.map((key) => keyring.encodeAddress(hexToU8a(key), 2)));
   return icons.map((i, index) => {
     i[0] = pubKeys[index];
     return i;
@@ -77,11 +69,7 @@ async function encodeAddress(pubKeys: string[], ss58Formats: number[]) {
 /**
  * query account address with account index
  */
-async function queryAddressWithAccountIndex(
-  api: ApiPromise,
-  accIndex: string,
-  ss58: number
-) {
+async function queryAddressWithAccountIndex(api: ApiPromise, accIndex: string, ss58: number) {
   const num = ss58Decode(accIndex, ss58).toJSON();
   const res = await api.query.indices.accounts(num.data);
   return res;
@@ -94,26 +82,14 @@ async function queryAccountsBonded(api: ApiPromise, pubKeys: string[]) {
   return Promise.all(
     pubKeys
       .map((key) => keyring.encodeAddress(hexToU8a(key), 2))
-      .map((i) =>
-        Promise.all([api.query.staking.bonded(i), api.query.staking.ledger(i)])
-      )
-  ).then((ls) =>
-    ls.map((i, index) => [
-      pubKeys[index],
-      i[0],
-      i[1].toHuman() ? i[1].toHuman()["stash"] : null,
-    ])
-  );
+      .map((i) => Promise.all([api.query.staking.bonded(i), api.query.staking.ledger(i)]))
+  ).then((ls) => ls.map((i, index) => [pubKeys[index], i[0], i[1].toHuman() ? i[1].toHuman()["stash"] : null]));
 }
 
 /**
  * get network native token balance of an address
  */
-async function getBalance(
-  api: ApiPromise,
-  address: string,
-  msgChannel: string
-) {
+async function getBalance(api: ApiPromise, address: string, msgChannel: string) {
   const transfrom = (res: any) => {
     const lockedBreakdown = res.lockedBreakdown.map((i: any) => {
       return {

diff --git a/js_api/src/service/keyring.ts b/js_api/src/service/keyring.ts
@@ -4,8 +4,7 @@ import BN from "bn.js";
 import { parseQrCode, getSigner, makeTx, getSubmittable } from "../utils/QrSigner";
 import gov from "./gov";
 import metaDataMap from "../constants/networkMetadata";
-import { TypeRegistry } from "@polkadot/types";
-import { Metadata } from "@polkadot/metadata";
+import { Metadata, TypeRegistry } from "@polkadot/types";
 import { wrapBytes } from "@polkadot/extension-dapp/wrapBytes";
 
 import { Keyring } from "@polkadot/keyring";