@subwallet/extension-base 1.3.31-0 → 1.3.32-0

package/cjs/page/cardano/cips/cip30.js

@@ -0,0 +1,63 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CIP30Api = void 0;
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class CIP30Api {
+  constructor(sendMessage) {
+    this.sendMessage = sendMessage;
+  }
+  getExtension() {
+    return [{
+      cip: 30
+    }];
+  }
+  async getNetworkId() {
+    return await this.sendMessage('cardano(network.get.current)');
+  }
+  async getCollateral(payload) {
+    return await this.sendMessage('cardano(account.get.collateral)', payload);
+  }
+  async getUtxos(amount, paginate) {
+    return await this.sendMessage('cardano(account.get.utxos)', {
+      amount,
+      paginate
+    });
+  }
+  async getUsedAddresses() {
+    return await this.sendMessage('cardano(account.get.address)');
+  }
+  async getChangeAddress() {
+    return await this.sendMessage('cardano(account.get.change.address)');
+  }
+  async getUnusedAddresses() {
+    return new Promise(resolve => resolve([]));
+  }
+  async getRewardAddresses() {
+    return new Promise(resolve => resolve([]));
+  }
+  async signTx(tx) {
+    let partialSign = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    return await this.sendMessage('cardano(transaction.sign)', {
+      tx,
+      partialSign
+    });
+  }
+  async signData(address, payload) {
+    return await this.sendMessage('cardano(data.sign)', {
+      address,
+      payload
+    });
+  }
+  async submitTx(tx) {
+    return await this.sendMessage('cardano(transaction.submit)', tx);
+  }
+  async getBalance() {
+    return await this.sendMessage('cardano(account.get.balance)');
+  }
+}
+exports.CIP30Api = CIP30Api;

package/cjs/page/cardano/cips/index.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "CIP30Api", {
+  enumerable: true,
+  get: function () {
+    return _cip.CIP30Api;
+  }
+});
+exports.ExtensionCIPsSupported = void 0;
+var _cip = require("./cip30");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const ExtensionCIPsSupported = [{
+  cip: 30
+}];
+exports.ExtensionCIPsSupported = ExtensionCIPsSupported;

package/cjs/page/cardano/index.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _cips = require("@subwallet/extension-base/page/cardano/cips");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const WALLET_NAME = 'SubWallet';
+const WALLET_VERSION = process.env.PKG_VERSION;
+const WALLET_ICON = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYwIiBoZWlnaHQ9IjE2MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNODAgNGM1Ny42MyAwIDc2IDE4LjM3IDc2IDc2IDAgNTcuNjMtMTguMzcgNzYtNzYgNzYtNTcuNjMgMC03Ni0xOC4zNy03Ni03NkM0IDIyLjM3IDIyLjM3IDQgODAgNFoiIGZpbGw9InVybCgjYSkiLz48ZyBjbGlwLXBhdGg9InVybCgjYikiPjxwYXRoIGQ9Ik0xMTIuNjE1IDY2LjcyVjUzLjM5OEw1OC43NiAzMiA0OCAzNy40MTJsLjA1NyA0MS40NjQgNDAuMjkyIDE2LjA3LTIxLjUyIDkuMDc1di03LjAxOEw1Ni45NSA5My4wM2wtOC44OTMgNC4xNjN2MjUuMzk1TDU4Ljc2OSAxMjhsNTMuODQ2LTI0LjA2MlY4Ni44NjlMNjQuMTU0IDY3LjY1N1Y1NmwzOC40NDkgMTUuMjE2IDEwLjAxMi00LjQ5NloiIGZpbGw9IiNmZmYiLz48L2c+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4MT0iODAiIHkxPSI0IiB4Mj0iODAiIHkyPSIxNTYiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBzdG9wLWNvbG9yPSIjMDA0QkZGIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjNENFQUFDIi8+PC9saW5lYXJHcmFkaWVudD48Y2xpcFBhdGggaWQ9ImIiPjxwYXRoIGZpbGw9IiNmZmYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDQ4IDMyKSIgZD0iTTAgMGg2NC42MTV2OTZIMHoiLz48L2NsaXBQYXRoPjwvZGVmcz48L3N2Zz4=';
+class SubWalletCardanoProvider {
+  apiVersion = WALLET_VERSION;
+  icon = WALLET_ICON;
+  name = WALLET_NAME;
+  supportedExtensions = [..._cips.ExtensionCIPsSupported];
+  constructor(sendMessage) {
+    this.icon = WALLET_ICON;
+    this.sendMessage = sendMessage;
+  }
+  async enable() {
+    const isEnabled = await this.sendMessage('pub(authorize.tabV2)', {
+      origin,
+      accountAuthTypes: ['cardano']
+    });
+    if (!isEnabled) {
+      throw new Error('Access to the wallet is denied');
+    }
+    const CIP30 = new _cips.CIP30Api(this.sendMessage);
+    return Object.freeze(CIP30);
+  }
+  async isEnable() {
+    const accountList = await this.sendMessage('pub(accounts.list)', {
+      accountAuthType: 'cardano'
+    });
+    return accountList.length > 0;
+  }
+}
+exports.default = SubWalletCardanoProvider;

