Merge pull request #454 from polkawallet-io/develop

release 3701
polkawallet-io · Nov 6, 2024 · 61bbdf3 · 61bbdf3
2 parents 6722d6d + 74ff324
commit 61bbdf3
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# [3.7.0-beta]
+20241105
+1. acala/karura plugin update.
+
 # [3.6.8-beta]
 20240809
 1. evm account import/delete fix.

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/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 = 3692;
+				CURRENT_PROJECT_VERSION = 3701;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -373,7 +373,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.9;
+				MARKETING_VERSION = 3.7.0;
 				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 = 3692;
+				CURRENT_PROJECT_VERSION = 3701;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -521,7 +521,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.9;
+				MARKETING_VERSION = 3.7.0;
 				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 = 3692;
+				CURRENT_PROJECT_VERSION = 3701;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7;
@@ -562,7 +562,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.9;
+				MARKETING_VERSION = 3.7.0;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/lib/pages/bridge/bridgePage.dart b/lib/pages/bridge/bridgePage.dart
@@ -264,6 +264,18 @@ class _BridgePageState extends State<BridgePage> {
       });
     }
     await widget.service.plugin.sdk.api.bridge.connectFromChains([chainFrom]);
+    // await widget.service.plugin.sdk.api.bridge.connectFromChains([
+    //   chainFrom
+    // ], nodeList: {
+    //   'acala': ['wss://crosschain-dev.polkawallet.io/chopsticksAcala'],
+    //   'karura': ['wss://crosschain-dev.polkawallet.io/chopsticksKarura'],
+    //   'basilisk': ['wss://crosschain-dev.polkawallet.io/chopsticksBasilisk'],
+    //   'assetHubPolkadot': [
+    //     'wss://crosschain-dev.polkawallet.io/chopsticksAssetHub'
+    //   ],
+    //   'kusama': ['wss://crosschain-dev.polkawallet.io/chopsticksKusama'],
+    //   'polkadot': ['wss://crosschain-dev.polkawallet.io/chopsticksPolkadot'],
+    // });
 
     if (chainFrom == _chainFrom) {
       _props = await widget.service.plugin.sdk.api.bridge

diff --git a/pubspec.lock b/pubspec.lock
@@ -1019,8 +1019,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "7b4ed9da262d27fc624abf1e0dffa2c52e8354b2"
-      resolved-ref: "7b4ed9da262d27fc624abf1e0dffa2c52e8354b2"
+      ref: "1eb9c05f27a01e663eca979cfc31934c37ba50d5"
+      resolved-ref: "1eb9c05f27a01e663eca979cfc31934c37ba50d5"
       url: "https://github.com/AcalaNetwork/polkawallet_plugin_acala.git"
     source: git
     version: "0.5.6"
@@ -1064,8 +1064,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "3f4397f8ad6709358500d9c874f5e0ce0304da1d"
-      resolved-ref: "3f4397f8ad6709358500d9c874f5e0ce0304da1d"
+      ref: c843e1e0f50a871856007a3a06ca03a3171ab799
+      resolved-ref: c843e1e0f50a871856007a3a06ca03a3171ab799
       url: "https://github.com/AcalaNetwork/polkawallet_plugin_karura.git"
     source: git
     version: "0.5.6"
@@ -1100,10 +1100,10 @@ packages:
     dependency: "direct main"
     description:
       name: polkawallet_sdk
-      sha256: "594f745189ec59b4434574752d806bc9d4291ed63da5301f7d7d51267a2179ae"
+      sha256: "69d1b782cc0a7d3f8c184970f758940aa9ad455f429b34ea7442e423170ea54d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.2"
+    version: "0.6.3"
   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.6.9+3692
+version: 3.7.0+3701
 
 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: 7b4ed9da262d27fc624abf1e0dffa2c52e8354b2
+      ref: 1eb9c05f27a01e663eca979cfc31934c37ba50d5
   polkawallet_plugin_karura:
     git:
       url: https://github.com/AcalaNetwork/polkawallet_plugin_karura.git
-      ref: 3f4397f8ad6709358500d9c874f5e0ce0304da1d
+      ref: c843e1e0f50a871856007a3a06ca03a3171ab799
   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.6
-  polkawallet_sdk: ^0.6.2
+  polkawallet_sdk: ^0.6.3
 #  polkawallet_ui:
 #     path: ../../coding/polkawallet/ui
 #  polkawallet_sdk: