Merge pull request #432 from polkawallet-io/develop

Develop
polkawallet-io · Aug 26, 2023 · 9a9e274 · 9a9e274
2 parents 2d9a4ab + f9cc91f
commit 9a9e274
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [3.5.2-beta]
+20230822
+1. bump sdk 0.5.5.
+2. acala/karura plugin update.
+3. add webview.isMessageChannelAlive check for reconnect.
+
 # [3.5.1-beta]
 20230726
 1. bump sdk 0.5.4+7.

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -352,7 +352,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3511;
+				CURRENT_PROJECT_VERSION = 3521;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -371,7 +371,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.5.1;
+				MARKETING_VERSION = 3.5.2;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -500,7 +500,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3511;
+				CURRENT_PROJECT_VERSION = 3521;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -519,7 +519,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.5.1;
+				MARKETING_VERSION = 3.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -541,7 +541,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3511;
+				CURRENT_PROJECT_VERSION = 3521;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -560,7 +560,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.5.1;
+				MARKETING_VERSION = 3.5.2;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/lib/app.dart b/lib/app.dart
@@ -367,6 +367,12 @@ class _WalletAppState extends State<WalletApp> with WidgetsBindingObserver {
   }
 
   _reconnectNode() async {
+    // isMessageChannelAlive = true means we have new message in last 10s.
+    if (_service.plugin.sdk.webView.isMessageChannelAlive) {
+      _startConnectionCheck();
+      return;
+    }
+
     print('connection check failed, reconnecting...');
     _restartPlugin();
 

diff --git a/lib/common/consts.dart b/lib/common/consts.dart
@@ -66,7 +66,7 @@ const bridge_account = {
   'acala': '13YMK2eYoAvStnzReuxBjMrAvPXmmdsURwZvc62PrdXimbNy'
 };
 
-const bridge_sdk_version = 35001;
+const bridge_sdk_version = 35101;
 
 const show_guide_status_key = 'show_guide_status';
 

diff --git a/pubspec.lock b/pubspec.lock
@@ -1147,11 +1147,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: dcb50c9109ad07da48355281a5bef91e103b5cc4
-      resolved-ref: dcb50c9109ad07da48355281a5bef91e103b5cc4
+      ref: "0c6d732657ade5ed5a3fdd1955a8dd27c837ece6"
+      resolved-ref: "0c6d732657ade5ed5a3fdd1955a8dd27c837ece6"
       url: "https://github.com/AcalaNetwork/polkawallet_plugin_acala.git"
     source: git
-    version: "0.5.4"
+    version: "0.5.5"
   polkawallet_plugin_bifrost:
     dependency: "direct main"
     description:
@@ -1192,11 +1192,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "8c28e00da504c293b58215b1199fa3a09f90eabb"
-      resolved-ref: "8c28e00da504c293b58215b1199fa3a09f90eabb"
+      ref: af5c2f3a41ecbe443f615da9fd50fc13d2819671
+      resolved-ref: af5c2f3a41ecbe443f615da9fd50fc13d2819671
       url: "https://github.com/AcalaNetwork/polkawallet_plugin_karura.git"
     source: git
-    version: "0.5.4"
+    version: "0.5.5"
   polkawallet_plugin_kusama:
     dependency: "direct main"
     description:
@@ -1228,10 +1228,10 @@ packages:
     dependency: "direct main"
     description:
       name: polkawallet_sdk
-      sha256: "101a9f943d41edceed0942dc3a54079b0f56490a1cd070ed5bacb6b1e8c6d47c"
+      sha256: e1998d6d17b2b4b3a18b0205ac6b6c29fef7e4af6244fdec10a6e8f2bbef4b60
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.4+7"
+    version: "0.5.5"
   polkawallet_ui:
     dependency: "direct main"
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 3.5.1+3511
+version: 3.5.2+3521
 
 environment:
   sdk: ">=2.10.0 <3.0.0"
@@ -55,11 +55,11 @@ dependencies:
   polkawallet_plugin_acala:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_acala.git
-      ref: dcb50c9109ad07da48355281a5bef91e103b5cc4
+      ref: 0c6d732657ade5ed5a3fdd1955a8dd27c837ece6
   polkawallet_plugin_karura:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_karura.git
-      ref: 8c28e00da504c293b58215b1199fa3a09f90eabb
+      ref: af5c2f3a41ecbe443f615da9fd50fc13d2819671
   polkawallet_plugin_evm:
     git:
       url: https://github.com/polkawallet-io/polkawallet_plugin_evm.git
@@ -112,7 +112,7 @@ dependency_overrides:
 #  polkawallet_plugin_evm:
 #    path: ../../coding/polkawallet/polkawallet_plugin_evm
   polkawallet_ui: ^0.5.4+2
-  polkawallet_sdk: ^0.5.4+7
+  polkawallet_sdk: ^0.5.5
 #  polkawallet_ui:
 #     path: ../../coding/polkawallet/ui
 #  polkawallet_sdk: