Merge pull request #18 from AcalaNetwork/develop

Release 0.4.6

Author: RomeroYang

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.4.6] - 20220526
+- bump polkawallet_sdk v0.4.6.
+- new module browser.
+- new module vault-multiply.
+
 ## [0.4.5] - 20220505
 - bump polkawallet_sdk v0.4.5.
 - XCM transfer rebuild.

assets/images/adjust_multiple.png

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:polkawallet_plugin_karura/common/constants/index.dart';
 import 'package:polkawallet_plugin_karura/polkawallet_plugin_karura.dart';
 import 'package:polkawallet_plugin_karura/utils/assets.dart';
 import 'package:polkawallet_sdk/plugin/store/balances.dart';
@@ -43,11 +44,8 @@ class AcalaServiceAssets {
     tokens.forEach((e) {
       final channel = '$tokenBalanceChannel${e.symbol}';
       plugin.sdk.api.subscribeMessage(
-        'api.query.tokens.accounts',
-        [
-          address,
-          e.currencyId ?? {'Token': e.symbol}
-        ],
+        'acala.getTokenBalance',
+        ['api', address, e.tokenNameId],
         channel,
         (Map data) {
           callback({
@@ -74,8 +72,8 @@ class AcalaServiceAssets {
       final channel =
           '$tokenBalanceChannel${lpToken.map((e) => e.symbol).join('')}';
       plugin.sdk.api.subscribeMessage(
-        'api.query.tokens.accounts',
-        [address, currencyId],
+        'acala.getTokenBalance',
+        ['api', address, e.tokenNameId],
         channel,
         (Map data) {
           callback({
@@ -103,6 +101,10 @@ class AcalaServiceAssets {
             AssetsUtils.tokenDataFromCurrencyId(plugin, e[0]).tokenNameId!;
         prices[tokenNameId] = Fmt.balanceInt(e[1]['value'].toString());
       });
+      if (prices[relay_chain_token_symbol] != null &&
+          prices[relay_chain_token_symbol]! > BigInt.zero) {
+        prices['sa://0'] = prices[relay_chain_token_symbol]!;
+      }
       callback(prices);
     }
 

assets/images/icon_multiply.png

@@ -19,9 +19,7 @@ class LoanType extends _LoanType {
         BigInt.parse((json['requiredCollateralRatio'] ?? 0).toString());
     data.interestRatePerSec =
         BigInt.parse((json['interestRatePerSec'] ?? 0).toString());
-    data.globalInterestRatePerSec = json['globalInterestRatePerSec'] == null
-        ? null
-        : BigInt.parse(json['globalInterestRatePerSec'].toString());
+    data.stableFeeYear = data.calcStableFee(SECONDS_OF_YEAR);
     data.maximumTotalDebitValue =
         BigInt.parse(json['maximumTotalDebitValue'].toString());
     data.minimumDebitValue = BigInt.parse(json['minimumDebitValue'].toString());
@@ -87,6 +85,12 @@ class LoanType extends _LoanType {
             requiredCollateralRatio
         : BigInt.zero;
   }
+
+  double calcStableFee(int seconds) {
+    final base =
+        interestRatePerSec / BigInt.from(pow(10, acala_price_decimals));
+    return pow((1 + base), seconds) - 1;
+  }
 }
 
 abstract class _LoanType {
@@ -96,9 +100,9 @@ abstract class _LoanType {
   BigInt liquidationRatio = BigInt.zero;
   BigInt requiredCollateralRatio = BigInt.zero;
   BigInt interestRatePerSec = BigInt.zero;
-  BigInt? globalInterestRatePerSec = BigInt.zero;
   BigInt maximumTotalDebitValue = BigInt.zero;
   BigInt minimumDebitValue = BigInt.zero;
+  double stableFeeYear = 0;
   int expectedBlockTime = 0;
 }
 
@@ -131,7 +135,6 @@ class LoanData extends _LoanData {
     data.maxToBorrow = type.calcMaxToBorrow(data.collaterals, tokenPrice,
         stableCoinDecimals: stableCoinDecimals,
         collateralDecimals: collateralDecimals);
-    data.stableFeeYear = data.calcStableFee(SECONDS_OF_YEAR);
     data.liquidationPrice = type.calcLiquidationPrice(
         data.debitInUSD, data.collaterals,
         stableCoinDecimals: stableCoinDecimals,
@@ -155,7 +158,6 @@ class LoanData extends _LoanData {
     data.maxToBorrow = this.maxToBorrow;
     data.stableCoinPrice = this.stableCoinPrice;
     data.liquidationPrice = this.liquidationPrice;
-    data.stableFeeYear = this.stableFeeYear;
     return data;
   }
 }
@@ -175,14 +177,7 @@ abstract class _LoanData {
   double collateralRatio = 0;
   BigInt requiredCollateral = BigInt.zero;
   BigInt maxToBorrow = BigInt.zero;
-  double stableFeeYear = 0;
   BigInt liquidationPrice = BigInt.zero;
-
-  double calcStableFee(int seconds) {
-    final base = (type.globalInterestRatePerSec! + type.interestRatePerSec) /
-        BigInt.from(pow(10, acala_price_decimals));
-    return pow((1 + base), seconds) - 1;
-  }
 }
 
 class CollateralIncentiveData extends _CollateralIncentiveData {

assets/images/multiply_update.png

@@ -5,21 +5,6 @@
  * @license  MIT
  */
 
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
 /*! noble-hashes - MIT License (c) 2022 Paul Miller (paulmillr.com) */
@@ -38,3 +23,12 @@ PERFORMANCE OF THIS SOFTWARE.
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
  * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
  */
+
+/**
+ * [js-sha3]{@link https://github.com/emn178/js-sha3}
+ *
+ * @version 0.8.0
+ * @author Chen, Yi-Cyuan [emn178@gmail.com]
+ * @copyright Chen, Yi-Cyuan 2015-2018
+ * @license MIT
+ */

lib/api/assets/acalaServiceAssets.dart

@@ -21,11 +21,11 @@
     "@polkadot/api": "^7.2.1"
   },
   "dependencies": {
-    "@acala-network/api": "^4.0.4-1",
-    "@acala-network/sdk": "^4.0.4-1",
-    "@acala-network/sdk-core": "^4.0.4-1",
-    "@acala-network/sdk-swap": "^4.0.4-1",
-    "@acala-network/sdk-wallet": "^4.0.4-1",
+    "@acala-network/api": "^4.1.2-28",
+    "@acala-network/sdk": "^4.1.2-28",
+    "@acala-network/sdk-core": "^4.1.2-28",
+    "@acala-network/sdk-swap": "^4.1.2-28",
+    "@acala-network/sdk-wallet": "^4.1.2-28",
     "@babel/polyfill": "^7.8.3",
     "@polkadot/api": "^7.2.1",
     "@polkadot/ui-shared": "^0.85.3",
@@ -51,5 +51,21 @@
     "stream-browserify": "^3.0.0",
     "webpack": "^5.58.2",
     "webpack-cli": "^4.9.0"
+  },
+  "browserslist": {
+    "production": [
+      "chrome >= 67",
+      "edge >= 79",
+      "firefox >= 68",
+      "opera >= 54",
+      "safari >= 13",
+      "android >= 56",
+      "ios_saf >= 13"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
   }
 }