Merge branch 'develop'

Author: RomeroYang

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.3.7] - 20211101
+
+* bump polkadot-js/api v6.5.2
+* fix gov referendum data parsing
+
 ## [0.3.6] - 20211025
 
 * bump polkadot-js/api v6.5.1

js_api/dist/main.js

@@ -1,6 +1,6 @@
 {
   "name": "@polkawallet/js-api",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "main": "index.js",
   "license": "Apache-2.0",
   "keywords": [
@@ -24,10 +24,10 @@
     "build-dev": "webpack --mode development"
   },
   "resolutions": {
-    "@polkadot/api": "^6.5.1"
+    "@polkadot/api": "^6.5.2"
   },
   "dependencies": {
-    "@polkadot/api": "^6.5.1",
+    "@polkadot/api": "^6.5.2",
     "@polkadot/extension-dapp": "^0.40.3",
     "@polkadot/ui-shared": "0.86.2",
     "@walletconnect/client": "2.0.0-alpha.26",

js_api/package.json

@@ -1,23 +1,24 @@
 import { ApiPromise } from "@polkadot/api";
 import { DeriveCollectiveProposal, DeriveReferendumExt, DeriveCouncilVotes } from "@polkadot/api-derive/types";
 import { SubmittableExtrinsic } from "@polkadot/api/types";
-import { GenericCall, getTypeDef, Option, Bytes } from "@polkadot/types";
-import { OpenTip, AccountId, FunctionMetadataLatest } from "@polkadot/types/interfaces";
+import { getTypeDef, Option, Bytes } from "@polkadot/types";
+import { OpenTip, AccountId } from "@polkadot/types/interfaces";
 import { formatBalance, stringToU8a, BN_ZERO, hexToString } from "@polkadot/util";
 import BN from "bn.js";
 
 import { approxChanges } from "../utils/referendumApproxChanges";
 
-function _extractMetaData(value: FunctionMetadataLatest) {
-  const params = GenericCall.filterOrigin(value).map(({ name, type }) => ({
+function _extractMetaData(value: any) {
+  const params = value.meta.args.map(({ name, type }) => ({
     name: name.toString(),
     type: getTypeDef(type.toString()),
   }));
   const values = value.args.map((value) => ({
     isValid: true,
     value,
   }));
-  const hash = value.hash;
+  const hash = value.hash.toHex();
+
   return { hash, params, values };
 }
 
@@ -33,15 +34,15 @@ function _transfromProposalMeta(proposal: any): {} {
     }
   }
   const json = proposal.toHuman();
+  let args: string[] = Object.values(json.args);
   if (json.method == "setCode") {
-    const args = json.args;
-    json.args = [args[0].slice(0, 16) + "..." + args[0].slice(args[0].length - 16)];
+    args = [json.args.code.substring(0, 64)];
   }
   return {
     callIndex: proposal.toJSON().callIndex,
     method: json.method,
     section: json.section,
-    args: json.args,
+    args,
     meta: {
       ...meta.toJSON(),
       documentation: doc,
@@ -59,16 +60,12 @@ async function fetchReferendums(api: ApiPromise, address: string) {
     let proposalMeta: any = {};
     let parsedMeta: any = {};
     if (image && image.proposal) {
-      proposalMeta = _extractMetaData(image.proposal.registry.findMetaCall(image.proposal.callIndex).meta);
+      proposalMeta = _extractMetaData(image.proposal);
       parsedMeta = _transfromProposalMeta(image.proposal);
-      image.proposal = image.proposal.toHuman() as any;
-      if (image.proposal?.method == "setCode") {
-        const args = image.proposal.args;
-        image.proposal = {
-          ...image.proposal,
-          args: [(args[0].toString().slice(0, 16) + "..." + args[0].toString().slice(args[0].toString().length - 16)) as any],
-        } as any;
-      }
+      image.proposal = {
+        ...image.proposal.toHuman(),
+        args: parsedMeta.args,
+      } as any;
     }
 
     const changes = approxChanges(status.threshold, sqrtElectorate, {

js_api/src/service/gov.ts

@@ -1946,31 +1946,31 @@
   dependencies:
     pino "^6.7.0"
 
-"@polkadot/[email protected].1":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-6.5.1.tgz#c2e7d632c3c156355218650e6414504d9a154b17"
-  integrity sha512-OwiCYcak3fqiZtE28FbqEd+ZTck9LmsEk01VPQigwSgNu/qbiuKGZ+MurK6yWy8sHbFdcDLPR07/iD5/fhQZRw==
+"@polkadot/[email protected].2":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-6.5.2.tgz#1c14c4cda13bab958b55ce8973aed2a4388d400d"
+  integrity sha512-QD7xegHVLIrDxbuBiAF4wGzqXc/pXsfwTLpkVW1bT7Aa8pXWVTdahh4HCcgOq7c1i01QS2lQE21/4SSLG7KzUA==
   dependencies:
     "@babel/runtime" "^7.15.4"
-    "@polkadot/api" "6.5.1"
-    "@polkadot/rpc-core" "6.5.1"
-    "@polkadot/types" "6.5.1"
+    "@polkadot/api" "6.5.2"
+    "@polkadot/rpc-core" "6.5.2"
+    "@polkadot/types" "6.5.2"
     "@polkadot/util" "^7.6.1"
     "@polkadot/util-crypto" "^7.6.1"
     rxjs "^7.4.0"
 
-"@polkadot/[email protected].1", "@polkadot/api@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-6.5.1.tgz#c6c46ed8274114d56652574bfc64a01610401490"
-  integrity sha512-hxnXb4qFlRbqBKnWgvNtRAukDRthAcLjhh1IY9oQ6WRJipdb2wMtNz6MY06gLI0MVGv9u2fOC6Rhd2JGo4CKZg==
+"@polkadot/[email protected].2", "@polkadot/api@^6.5.2":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-6.5.2.tgz#40a2a2545cc3be19ce35b4c4b688c0a2055576bd"
+  integrity sha512-UNR8pynzPzS1GxpCoLh2a/iPf9lPYY03q0ZLZG/qYYFR+njeD7/4B5e+yEMHIDKS/+XAvM5zXDEbEtxHMiCR9A==
   dependencies:
     "@babel/runtime" "^7.15.4"
-    "@polkadot/api-derive" "6.5.1"
+    "@polkadot/api-derive" "6.5.2"
     "@polkadot/keyring" "^7.6.1"
-    "@polkadot/rpc-core" "6.5.1"
-    "@polkadot/rpc-provider" "6.5.1"
-    "@polkadot/types" "6.5.1"
-    "@polkadot/types-known" "6.5.1"
+    "@polkadot/rpc-core" "6.5.2"
+    "@polkadot/rpc-provider" "6.5.2"
+    "@polkadot/types" "6.5.2"
+    "@polkadot/types-known" "6.5.2"
     "@polkadot/util" "^7.6.1"
     "@polkadot/util-crypto" "^7.6.1"
     eventemitter3 "^4.0.7"
@@ -2016,45 +2016,45 @@
   dependencies:
     "@babel/runtime" "^7.15.4"
 
-"@polkadot/[email protected].1":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-6.5.1.tgz#0a2ecb78b38c63f0831c7fb5363d9cc1fb72ec0e"
-  integrity sha512-teWI8iumsAMHF1vgMzbRVqpSTfVcNIG7bRwSlGoy4V4ZT8dS5LjOYCR7Eqr19wRuef1DjBY87oiN7e8M2x8jCA==
+"@polkadot/[email protected].2":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-6.5.2.tgz#4dbdf39974284df9f0cc6897654c91b05db66482"
+  integrity sha512-ZZRUQqizqH2E4OZ61C1T78KnWm2OiewIZt0SomB5s7zc7ixwcvFltjlWdiuQspG2m4VMb46jFy3pVdkycgrMfg==
   dependencies:
     "@babel/runtime" "^7.15.4"
-    "@polkadot/rpc-provider" "6.5.1"
-    "@polkadot/types" "6.5.1"
+    "@polkadot/rpc-provider" "6.5.2"
+    "@polkadot/types" "6.5.2"
     "@polkadot/util" "^7.6.1"
     rxjs "^7.4.0"
 
-"@polkadot/[email protected].1":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-6.5.1.tgz#bde30ac49b62edb592b89e19aeea36d23e14b25c"
-  integrity sha512-09GId3vknImuEaRH0WDlrP8rsTC/QSIFM7sV55QzjfnLKRct1Fulez0hfFP25orXpjraWqHNZvY1yxniUxK6nA==
+"@polkadot/[email protected].2":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-6.5.2.tgz#359ba68ef5c171191bdd10867e99d3c7b7d71cc5"
+  integrity sha512-MFphpbI9zsYKGFb2mXkeOhWRiyDZxKYTyViVB5kE0YeMMl1DHR3YVfjR6t+K5H1A++iwh3xilkyZ8imcfTK/BQ==
   dependencies:
     "@babel/runtime" "^7.15.4"
-    "@polkadot/types" "6.5.1"
+    "@polkadot/types" "6.5.2"
     "@polkadot/util" "^7.6.1"
     "@polkadot/util-crypto" "^7.6.1"
     "@polkadot/x-fetch" "^7.6.1"
     "@polkadot/x-global" "^7.6.1"
     "@polkadot/x-ws" "^7.6.1"
     eventemitter3 "^4.0.7"
 
-"@polkadot/[email protected].1":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-6.5.1.tgz#753af9a6c4188accb761639505e3e5cd7e5bc176"
-  integrity sha512-eIgk836zlA5KnhK6UotXYr/I9O12xxhNcKXTcA+8NY6ek2xQWlT9VGuMk4wTF4qU1sV/fhOFIDeoNrT7AgSagg==
+"@polkadot/[email protected].2":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-6.5.2.tgz#a5b3afe7ddf9fc4a87f1b391d6d7058eb4e03ae0"
+  integrity sha512-5mFcsAJDL10pwTRI2ODNYvzeB1pQsSbYakI323BkA9iWxNSDYgHNU9prgEAnbO6VXP31HMX86ZDGhEm/XpGo4A==
   dependencies:
     "@babel/runtime" "^7.15.4"
     "@polkadot/networks" "^7.6.1"
-    "@polkadot/types" "6.5.1"
+    "@polkadot/types" "6.5.2"
     "@polkadot/util" "^7.6.1"
 
-"@polkadot/[email protected].1":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-6.5.1.tgz#6d348b7c37ec351506e952ee16f696ecf4a56725"
-  integrity sha512-EiW/5vbR6sP20Yq7wto7Ozepie6YzGjPCH4IPLkGrPsDaMegbwNRvEV+5AbCYvEPKF6LJoaRPUcF/WQxncVonA==
+"@polkadot/[email protected].2":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-6.5.2.tgz#76f5fb1b35ae20530554869b9a859811b4048b28"
+  integrity sha512-QDE5SxyW/Veq0IB8zT0RaBJTedmVkxhR8EykwslJiRuHSBz/HZjtEhcnA44c8fdKWKkbURklbX2vlWd7d2w4jQ==
   dependencies:
     "@babel/runtime" "^7.15.4"
     "@polkadot/util" "^7.6.1"

js_api/yarn.lock

@@ -51,12 +51,15 @@ abstract class PolkawalletPlugin implements PolkawalletPluginBase {
       '${balance_cache_key}_${basic.name}_$pubKey';
 
   Future<void> updateNetworkState() async {
-    final state = await Future.wait([
-      sdk.api.service.setting.queryNetworkConst(),
-      sdk.api.service.setting.queryNetworkProps(),
-    ]);
-    _cache.write(_getNetworkCacheKey(net_const_cache_key), state[0]);
-    _cache.write(_getNetworkCacheKey(net_state_cache_key), state[1]);
+    // final state = await Future.wait([
+    //   sdk.api.service.setting.queryNetworkConst(),
+    //   sdk.api.service.setting.queryNetworkProps(),
+    // ]);
+    final state = await sdk.api.service.setting.queryNetwork();
+    if (state != null) {
+      _cache.write(_getNetworkCacheKey(net_const_cache_key), state["const"]);
+      _cache.write(_getNetworkCacheKey(net_state_cache_key), state["props"]);
+    }
   }
 
   void _updateBalances(KeyPairData acc, BalanceData data,

lib/plugin/index.dart

@@ -7,6 +7,24 @@ class ServiceSetting {
 
   final SubstrateService serviceRoot;
 
+  Future<Map?> queryNetwork() async {
+    // fetch network info
+    List res = await serviceRoot.webView!.evalJavascript(
+        'Promise.all([settings.getNetworkProperties(api), api.rpc.system.chain(),settings.getNetworkConst(api)])');
+    // List<dynamic> res = await Future.wait([
+    //   serviceRoot.webView!.evalJavascript('settings.getNetworkProperties(api)'),
+    //   serviceRoot.webView!.evalJavascript('api.rpc.system.chain()'),
+    // ]);
+
+    if (res[0] == null || res[1] == null || res[2] == null) {
+      return null;
+    }
+
+    final Map props = {"props": res[0], "const": res[2]};
+    props["props"]['name'] = res[1];
+    return props;
+  }
+
   Future<Map> queryNetworkConst() async {
     final dynamic res = await serviceRoot.webView!
         .evalJavascript('settings.getNetworkConst(api)');

lib/service/setting.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
@@ -93,6 +94,27 @@ class _WebViewWithExtensionState extends State<WebViewWithExtension> {
     return Future(() => "");
   }
 
+  Future<void> _onFinishLoad(String url) async {
+    if (_loadingFinished) return;
+    setState(() {
+      _loadingFinished = true;
+    });
+
+    if (widget.onPageFinished != null) {
+      widget.onPageFinished!(url);
+    }
+    print('Page loaded: $url');
+
+    print('Inject extension js code...');
+    final jsCode = await rootBundle
+        .loadString('packages/polkawallet_sdk/js_as_extension/dist/main.js');
+    _controller.evaluateJavascript(jsCode);
+    print('js code injected');
+    if (widget.onExtensionReady != null) {
+      widget.onExtensionReady!();
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return WebView(
@@ -115,24 +137,14 @@ class _WebViewWithExtensionState extends State<WebViewWithExtension> {
           },
         ),
       ].toSet(),
-      onPageFinished: (String url) async {
-        if (_loadingFinished) return;
-        setState(() {
-          _loadingFinished = true;
-        });
-
-        if (widget.onPageFinished != null) {
-          widget.onPageFinished!(url);
+      onPageStarted: (String url) {
+        if (Platform.isAndroid) {
+          _onFinishLoad(url);
         }
-        print('Page finished loading: $url');
-
-        print('Inject extension js code...');
-        final jsCode = await rootBundle.loadString(
-            'packages/polkawallet_sdk/js_as_extension/dist/main.js');
-        _controller.evaluateJavascript(jsCode);
-        print('js code injected');
-        if (widget.onExtensionReady != null) {
-          widget.onExtensionReady!();
+      },
+      onPageFinished: (String url) {
+        if (Platform.isIOS) {
+          _onFinishLoad(url);
         }
       },
       gestureNavigationEnabled: true,

lib/webviewWithExtension/webviewWithExtension.dart

@@ -1,6 +1,6 @@
 name: polkawallet_sdk
 description: Flutter SDK for building plugin package for polkawallet.
-version: 0.3.6
+version: 0.3.7
 homepage: https://polkawallet.io
 
 environment: