feat: update types and rpc

src/mangataInstance.ts

@@ -108,6 +108,8 @@ import { isBuyAssetLockFree } from "./methods/rpc/isBuyAssetLockFree";
 import { isSellAssetLockFree } from "./methods/rpc/isSellAssetLockFree";
 import { withdrawToMoonriver } from "./methods/xTokens/withdrawToMoonriver";
 import { getWithdrawFromMoonriverFee } from "./methods/fee/getWithdrawFromMoonriverFee";
+import {getTradeableTokens} from "./methods/rpc/getTradeableTokens";
+import {getLiquidityTokensForTrading} from "./methods/rpc/getLiquidityTokensForTrading";
 import { logger } from "./utils/mangataLogger";
 
 /**
@@ -163,6 +165,8 @@ export function createMangataInstance(urls: string[]): MangataInstance {
          multiswapSellAsset(instancePromise, args, false)
     },
     rpc: {
+      getTradeableTokens: () => getTradeableTokens(instancePromise),
+      getLiquidityTokensForTrading: ()  => getLiquidityTokensForTrading(instancePromise),
       isBuyAssetLockFree:  (tokenIds: TokenId[], amount: BN) =>
          isBuyAssetLockFree(instancePromise, tokenIds, amount),
       isSellAssetLockFree:  (tokenIds: TokenId[], amount: BN) =>

src/methods/rpc/calculateBuyPrice.ts

@@ -17,10 +17,10 @@ export const calculateBuyPrice = async (
   });
   const api = await instancePromise;
   const { inputReserve, outputReserve, amount } = args;
-  const result = await (api.rpc as any).xyk.calculate_buy_price(
+  const price = await (api.rpc as any).xyk.calculate_buy_price(
     inputReserve,
     outputReserve,
     amount
   );
-  return new BN(result.price);
+  return new BN(price);
 };

src/methods/rpc/calculateBuyPriceId.ts

@@ -18,10 +18,10 @@ export const calculateBuyPriceId = async (
     amount: amount.toString()
   });
   const api = await instancePromise;
-  const result = await (api.rpc as any).xyk.calculate_buy_price_id(
+  const price = await (api.rpc as any).xyk.calculate_buy_price_id(
     soldTokenId,
     boughtTokenId,
     amount
   );
-  return new BN(result.price);
+  return new BN(price);
 };

src/methods/rpc/calculateRewardsAmount.ts

@@ -21,9 +21,7 @@ export const calculateRewardsAmount = async (
     liquidityTokenId
   );
 
-  const price = isHex(rewards.price.toString())
-    ? hexToBn(rewards.price.toString())
-    : new BN(rewards.price);
-
-  return price;
+  return isHex(rewards.toString())
+      ? hexToBn(rewards.toString())
+      : new BN(rewards);
 };

src/methods/rpc/calculateSellPrice.ts

@@ -17,10 +17,10 @@ export const calculateSellPrice = async (
   });
   const api = await instancePromise;
   const { inputReserve, outputReserve, amount } = args;
-  const result = await (api.rpc as any).xyk.calculate_sell_price(
+  const price = await (api.rpc as any).xyk.calculate_sell_price(
     inputReserve,
     outputReserve,
     amount
   );
-  return new BN(result.price);
+  return new BN(price);
 };

src/methods/rpc/calculateSellPriceId.ts

@@ -18,10 +18,10 @@ export const calculateSellPriceId = async (
     amount: amount.toString()
   });
   const api = await instancePromise;
-  const result = await (api.rpc as any).xyk.calculate_sell_price_id(
+  const price = await (api.rpc as any).xyk.calculate_sell_price_id(
     soldTokenId,
     boughtTokenId,
     amount
   );
-  return new BN(result.price);
+  return new BN(price);
 };

src/methods/rpc/getBurnAmount.ts

@@ -1,6 +1,7 @@
 import { ApiPromise } from "@polkadot/api";
 import { BurnAmount, Price } from "../../types/xyk";
 import { logger } from "../../utils/mangataLogger";
+import {BN} from "@polkadot/util";
 
 /**
  * @since 2.0.0
@@ -21,6 +22,8 @@ export const getBurnAmount = async (
     secondTokenId,
     amount
   );
-  const resultAsJson = JSON.parse(result.toString());
-  return resultAsJson as BurnAmount;
+  return {
+    firstAssetAmount: new BN(result[0]),
+    secondAssetAmount: new BN(result[1])
+  } as BurnAmount
 };

src/methods/rpc/getLiquidityTokensForTrading.ts

@@ -0,0 +1,16 @@
+
+import { ApiPromise } from "@polkadot/api";
+import { logger } from "../../utils/mangataLogger";
+
+/**
+ * @since 2.0.0
+ */
+export const getLiquidityTokensForTrading = async (
+    instancePromise: Promise<ApiPromise>
+) => {
+    logger.info("getLiquidityTokensForTrading");
+    const api = await instancePromise;
+    const lpTokens = await (api.rpc as any).xyk.get_liq_tokens_for_trading()
+    const lpTokensForTrading: string[] = lpTokens.map((item: any) => item.toString());
+    return lpTokensForTrading
+};

src/methods/rpc/getTradeableTokens.ts

@@ -0,0 +1,21 @@
+import { ApiPromise } from "@polkadot/api";
+import {TradeAbleTokens} from "../../types/xyk";
+import { logger } from "../../utils/mangataLogger";
+
+/**
+ * @since 2.0.0
+ */
+export const getTradeableTokens = async (
+    instancePromise: Promise<ApiPromise>
+) => {
+    logger.info("getTradeableTokens");
+    const api = await instancePromise;
+    const tokens = await (api.rpc as any).xyk.get_tradeable_tokens()
+    const tradeableTokens: TradeAbleTokens[] = tokens.map((item: any) => ({
+        tokenId: item.tokenId.toString(),
+        decimals: parseInt(item.decimals, 10),
+        name: item.name.toUtf8(),
+        symbol: item.symbol.toUtf8(),
+    }));
+    return tradeableTokens
+};

src/types/common.ts

@@ -44,7 +44,7 @@ import {
   MultiswapSellAsset,
   Price,
   Reserve,
-  Rewards
+  Rewards, TradeAbleTokens
 } from "../types/xyk";
 import {
   Transfer,
@@ -232,6 +232,8 @@ export interface MangataInstance {
    * rpc methods for interacting with various RPC operations.
    */
   rpc: {
+    getLiquidityTokensForTrading: () => Promise<string[]>,
+    getTradeableTokens: () => Promise<TradeAbleTokens[]>,
     isSellAssetLockFree: (tokendIds: TokenId[], amount: BN) => Promise<Boolean>;
     isBuyAssetLockFree: (tokendIds: TokenId[], amount: BN) => Promise<Boolean>;
     /**

src/types/xyk.ts

@@ -13,6 +13,13 @@ export type BurnAmount = {
   secondAssetAmount: TokenAmount;
 };
 
+export type TradeAbleTokens = {
+    tokenId: string,
+    decimals: number,
+    name: string,
+    symbol: string
+}
+
 export type Rewards = {
   address: Address;
   liquidityTokenId: TokenId;

src/utils/getRatio.ts

@@ -18,6 +18,7 @@ const calculateRatio = (numerator: BN, denominator: BN) => {
 };
 
 export const getRatio = (left: BN, right: BN) => {
+  if (left.isZero() && right.isZero()) return BN_ZERO;
   const ratios = calculateRatio(left, right);
 
   const res = ratios[1].mul(BN_DIV_NUMERATOR_MULTIPLIER).div(ratios[0]);