package/cjs/page/{SubWalleEvmProvider.js → evm/index.js}

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SubWalletEvmProvider = void 0;
+exports.default = void 0;
 var _safeEventEmitter = _interopRequireDefault(require("@metamask/safe-event-emitter"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -156,4 +156,4 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
     });
   }
 }
-exports.SubWalletEvmProvider = SubWalletEvmProvider;
+exports.default = SubWalletEvmProvider;

package/cjs/page/index.js

@@ -6,14 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.enable = enable;
 exports.handleResponse = handleResponse;
+exports.initCardanoProvider = initCardanoProvider;
 exports.initEvmProvider = initEvmProvider;
 exports.sendMessage = sendMessage;
 var _ProviderError = require("@subwallet/extension-base/background/errors/ProviderError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _SubWalleEvmProvider = require("@subwallet/extension-base/page/SubWalleEvmProvider");
+var _cardano = _interopRequireDefault(require("@subwallet/extension-base/page/cardano"));
+var _evm = _interopRequireDefault(require("@subwallet/extension-base/page/evm"));
+var _substrate = _interopRequireDefault(require("@subwallet/extension-base/page/substrate"));
 var _defaults = require("../defaults");
 var _getId = require("../utils/getId");
-var _Injected = _interopRequireDefault(require("./Injected"));
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -48,7 +50,7 @@ async function enable(origin, opt) {
     origin,
     accountAuthTypes
   });
