Merge pull request #26 from AcalaNetwork/develop

Release 0.4.9
AcalaNetwork · Aug 8, 2022 · 9c8bf1a · 9c8bf1a
2 parents 415c730 + 7f8b4d5
commit 9c8bf1a
Show file tree

Hide file tree

Showing 148 changed files with 10,921 additions and 5,754 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [0.4.9] - 20220808
+- bump polkawallet_sdk v0.4.9.
+- js api update.
+- ui update.
+
 ## [0.4.8] - 20220621
 - bump polkawallet_sdk v0.4.8.
 - ui update.

diff --git a/assets/images/QueuedRedeemRequesting.png b/assets/images/QueuedRedeemRequesting.png
diff --git a/assets/images/cdp_multiply.riv b/assets/images/cdp_multiply.riv
diff --git a/assets/images/cdp_right.png b/assets/images/cdp_right.png
diff --git a/assets/images/history.png b/assets/images/history.png
diff --git a/assets/images/homa_myStats_item_bg.png b/assets/images/homa_myStats_item_bg.png
diff --git a/assets/images/homa_myStats_item_select_bg.png b/assets/images/homa_myStats_item_select_bg.png
diff --git a/assets/images/icon_earn.png b/assets/images/icon_earn.png
diff --git a/assets/images/icon_homa.png b/assets/images/icon_homa.png
diff --git a/assets/images/icon_instrument_black.png b/assets/images/icon_instrument_black.png
diff --git a/assets/images/icon_instrument_blue.png b/assets/images/icon_instrument_blue.png
diff --git a/assets/images/icon_instrument_orange.png b/assets/images/icon_instrument_orange.png
diff --git a/assets/images/icon_instrument_yellow.png b/assets/images/icon_instrument_yellow.png
diff --git a/assets/images/icon_loan.png b/assets/images/icon_loan.png
diff --git a/assets/images/icon_multiply.png b/assets/images/icon_multiply.png
diff --git a/assets/images/icon_swap.png b/assets/images/icon_swap.png
diff --git a/assets/images/lp_detail_reward.png b/assets/images/lp_detail_reward.png
diff --git a/assets/images/mint_kusd_head.png b/assets/images/mint_kusd_head.png
diff --git a/assets/images/qr_dark.png b/assets/images/qr_dark.png
diff --git a/assets/images/rewards.png b/assets/images/rewards.png
diff --git a/assets/images/screening.png b/assets/images/screening.png
diff --git a/assets/images/send_dark.png b/assets/images/send_dark.png
diff --git a/assets/images/staked.png b/assets/images/staked.png
diff --git a/assets/images/staked.svg b/assets/images/staked.svg
diff --git a/assets/images/staked_1.png b/assets/images/staked_1.png
diff --git a/assets/images/swapRoute/karura.png b/assets/images/swapRoute/karura.png
diff --git a/assets/images/swapRoute/nuts-taiga-icon.png b/assets/images/swapRoute/nuts-taiga-icon.png
diff --git a/assets/images/swap_repeat.png b/assets/images/swap_repeat.png
diff --git a/assets/images/swap_set.png b/assets/images/swap_set.png
diff --git a/assets/images/swap_switch.png b/assets/images/swap_switch.png
diff --git a/assets/images/swap_to.png b/assets/images/swap_to.png
diff --git a/assets/images/taiga_addliquidity.png b/assets/images/taiga_addliquidity.png
diff --git a/assets/images/tokens/ARIS.png b/assets/images/tokens/ARIS.png
diff --git a/assets/images/tokens/KAR.png b/assets/images/tokens/KAR.png
diff --git a/assets/images/tokens/KUSD.png b/assets/images/tokens/KUSD.png
diff --git a/assets/images/unstaked.png b/assets/images/unstaked.png
diff --git a/assets/images/xcm_to.png b/assets/images/xcm_to.png
diff --git a/lib/api/acalaApi.dart b/lib/api/acalaApi.dart
@@ -1,6 +1,7 @@
 import 'package:polkawallet_plugin_karura/api/acalaService.dart';
 import 'package:polkawallet_plugin_karura/api/assets/acalaApiAssets.dart';
 import 'package:polkawallet_plugin_karura/api/earn/acalaApiEarn.dart';
+import 'package:polkawallet_plugin_karura/api/history/acalaApiHistory.dart';
 import 'package:polkawallet_plugin_karura/api/homa/acalaApiHoma.dart';
 import 'package:polkawallet_plugin_karura/api/loan/acalaApiLoan.dart';
 import 'package:polkawallet_plugin_karura/api/swap/acalaApiSwap.dart';
