Merge pull request #447 from polkawallet-io/develop

release 3641

CHANGELOG.md

@@ -1,3 +1,7 @@
+# [3.6.4-beta]
+20240516
+1. acala EVM address binding fix.
+
 # [3.6.3-beta]
 20240405
 1. statemint tx submit fix.

ios/Runner.xcodeproj/project.pbxproj

@@ -354,7 +354,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3631;
+				CURRENT_PROJECT_VERSION = 3641;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -373,7 +373,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.3;
+				MARKETING_VERSION = 3.6.4;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -502,7 +502,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3631;
+				CURRENT_PROJECT_VERSION = 3641;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -521,7 +521,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.3;
+				MARKETING_VERSION = 3.6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -543,7 +543,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3631;
+				CURRENT_PROJECT_VERSION = 3641;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -562,7 +562,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.3;
+				MARKETING_VERSION = 3.6.4;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";

lib/pages/account/bind/accountBindPage.dart

@@ -57,8 +57,8 @@ class _AccountBindPageState extends State<AccountBindPage> {
     await widget.service.plugin.sdk.api.bridge.connectFromChains([
       chain
     ], nodeList: {
-      'karura': ['wss://karura-dev.aca-dev.network/rpc/ws'],
-      'acala': ['wss://acala-dev.aca-dev.network/rpc/ws']
+      // 'karura': ['wss://karura-dev.aca-dev.network/rpc/ws'],
+      // 'acala': ['wss://acala-dev.aca-dev.network/rpc/ws']
     });
     _subscribeBalance();
     _queryBindAddress();
@@ -83,12 +83,15 @@ class _AccountBindPageState extends State<AccountBindPage> {
 
   void _queryBindAddress() async {
     final chain = _isAcala ? 'acala' : 'karura';
-    final subAddress = await widget.service.plugin.sdk.api.bridge.service
-        .evalJavascript(
+
+    final subAddress = _ethWalletData.address == null
+        ? null
+        : await widget.service.plugin.sdk.api.bridge.service.evalJavascript(
             'bridge.getApi("$chain").query.evmAccounts.accounts("${_ethWalletData.address}")');
 
-    final evmAddress = await widget.service.plugin.sdk.api.bridge.service
-        .evalJavascript(
+    final evmAddress = _keyPairData.address == null
+        ? null
+        : await widget.service.plugin.sdk.api.bridge.service.evalJavascript(
             'bridge.getApi("$chain").query.evmAccounts.evmAddresses("${_keyPairData.address}")');
 
     if (subAddress == null && evmAddress == null) {

pubspec.lock

@@ -1073,8 +1073,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: f2ff2c916faee504f8271afcb487d87268aee182
-      resolved-ref: f2ff2c916faee504f8271afcb487d87268aee182
+      ref: "6693774b1c30731c2e09d77707a74edca3c6d0de"
+      resolved-ref: "6693774b1c30731c2e09d77707a74edca3c6d0de"
       url: "https://github.com/polkawallet-io/polkawallet_plugin_kusama.git"
     source: git
     version: "0.5.2"
@@ -1100,10 +1100,10 @@ packages:
     dependency: "direct main"
     description:
       name: polkawallet_sdk
-      sha256: "65278e48fd10db1e8b4f682112ccbfa68dda311546b70dc9206e98d0fd5adf8f"
+      sha256: c53cd369adf81b12f03dd42df4174da63d77436c107bf262011f9b5e7b2dcd6d
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.9+4"
+    version: "0.6.0+1"
   polkawallet_ui:
     dependency: "direct main"
     description:

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.6.3+3631
+version: 3.6.4+3641
 
 environment:
   sdk: ">=2.10.0 <3.0.0"
@@ -51,7 +51,7 @@ dependencies:
   polkawallet_plugin_kusama:
     git:
       url: https://github.com/polkawallet-io/polkawallet_plugin_kusama.git
-      ref: f2ff2c916faee504f8271afcb487d87268aee182
+      ref: 6693774b1c30731c2e09d77707a74edca3c6d0de
   polkawallet_plugin_acala:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_acala.git
@@ -112,7 +112,7 @@ dependency_overrides:
 #  polkawallet_plugin_evm:
 #    path: ../../coding/polkawallet/polkawallet_plugin_evm
   polkawallet_ui: ^0.5.5+2
-  polkawallet_sdk: ^0.5.9+4
+  polkawallet_sdk: ^0.6.0+1
 #  polkawallet_ui:
 #     path: ../../coding/polkawallet/ui
 #  polkawallet_sdk: