Merge pull request #29 from polkawallet-io/develop

Release 0.4.9
polkawallet-io · Aug 8, 2022 · cc7d6bb · cc7d6bb
2 parents f3fbb20 + ec57669
commit cc7d6bb
Show file tree

Hide file tree

Showing 93 changed files with 21,173 additions and 5,515 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+js_api/.yarn/releases/** binary
+js_api/.yarn/plugins/** binary
+js_api/dist/** binary
+assets/*.js binary
diff --git a/.gitignore b/.gitignore
@@ -45,6 +45,14 @@ app.*.map.json
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 
 js_api/node_modules/
-js_api/dist/main.js.LICENSE.txt
+js_api/.yarn/*
+!js_api/.yarn/patches
+!js_api/.yarn/plugins
+!js_api/.yarn/releases
+!js_api/.yarn/sdks
+!js_api/.yarn/versions
+
+js_api/dist/*.js.LICENSE.txt
+
 js_as_extension/node_modules/
 js_api_eth/node_modules/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [0.4.9] - 20220808
+
+* add bridge api
+* fix DApp browser request parsing with unknown address format
+
 ## [0.4.8] - 20220621
 
 * upgrade flutter 3.0.1

diff --git a/assets/bridge.html b/assets/bridge.html
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <script type="application/javascript" src="bridge.js"></script>
+  </head>
+  <body>
+    <h1>polkawallet bridge js runner</h1>
+  </body>
+</html>
diff --git a/assets/bridge.js b/assets/bridge.js
diff --git a/assets/index.html b/assets/index.html
@@ -1,4 +1,8 @@
 <html>
+  <head>
+    <meta charset="utf-8" />
+    <script type="application/javascript" src="index.js"></script>
+  </head>
   <body>
     <h1>polkadot-js/api runner</h1>
   </body>

diff --git a/assets/index.js b/assets/index.js
diff --git a/build.yaml b/build.yaml
@@ -0,0 +1,4 @@
+targets:
+  $default:
+    sources:
+      - lib/**
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -6,33 +6,16 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="${applicationName}"
         android:label="example"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <!-- Specifies an Android theme to apply to this Activity as soon as
-                 the Android process has started. This theme is visible to the user
-                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         jcenter()

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 android.enableR8=true
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -3,8 +3,11 @@ import 'package:flutter/material.dart';
 import 'package:polkawallet_sdk/api/types/networkParams.dart';
 import 'package:polkawallet_sdk/polkawallet_sdk.dart';
 import 'package:polkawallet_sdk/storage/keyring.dart';
+import 'package:polkawallet_sdk/storage/keyringEVM.dart';
 import 'package:polkawallet_sdk_example/pages/account.dart';
 import 'package:polkawallet_sdk_example/pages/dAppPage.dart';
+import 'package:polkawallet_sdk_example/pages/ethWithJS.dart';
+import 'package:polkawallet_sdk_example/pages/evm.dart';
 import 'package:polkawallet_sdk_example/pages/keyring.dart';
 import 'package:polkawallet_sdk_example/pages/setting.dart';
 import 'package:polkawallet_sdk_example/pages/tx.dart';
@@ -23,11 +26,13 @@ class MyApp extends StatefulWidget {
 class _MyAppState extends State<MyApp> {
   final WalletSDK sdk = WalletSDK();
   final Keyring keyring = Keyring();
+  final KeyringEVM keyringEVM = KeyringEVM();
 
   bool _sdkReady = false;
 
   Future<void> _initApi() async {
     await keyring.init([0, 2]);
+    await keyringEVM.init();
 
     await sdk.init(keyring);
     setState(() {
@@ -77,6 +82,8 @@ class _MyAppState extends State<MyApp> {
         AccountPage.route: (_) => AccountPage(sdk, _showResult),
         TxPage.route: (_) => TxPage(sdk, keyring, _showResult),
         StakingPage.route: (_) => StakingPage(sdk, keyring, _showResult),
+        EVMPage.route: (_) => EVMPage(sdk, keyringEVM, _showResult),
+        EthWithJSPage.route: (_) => EthWithJSPage(sdk, keyringEVM, _showResult),
       },
     );
   }
@@ -145,7 +152,7 @@ class _MyHomePageState extends State<MyHomePage> {
                         child: _connecting
                             ? CupertinoActivityIndicator()
                             : Text(_apiConnected
-                                ? 'connected ${widget.sdk.api.connectedNode.name}'
+                                ? 'connected ${widget.sdk.api.connectedNode?.name}'
                                 : 'connect'),
                         onPressed: _apiConnected || _connecting
                             ? null
@@ -217,6 +224,23 @@ class _MyHomePageState extends State<MyHomePage> {
                 Navigator.of(context).pushNamed(StakingPage.route);
               },
             ),
+            Divider(),
+            ListTile(
+              title: Text('ethers'),
+              subtitle: Text('ethers keyring'),
+              onTap: () {
+                Navigator.of(context).pushNamed(EVMPage.route);
+              },
+            ),
+            Divider(),
+            ListTile(
+              title: Text('sdk.eth'),
+              subtitle: Text('eth js keyring'),
+              onTap: () {
+                Navigator.of(context).pushNamed(EthWithJSPage.route);
+              },
+            ),
+            Divider(),
           ],
         ),
       ), // This trailing comma makes auto-formatting nicer for build methods.

diff --git a/example/lib/pages/account.dart b/example/lib/pages/account.dart
@@ -1,9 +1,8 @@
 import 'dart:convert';
 
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:polkawallet_sdk/polkawallet_sdk.dart';
 import 'package:polkawallet_sdk/api/types/balanceData.dart';
+import 'package:polkawallet_sdk/polkawallet_sdk.dart';
 import 'package:polkawallet_sdk_example/pages/keyring.dart';
 
 class AccountPage extends StatefulWidget {
@@ -28,14 +27,14 @@ class _AccountPageState extends State<AccountPage> {
 
   bool _submitting = false;
 
-  BalanceData _balance;
-  String _msgChannel;
+  BalanceData? _balance;
+  String? _msgChannel;
 
   Future<void> _encodeAddress() async {
     setState(() {
       _submitting = true;
     });
-    final Map res = await widget.sdk.api.account.encodeAddress([_testPubKey]);
+    final res = await widget.sdk.api.account.encodeAddress([_testPubKey]);
     widget.showResult(
       context,
       'encodeAddress',
@@ -50,7 +49,7 @@ class _AccountPageState extends State<AccountPage> {
     setState(() {
       _submitting = true;
     });
-    final Map res = await widget.sdk.api.account.decodeAddress([_testAddress]);
+    final res = await widget.sdk.api.account.decodeAddress([_testAddress]);
     widget.showResult(
       context,
       'decodeAddress',
@@ -65,7 +64,7 @@ class _AccountPageState extends State<AccountPage> {
     setState(() {
       _submitting = true;
     });
-    final List res = await widget.sdk.api.account.getPubKeyIcons([_testPubKey]);
+    final res = await widget.sdk.api.account.getPubKeyIcons([_testPubKey]);
     widget.showResult(
         context, 'getPubKeyIcons', JsonEncoder.withIndent('  ').convert(res));
     setState(() {
@@ -77,8 +76,7 @@ class _AccountPageState extends State<AccountPage> {
     setState(() {
       _submitting = true;
     });
-    final List res =
-        await widget.sdk.api.account.getAddressIcons([_testAddress]);
+    final res = await widget.sdk.api.account.getAddressIcons([_testAddress]);
     widget.showResult(
         context, 'getAddressIcons', JsonEncoder.withIndent('  ').convert(res));
     setState(() {
@@ -90,7 +88,7 @@ class _AccountPageState extends State<AccountPage> {
     setState(() {
       _submitting = true;
     });
-    final List res = await widget.sdk.api.account
+    final res = await widget.sdk.api.account
         .queryIndexInfo([_testAddress, _testAddressGav]);
     widget.showResult(
         context, 'queryIndexInfo', JsonEncoder.withIndent('  ').convert(res));
@@ -105,7 +103,7 @@ class _AccountPageState extends State<AccountPage> {
     });
     final res = await widget.sdk.api.account.queryBalance(_testAddress);
     widget.showResult(context, 'queryBalance',
-        JsonEncoder.withIndent('  ').convert(res.toJson()));
+        JsonEncoder.withIndent('  ').convert(res?.toJson()));
     setState(() {
       _submitting = false;
     });
@@ -139,7 +137,7 @@ class _AccountPageState extends State<AccountPage> {
   @override
   void dispose() {
     if (_msgChannel != null) {
-      widget.sdk.api.unsubscribeMessage(_msgChannel);
+      widget.sdk.api.unsubscribeMessage(_msgChannel!);
     }
     super.dispose();
   }

diff --git a/example/lib/pages/dAppPage.dart b/example/lib/pages/dAppPage.dart
@@ -21,7 +21,7 @@ class _DAppPageState extends State<DAppPage> {
 
   @override
   Widget build(BuildContext context) {
-    final String url = ModalRoute.of(context).settings.arguments;
+    final url = ModalRoute.of(context)?.settings.arguments as String;
     return Scaffold(
       appBar: AppBar(
           title: Text(