update acala.js history api

lib/api/assets/acalaServiceAssets.dart

@@ -17,7 +17,7 @@ class AcalaServiceAssets {
 
   Future<List?> getAllTokenSymbols() async {
     final List? res =
-        await plugin.sdk.webView!.evalJavascript('acala.getAllTokens(api)');
+        await plugin.sdk.webView!.evalJavascript('acala.getAllTokens()');
     return res;
   }
 
@@ -53,7 +53,7 @@ class AcalaServiceAssets {
       final channel = '$tokenBalanceChannel${e.symbol}';
       plugin.sdk.api.subscribeMessage(
         'acala.getTokenBalance',
-        ['api', address, e.tokenNameId],
+        [address, e.tokenNameId],
         channel,
         (Map data) {
           callback({
@@ -80,7 +80,7 @@ class AcalaServiceAssets {
           '$tokenBalanceChannel${lpToken.map((e) => e.symbol).join('')}';
       plugin.sdk.api.subscribeMessage(
         'acala.getTokenBalance',
-        ['api', address, e.tokenNameId],
+        [address, e.tokenNameId],
         channel,
         (Map data) {
           callback({

lib/api/history/acalaServiceHistory.dart

@@ -11,7 +11,7 @@ class AcalaServiceHistory {
   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)})');
+        'acala.getHistory("$type","$address",${jsonEncode(params)})');
     return list;
   }
 }

lib/common/constants/base.dart

@@ -5,7 +5,7 @@ const plugin_name_acala = 'acala';
 const ss58_prefix_acala = 10;
 
 const GraphQLConfig = {
-  'defiUri': 'https://api.subquery.network/sq/AcalaNetwork/acala',
-  'loanUri': 'https://api.subquery.network/sq/AcalaNetwork/acala-loans',
+  'defiUri': 'https://api.polkawallet.io/acala-dex-subql',
+  'loanUri': 'https://api.polkawallet.io/acala-loan-subql',
   "taigaUri": "https://api.subquery.network/sq/nutsfinance/tapio-protocol"
 };

lib/js_service_acala/src/index.ts

@@ -1,4 +1,5 @@
 import { WsProvider, ApiPromise, ApiRx } from "@polkadot/api";
+import { EvmRpcProvider } from "@acala-network/eth-providers";
 import { firstValueFrom } from "rxjs";
 import { subscribeMessage, getNetworkConst, getNetworkProperties } from "./service/setting";
 import keyring from "./service/keyring";
@@ -36,11 +37,9 @@ async function connect(nodes: string[]) {
         (<any>window).apiRx = resRx;
         // console.log(res);
         const url = nodes[(<any>res)._options.provider.__private_59_endpointIndex];
+        await _initAcalaSDK(res, url);
         send("log", `${url} wss connected success`);
         resolve(url);
-
-        (<any>window).wallet = new Wallet(res, { wsProvider });
-        (<any>window).wallet.isReady;
       } else {
         res.disconnect();
         const url = nodes[(<any>res)._options.provider.__private_59_endpointIndex];
@@ -55,6 +54,15 @@ async function connect(nodes: string[]) {
   });
 }
 
+async function _initAcalaSDK(api: ApiPromise, url: string) {
+  const evmProvider = new EvmRpcProvider(url, {
+    maxBlockCacheSize: 1,
+    storageCacheSize: 100,
+  });
+  (<any>window).wallet = new Wallet(api, { evmProvider });
+  await (<any>window).wallet.isReady;
+}
+
 async function test() {}
 
 (<any>window).settings = {

lib/js_service_acala/src/service/acala.ts

@@ -1,6 +1,6 @@
 import { createDexShareName, FixedPointNumber, forceToCurrencyId, forceToCurrencyName, Token } from "@acala-network/sdk-core";
 import { ApiPromise, ApiRx } from "@polkadot/api";
-import { hexToString } from "@polkadot/util";
+import { hexToString, BN_ZERO } from "@polkadot/util";
 import { nft_image_config } from "../constants/acala";
 import { BN } from "@polkadot/util/bn/bn";
 import { AcalaDex, AggregateDex, NutsDex } from "@acala-network/sdk-swap";
@@ -60,6 +60,8 @@ function _getTokenSymbol(allTokens: any[], tokenNameId: string): string {
 let swapper: AggregateDex;
 async function _initDexSDK(api: ApiRx) {
   const wallet = (<any>window).wallet;
+  await wallet.isReady;
+
   swapper = new AggregateDex({
     api,
     wallet,
@@ -143,8 +145,11 @@ async function calcTokenSwapAmount(apiRx: ApiRx, input: number, output: number,
 /**
  * getAllTokens, with ForeignAssets
  */
-async function getAllTokens(api: ApiPromise) {
-  const allTokens = await ((<any>window).wallet as Wallet).getTokens();
+async function getAllTokens() {
+  const w = (<any>window).wallet as Wallet;
+  await w.isReady;
+
+  const allTokens = await w.getTokens();
 
   return Object.values(allTokens)
     .map((e) => {
@@ -187,8 +192,11 @@ function _getTokenType(token: Token) {
 /**
  * get token balance from acala wallet sdk
  */
-async function getTokenBalance(api: ApiPromise, address: string, tokenNameId: string, callback: (value: any) => void) {
-  const sub = ((<any>window).wallet as Wallet).subscribeBalance(tokenNameId, address);
+async function getTokenBalance(address: string, tokenNameId: string, callback: (value: any) => void) {
+  const w = (<any>window).wallet as Wallet;
+  await w.isReady;
+
+  const sub = w.subscribeBalance(tokenNameId, address);
   if (!!callback) {
     sub.subscribe({
       next: (value: BalanceData) => {
@@ -382,7 +390,7 @@ async function _fetchCollateralRewards(api: ApiPromise, pool: any, address: stri
   const res = (await Promise.all([
     api.query.rewards.poolInfos({ Loans: pool }),
     api.query.rewards.sharesAndWithdrawnRewards({ Loans: pool }, address),
-    getAllTokens(api),
+    getAllTokens(),
   ])) as any;
   const pendingRewards = (!!api.query.incentives.pendingMultiRewards
     ? await api.query.incentives?.pendingMultiRewards({ Loans: pool }, address)
@@ -448,7 +456,7 @@ async function fetchDexPoolInfo(api: ApiPromise, pool: any, address: string) {
     api.query.rewards.poolInfos({ Dex: pool }),
     api.query.rewards.sharesAndWithdrawnRewards({ Dex: pool }, address),
     api.query.tokens.totalIssuance(pool),
-    getAllTokens(api),
+    getAllTokens(),
   ])) as any;
   const pendingRewards = (!!api.query.incentives.pendingMultiRewards
     ? await api.query.incentives?.pendingMultiRewards({ Dex: pool }, address)
@@ -460,13 +468,13 @@ async function fetchDexPoolInfo(api: ApiPromise, pool: any, address: string) {
   const withdrawns = Array.from(res[2][1].entries()).map((entry) => {
     const currencyId = forceToCurrencyId(api, entry[0]);
     const tokenNameId = forceToCurrencyName(currencyId);
-    const amount = FPNum(entry[1].toString(), _getTokenDecimal(res[4], tokenNameId));
+    const amount = FPNum(entry[1]?.toString() || BN_ZERO, _getTokenDecimal(res[4], tokenNameId));
     return { tokenNameId, amount };
   });
   const pendings = Array.from(pendingRewards.entries()).map((entry) => {
     const currencyId = forceToCurrencyId(api, entry[0]);
     const tokenNameId = forceToCurrencyName(currencyId);
-    const amount = FPNum(entry[1].toString(), _getTokenDecimal(res[4], tokenNameId));
+    const amount = FPNum(entry[1]?.toString() || BN_ZERO, _getTokenDecimal(res[4], tokenNameId));
     return { tokenNameId, amount };
   });
   let saving = "0";
@@ -972,14 +980,14 @@ async function queryDexIncentiveLoyaltyEndBlock(api: ApiPromise) {
   return { result, loyalty };
 }
 
-async function getHistory(api: ApiPromise, type: string, address: string, params: Object) {
+async function getHistory(type: string, address: string, params: any) {
   const history = new History({
     fetchEndpoints: {
-      transfer: "https://api.subquery.network/sq/AcalaNetwork/acala-transfer",
-      swap: "https://api.subquery.network/sq/AcalaNetwork/acala-dex",
-      earn: "https://api.subquery.network/sq/AcalaNetwork/acala-incentives",
-      loan: "https://api.subquery.network/sq/AcalaNetwork/acala-loans",
-      homa: "https://api.subquery.network/sq/AcalaNetwork/acala-homa",
+      transfer: "https://api.polkawallet.io/acala-history-subql",
+      swap: "https://api.polkawallet.io/acala-dex-subql",
+      earn: "https://api.polkawallet.io/acala-history-subql",
+      loan: "https://api.polkawallet.io/acala-loan-subql",
+      homa: "https://api.polkawallet.io/acala-history-subql",
     },
     wallet: (<any>window).wallet as Wallet,
     poolInterval: 5 * 60 * 1000,

lib/service/serviceAssets.dart

@@ -62,7 +62,7 @@ class ServiceAssets {
 
   Future<TokenBalanceData> updateTokenBalances(TokenBalanceData token) async {
     final res = await plugin.sdk.webView!.evalJavascript(
-        'acala.getTokenBalance(api, "${keyring.current.address}", "${token.tokenNameId}")');
+        'acala.getTokenBalance("${keyring.current.address}", "${token.tokenNameId}")');
 
     final balances =
         Map<String?, TokenBalanceData>.from(store!.assets.tokenBalanceMap);