-  return new _Injected.default(sendMessage);
+  return new _substrate.default(sendMessage);
 }
 function handleResponse(data) {
   const handler = handlers[data.id];
@@ -70,5 +72,8 @@ function handleResponse(data) {
   }
 }
 function initEvmProvider(version) {
-  return new _SubWalleEvmProvider.SubWalletEvmProvider(sendMessage, version);
+  return new _evm.default(sendMessage, version);
+}
+function initCardanoProvider() {
+  return new _cardano.default(sendMessage);
 }

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -21,6 +21,7 @@ var _constants2 = require("@subwallet/extension-base/services/chain-service/cons
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
+var _rxjs = require("rxjs");
 var _evm = require("../evm");
 var _equilibrium = require("./equilibrium");
 var _gear = require("./gear");
@@ -337,7 +338,19 @@ const subscribeTokensAccountsPallet = async _ref6 => {
   const tokensAccountsKey = 'query_tokens_accounts';
   const tokenTypes = includeNativeToken ? [_types._AssetType.NATIVE, _types._AssetType.LOCAL] : [_types._AssetType.LOCAL];
   const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chainInfo.slug, tokenTypes);
+
+  // Hotfix balance for gdot
+  const getGdotBalance = async () => {
+    const gdotBalances = await queryGdotBalance(substrateApi, addresses, assetMap[gdotSlug], extrinsicType);
+    callback(gdotBalances);
+  };
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
+    // Hotfix balance for gdot
+    if (tokenInfo.slug === gdotSlug) {
+      return (0, _rxjs.timer)(0, _constants.CRON_REFRESH_PRICE_INTERVAL).subscribe(() => {
+        getGdotBalance().catch(console.error);
+      });
+    }
     try {
       const params = [{
         section: 'query',
@@ -547,4 +560,23 @@ const subscribeSubnetAlphaPallet = async _ref9 => {
     cancel = true;
     clearInterval(interval);
   };
-};
+};
+
+// Hot fix for gdot balance
+
+const gdotSlug = 'hydradx_main-LOCAL-GDOT';
+async function queryGdotBalance(substrateApi, addresses, tokenInfo, extrinsicType) {
+  return await Promise.all(addresses.map(async address => {
+    const _balanceInfo = await substrateApi.api.call.currenciesApi.account((0, _utils2._getTokenOnChainAssetId)(tokenInfo), address);
+    const balanceInfo = _balanceInfo.toPrimitive();
+    const transferableBalance = (0, _tokensPallet._getTokensPalletTransferable)(balanceInfo, (0, _utils2._getAssetExistentialDeposit)(tokenInfo), extrinsicType);
+    const totalLockedFromTransfer = (0, _tokensPallet._getTokensPalletLocked)(balanceInfo);
+    return {
+      address,
+      tokenSlug: tokenInfo.slug,
+      state: _KoniTypes.APIItemState.READY,
+      free: transferableBalance.toString(),
+      locked: totalLockedFromTransfer.toString()
+    };
+  }));
+}

package/cjs/services/balance-service/transfer/xcm/acrossBridge/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SpokePoolMapping = void 0;
+exports.SpokePoolMapping = exports.AcrossErrorMsg = void 0;
 exports._isAcrossChainBridge = _isAcrossChainBridge;
 exports._isAcrossTestnetBridge = _isAcrossTestnetBridge;
 exports.getAcrossQuote = void 0;
@@ -196,6 +196,11 @@ const SpokePoolMapping = {
   }
 };
 exports.SpokePoolMapping = SpokePoolMapping;
+const AcrossErrorMsg = {
+  AMOUNT_TOO_LOW: 'amount too low',
+  AMOUNT_TOO_HIGH: 'amount too high'
+};
+exports.AcrossErrorMsg = AcrossErrorMsg;
 // Calculate fee for across bridge transfer
 const getAcrossQuote = async _ref => {
   let {
@@ -208,7 +213,6 @@ const getAcrossQuote = async _ref => {
     sendingValue
   } = _ref;
   const isAcrossBridgeXcm = (0, _xcmParser._isAcrossBridgeXcm)(originChain, destinationChain);
-  console.log('sendingValue', sendingValue);
   if (!isAcrossBridgeXcm) {
     throw new Error('This is not a valid AcrossBridge transfer');
   }

package/cjs/services/balance-service/transfer/xcm/index.js

@@ -202,6 +202,8 @@ const createAcrossBridgeExtrinsic = async _ref6 => {
     const data = await ((_subwalletApiSdk$xcmA = _subwalletApiSdk.default.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
     const _feeCustom = feeCustom;
     const feeCombine = (0, _utils3.combineEthFee)(feeInfo, feeOption, _feeCustom);
+
+    // todo: validate data before sending
     const transactionConfig = {
       from: data === null || data === void 0 ? void 0 : data.sender,
       to: data === null || data === void 0 ? void 0 : data.to,

package/cjs/services/chain-service/handler/CardanoApi.js

@@ -129,6 +129,39 @@ class CardanoApi {
       return [];
     }
   }
+  async getUtxos(address, page, limit) {
+    try {
+      let url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/addresses/${address}/utxos` : `https://cardano-mainnet.blockfrost.io/api/v0/addresses/${address}/utxos`;
+      url += `?page=${page}&count=${limit}`;
+      const response = await fetch(url, {
+        method: 'GET',
+        headers: {
+          Project_id: this.projectId
+        }
+      });
+      const utxos = await response.json();
+      return utxos;
+    } catch (e) {
+      console.error('Error on getting account balance', e);
+      return [];
+    }
+  }
+  async getSpecificUtxo(txHash) {
+    try {
+      const url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/txs/${txHash}/utxos` : `https://cardano-mainnet.blockfrost.io/api/v0/txs/${txHash}/utxos`;
+      const response = await fetch(url, {
+        method: 'GET',
+        headers: {
+          Project_id: this.projectId
+        }
+      });
+      const utxo = await response.json();
+      return utxo;
+    } catch (e) {
+      console.error('Error on getting account balance', e);
+      return {};
+    }
+  }
   async sendCardanoTxReturnHash(tx) {
     try {
       const url = this.isTestnet ? 'https://cardano-preprod.blockfrost.io/api/v0/tx/submit' : 'https://cardano-mainnet.blockfrost.io/api/v0/tx/submit';

package/cjs/services/chain-service/index.js

@@ -17,10 +17,12 @@ var _types2 = require("@subwallet/extension-base/services/chain-service/handler/
 var _types3 = require("@subwallet/extension-base/services/chain-service/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _scripts = require("@subwallet/extension-base/services/migration-service/scripts");
+var _helper = require("@subwallet/extension-base/services/request-service/helper");
 var _AssetSetting = _interopRequireDefault(require("@subwallet/extension-base/stores/AssetSetting"));
 var _utils2 = require("@subwallet/extension-base/utils");
 var _rxjs = require("rxjs");
 var _web = _interopRequireDefault(require("web3"));
+var _util = require("@polkadot/util");
 var _logger = require("@polkadot/util/logger");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -171,6 +173,35 @@ class ChainService {
   getCardanoApi(slug) {
     return this.cardanoChainHandler.getCardanoApiByChain(slug);
   }
+  async getUtxosByAddress(address, slug, paginate) {
+    const cardanoApi = this.getCardanoApi(slug);
+    const isTestnet = slug === 'cardano_preproduction';
+    const formattedAddress = isTestnet ? (0, _utils2.reformatAddress)(address, 0) : address;
+    const limit = (paginate === null || paginate === void 0 ? void 0 : paginate.limit) || 100;
+    const utxos = [];
+    let needStop = false;
+    let page = ((paginate === null || paginate === void 0 ? void 0 : paginate.page) || 0) + 1;
+    while (!needStop) {
+      const utxoRaw = await cardanoApi.getUtxos(formattedAddress, page, limit);
+      if (utxoRaw.length === 0 || !(0, _util.isArray)(utxoRaw)) {
+        needStop = true;
+      } else {
+        utxos.push(...utxoRaw);
+        page++;
+      }
+    }
+    return (0, _helper.convertUtxoRawToUtxo)(utxos);
+  }
+  getSpecificUtxo(slug) {
+    const cardanoApi = this.getCardanoApi(slug);
+    return async (txHash, txId) => {
+      const utxoRaw = await cardanoApi.getSpecificUtxo(txHash);
+      if (!(utxoRaw !== null && utxoRaw !== void 0 && utxoRaw.outputs)) {
+        return undefined;
+      }
+      return utxoRaw.outputs[txId];
+    };
+  }
   getCardanoApiMap() {
     return this.cardanoChainHandler.getCardanoApiMap();
   }

package/cjs/services/chain-service/utils/patch.js

@@ -11,7 +11,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-const ChainListVersion = '0.2.103'; // update this when build chainlist
+const ChainListVersion = '0.2.104'; // update this when build chainlist
 
 // todo: move this interface to chainlist
 

package/cjs/services/earning-service/handlers/liquid-staking/stella-swap.js

@@ -25,7 +25,7 @@ const getStellaswapLiquidStakingContract = function (networkKey, assetAddress, e
   return new evmApi.api.eth.Contract(_constants.ST_LIQUID_TOKEN_ABI, assetAddress, options);
 };
 exports.getStellaswapLiquidStakingContract = getStellaswapLiquidStakingContract;
-const APR_STATS_URL = 'https://apr-api.stellaswap.com/api/v1/stdot';
+const APR_STATS_URL = 'https://stdot-apr.stellaswap.com/';
 const SUBWALLET_REFERRAL = '0x7e6815f45E624768548d085231f2d453f16FD7DD';
 const TOP_HOLDER = '0x4300e09284e3bB4d9044DdAB31EfAF5f3301DABa';
 class StellaSwapLiquidStakingPoolHandler extends _base.default {
@@ -95,7 +95,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
       statistic: {
         assetEarning: [{
           slug: this.rewardAssets[0],
-          apr: aprObject.result,
+          apr: aprObject.stDOTAPR,
           exchangeRate: exchangeRate
         }],
         unstakingPeriod: 24 * 28,
@@ -106,7 +106,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
           defaultUnstake: '0',
           fastUnstake: '0'
         },
-        totalApr: aprObject.result,
+        totalApr: aprObject.stDOTAPR,
         tvl: tvl.toString()
       }
     };

package/cjs/services/earning-service/handlers/native-staking/dtao.js

@@ -462,7 +462,7 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
     const BNlimitPrice = new _bignumber.default(limitPrice.integerValue(_bignumber.default.ROUND_CEIL).toFixed());
     const selectedValidatorInfo = targetValidators[0];
     const hotkey = selectedValidatorInfo.address;
-    const extrinsic = chainApi.api.tx.subtensorModule.addStakeLimit(hotkey, netuid, binaryAmount, BNlimitPrice, false);
+    const extrinsic = chainApi.api.tx.subtensorModule.addStakeLimit(hotkey, netuid, binaryAmount.toFixed(), BNlimitPrice.toFixed(), false);
     return [extrinsic, {
       slug: this.nativeToken.slug,
       amount: '0'
@@ -495,7 +495,7 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
     const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid || 0));
     const limitPrice = alphaToTaoPrice.multipliedBy(10 ** (0, _utils2._getAssetDecimals)(this.nativeToken)).multipliedBy(1 - (slippage || DEFAULT_BITTENSOR_SLIPPAGE));
     const BNlimitPrice = new _bignumber.default(limitPrice.integerValue(_bignumber.default.ROUND_CEIL).toFixed());
-    const extrinsic = apiPromise.api.tx.subtensorModule.removeStakeLimit(selectedTarget, netuid, binaryAmount, BNlimitPrice, false);
+    const extrinsic = apiPromise.api.tx.subtensorModule.removeStakeLimit(selectedTarget, netuid, binaryAmount.toFixed(), BNlimitPrice.toFixed(), false);
     return [_KoniTypes.ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
   async validateYieldLeave(amount, address, fastLeave, selectedTarget, slug, poolInfo) {

package/cjs/services/earning-service/handlers/native-staking/mythos.js

@@ -12,9 +12,24 @@ var _constants = require("@subwallet/extension-base/services/chain-service/const
 var _basePara = _interopRequireDefault(require("@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para"));
 var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+const FIXED_DAY_REWARD = '123287670000000000000000';
+const COMMISSION = 0.1;
+const DAYS_PER_YEAR = 365;
+function calculateCollatorApy(numberOfCollators, totalStakeStr) {
+  const totalStake = new _bignumber.default(totalStakeStr);
+  const collatorRewardPerDay = new _bignumber.default(FIXED_DAY_REWARD).div(numberOfCollators);
+  const dayRate = collatorRewardPerDay.div(totalStake);
+  const finalTokens = totalStake.multipliedBy(dayRate.multipliedBy(DAYS_PER_YEAR).plus(1));
+  const yearReward = finalTokens.minus(totalStake).multipliedBy(1 - COMMISSION);
+  return yearReward.div(totalStake).multipliedBy(100).toNumber();
+}
+function calculateNetworkApy(totalStake) {
+  return new _bignumber.default(FIXED_DAY_REWARD).multipliedBy(DAYS_PER_YEAR).multipliedBy(1 - COMMISSION).div(totalStake).multipliedBy(100).toNumber();
+}
 class MythosNativeStakingPoolHandler extends _basePara.default {
   availableMethod = {
     join: true,
@@ -63,7 +78,12 @@ class MythosNativeStakingPoolHandler extends _basePara.default {
       const sessionTime = _constants._STAKING_ERA_LENGTH_MAP[this.chain] || _constants._STAKING_ERA_LENGTH_MAP.default; // in hours
       const blockTime = _constants._EXPECTED_BLOCK_TIME[this.chain];
       const unstakingPeriod = parseInt(unstakeDelay) * blockTime / 60 / 60;
-      const _minStake = await substrateApi.api.query.collatorStaking.minStake();
+      const [_minStake, _candidates] = await Promise.all([substrateApi.api.query.collatorStaking.minStake(), substrateApi.api.query.collatorStaking.candidates.entries()]);
+      const bnTotalChainStake = _candidates.reduce((total, _candidate) => {
+        const collatorInfo = _candidate[1].toPrimitive();
+        const collatorTotalStake = new _bignumber.default(collatorInfo.stake);
+        return total.plus(collatorTotalStake);
+      }, new _bignumber.default(0));
       const minStake = _minStake.toString();
       const minStakeToHuman = (0, _utils2.formatNumber)(minStake, nativeToken.decimals || 0, _utils2.balanceFormatter);
       const data = {
@@ -87,7 +107,7 @@ class MythosNativeStakingPoolHandler extends _basePara.default {
           era: parseInt(currentSession),
           eraTime: sessionTime,
           unstakingPeriod: unstakingPeriod,
-          totalApy: undefined
+          totalApy: calculateNetworkApy(bnTotalChainStake)
           // tvl: totalStake.toString(),
           // inflation
         },
@@ -215,27 +235,41 @@ class MythosNativeStakingPoolHandler extends _basePara.default {
 
   async getPoolTargets() {
     const substrateApi = await this.substrateApi.isReady;
-    const [_allCollators, _minStake, _commission] = await Promise.all([substrateApi.api.query.collatorStaking.candidates.entries(), substrateApi.api.query.collatorStaking.minStake(), substrateApi.api.query.collatorStaking.collatorRewardPercentage()]);
+    const [_allCollators, _minStake, _commission, _desiredCandidates] = await Promise.all([substrateApi.api.query.collatorStaking.candidates.entries(), substrateApi.api.query.collatorStaking.minStake(), substrateApi.api.query.collatorStaking.collatorRewardPercentage(), substrateApi.api.query.collatorStaking.desiredCandidates()]);
     const maxStakersPerCollator = substrateApi.api.consts.collatorStaking.maxStakers.toPrimitive();
-    return _allCollators.map(_collator => {
+    const numberOfRewardCollators = parseInt(_desiredCandidates.toString());
+    const numberOfCollators = _allCollators.length;
+    const allTargets = _allCollators.map(_collator => {
       const _collatorAddress = _collator[0].toHuman();
       const collatorAddress = _collatorAddress[0];
       const collatorInfo = _collator[1].toPrimitive();
-      const bnTotalStake = BigInt(collatorInfo.stake);
+      const totalStake = collatorInfo.stake;
       const numOfStakers = parseInt(collatorInfo.stakers);
       const isCrowded = numOfStakers >= maxStakersPerCollator;
       return {
         address: collatorAddress,
         chain: this.chain,
-        totalStake: bnTotalStake.toString(),
+        totalStake: totalStake,
         ownStake: '0',
-        otherStake: bnTotalStake.toString(),
+        otherStake: totalStake,
         minBond: _minStake.toPrimitive(),
         nominatorCount: numOfStakers,
         commission: (0, _utils.getCommission)(_commission.toString()),
         blocked: false,
         isVerified: false,
-        isCrowded
+        isCrowded,
+        expectedReturn: calculateCollatorApy(numberOfCollators, totalStake)
+      };
+    });
+    const sortTargetsByStake = allTargets.sort((a, b) => (0, _bignumber.default)(b.totalStake).minus((0, _bignumber.default)(a.totalStake)).toNumber());
+    return sortTargetsByStake.map((target, rank) => {
+      let expectedReturn = target.expectedReturn;
+      if (rank >= numberOfRewardCollators) {
+        expectedReturn = 0.000000000000001;
+      }
+      return {
+        ...target,
+        expectedReturn
       };
     });
   }

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -82,7 +82,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const bnTotalEraStake = new _util.BN(rawTotalEraStake);
       const bnTotalIssuance = new _util.BN(rawTotalIssuance);
       const inflation = (0, _utils.calculateInflation)(bnTotalEraStake, bnTotalIssuance, numAuctions, chainInfo.slug);
-      const expectedReturn = (0, _utils.calculateChainStakedReturnV2)(chainInfo, rawTotalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, new _bignumber.default(inflation), true);
+      const expectedReturn = await (0, _utils.calculateChainStakedReturnV2)(chainInfo, rawTotalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, new _bignumber.default(inflation), true);
       const eraTime = _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._STAKING_ERA_LENGTH_MAP.default; // in hours
       const unlockingPeriod = parseInt(unlockingEras) * eraTime; // in hours
       const farmerCount = _counterForNominators.toPrimitive();

package/cjs/services/earning-service/handlers/native-staking/tao.js

@@ -175,8 +175,8 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
   /* Unimplemented function  */
 
   get maintainBalance() {
-    const ed = new _util.BN(this.nativeToken.minAmount || '0');
-    const calculateMaintainBalance = new _util.BN(15).mul(ed).div(_util.BN_TEN);
+    const ed = new _bignumber.default(this.nativeToken.minAmount || '0');
+    const calculateMaintainBalance = new _bignumber.default(15).multipliedBy(ed).dividedBy(10);
     const maintainBalance = calculateMaintainBalance;
     return maintainBalance.toString();
   }
@@ -202,7 +202,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
             highestApr = validators[i];
           }
         }
-        const bnTaoIn = new _util.BN(taoIn);
+        const bnTaoIn = new _bignumber.default(taoIn);
         const BNminDelegatorStake = new _bignumber.default(minDelegatorStake.toString());
         const apr = this.chain === 'bittensor' ? Number(highestApr.apr) * 100 : 0;
         const data = {
@@ -430,7 +430,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     const testnetDelegate = (await this.substrateApi.api.call.delegateInfoRuntimeApi.getDelegates()).toJSON();
     const getNominatorMinRequiredStake = this.substrateApi.api.query.subtensorModule.nominatorMinRequiredStake();
     const nominatorMinRequiredStake = (await getNominatorMinRequiredStake).toString();
-    const bnMinBond = new _util.BN(nominatorMinRequiredStake);
+    const bnMinBond = new _bignumber.default(nominatorMinRequiredStake);
     return testnetDelegate.map(delegate => ({
       address: delegate.delegateSs58,
       totalStake: '0',
@@ -450,14 +450,14 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     const topValidator = _topValidator;
     const getNominatorMinRequiredStake = this.substrateApi.api.query.subtensorModule.nominatorMinRequiredStake();
     const nominatorMinRequiredStake = (await getNominatorMinRequiredStake).toString();
-    const bnMinBond = new _util.BN(nominatorMinRequiredStake);
+    const bnMinBond = new _bignumber.default(nominatorMinRequiredStake);
     const validatorList = topValidator.data;
     const validatorAddresses = Object.keys(validatorList);
     const results = await Promise.all(validatorAddresses.map(i => {
       const address = validatorList[i].hotkey.ss58;
-      const bnTotalStake = new _util.BN(validatorList[i].stake);
-      const bnOwnStake = new _util.BN(validatorList[i].validator_stake);
-      const otherStake = bnTotalStake.sub(bnOwnStake);
+      const bnTotalStake = new _bignumber.default(validatorList[i].stake);
+      const bnOwnStake = new _bignumber.default(validatorList[i].validator_stake);
+      const otherStake = bnTotalStake.minus(bnOwnStake);
       const nominatorCount = validatorList[i].nominators;
       const commission = validatorList[i].take;
       const roundedCommission = (parseFloat(commission) * 100).toFixed(0);
@@ -501,10 +501,10 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
       selectedValidators: targetValidators
     } = data;
     const chainApi = await this.substrateApi.isReady;
-    const binaryAmount = new _util.BN(amount);
+    const binaryAmount = new _bignumber.default(amount);
     const selectedValidatorInfo = targetValidators[0];
     const hotkey = selectedValidatorInfo.address;
-    const extrinsic = chainApi.api.tx.subtensorModule.addStake(hotkey, 0, binaryAmount);
+    const extrinsic = chainApi.api.tx.subtensorModule.addStake(hotkey, 0, binaryAmount.toFixed());
     return [extrinsic, {
       slug: this.nativeToken.slug,
       amount: '0'
@@ -518,7 +518,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     const {
       amount
     } = data;
-    if (new _util.BN(amount).lt(new _util.BN(_dtao.DEFAULT_DTAO_MINBOND))) {
+    if (new _bignumber.default(amount).lt(new _bignumber.default(_dtao.DEFAULT_DTAO_MINBOND))) {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)(`Insufficient stake. You need to stake at least ${(0, _utils3.formatNumber)(_dtao.DEFAULT_DTAO_MINBOND, (0, _utils2._getAssetDecimals)(this.nativeToken))} ${(0, _utils2._getAssetSymbol)(this.nativeToken)} to earn rewards`))];
     }
     return baseErrors;
@@ -530,12 +530,12 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
 
   async handleYieldUnstake(amount, address, selectedTarget) {
     const apiPromise = await this.substrateApi.isReady;
-    const binaryAmount = new _util.BN(amount);
+    const binaryAmount = new _bignumber.default(amount);
     const poolPosition = await this.getPoolPosition(address);
     if (!selectedTarget || !poolPosition) {
       return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS));
     }
-    const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, 0, binaryAmount);
+    const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, 0, binaryAmount.toFixed());
     return [_KoniTypes.ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
   async validateYieldLeave(amount, address, fastLeave, selectedTarget, slug, poolInfo) {

package/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -103,7 +103,7 @@ class NominationPoolHandler extends _base.default {
       const bnTotalIssuance = new _util.BN(rawTotalIssuance);
       const inflation = (0, _utils.calculateInflation)(bnTotalEraStake, bnTotalIssuance, numAuctions, chainInfo.slug);
       const minPoolJoin = (_minPoolJoin === null || _minPoolJoin === void 0 ? void 0 : _minPoolJoin.toString()) || undefined;
-      const expectedReturn = (0, _utils.calculateChainStakedReturnV2)(chainInfo, rawTotalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, new _bignumber.default(inflation), true);
+      const expectedReturn = await (0, _utils.calculateChainStakedReturnV2)(chainInfo, rawTotalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, new _bignumber.default(inflation), true);
       const eraTime = _constants._STAKING_ERA_LENGTH_MAP[this.chain] || _constants._STAKING_ERA_LENGTH_MAP.default; // in hours
       const unlockingPeriod = parseInt(unlockingEras) * eraTime; // in hours
 

package/cjs/services/migration-service/scripts/MigrateAuthUrls.js

@@ -18,7 +18,7 @@ class MigrateSettings extends _Base.default {
             const key = 'app.stellaswap.com';
             const stellaSwap = value[key];
             if (stellaSwap) {
-              stellaSwap.currentEvmNetworkKey = 'moonbeam';
+              stellaSwap.currentNetworkMap.evm = 'moonbeam';
               value[key] = stellaSwap;
               this.state.setAuthorize(value, () => {
                 resolve();

package/cjs/services/request-service/constants.js

@@ -12,7 +12,9 @@ exports.EXTENSION_REQUEST_URL = EXTENSION_REQUEST_URL;
 const PREDEFINED_CHAIN_DAPP_CHAIN_MAP = {
   'portal.astar.network': ['astar', 'astarEvm'],
   'apps.moonbeam.network': ['moonbeam', 'moonriver'],
-  'app.stellaswap.com': ['moonbeam']
+  'app.stellaswap.com': ['moonbeam'],
+  'testnet-preprod.minswap.org': ['cardano_preproduction'],
+  'localhost:7777': ['cardano_preproduction']
 };
 exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = PREDEFINED_CHAIN_DAPP_CHAIN_MAP;
 const WEB_APP_URL = [