update laminar js api to fix issue #133

polkawallet-io · Aug 13, 2020 · 1a30493 · 1a30493
1 parent 00a4ec7
commit 1a30493
Show file tree

Hide file tree

Showing 14 changed files with 10,271 additions and 30 deletions.
diff --git a/ios/Flutter/.last_build_id b/ios/Flutter/.last_build_id
@@ -1 +1 @@
-21550ad233f9eb1230b6dc6301eb3cf0
+c037ac044b13ecbf47a895de46b54202
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -383,7 +383,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -518,7 +518,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -548,7 +548,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = WQ5H736A22;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/lib/common/consts/settings.dart b/lib/common/consts/settings.dart
@@ -129,14 +129,14 @@ const String cross_chain_transfer_address_laminar =
     '5CLaminarAUSDCrossChainTransferxxxxxxxxxxxxxwisu';
 
 /// app versions
-const String app_beta_version = '0.9.1-beta.1';
+const String app_beta_version = '0.9.1-beta.2';
 
 /// js code versions
 const Map<String, int> js_code_version_map = {
-  network_name_polkadot: 9110,
-  network_name_kusama: 9110,
-  network_name_acala_mandala: 9110,
-  network_name_laminar_turbulence: 9110,
+  network_name_polkadot: 9120,
+  network_name_kusama: 9120,
+  network_name_acala_mandala: 9120,
+  network_name_laminar_turbulence: 9120,
 };
 
 /// graphql for laminar

diff --git a/lib/js_service_laminar/package.json b/lib/js_service_laminar/package.json
@@ -10,17 +10,19 @@
   },
   "resolutions": {
     "@open-web3/orml-types": "0.3.0-beta.9",
-    "@polkadot/api": "1.23.1",
-    "@laminar/api": "0.2.0-beta.127",
-    "@laminar/types": "0.2.0-beta.127"
+    "@polkadot/api": "1.27.1",
+    "@laminar/api": "0.2.0-beta.137",
+    "@laminar/types": "0.2.0-beta.137",
+    "@laminar/type-definitions": "0.2.0-beta.137"
   },
   "dependencies": {
     "@babel/polyfill": "^7.8.3",
     "@open-web3/orml-types": "^0.3.0-beta.9",
-    "@polkadot/api": "^1.23.1",
+    "@polkadot/api": "^1.27.1",
     "@polkadot/keyring": "^3.1.0-beta.0",
-    "@laminar/api": "^0.2.0-beta.127",
-    "@laminar/types": "^0.2.0-beta.127",
+    "@laminar/api": "^0.2.0-beta.137",
+    "@laminar/types": "^0.2.0-beta.137",
+    "@laminar/type-definitions": "0.2.0-beta.137",
     "@polkadot/ui-shared": "^0.51.1",
     "bn.js": "^5.1.1"
   },

diff --git a/lib/js_service_laminar/yarn.lock b/lib/js_service_laminar/yarn.lock
diff --git a/lib/page-laminar/margin/laminarMarginPositionItem.dart b/lib/page-laminar/margin/laminarMarginPositionItem.dart
@@ -68,6 +68,8 @@ class LaminarMarginPosition extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    if (pairData == null) return Container();
+
     final Map dic = I18n.of(context).laminar;
     final String direction =
         RegExp(r'^Long(.*)$').hasMatch(position['args'][4]) ? 'long' : 'short';

diff --git a/lib/page-laminar/margin/laminarMarginPositions.dart b/lib/page-laminar/margin/laminarMarginPositions.dart
@@ -211,7 +211,7 @@ class _LaminarMarginPageWrapperState extends State<LaminarMarginPageWrapper> {
                                         isLoading: false,
                                       )
                                     ]
-                                  : list.reversed.map((e) {
+                                  : list.map((e) {
                                       final LaminarMarginPairData pairData =
                                           _getPairData(e);
                                       return LaminarMarginPosition(

diff --git a/lib/page-laminar/margin/laminarMarginTradePairSelector.dart b/lib/page-laminar/margin/laminarMarginTradePairSelector.dart
@@ -80,8 +80,7 @@ class _LaminarMarginTradePairSelectorState
         final poolId = _poolId ?? widget.initialPoolId;
         final List<LaminarMarginPairData> pairs =
             widget.store.laminar.marginPoolInfo[poolId].options.toList();
-        pairs.retainWhere(
-            (e) => e.enabled && e.askSpread != null && e.bidSpread != null);
+        pairs.retainWhere((e) => e.askSpread != null && e.bidSpread != null);
         return Container(
           height: MediaQuery.of(context).copyWith().size.height / 2,
           color: Theme.of(context).cardColor,

diff --git a/lib/store/laminar/laminar.dart b/lib/store/laminar/laminar.dart
@@ -50,8 +50,7 @@ abstract class _LaminarStore with Store {
     syntheticPoolInfo.keys.forEach((key) {
       final List<LaminarSyntheticPoolTokenData> ls =
           syntheticPoolInfo[key].options.toList();
-      ls.retainWhere((e) =>
-          e.syntheticEnabled && e.askSpread != null && e.bidSpread != null);
+      ls.retainWhere((e) => e.askSpread != null && e.bidSpread != null);
       res.addAll(ls);
     });
     return res;

diff --git a/lib/store/laminar/types/laminarMarginData.dart b/lib/store/laminar/types/laminarMarginData.dart
@@ -29,7 +29,6 @@ abstract class _LaminarMarginPoolPairData {
   String pairId;
   dynamic bidSpread;
   dynamic askSpread;
-  bool enabled;
   List<String> enabledTrades;
   LaminarMarginPairItemData pair;
 }

diff --git a/lib/store/laminar/types/laminarMarginData.g.dart b/lib/store/laminar/types/laminarMarginData.g.dart
diff --git a/lib/store/laminar/types/laminarSyntheticData.dart b/lib/store/laminar/types/laminarSyntheticData.dart
@@ -28,6 +28,5 @@ abstract class _LaminarSyntheticPoolTokenData {
   String tokenId;
   dynamic bidSpread;
   dynamic askSpread;
-  double additionalCollateralRatio;
-  bool syntheticEnabled;
+  String additionalCollateralRatio;
 }
diff --git a/lib/store/laminar/types/laminarSyntheticData.g.dart b/lib/store/laminar/types/laminarSyntheticData.g.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -11,7 +11,7 @@ description: PolkaWallet made with Flutter.
 # 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: 0.9.1+911
+version: 0.9.1+912
 
 environment:
   sdk: ">=2.1.0 <3.0.0"