@@ -11,11 +12,13 @@ class AcalaApi {
         loan = AcalaApiLoan(service.loan),
         swap = AcalaApiSwap(service.swap),
         homa = AcalaApiHoma(service.homa),
-        earn = AcalaApiEarn(service.earn);
+        earn = AcalaApiEarn(service.earn),
+        history = AcalaApiHistory(service.history);
 
   final AcalaApiAssets assets;
   final AcalaApiLoan loan;
   final AcalaApiSwap swap;
   final AcalaApiHoma homa;
   final AcalaApiEarn earn;
+  final AcalaApiHistory history;
 }
diff --git a/lib/api/acalaService.dart b/lib/api/acalaService.dart
@@ -1,5 +1,6 @@
 import 'package:polkawallet_plugin_karura/api/assets/acalaServiceAssets.dart';
 import 'package:polkawallet_plugin_karura/api/earn/acalaServiceEarn.dart';
+import 'package:polkawallet_plugin_karura/api/history/acalaServiceHistory.dart';
 import 'package:polkawallet_plugin_karura/api/homa/acalaServiceHoma.dart';
 import 'package:polkawallet_plugin_karura/api/loan/acalaServiceLoan.dart';
 import 'package:polkawallet_plugin_karura/api/swap/acalaServiceSwap.dart';
@@ -11,11 +12,13 @@ class AcalaService {
         loan = AcalaServiceLoan(plugin),
         swap = AcalaServiceSwap(plugin),
         homa = AcalaServiceHoma(plugin),
-        earn = AcalaServiceEarn(plugin);
+        earn = AcalaServiceEarn(plugin),
+        history = AcalaServiceHistory(plugin);
 
   final AcalaServiceAssets assets;
   final AcalaServiceLoan loan;
   final AcalaServiceSwap swap;
   final AcalaServiceHoma homa;
   final AcalaServiceEarn earn;
+  final AcalaServiceHistory history;
 }
diff --git a/lib/api/assets/acalaApiAssets.dart b/lib/api/assets/acalaApiAssets.dart
@@ -1,6 +1,7 @@
 import 'package:polkawallet_plugin_karura/api/assets/acalaServiceAssets.dart';
 import 'package:polkawallet_plugin_karura/api/types/nftData.dart';
 import 'package:polkawallet_plugin_karura/pages/assets/tokenDetailPage.dart';
+import 'package:polkawallet_plugin_karura/utils/assets.dart';
 import 'package:polkawallet_plugin_karura/utils/format.dart';
 import 'package:polkawallet_sdk/plugin/store/balances.dart';
 
@@ -32,6 +33,12 @@ class AcalaApiAssets {
     return res;
   }
 
+  Future<Map<String, num>> getTokenPrices(List<String> tokens) async {
+    tokens.add('KAR');
+    final res = await service.getTokenPrices(tokens);
+    return Map<String, num>.from(res);
+  }
+
   void unsubscribeTokenBalances(String? address) {
     service.unsubscribeTokenBalances(address);
   }
@@ -85,7 +92,10 @@ class AcalaApiAssets {
           amount: e['balance']['free'].toString(),
           locked: e['balance']['frozen'].toString(),
           reserved: e['balance']['reserved'].toString(),
-          price: service.plugin.store!.assets.marketPrices[e['symbol']],
+          price: AssetsUtils.getMarketPrice(service.plugin, e['symbol']),
+          getPrice: () {
+            return AssetsUtils.getMarketPrice(service.plugin, e['symbol']);
+          },
           detailPageRoute: TokenDetailPage.route,
         );
       }).toList());

diff --git a/lib/api/assets/acalaServiceAssets.dart b/lib/api/assets/acalaServiceAssets.dart
@@ -22,6 +22,12 @@ class AcalaServiceAssets {
     return res;
   }
 
