@subwallet/extension-base 1.1.35-beta.2 → 1.1.35-beta.3

package/koni/api/tokens/evm/transfer.js

@@ -5,8 +5,9 @@ import { ExternalRequestPromiseStatus } from '@subwallet/extension-base/backgrou
 import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
 import { _BALANCE_PARSING_CHAIN_GROUP, EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ERC721_ABI } from '@subwallet/extension-base/services/chain-service/helper';
-import { recalculateGasPrice } from '@subwallet/extension-base/utils/eth';
-import { BN, hexToBn } from '@polkadot/util';
+import { calculateGasFeeParams } from '@subwallet/extension-base/utils/eth';
+import BigN from 'bignumber.js';
+import { hexToBn } from '@polkadot/util';
 export const handleTransferBalanceResult = ({
   callback,
   changeValue,
@@ -34,20 +35,29 @@ export const handleTransferBalanceResult = ({
   callback(response);
 };
 export async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, evmApiMap) {
+  var _priority$maxFeePerGa, _priority$maxPriority;
   const networkKey = chainInfo.slug;
   const web3Api = evmApiMap[networkKey];
-  const _price = await web3Api.api.eth.getGasPrice();
-  const gasPrice = recalculateGasPrice(_price, chainInfo.slug);
+  const priority = await calculateGasFeeParams(web3Api, networkKey);
   const transactionObject = {
-    gasPrice: gasPrice,
     to: to,
     value: value,
-    from: from
+    from: from,
+    gasPrice: priority.gasPrice,
+    maxFeePerGas: (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
+    maxPriorityFeePerGas: (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
   };
   const gasLimit = await web3Api.api.eth.estimateGas(transactionObject);
   transactionObject.gas = gasLimit;
-  const estimateFee = new BN(gasLimit).mul(new BN(gasPrice));
-  transactionObject.value = transferAll ? new BN(value).sub(estimateFee).toString() : value;
+  let estimateFee;
+  if (priority.baseGasFee) {
+    const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
+    const maxFee = priority.maxFeePerGas.gte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+    estimateFee = maxFee.multipliedBy(gasLimit);
+  } else {
+    estimateFee = new BigN(priority.gasPrice).multipliedBy(gasLimit);
+  }
+  transactionObject.value = transferAll ? new BigN(value).minus(estimateFee).toString() : value;
   if (EVM_REFORMAT_DECIMALS.acala.includes(networkKey)) {
     const numberReplace = 18 - 12;
     transactionObject.value = transactionObject.value.substring(0, transactionObject.value.length - 6) + new Array(numberReplace).fill('0').join('');
@@ -55,53 +65,58 @@ export async function getEVMTransactionObject(chainInfo, from, to, value, transf
   return [transactionObject, transactionObject.value.toString()];
 }
 export async function getERC20TransactionObject(assetAddress, chainInfo, from, to, value, transferAll, evmApiMap) {
+  var _priority$maxFeePerGa2, _priority$maxPriority2;
   const networkKey = chainInfo.slug;
   const evmApi = evmApiMap[networkKey];
   const erc20Contract = getERC20Contract(networkKey, assetAddress, evmApiMap);
-  let freeAmount = new BN(0);
+  let freeAmount = new BigN(0);
   let transferValue = value;
   if (transferAll) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
     const bal = await erc20Contract.methods.balanceOf(from).call();
-    freeAmount = new BN(bal || '0');
-    transferValue = freeAmount.toString() || '0';
+    freeAmount = new BigN(bal || '0');
+    transferValue = freeAmount.toFixed(0) || '0';
   }
   function generateTransferData(to, transferValue) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
     return erc20Contract.methods.transfer(to, transferValue).encodeABI();
   }
   const transferData = generateTransferData(to, transferValue);
-  const [gasLimit, _price] = await Promise.all([
+  const [gasLimit, priority] = await Promise.all([
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   erc20Contract.methods.transfer(to, transferValue).estimateGas({
     from
-  }), evmApi.api.eth.getGasPrice()]);
-  const gasPrice = recalculateGasPrice(_price, chainInfo.slug);
+  }), calculateGasFeeParams(evmApi, networkKey)]);
   const transactionObject = {
-    gasPrice: gasPrice,
     gas: gasLimit,
     from,
+    value: '0',
     to: assetAddress,
-    data: transferData
+    data: transferData,
+    gasPrice: priority.gasPrice,
+    maxFeePerGas: (_priority$maxFeePerGa2 = priority.maxFeePerGas) === null || _priority$maxFeePerGa2 === void 0 ? void 0 : _priority$maxFeePerGa2.toString(),
+    maxPriorityFeePerGas: (_priority$maxPriority2 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority2 === void 0 ? void 0 : _priority$maxPriority2.toString()
   };
   if (transferAll) {
-    transferValue = new BN(freeAmount).toString();
+    transferValue = freeAmount.toFixed(0);
     transactionObject.data = generateTransferData(to, transferValue);
   }
   return [transactionObject, transferValue];
 }
 export async function getERC721Transaction(web3Api, chain, contractAddress, senderAddress, recipientAddress, tokenId) {
+  var _priority$maxFeePerGa3, _priority$maxPriority3;
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   const contract = new web3Api.api.eth.Contract(_ERC721_ABI, contractAddress);
-  const [gasLimit, _price] = await Promise.all([
+  const [gasLimit, priority] = await Promise.all([
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).estimateGas({
     from: senderAddress
-  }), web3Api.api.eth.getGasPrice()]);
-  const gasPrice = recalculateGasPrice(_price, chain);
+  }), calculateGasFeeParams(web3Api, chain)]);
   return {
     from: senderAddress,
-    gasPrice,
+    gasPrice: priority.gasPrice,
+    maxFeePerGas: (_priority$maxFeePerGa3 = priority.maxFeePerGas) === null || _priority$maxFeePerGa3 === void 0 ? void 0 : _priority$maxFeePerGa3.toString(),
+    maxPriorityFeePerGas: (_priority$maxPriority3 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority3 === void 0 ? void 0 : _priority$maxPriority3.toString(),
     gas: gasLimit,
     to: contractAddress,
     value: '0x00',

package/koni/api/yield/helper/utils.d.ts

@@ -7,4 +7,4 @@ export declare const DEFAULT_YIELD_FIRST_STEP: YieldStepDetail;
 export declare const YIELD_EXTRINSIC_TYPES: ExtrinsicType[];
 export declare const YIELD_POOL_STAT_REFRESH_INTERVAL = 90000;
 export declare const YIELD_POOL_MIN_AMOUNT_PERCENT: Record<string, number>;
-export declare function convertDerivativeToOriginToken(amount: string, poolInfo: SpecialYieldPoolInfo, derivativeTokenInfo: _ChainAsset, originTokenInfo: _ChainAsset): number;
+export declare function convertDerivativeToOriginToken(amount: string, poolInfo: SpecialYieldPoolInfo, derivativeTokenInfo: _ChainAsset, originTokenInfo: _ChainAsset): string;

package/koni/api/yield/helper/utils.js

@@ -4,6 +4,8 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getAssetDecimals } from '@subwallet/extension-base/services/chain-service/utils';
 import { YieldStepType } from '@subwallet/extension-base/types';
+import { BN_TEN } from '@subwallet/extension-base/utils';
+import BigN from 'bignumber.js';
 export const syntheticSelectedValidators = ['15MLn9YQaHZ4GMkhK3qXqR5iGGSdULyJ995ctjeBgFRseyi6', '1REAJ1k691g5Eqqg9gL7vvZCBG7FCCZ8zgQkZWd4va5ESih', '1yGJ3h7TQuJWLYSsUVPZbM8aR8UsQXCqMvrFx5Fn1ktiAmq', '16GDRhRYxk42paoK6TfHAqWej8PdDDUwdDazjv4bAn4KGNeb', '13Ybj8CPEArUee78DxUAP9yX3ABmFNVQME1ZH4w8HVncHGzc', '14yx4vPAACZRhoDQm1dyvXD3QdRQyCRRCe5tj1zPomhhS29a', '14Vh8S1DzzycngbAB9vqEgPFR9JpSvmF1ezihTUES1EaHAV', '153YD8ZHD9dRh82U419bSCB5SzWhbdAFzjj4NtA5pMazR2yC', '1LUckyocmz9YzeQZHVpBvYYRGXb3rnSm2tvfz79h3G3JDgP', '14oRE62MB1SWR6h5RTx3GY5HK2oZipi1Gp3zdiLwVYLfEyRZ', '1cFsLn7o74nmjbRyDtMAnMpQMc5ZLsjgCSz9Np2mcejUK83', '15ZvLonEseaWZNy8LDkXXj3Y8bmAjxCjwvpy4pXWSL4nGSBs', '1NebF2xZHb4TJJpiqZZ3reeTo8dZov6LZ49qZqcHHbsmHfo', '1HmAqbBRrWvsqbLkvpiVDkdA2PcctUE5JUe3qokEh1FN455', '15tfUt4iQNjMyhZiJGBf4EpETE2KqtW1nfJwbBT1MvWjvcK9', '12RXTLiaYh59PokjZVhQvKzcfBEB5CvDnjKKUmDUotzcTH3S'];
 export function calculateAlternativeFee(feeInfo) {
   return feeInfo.partialFee;
@@ -26,7 +28,7 @@ export function convertDerivativeToOriginToken(amount, poolInfo, derivativeToken
   const derivativeDecimals = _getAssetDecimals(derivativeTokenInfo);
   const originDecimals = _getAssetDecimals(originTokenInfo);
   const exchangeRate = ((_poolInfo$statistic = poolInfo.statistic) === null || _poolInfo$statistic === void 0 ? void 0 : (_poolInfo$statistic$a = _poolInfo$statistic.assetEarning) === null || _poolInfo$statistic$a === void 0 ? void 0 : _poolInfo$statistic$a[0].exchangeRate) || 1;
-  const formattedAmount = parseInt(amount) / 10 ** derivativeDecimals; // TODO: decimals
-  const minAmount = formattedAmount * exchangeRate;
-  return Math.floor(minAmount * 10 ** originDecimals);
+  const formattedAmount = new BigN(amount).dividedBy(BN_TEN.pow(derivativeDecimals)); // TODO: decimals
+  const minAmount = formattedAmount.multipliedBy(exchangeRate);
+  return minAmount.multipliedBy(BN_TEN.pow(originDecimals)).toFixed(0);
 }

package/koni/background/handlers/Extension.js

@@ -1,7 +1,8 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import Common from '@ethereumjs/common';
+import { Common } from '@ethereumjs/common';
+import { LegacyTransaction } from '@ethereumjs/tx';
 import { _AssetType } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { isJsonPayload, SEED_DEFAULT_LENGTH, SEED_LENGTHS } from '@subwallet/extension-base/background/handlers/Extension';
@@ -31,14 +32,13 @@ import { WALLET_CONNECT_EIP155_NAMESPACE } from '@subwallet/extension-base/servi
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { YieldPoolType } from '@subwallet/extension-base/types';
 import { convertSubjectInfoToAddresses, isSameAddress, reformatAddress, uniqueStringArray } from '@subwallet/extension-base/utils';
-import { createTransactionFromRLP, recalculateGasPrice, signatureToHex } from '@subwallet/extension-base/utils/eth';
+import { calculateGasFeeParams, createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { createPair } from '@subwallet/keyring';
 import { keyring } from '@subwallet/ui-keyring';
 import { getSdkError } from '@walletconnect/utils';
 import BigN from 'bignumber.js';
-import { Transaction } from 'ethereumjs-tx';
 import { t } from 'i18next';
 import { TypeRegistry } from '@polkadot/types';
 import { assert, BN, BN_ZERO, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
@@ -1880,10 +1880,15 @@ export default class KoniExtension {
               // null address
               from: address
             };
-            const _price = await web3.api.eth.getGasPrice();
-            const gasPrice = recalculateGasPrice(_price, networkKey);
             const gasLimit = await web3.api.eth.estimateGas(transaction);
-            estimatedFee = (gasLimit * parseInt(gasPrice)).toString();
+            const priority = await calculateGasFeeParams(web3, networkKey);
+            if (priority.baseGasFee) {
+              const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
+              const maxFee = priority.maxFeePerGas.gte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+              estimatedFee = maxFee.multipliedBy(gasLimit).toFixed(0);
+            } else {
+              estimatedFee = new BigN(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
+            }
           } else {
             var _paymentInfo$partialF2;
             const [mockTx] = await createTransferExtrinsic({
@@ -2407,6 +2412,7 @@ export default class KoniExtension {
       }
       signed = await pair.evmSigner.signMessage(data, 'personal_sign');
     } else {
+      var _signedTranaction$r, _signedTranaction$s, _signedTranaction$v;
       const tx = createTransactionFromRLP(message);
       if (!tx) {
         throw new Error(t('Failed to decode data. Please use a valid QR code'));
@@ -2419,21 +2425,23 @@ export default class KoniExtension {
         nonce: new BigN(tx.nonce).toNumber(),
         gas: new BigN(tx.gas).toNumber()
       };
-      const common = Common.forCustomChain('mainnet', {
+      const common = Common.custom({
         name: network.name,
         networkId: _getEvmChainId(network),
         chainId: _getEvmChainId(network)
-      }, 'petersburg');
+      }, {
+        hardfork: 'petersburg'
+      });
 
       // @ts-ignore
-      const transaction = new Transaction(txObject, {
+      const transaction = new LegacyTransaction(txObject, {
         common
       });
-      pair.evmSigner.signTransaction(transaction);
+      const signedTranaction = LegacyTransaction.fromSerializedTx(hexToU8a(pair.evmSigner.signTransaction(transaction)));
       signed = signatureToHex({
-        r: u8aToHex(transaction.r),
-        s: u8aToHex(transaction.s),
-        v: u8aToHex(transaction.v)
+        r: ((_signedTranaction$r = signedTranaction.r) === null || _signedTranaction$r === void 0 ? void 0 : _signedTranaction$r.toString(16)) || '',
+        s: ((_signedTranaction$s = signedTranaction.s) === null || _signedTranaction$s === void 0 ? void 0 : _signedTranaction$s.toString(16)) || '',
+        v: ((_signedTranaction$v = signedTranaction.v) === null || _signedTranaction$v === void 0 ? void 0 : _signedTranaction$v.toString(16)) || ''
       });
     }
     return {

package/koni/background/handlers/State.js

@@ -31,11 +31,12 @@ import TransactionService from '@subwallet/extension-base/services/transaction-s
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
 import { addLazy, isAccountAll, stripUrl, TARGET_ENV } from '@subwallet/extension-base/utils';
-import { recalculateGasPrice } from '@subwallet/extension-base/utils/eth';
+import { calculateGasFeeParams } from '@subwallet/extension-base/utils/eth';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
 import { keyring } from '@subwallet/ui-keyring';
+import BigN from 'bignumber.js';
 import SimpleKeyring from 'eth-simple-keyring';
 import { t } from 'i18next';
 import { Subject } from 'rxjs';
@@ -1239,10 +1240,17 @@ export default class KoniState {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
-    const _price = await web3.eth.getGasPrice();
-    const gasPrice = recalculateGasPrice(_price, networkKey);
-    transaction.gasPrice = gasPrice;
-    const estimateGas = new BN(gasPrice.toString()).mul(new BN(transaction.gas)).toString();
+    const priority = await calculateGasFeeParams(evmApi, networkKey);
+    let estimateGas;
+    if (priority.baseGasFee) {
+      transaction.maxPriorityFeePerGas = priority.maxPriorityFeePerGas.toString();
+      transaction.maxFeePerGas = priority.maxFeePerGas.toString();
+      const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
+      const maxFee = priority.maxFeePerGas.lte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+      estimateGas = maxFee.multipliedBy(transaction.gas).toFixed(0);
+    } else {
+      estimateGas = new BigN(priority.gasPrice).multipliedBy(transaction.gas).toFixed(0);
+    }
 
     // Address is validated in before step
     const fromAddress = allowedAccounts.find(account => account.toLowerCase() === transaction.from.toLowerCase());
@@ -1260,7 +1268,7 @@ export default class KoniState {
 
     // Validate balance
     const balance = new BN((await web3.eth.getBalance(fromAddress)) || 0);
-    if (balance.lt(new BN(gasPrice.toString()).mul(new BN(transaction.gas)).add(new BN(autoFormatNumber(transactionParams.value) || '0')))) {
+    if (balance.lt(new BN(estimateGas).add(new BN(autoFormatNumber(transactionParams.value) || '0')))) {
       throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Insufficient balance'));
     }
     transaction.nonce = await web3.eth.getTransactionCount(fromAddress);
@@ -1571,6 +1579,8 @@ export default class KoniState {
     await this.keyringService.resetWallet(resetAll);
     this.requestService.resetWallet();
     this.transactionService.resetWallet();
+    await this.handleResetBalance(ALL_ACCOUNT_KEY, true);
+    await this.earningService.resetWallet();
     await this.dbService.resetWallet(resetAll);
     this.accountRefStore.set('refList', []);
     if (resetAll) {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.35-beta.2",
+  "version": "1.1.35-beta.3",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -755,6 +755,11 @@
       "require": "./cjs/services/earning-service/handlers/liquid-staking/bifrost.js",
       "default": "./services/earning-service/handlers/liquid-staking/bifrost.js"
     },
+    "./services/earning-service/handlers/liquid-staking/bifrost-manta": {
+      "types": "./services/earning-service/handlers/liquid-staking/bifrost-manta.d.ts",
+      "require": "./cjs/services/earning-service/handlers/liquid-staking/bifrost-manta.js",
+      "default": "./services/earning-service/handlers/liquid-staking/bifrost-manta.js"
+    },
     "./services/earning-service/handlers/liquid-staking/parallel": {
       "types": "./services/earning-service/handlers/liquid-staking/parallel.d.ts",
       "require": "./cjs/services/earning-service/handlers/liquid-staking/parallel.js",
@@ -1702,8 +1707,8 @@
     "@apollo/client": "^3.7.14",
     "@azns/resolver-core": "^1.4.0",
     "@equilab/api": "~1.14.25",
-    "@ethereumjs/common": "^2.6.5",
-    "@ethereumjs/tx": "^4.0.2",
+    "@ethereumjs/common": "^4.1.0",
+    "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/safe-event-emitter": "^2.0.0",
@@ -1726,13 +1731,13 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.39",
+    "@subwallet/chain-list": "0.2.40-beta.2",
     "@subwallet/extension-base": "^1.1.35-0",
     "@subwallet/extension-chains": "^1.1.35-0",
     "@subwallet/extension-dapp": "^1.1.35-0",
     "@subwallet/extension-inject": "^1.1.35-0",
-    "@subwallet/keyring": "^0.1.1",
-    "@subwallet/ui-keyring": "^0.1.1",
+    "@subwallet/keyring": "^0.1.3",
+    "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",
     "@walletconnect/types": "^2.8.4",
     "@walletconnect/utils": "^2.8.4",
@@ -1747,7 +1752,6 @@
     "dexie": "^3.2.2",
     "dexie-export-import": "^4.0.7",
     "eth-simple-keyring": "^4.2.0",
-    "ethereumjs-tx": "^2.1.2",
     "ethereumjs-util": "^7.1.5",
     "ethers": "^6.4.2",
     "eventemitter3": "^5.0.0",

package/services/chain-service/index.js

@@ -433,9 +433,6 @@ export class ChainService {
   checkLatestData() {
     clearInterval(this.refreshLatestChainDataTimeOut);
     this.handleLatestData();
-    this.handleLatestData();
-    this.handleLatestData();
-    this.handleLatestData();
     this.refreshLatestChainDataTimeOut = setInterval(this.handleLatestData.bind(this), LATEST_CHAIN_DATA_FETCHING_INTERVAL);
   }
   stopCheckLatestChainData() {

package/services/earning-service/handlers/liquid-staking/base.d.ts

@@ -6,6 +6,6 @@ export default abstract class BaseLiquidStakingPoolHandler extends BaseSpecialSt
     /** Rate convert token when redeem */
     readonly minAmountPercent: number;
     static get defaultMinAmountPercent(): number;
-    createParamToRedeem(amount: string, address: string): Promise<number>;
+    createParamToRedeem(amount: string, address: string): Promise<string>;
     validateYieldLeave(amount: string, address: string, fastLeave: boolean, selectedTarget?: string): Promise<TransactionError[]>;
 }

package/services/earning-service/handlers/liquid-staking/base.js

@@ -6,6 +6,7 @@ import { BasicTxErrorType, StakingTxErrorType } from '@subwallet/extension-base/
 import { convertDerivativeToOriginToken } from '@subwallet/extension-base/koni/api/yield/helper/utils';
 import { YieldPoolType } from '@subwallet/extension-base/types';
 import { formatNumber } from '@subwallet/extension-base/utils';
+import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BN, BN_ZERO } from '@polkadot/util';
 import BaseSpecialStakingPoolHandler from "../special.js";
@@ -31,7 +32,7 @@ export default class BaseLiquidStakingPoolHandler extends BaseSpecialStakingPool
       return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
     }
     const formattedMinAmount = convertDerivativeToOriginToken(amount, poolInfo, derivativeTokenInfo, originTokenInfo);
-    return Math.floor(this.minAmountPercent * formattedMinAmount);
+    return new BigN(formattedMinAmount).multipliedBy(this.minAmountPercent).toFixed(0);
   }
   async validateYieldLeave(amount, address, fastLeave, selectedTarget) {
     const poolInfo = await this.getPoolInfo();

package/services/earning-service/handlers/liquid-staking/bifrost-manta.d.ts

@@ -0,0 +1,37 @@
+import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
+import { BaseYieldStepDetail, HandleYieldStepData, LiquidYieldPoolInfo, OptimalYieldPath, SubmitYieldJoinData, TransactionData } from '@subwallet/extension-base/types';
+import BifrostLiquidStakingPoolHandler from './bifrost';
+export interface BifrostLiquidStakingMeta {
+    apy: string;
+    apyBase: string;
+    apyReward: string;
+    tvl: number;
+    tvm: number;
+    holders: number;
+}
+export interface BifrostVtokenExchangeRateResp {
+    ratio: BifrostVtokenExchangeRate[];
+}
+export interface BifrostVtokenExchangeRate {
+    ratio: string;
+    key: string;
+    timestamp: string;
+    total_issuance: number;
+    token_pool: number;
+}
+export default class BifrostMantaLiquidStakingPoolHandler extends BifrostLiquidStakingPoolHandler {
+    protected readonly altInputAsset: string;
+    protected readonly derivativeAssets: string[];
+    protected readonly inputAsset: string;
+    protected readonly rewardAssets: string[];
+    protected readonly feeAssets: string[];
+    readonly minAmountPercent: number;
+    constructor(state: KoniState, chain: string);
+    protected getDescription(): string;
+    getPoolStat(): Promise<LiquidYieldPoolInfo>;
+    get submitJoinStepInfo(): BaseYieldStepDetail;
+    handleSubmitStep(data: SubmitYieldJoinData, path: OptimalYieldPath): Promise<HandleYieldStepData>;
+    handleYieldRedeem(amount: string, address: string, selectedTarget?: string): Promise<[ExtrinsicType, TransactionData]>;
+    handleYieldUnstake(amount: string, address: string, selectedTarget?: string): Promise<[ExtrinsicType, TransactionData]>;
+}

package/services/earning-service/handlers/liquid-staking/bifrost-manta.js

@@ -0,0 +1,132 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { _getAssetDecimals, _getTokenOnChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
+import { YieldStepType } from '@subwallet/extension-base/types';
+import fetch from 'cross-fetch';
+import BifrostLiquidStakingPoolHandler from "./bifrost.js";
+const STATS_URL = 'https://api.bifrost.app/api/site';
+const RATIO_URL = 'https://api.bifrost.app/api/omni/MANTA';
+export default class BifrostMantaLiquidStakingPoolHandler extends BifrostLiquidStakingPoolHandler {
+  altInputAsset = 'manta_network-NATIVE-MANTA';
+  derivativeAssets = ['bifrost_dot-LOCAL-vMANTA'];
+  inputAsset = 'bifrost_dot-LOCAL-MANTA';
+  rewardAssets = ['bifrost_dot-LOCAL-MANTA'];
+  feeAssets = ['bifrost_dot-NATIVE-BNC', 'bifrost_dot-LOCAL-MANTA'];
+  minAmountPercent = 0.985;
+  constructor(state, chain) {
+    super(state, chain);
+    const chainInfo = this.chainInfo;
+    this.slug = `MANTA___liquid_staking___${chain}`;
+    this.name = `${chainInfo.name} Liquid Staking Manta`;
+    this.shortName = chainInfo.name.replaceAll(' Relay Chain', '');
+  }
+  getDescription() {
+    return 'Stake MANTA to earn yield on vMANTA';
+  }
+
+  /* Subscribe pool info */
+
+  async getPoolStat() {
+    const substrateApi = await this.substrateApi.isReady;
+    const stakingMetaPromise = new Promise(function (resolve) {
+      fetch(STATS_URL, {
+        method: 'GET'
+      }).then(res => {
+        resolve(res.json());
+      }).catch(console.error);
+    });
+    const exchangeRatePromise = new Promise(function (resolve) {
+      fetch(RATIO_URL, {
+        method: 'GET'
+      }).then(resp => {
+        resolve(resp.json());
+      }).catch(console.error);
+    });
+    const derivativeTokenInfo = this.state.getAssetBySlug(this.derivativeAssets[0]);
+    const inputTokenInfo = this.state.getAssetBySlug(this.inputAsset);
+    const [_stakingMeta, _exchangeRate, _minimumRedeem, _minimumMint] = await Promise.all([stakingMetaPromise, exchangeRatePromise, substrateApi.api.query.vtokenMinting.minimumRedeem(_getTokenOnChainInfo(derivativeTokenInfo)), substrateApi.api.query.vtokenMinting.minimumMint(_getTokenOnChainInfo(inputTokenInfo))]);
+    const minimumRedeem = _minimumRedeem.toString();
+    const minimumMint = _minimumMint.toString();
+    const stakingMeta = _stakingMeta;
+    const exchangeRate = _exchangeRate;
+    const vMANTAStats = stakingMeta.vMANTA;
+    const assetInfo = this.state.getAssetBySlug(this.inputAsset);
+    const assetDecimals = 10 ** _getAssetDecimals(assetInfo);
+    const rate = parseFloat(exchangeRate.ratio[exchangeRate.ratio.length - 1].ratio); // TODO
+
+    this.updateExchangeRate(rate);
+    return {
+      ...this.baseInfo,
+      type: this.type,
+      metadata: {
+        ...this.metadataInfo,
+        description: this.getDescription()
+      },
+      statistic: {
+        assetEarning: [{
+          slug: this.rewardAssets[0],
+          apy: parseFloat(vMANTAStats.apyBase),
+          exchangeRate: rate
+        }],
+        farmerCount: vMANTAStats.holders,
+        unstakingPeriod: 24 * 7,
+        maxCandidatePerFarmer: 1,
+        maxWithdrawalRequestPerFarmer: 1,
+        earningThreshold: {
+          join: minimumMint,
+          defaultUnstake: minimumRedeem,
+          fastUnstake: '0'
+        },
+        totalApy: parseFloat(vMANTAStats.apyBase),
+        tvl: (vMANTAStats.tvm * assetDecimals).toString()
+      }
+    };
+  }
+
+  /* Subscribe pool info */
+
+  /* Join pool action */
+
+  get submitJoinStepInfo() {
+    return {
+      name: 'Mint vMANTA',
+      type: YieldStepType.MINT_VMANTA
+    };
+  }
+  async handleSubmitStep(data, path) {
+    const substrateApi = await this.substrateApi.isReady;
+    const inputTokenSlug = this.inputAsset;
+    const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
+    const extrinsic = substrateApi.api.tx.vtokenMinting.mint(_getTokenOnChainInfo(inputTokenInfo), data.amount, undefined, undefined);
+    return {
+      txChain: this.chain,
+      extrinsicType: ExtrinsicType.MINT_VMANTA,
+      extrinsic,
+      txData: data,
+      transferNativeAmount: '0',
+      chainType: ChainType.SUBSTRATE
+    };
+  }
+
+  /* Join pool action */
+
+  /* Leave pool action */
+
+  async handleYieldRedeem(amount, address, selectedTarget) {
+    const substrateApi = await this.substrateApi.isReady;
+    const weightedMinAmount = await this.createParamToRedeem(amount, address);
+    const extrinsic = substrateApi.api.tx.stablePool.swap(5, 1, 0, amount, weightedMinAmount);
+    return [ExtrinsicType.REDEEM_VMANTA, extrinsic];
+  }
+  async handleYieldUnstake(amount, address, selectedTarget) {
+    const chainApi = await this.substrateApi.isReady;
+    const derivativeTokenSlug = this.derivativeAssets[0];
+    const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
+    const extrinsic = chainApi.api.tx.vtokenMinting.redeem(_getTokenOnChainInfo(derivativeTokenInfo), amount);
+    return [ExtrinsicType.UNSTAKE_VMANTA, extrinsic];
+  }
+
+  /* Leave pool action */
+}

package/services/earning-service/handlers/liquid-staking/bifrost.d.ts

@@ -24,14 +24,14 @@ export interface BifrostVtokenExchangeRate {
 }
 export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPoolHandler {
     slug: string;
-    protected readonly name: string;
-    protected readonly shortName: string;
+    protected name: string;
+    protected shortName: string;
     protected readonly altInputAsset: string;
     protected readonly derivativeAssets: string[];
     protected readonly inputAsset: string;
     protected readonly rewardAssets: string[];
     protected readonly feeAssets: string[];
-    readonly minAmountPercent = 0.99;
+    readonly minAmountPercent: number;
     protected readonly availableMethod: YieldPoolMethodInfo;
     protected readonly rateDecimals = 0;
     constructor(state: KoniState, chain: string);

package/services/earning-service/handlers/liquid-staking/bifrost.js

@@ -34,7 +34,7 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
     super(state, chain);
     const chainInfo = this.chainInfo;
     this.slug = `DOT___liquid_staking___${chain}`;
-    this.name = `${chainInfo.name} Liquid Staking`;
+    this.name = `${chainInfo.name} Liquid Staking DOT`;
     this.shortName = chainInfo.name.replaceAll(' Relay Chain', '');
   }
   getDescription() {
@@ -93,6 +93,7 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
         unstakingPeriod: 24 * 28,
         maxCandidatePerFarmer: 1,
         maxWithdrawalRequestPerFarmer: 1,
+        farmerCount: vDOTStats.holders,
         earningThreshold: {
           join: minimumMint,
           defaultUnstake: minimumRedeem,

package/services/earning-service/handlers/liquid-staking/index.d.ts

@@ -1,4 +1,5 @@
 export { default as AcalaLiquidStakingPoolHandler } from './acala';
 export { default as BifrostLiquidStakingPoolHandler } from './bifrost';
+export { default as BifrostMantaLiquidStakingPoolHandler } from './bifrost-manta';
 export { default as ParallelLiquidStakingPoolHandler } from './parallel';
 export { default as StellaSwapLiquidStakingPoolHandler } from './stella-swap';

package/services/earning-service/handlers/liquid-staking/index.js

@@ -3,5 +3,6 @@
 
 export { default as AcalaLiquidStakingPoolHandler } from "./acala.js";
 export { default as BifrostLiquidStakingPoolHandler } from "./bifrost.js";
+export { default as BifrostMantaLiquidStakingPoolHandler } from "./bifrost-manta.js";
 export { default as ParallelLiquidStakingPoolHandler } from "./parallel.js";
 export { default as StellaSwapLiquidStakingPoolHandler } from "./stella-swap.js";

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

@@ -38,9 +38,9 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
   constructor(state, chain) {
     super(state, chain);
     this.slug = 'xcDOT___liquid_staking___stellaswap';
-    this.name = 'Stellaswap Liquid Staking';
+    this.name = 'StellaSwap Liquid Staking';
     this._logo = 'stellaswap';
-    this.shortName = 'Stellaswap';
+    this.shortName = 'StellaSwap';
   }
   getDescription() {
     return 'Earn rewards by staking xcDOT for stDOT';