update acala.js history api

AcalaNetwork · Dec 21, 2022 · 93ec276 · 93ec276
1 parent 7931d83
commit 93ec276
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.5.1] - 20221221
+- bump polkawallet_sdk v0.5.1.
+- cross-chain staking api update.
+
 ## [0.4.9] - 20220808
 - bump polkawallet_sdk v0.4.9.
 - js api update.

diff --git a/lib/js_service_acala/dist/main.js b/lib/js_service_acala/dist/main.js
diff --git a/lib/js_service_acala/src/service/xcm.ts b/lib/js_service_acala/src/service/xcm.ts
@@ -32,6 +32,7 @@ const chainNodes = {
   ],
 };
 const xcm_dest_weight_v2 = "5000000000";
+const xcm_dest_weight_unlimited = "Unlimited";
 
 const xcmApi: Record<string, ApiPromise> = {};
 // let xcmApi: ApiPromise;
@@ -132,14 +133,7 @@ async function _getTokenBalance(chain: string, address: string, tokenNameId: str
   };
 }
 
-async function getTransferTx(
-  chainFrom: ChainData,
-  chainTo: ChainData,
-  tokenName: string,
-  amount: string,
-  addressTo: string,
-  sendFee: any
-) {
+async function getTransferTx(chainFrom: ChainData, chainTo: ChainData, tokenName: string, amount: string, addressTo: string, sendFee: any) {
   if (!wallet) {
     wallet = new Wallet((<any>window).api);
     await wallet.isReady;
@@ -149,6 +143,8 @@ async function getTransferTx(
 
   // from acala
   if (chainFrom.name === chain_name_acala) {
+    const useNewDestWeight = (<any>window).api.tx.xTokens.transfer.meta.args[3].type.toString() === "XcmV2WeightLimit";
+
     let dst: any;
     if (chainTo.name === chain_name_polkadot) {
       // to relay-chain
@@ -165,12 +161,17 @@ async function getTransferTx(
         ? {
             module: "xTokens",
             call: "transfer",
-            params: [token.toChainData(), amount, { V1: dst }, xcm_dest_weight_v2],
+            params: [token.toChainData(), amount, { V1: dst }, useNewDestWeight ? xcm_dest_weight_unlimited : xcm_dest_weight_v2],
           }
         : {
             module: "xTokens",
             call: "transferMulticurrencies",
-            params: [[[token.toChainData(), amount], sendFee], 1, { V1: dst }, xcm_dest_weight_v2],
+            params: [
+              [[token.toChainData(), amount], sendFee],
+              1,
+              { V1: dst },
+              useNewDestWeight ? xcm_dest_weight_unlimited : xcm_dest_weight_v2,
+            ],
           };
     } else {
       // to other parachains
@@ -186,12 +187,17 @@ async function getTransferTx(
       ? {
           module: "xTokens",
           call: "transferMulticurrencies",
-          params: [[[token.toChainData(), amount], sendFee], 1, { V1: dst }, xcm_dest_weight_v2],
+          params: [
+            [[token.toChainData(), amount], sendFee],
+            1,
+            { V1: dst },
+            useNewDestWeight ? xcm_dest_weight_unlimited : xcm_dest_weight_v2,
+          ],
         }
       : {
           module: "xTokens",
           call: "transfer",
-          params: [token.toChainData() as any, amount, { V1: dst }, xcm_dest_weight_v2],
+          params: [token.toChainData() as any, amount, { V1: dst }, useNewDestWeight ? xcm_dest_weight_unlimited : xcm_dest_weight_v2],
         };
   }
 
@@ -248,7 +254,7 @@ async function getTransferTx(
     return {
       module: "xTokens",
       call: "transfer",
-      params: [tokenIds[token.name], amount, { V1: dst }, xcm_dest_weight_v2],
+      params: [tokenIds[token.name], amount, { V1: dst }, xcm_dest_weight_unlimited],
     };
   }
 
@@ -266,13 +272,13 @@ async function getTransferParams(
   const res = await getTransferTx(chainFrom, chainTo, tokenName, amount, addressTo, sendFee);
   if (!res) return null;
 
-  const {module, call, params} = res;
-  const tx = (chainFrom.name === 'acala' ? (<any>window).api : getApi(chainFrom.name)).tx[module][call](...params);
+  const { module, call, params } = res;
+  const tx = (chainFrom.name === "acala" ? (<any>window).api : getApi(chainFrom.name)).tx[module][call](...params);
   return {
     module,
     call,
-    params: tx.args.map(e => e.toHuman()),
-    txHex: tx.toHex()
+    params: tx.args.map((e) => e.toHuman()),
+    txHex: tx.toHex(),
   };
 }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: polkawallet_plugin_acala
 description: Acala network plugin for Polkawallet.
-version: 0.4.9
+version: 0.5.1
 homepage:
 
 environment:
@@ -20,8 +20,8 @@ dependencies:
   get_storage: ^2.0.2
   device_info: ^2.0.1
   graphql_flutter: ^5.0.0-nullsafety.5
-  polkawallet_sdk: ^0.4.9
-  polkawallet_ui: ^0.4.9
+  polkawallet_sdk: ^0.5.1
+  polkawallet_ui: ^0.5.1
   flutter_screenutil: ^5.0.0+2
   skeleton_loader: ^2.0.0+4
   rive: ^0.9.0