+  Future<Map> getTokenPrices(List<String> tokens) async {
+    final Map? res = await plugin.sdk.webView!
+        .evalJavascript('acala.getTokenPrices(${jsonEncode(tokens)})');
+    return res ?? {};
+  }
+
   void unsubscribeTokenBalances(String? address) async {
     final tokens = await plugin.api!.assets.getAllTokenSymbols(withCache: true);
     tokens.forEach((e) {

diff --git a/lib/api/earn/acalaApiEarn.dart b/lib/api/earn/acalaApiEarn.dart
@@ -1,11 +1,42 @@
 import 'package:polkawallet_plugin_karura/api/earn/acalaServiceEarn.dart';
 import 'package:polkawallet_plugin_karura/api/earn/types/incentivesData.dart';
+import 'package:polkawallet_plugin_karura/api/types/dexPoolInfoData.dart';
+import 'package:polkawallet_plugin_karura/pages/types/taigaPoolInfoData.dart';
 
 class AcalaApiEarn {
   AcalaApiEarn(this.service);
 
   final AcalaServiceEarn service;
 
+  Future<Map?> getTaigaMintAmount(
+      String poolId, List<String> input, double slippage) async {
+    final Map? res = await service.getTaigaMintAmount(poolId, input, slippage);
+    //{"minAmount":"99215063014","params":[0,["98963000000","0"],"99215063014"]}
+    return res;
+  }
+
+  Future<Map?> getTaigaRedeemAmount(
+      String poolId, String input, double slippage) async {
+    final Map? res =
+        await service.getTaigaRedeemAmount(poolId, input, slippage);
+    // {"minAmount":["23693477297","384434880258"],"params":[0,"69679144669",["23693477297","45491610738"]]}
+    return res;
+  }
+
+  Future<List<DexPoolData>?> getTaigaTokenPairs() async {
+    final List? res = await service.getTaigaTokenPairs();
+    return res?.map((e) => DexPoolData.fromJson(e)).toList();
+  }
+
+  Future<Map<String, TaigaPoolInfoData>> getTaigaPoolInfo(
+      String address) async {
+    final Map? res = await service.getTaigaPoolInfo(address);
+    Map<String, TaigaPoolInfoData> data = {};
+    res?.forEach(
+        (key, value) => data.addAll({key: TaigaPoolInfoData.fromJson(value)}));
+    return data;
+  }
+
   Future<IncentivesData> queryIncentives() async {
     final res =
         await (service.queryIncentives() as Future<Map<dynamic, dynamic>>);

diff --git a/lib/api/earn/acalaServiceEarn.dart b/lib/api/earn/acalaServiceEarn.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:polkawallet_plugin_karura/polkawallet_plugin_karura.dart';
 
@@ -7,6 +8,37 @@ class AcalaServiceEarn {
 
   final PluginKarura plugin;
 
+  Future<Map?> getTaigaMintAmount(
+      String poolId, List<String> input, double slippage) async {
+    final Map? res = await plugin.sdk.webView!.evalJavascript(
+        'acala.getTaigaMintAmount("$poolId",${jsonEncode(input)},$slippage)');
+    return res;
+  }
+
+  Future<Map?> getTaigaRedeemAmount(
+      String poolId, String input, double slippage) async {
+    final Map? res = await plugin.sdk.webView!.evalJavascript(
+        'acala.getTaigaRedeemAmount("$poolId","$input",$slippage)');
+    return res;
+  }
+
+  Future<List?> getTaigaTokenPairs() async {
+    final List? res =
+        await plugin.sdk.webView!.evalJavascript('acala.getTaigaTokenPairs()');
+    return res;
+  }
+
+  Future<Map?> getTaigaPoolInfo(String address) async {
+    try {
+      final Map? res = await plugin.sdk.webView!
+          .evalJavascript('acala.getTaigaPoolInfo(api, "$address")');
+      return res;
+    } catch (error) {
+      print(error);
+      return {};
+    }
+  }
+
   Future<Map?> queryIncentives() async {
     final Map? res =
         await plugin.sdk.webView!.evalJavascript('acala.queryIncentives(api)');

diff --git a/lib/api/history/acalaApiHistory.dart b/lib/api/history/acalaApiHistory.dart
@@ -0,0 +1,14 @@
+import 'package:polkawallet_plugin_karura/api/history/acalaServiceHistory.dart';
+import 'package:polkawallet_plugin_karura/api/history/types/historyData.dart';
+
+class AcalaApiHistory {
+  AcalaApiHistory(this.service);
+
+  final AcalaServiceHistory service;
+
+  Future<List<HistoryData>> queryHistory(String type, String? address,
+      {Map<String, dynamic> params = const {}}) async {
+    final List? res = await service.queryHistory(type, address, params);
+    return res?.map((e) => HistoryData.fromJson(e)).toList() ?? [];
+  }
+}
diff --git a/lib/api/history/acalaServiceHistory.dart b/lib/api/history/acalaServiceHistory.dart
@@ -0,0 +1,17 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:polkawallet_plugin_karura/polkawallet_plugin_karura.dart';
+
+class AcalaServiceHistory {
+  AcalaServiceHistory(this.plugin);
+
+  final PluginKarura plugin;
+
+  Future<List?> queryHistory(
+      String type, String? address, Map<String, dynamic> params) async {
+    final List? list = await plugin.sdk.webView!.evalJavascript(
+        'acala.getHistory(api,"$type","$address",${jsonEncode(params)})');
+    return list;
+  }
+}
diff --git a/lib/api/history/types/historyData.dart b/lib/api/history/types/historyData.dart
@@ -0,0 +1,19 @@
+class HistoryData extends _HistoryData {
+  static HistoryData fromJson(Map json) {
+    final res = new HistoryData();
+    res.message = json['message'] as String?;
+    res.hash = json['hash'] as String?;
+    res.resolveLinks = json['resolveLinks'] as String?;
+    res.data = Map.from(json['data']);
+    res.event = json['event'] as String?;
+    return res;
+  }
+}
+
+abstract class _HistoryData {
+  String? message;
+  Map<String, dynamic>? data;
+  String? hash;
+  String? resolveLinks;
+  String? event;
+}
diff --git a/lib/api/swap/acalaApiSwap.dart b/lib/api/swap/acalaApiSwap.dart
@@ -1,16 +1,43 @@
 import 'package:polkawallet_plugin_karura/api/swap/acalaServiceSwap.dart';
 import 'package:polkawallet_plugin_karura/api/types/dexPoolInfoData.dart';
 import 'package:polkawallet_plugin_karura/api/types/swapOutputData.dart';
+import 'package:polkawallet_plugin_karura/pages/assets/tokenDetailPage.dart';
+import 'package:polkawallet_plugin_karura/utils/assets.dart';
+import 'package:polkawallet_plugin_karura/utils/format.dart';
+import 'package:polkawallet_sdk/plugin/store/balances.dart';
 
 class AcalaApiSwap {
   AcalaApiSwap(this.service);
 
   final AcalaServiceSwap service;
 
+  Future<List<TokenBalanceData>?> getSwapTokens() async {
+    final data = await service.getSwapTokens();
+    final tokensConfig =
+        service.plugin.store!.setting.remoteConfig['tokens'] ?? {};
+    return data
+        ?.map((e) => TokenBalanceData(
+              id: e['id'] ?? e['symbol'],
+              symbol: e['symbol'],
+              type: e['type'],
+              tokenNameId: e['tokenNameId'],
+              currencyId: e['currencyId'],
+              minBalance: e['minBalance'],
+              name: PluginFmt.tokenView(e['symbol']),
+              fullName: tokensConfig['tokenName'] != null
+                  ? tokensConfig['tokenName'][e['symbol']]
+                  : null,
+              decimals: e['decimals'],
+              price: AssetsUtils.getMarketPrice(service.plugin, e['symbol']),
+              detailPageRoute: TokenDetailPage.route,
+            ))
+        .toList();
+  }
+
   Future<SwapOutputData> queryTokenSwapAmount(
     String? supplyAmount,
     String? targetAmount,
-    List<Map> swapPair,
+    List<String?> swapPair,
     String slippage,
   ) async {
     final output = await (service.queryTokenSwapAmount(

diff --git a/lib/api/swap/acalaServiceSwap.dart b/lib/api/swap/acalaServiceSwap.dart
@@ -8,14 +8,19 @@ class AcalaServiceSwap {
 
   final PluginKarura plugin;
 
+  Future<List?> getSwapTokens() async {
+    return await plugin.sdk.webView!
+        .evalJavascript('acala.getSwapTokens(apiRx)');
+  }
+
   Future<Map?> queryTokenSwapAmount(
     String? supplyAmount,
     String? targetAmount,
-    List<Map> swapPair,
+    List<String?> swapPair,
     String slippage,
   ) async {
     final code =
-        'acala.calcTokenSwapAmount(api, $supplyAmount, $targetAmount, ${jsonEncode(swapPair)}, $slippage)';
+        'acala.calcTokenSwapAmount(apiRx, $supplyAmount, $targetAmount, ${jsonEncode(swapPair)}, $slippage)';
     final output = await plugin.sdk.webView!.evalJavascript(code);
     return output;
   }

diff --git a/lib/api/types/dexPoolInfoData.dart b/lib/api/types/dexPoolInfoData.dart
@@ -53,6 +53,7 @@ abstract class _DexPoolData {
   ProvisioningData? provisioning;
   double? rewards;
   double? rewardsLoyalty;
+  List? balances;
 }
 
 @JsonSerializable()

diff --git a/lib/api/types/dexPoolInfoData.g.dart b/lib/api/types/dexPoolInfoData.g.dart
diff --git a/lib/api/types/homaNewEnvData.g.dart b/lib/api/types/homaNewEnvData.g.dart