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

package/background/KoniTypes.d.ts

@@ -371,16 +371,19 @@ export declare enum ExtrinsicType {
     MINT_SDOT = "earn.mint_sdot",
     MINT_QDOT = "earn.mint_qdot",
     MINT_STDOT = "earn.mint_stdot",
+    MINT_VMANTA = "earn.mint_vmanta",
     REDEEM_QDOT = "earn.redeem_qdot",
     REDEEM_VDOT = "earn.redeem_vdot",
     REDEEM_LDOT = "earn.redeem_ldot",
     REDEEM_SDOT = "earn.redeem_sdot",
     REDEEM_STDOT = "earn.redeem_stdot",
+    REDEEM_VMANTA = "earn.redeem_vmanta",
     UNSTAKE_QDOT = "earn.unstake_qdot",
     UNSTAKE_VDOT = "earn.unstake_vdot",
     UNSTAKE_LDOT = "earn.unstake_ldot",
     UNSTAKE_SDOT = "earn.unstake_sdot",
     UNSTAKE_STDOT = "earn.unstake_stdot",
+    UNSTAKE_VMANTA = "earn.unstake_vmanta",
     TOKEN_APPROVE = "evm.token_approve",
     EVM_EXECUTE = "evm.execute",
     UNKNOWN = "unknown"
@@ -407,16 +410,19 @@ export interface ExtrinsicDataTypeMap {
     [ExtrinsicType.MINT_QDOT]: SubmitYieldStepData;
     [ExtrinsicType.MINT_STDOT]: SubmitYieldStepData;
     [ExtrinsicType.MINT_STDOT]: SubmitYieldStepData;
+    [ExtrinsicType.MINT_VMANTA]: SubmitYieldStepData;
     [ExtrinsicType.UNSTAKE_VDOT]: RequestYieldLeave;
     [ExtrinsicType.UNSTAKE_QDOT]: RequestYieldLeave;
     [ExtrinsicType.UNSTAKE_LDOT]: RequestYieldLeave;
     [ExtrinsicType.UNSTAKE_SDOT]: RequestYieldLeave;
     [ExtrinsicType.UNSTAKE_STDOT]: RequestYieldLeave;
+    [ExtrinsicType.UNSTAKE_VMANTA]: RequestYieldLeave;
     [ExtrinsicType.REDEEM_VDOT]: RequestYieldLeave;
     [ExtrinsicType.REDEEM_QDOT]: RequestYieldLeave;
     [ExtrinsicType.REDEEM_LDOT]: RequestYieldLeave;
     [ExtrinsicType.REDEEM_SDOT]: RequestYieldLeave;
     [ExtrinsicType.REDEEM_STDOT]: RequestYieldLeave;
+    [ExtrinsicType.REDEEM_VMANTA]: RequestYieldLeave;
     [ExtrinsicType.TOKEN_APPROVE]: TokenApproveData;
     [ExtrinsicType.EVM_EXECUTE]: TransactionConfig;
     [ExtrinsicType.CROWDLOAN]: any;
@@ -455,6 +461,9 @@ export interface BasicTokenInfo {
 export interface AmountData extends BasicTokenInfo {
     value: string;
 }
+export interface FeeData extends AmountData {
+    tooHigh?: boolean;
+}
 export interface AmountDataWithId extends AmountData {
     id: string;
 }
@@ -470,16 +479,19 @@ export declare type TransactionAdditionalInfo = {
     [ExtrinsicType.TRANSFER_XCM]: XCMTransactionAdditionalInfo;
     [ExtrinsicType.SEND_NFT]: NFTTransactionAdditionalInfo;
     [ExtrinsicType.MINT_VDOT]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
+    [ExtrinsicType.MINT_VMANTA]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
     [ExtrinsicType.MINT_QDOT]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
     [ExtrinsicType.MINT_SDOT]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
     [ExtrinsicType.MINT_LDOT]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
     [ExtrinsicType.MINT_STDOT]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
     [ExtrinsicType.REDEEM_VDOT]: LeavePoolAdditionalData;
+    [ExtrinsicType.REDEEM_VMANTA]: LeavePoolAdditionalData;
     [ExtrinsicType.REDEEM_QDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.REDEEM_SDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.REDEEM_LDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.REDEEM_STDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.UNSTAKE_VDOT]: LeavePoolAdditionalData;
+    [ExtrinsicType.UNSTAKE_VMANTA]: LeavePoolAdditionalData;
     [ExtrinsicType.UNSTAKE_QDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.UNSTAKE_SDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.UNSTAKE_LDOT]: LeavePoolAdditionalData;

package/background/KoniTypes.js

@@ -81,16 +81,19 @@ export let ExtrinsicType;
   ExtrinsicType["MINT_SDOT"] = "earn.mint_sdot";
   ExtrinsicType["MINT_QDOT"] = "earn.mint_qdot";
   ExtrinsicType["MINT_STDOT"] = "earn.mint_stdot";
+  ExtrinsicType["MINT_VMANTA"] = "earn.mint_vmanta";
   ExtrinsicType["REDEEM_QDOT"] = "earn.redeem_qdot";
   ExtrinsicType["REDEEM_VDOT"] = "earn.redeem_vdot";
   ExtrinsicType["REDEEM_LDOT"] = "earn.redeem_ldot";
   ExtrinsicType["REDEEM_SDOT"] = "earn.redeem_sdot";
   ExtrinsicType["REDEEM_STDOT"] = "earn.redeem_stdot";
+  ExtrinsicType["REDEEM_VMANTA"] = "earn.redeem_vmanta";
   ExtrinsicType["UNSTAKE_QDOT"] = "earn.unstake_qdot";
   ExtrinsicType["UNSTAKE_VDOT"] = "earn.unstake_vdot";
   ExtrinsicType["UNSTAKE_LDOT"] = "earn.unstake_ldot";
   ExtrinsicType["UNSTAKE_SDOT"] = "earn.unstake_sdot";
   ExtrinsicType["UNSTAKE_STDOT"] = "earn.unstake_stdot";
+  ExtrinsicType["UNSTAKE_VMANTA"] = "earn.unstake_vmanta";
   ExtrinsicType["TOKEN_APPROVE"] = "evm.token_approve";
   ExtrinsicType["EVM_EXECUTE"] = "evm.execute";
   ExtrinsicType["UNKNOWN"] = "unknown";

package/cjs/background/KoniTypes.js

@@ -95,16 +95,19 @@ exports.ExtrinsicType = ExtrinsicType;
   ExtrinsicType["MINT_SDOT"] = "earn.mint_sdot";
   ExtrinsicType["MINT_QDOT"] = "earn.mint_qdot";
   ExtrinsicType["MINT_STDOT"] = "earn.mint_stdot";
+  ExtrinsicType["MINT_VMANTA"] = "earn.mint_vmanta";
   ExtrinsicType["REDEEM_QDOT"] = "earn.redeem_qdot";
   ExtrinsicType["REDEEM_VDOT"] = "earn.redeem_vdot";
   ExtrinsicType["REDEEM_LDOT"] = "earn.redeem_ldot";
   ExtrinsicType["REDEEM_SDOT"] = "earn.redeem_sdot";
   ExtrinsicType["REDEEM_STDOT"] = "earn.redeem_stdot";
+  ExtrinsicType["REDEEM_VMANTA"] = "earn.redeem_vmanta";
   ExtrinsicType["UNSTAKE_QDOT"] = "earn.unstake_qdot";
   ExtrinsicType["UNSTAKE_VDOT"] = "earn.unstake_vdot";
   ExtrinsicType["UNSTAKE_LDOT"] = "earn.unstake_ldot";
   ExtrinsicType["UNSTAKE_SDOT"] = "earn.unstake_sdot";
   ExtrinsicType["UNSTAKE_STDOT"] = "earn.unstake_stdot";
+  ExtrinsicType["UNSTAKE_VMANTA"] = "earn.unstake_vmanta";
   ExtrinsicType["TOKEN_APPROVE"] = "evm.token_approve";
   ExtrinsicType["EVM_EXECUTE"] = "evm.execute";
   ExtrinsicType["UNKNOWN"] = "unknown";

package/cjs/koni/api/staking/bonding/utils.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,9 +9,11 @@ exports.calcInflationRewardCurve = calcInflationRewardCurve;
 exports.calcInflationUniformEraPayout = calcInflationUniformEraPayout;
 exports.calculateAlephZeroValidatorReturn = calculateAlephZeroValidatorReturn;
 exports.calculateChainStakedReturn = calculateChainStakedReturn;
+exports.calculateChainStakedReturnV2 = calculateChainStakedReturnV2;
 exports.calculateInflation = calculateInflation;
 exports.calculateTernoaValidatorReturn = calculateTernoaValidatorReturn;
 exports.calculateValidatorStakedReturn = calculateValidatorStakedReturn;
+exports.getAvgValidatorEraReward = getAvgValidatorEraReward;
 exports.getBondedValidators = getBondedValidators;
 exports.getCommission = getCommission;
 exports.getEarningStatusByNominations = getEarningStatusByNominations;
@@ -20,6 +23,7 @@ exports.getMinStakeErrorMessage = exports.getMaxValidatorErrorMessage = void 0;
 exports.getParaCurrentInflation = getParaCurrentInflation;
 exports.getStakingAvailableActionsByChain = getStakingAvailableActionsByChain;
 exports.getStakingAvailableActionsByNominator = getStakingAvailableActionsByNominator;
+exports.getSupportedDaysByHistoryDepth = getSupportedDaysByHistoryDepth;
 exports.getValidatorLabel = getValidatorLabel;
 exports.getWithdrawalInfo = getWithdrawalInfo;
 exports.getYieldAvailableActionsByPosition = getYieldAvailableActionsByPosition;
@@ -37,6 +41,7 @@ var _constants2 = require("@subwallet/extension-base/services/earning-service/co
 var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _number = require("@subwallet/extension-base/utils/number");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -102,6 +107,24 @@ function calculateChainStakedReturn(inflation, totalEraStake, totalIssuance, net
 
   return stakedReturn;
 }
+function calculateChainStakedReturnV2(chainInfo, totalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, isCompound) {
+  const DAYS_PER_YEAR = 365;
+  // @ts-ignore
+  const DECIMAL = chainInfo.substrateInfo.decimals;
+  const lastTotalStakedUnit = new _bignumber.default(lastTotalStaked).dividedBy(new _bignumber.default(10 ** DECIMAL));
+  const totalIssuanceUnit = new _bignumber.default(totalIssuance).dividedBy(new _bignumber.default(10 ** DECIMAL));
+  const supplyStaked = lastTotalStakedUnit.dividedBy(totalIssuanceUnit);
+  const dayRewardRate = validatorEraReward.multipliedBy(erasPerDay).dividedBy(totalIssuance).multipliedBy(100);
+  let inflationToStakers = new _bignumber.default(0);
+  if (!isCompound) {
+    inflationToStakers = dayRewardRate.multipliedBy(DAYS_PER_YEAR);
+  } else {
+    const multiplier = dayRewardRate.dividedBy(100).plus(1).exponentiatedBy(365);
+    inflationToStakers = new _bignumber.default(100).multipliedBy(multiplier).minus(100);
+  }
+  const averageRewardRate = inflationToStakers.dividedBy(supplyStaked);
+  return averageRewardRate.toNumber();
+}
 function calculateAlephZeroValidatorReturn(chainStakedReturn, commission) {
   return chainStakedReturn * (100 - commission) / 100;
 }
@@ -343,6 +366,27 @@ function getValidatorLabel(chain) {
   }
   return 'Collator';
 }
+function getAvgValidatorEraReward(supportedDays, eraRewardHistory) {
+  let sumEraReward = new _bignumber.default(0);
+  let failEra = 0;
+  for (const _item of eraRewardHistory) {
+    const item = _item.toString();
+    if (!item) {
+      failEra += 1;
+    } else {
+      const eraReward = new _bignumber.default(item);
+      sumEraReward = sumEraReward.plus(eraReward);
+    }
+  }
+  return sumEraReward.dividedBy(new _bignumber.default(supportedDays - failEra));
+}
+function getSupportedDaysByHistoryDepth(erasPerDay, maxSupportedEras) {
+  if (maxSupportedEras / erasPerDay > 30) {
+    return 30;
+  } else {
+    return 15;
+  }
+}
 const getMinStakeErrorMessage = (chainInfo, bnMinStake) => {
   const tokenInfo = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
   const number = (0, _number.formatNumber)(bnMinStake.toString(), tokenInfo.decimals || 0, _number.balanceFormatter);

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

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,6 +13,7 @@ var _web = require("@subwallet/extension-base/koni/api/tokens/evm/web3");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _helper = require("@subwallet/extension-base/services/chain-service/helper");
 var _eth = require("@subwallet/extension-base/utils/eth");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -45,20 +47,29 @@ const handleTransferBalanceResult = _ref => {
 };
 exports.handleTransferBalanceResult = handleTransferBalanceResult;
 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 = (0, _eth.recalculateGasPrice)(_price, chainInfo.slug);
+  const priority = await (0, _eth.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 _util.BN(gasLimit).mul(new _util.BN(gasPrice));
-  transactionObject.value = transferAll ? new _util.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 _bignumber.default(priority.gasPrice).multipliedBy(gasLimit);
+  }
+  transactionObject.value = transferAll ? new _bignumber.default(value).minus(estimateFee).toString() : value;
   if (_constants.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('');
@@ -66,53 +77,58 @@ async function getEVMTransactionObject(chainInfo, from, to, value, transferAll,
   return [transactionObject, transactionObject.value.toString()];
 }
 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 = (0, _web.getERC20Contract)(networkKey, assetAddress, evmApiMap);
-  let freeAmount = new _util.BN(0);
+  let freeAmount = new _bignumber.default(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 _util.BN(bal || '0');
-    transferValue = freeAmount.toString() || '0';
+    freeAmount = new _bignumber.default(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 = (0, _eth.recalculateGasPrice)(_price, chainInfo.slug);
+  }), (0, _eth.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 _util.BN(freeAmount).toString();
+    transferValue = freeAmount.toFixed(0);
     transactionObject.data = generateTransferData(to, transferValue);
   }
   return [transactionObject, transferValue];
 }
 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(_helper._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 = (0, _eth.recalculateGasPrice)(_price, chain);
+  }), (0, _eth.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/cjs/koni/api/yield/helper/utils.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,6 +11,8 @@ exports.syntheticSelectedValidators = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 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
 
@@ -40,7 +43,7 @@ function convertDerivativeToOriginToken(amount, poolInfo, derivativeTokenInfo, o
   const derivativeDecimals = (0, _utils._getAssetDecimals)(derivativeTokenInfo);
   const originDecimals = (0, _utils._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 _bignumber.default(amount).dividedBy(_utils2.BN_TEN.pow(derivativeDecimals)); // TODO: decimals
+  const minAmount = formattedAmount.multipliedBy(exchangeRate);
+  return minAmount.multipliedBy(_utils2.BN_TEN.pow(originDecimals)).toFixed(0);
 }

package/cjs/koni/background/handlers/Extension.js

@@ -5,7 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _common = _interopRequireDefault(require("@ethereumjs/common"));
+var _common = require("@ethereumjs/common");
+var _tx = require("@ethereumjs/tx");
 var _types = require("@subwallet/chain-list/types");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _Extension = require("@subwallet/extension-base/background/handlers/Extension");
@@ -42,7 +43,6 @@ var _keyring = require("@subwallet/keyring");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _utils4 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
-var _ethereumjsTx = require("ethereumjs-tx");
 var _i18next = require("i18next");
 var _types4 = require("@polkadot/types");
 var _util = require("@polkadot/util");
@@ -1938,10 +1938,15 @@ class KoniExtension {
               // null address
               from: address
             };
-            const _price = await web3.api.eth.getGasPrice();
-            const gasPrice = (0, _eth.recalculateGasPrice)(_price, networkKey);
             const gasLimit = await web3.api.eth.estimateGas(transaction);
-            estimatedFee = (gasLimit * parseInt(gasPrice)).toString();
+            const priority = await (0, _eth.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 _bignumber.default(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
+            }
           } else {
             var _paymentInfo$partialF2;
             const [mockTx] = await (0, _transfer.createTransferExtrinsic)({
@@ -2480,6 +2485,7 @@ class KoniExtension {
       }
       signed = await pair.evmSigner.signMessage(data, 'personal_sign');
     } else {
+      var _signedTranaction$r, _signedTranaction$s, _signedTranaction$v;
       const tx = (0, _eth.createTransactionFromRLP)(message);
       if (!tx) {
         throw new Error((0, _i18next.t)('Failed to decode data. Please use a valid QR code'));
@@ -2492,21 +2498,23 @@ class KoniExtension {
         nonce: new _bignumber.default(tx.nonce).toNumber(),
         gas: new _bignumber.default(tx.gas).toNumber()
       };
-      const common = _common.default.forCustomChain('mainnet', {
+      const common = _common.Common.custom({
         name: network.name,
         networkId: (0, _utils2._getEvmChainId)(network),
         chainId: (0, _utils2._getEvmChainId)(network)
-      }, 'petersburg');
+      }, {
+        hardfork: 'petersburg'
+      });
 
       // @ts-ignore
-      const transaction = new _ethereumjsTx.Transaction(txObject, {
+      const transaction = new _tx.LegacyTransaction(txObject, {
         common
       });
-      pair.evmSigner.signTransaction(transaction);
+      const signedTranaction = _tx.LegacyTransaction.fromSerializedTx((0, _util.hexToU8a)(pair.evmSigner.signTransaction(transaction)));
       signed = (0, _eth.signatureToHex)({
-        r: (0, _util.u8aToHex)(transaction.r),
-        s: (0, _util.u8aToHex)(transaction.s),
-        v: (0, _util.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/cjs/koni/background/handlers/State.js

@@ -40,6 +40,7 @@ var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransa
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _decode = require("@subwallet/keyring/pair/decode");
 var _uiKeyring = require("@subwallet/ui-keyring");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethSimpleKeyring = _interopRequireDefault(require("eth-simple-keyring"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
@@ -1261,10 +1262,17 @@ class KoniState {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
-    const _price = await web3.eth.getGasPrice();
-    const gasPrice = (0, _eth.recalculateGasPrice)(_price, networkKey);
-    transaction.gasPrice = gasPrice;
-    const estimateGas = new _util.BN(gasPrice.toString()).mul(new _util.BN(transaction.gas)).toString();
+    const priority = await (0, _eth.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 _bignumber.default(priority.gasPrice).multipliedBy(transaction.gas).toFixed(0);
+    }
 
     // Address is validated in before step
     const fromAddress = allowedAccounts.find(account => account.toLowerCase() === transaction.from.toLowerCase());
@@ -1282,7 +1290,7 @@ class KoniState {
 
     // Validate balance
     const balance = new _util.BN((await web3.eth.getBalance(fromAddress)) || 0);
-    if (balance.lt(new _util.BN(gasPrice.toString()).mul(new _util.BN(transaction.gas)).add(new _util.BN(autoFormatNumber(transactionParams.value) || '0')))) {
+    if (balance.lt(new _util.BN(estimateGas).add(new _util.BN(autoFormatNumber(transactionParams.value) || '0')))) {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Insufficient balance'));
     }
     transaction.nonce = await web3.eth.getTransactionCount(fromAddress);
@@ -1595,6 +1603,8 @@ class KoniState {
     await this.keyringService.resetWallet(resetAll);
     this.requestService.resetWallet();
     this.transactionService.resetWallet();
+    await this.handleResetBalance(_constants.ALL_ACCOUNT_KEY, true);
+    await this.earningService.resetWallet();
     await this.dbService.resetWallet(resetAll);
     this.accountRefStore.set('refList', []);
     if (resetAll) {

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

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

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

@@ -10,6 +10,7 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/yield/helper/utils");
 var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _util = require("@polkadot/util");
 var _special = _interopRequireDefault(require("../special"));
@@ -38,7 +39,7 @@ class BaseLiquidStakingPoolHandler extends _special.default {
       return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS));
     }
     const formattedMinAmount = (0, _utils.convertDerivativeToOriginToken)(amount, poolInfo, derivativeTokenInfo, originTokenInfo);
-    return Math.floor(this.minAmountPercent * formattedMinAmount);
+    return new _bignumber.default(formattedMinAmount).multipliedBy(this.minAmountPercent).toFixed(0);
   }
   async validateYieldLeave(amount, address, fastLeave, selectedTarget) {
     const poolInfo = await this.getPoolInfo();

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

@@ -41,7 +41,7 @@ class BifrostLiquidStakingPoolHandler extends _base.default {
     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() {
@@ -100,6 +100,7 @@ class BifrostLiquidStakingPoolHandler extends _base.default {
         unstakingPeriod: 24 * 28,
         maxCandidatePerFarmer: 1,
         maxWithdrawalRequestPerFarmer: 1,
+        farmerCount: vDOTStats.holders,
         earningThreshold: {
           join: minimumMint,
           defaultUnstake: minimumRedeem,

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

@@ -16,6 +16,12 @@ Object.defineProperty(exports, "BifrostLiquidStakingPoolHandler", {
     return _bifrost.default;
   }
 });
+Object.defineProperty(exports, "BifrostMantaLiquidStakingPoolHandler", {
+  enumerable: true,
+  get: function () {
+    return _bifrostManta.default;
+  }
+});
 Object.defineProperty(exports, "ParallelLiquidStakingPoolHandler", {
   enumerable: true,
   get: function () {
@@ -30,5 +36,6 @@ Object.defineProperty(exports, "StellaSwapLiquidStakingPoolHandler", {
 });
 var _acala = _interopRequireDefault(require("./acala"));
 var _bifrost = _interopRequireDefault(require("./bifrost"));
+var _bifrostManta = _interopRequireDefault(require("./bifrost-manta"));
 var _parallel = _interopRequireDefault(require("./parallel"));
 var _stellaSwap = _interopRequireDefault(require("./stella-swap"));

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

@@ -47,9 +47,9 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
   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';

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

@@ -60,7 +60,15 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16'; // TODO
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
-      const [_totalEraStake, _totalIssuance, _auctionCounter, _minNominatorBond, _counterForNominators, _minimumActiveStake] = await Promise.all([substrateApi.api.query.staking.erasTotalStake(parseInt(currentEra)), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que2 = substrateApi.api.query.auctions) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.auctionCounter(), substrateApi.api.query.staking.minNominatorBond(), substrateApi.api.query.staking.counterForNominators(), ((_substrateApi$api$que3 = substrateApi.api.query) === null || _substrateApi$api$que3 === void 0 ? void 0 : (_substrateApi$api$que4 = _substrateApi$api$que3.staking) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minimumActiveStake) && ((_substrateApi$api$que5 = substrateApi.api.query) === null || _substrateApi$api$que5 === void 0 ? void 0 : (_substrateApi$api$que6 = _substrateApi$api$que5.staking) === null || _substrateApi$api$que6 === void 0 ? void 0 : _substrateApi$api$que6.minimumActiveStake())]);
+      const maxSupportedEras = substrateApi.api.consts.staking.historyDepth.toString();
+      const erasPerDay = 24 / _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug]; // Can be exactly calculate from epochDuration, blockTime, sessionsPerEra
+
+      const supportedDays = (0, _utils.getSupportedDaysByHistoryDepth)(erasPerDay, parseInt(maxSupportedEras));
+      const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
+      const [_EraStakeInfo, _totalIssuance, _auctionCounter, _minNominatorBond, _counterForNominators, _minimumActiveStake, ..._eraReward] = await Promise.all([substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que2 = substrateApi.api.query.auctions) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.auctionCounter(), substrateApi.api.query.staking.minNominatorBond(), substrateApi.api.query.staking.counterForNominators(), ((_substrateApi$api$que3 = substrateApi.api.query) === null || _substrateApi$api$que3 === void 0 ? void 0 : (_substrateApi$api$que4 = _substrateApi$api$que3.staking) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minimumActiveStake) && ((_substrateApi$api$que5 = substrateApi.api.query) === null || _substrateApi$api$que5 === void 0 ? void 0 : (_substrateApi$api$que6 = _substrateApi$api$que5.staking) === null || _substrateApi$api$que6 === void 0 ? void 0 : _substrateApi$api$que6.minimumActiveStake()), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays).keys()].map(i => i + startEra))]);
+      const [_totalEraStake, _lastTotalStaked] = _EraStakeInfo;
+      const validatorEraReward = (0, _utils.getAvgValidatorEraReward)(supportedDays, _eraReward[0]);
+      const lastTotalStaked = _lastTotalStaked.toString();
       const minActiveStake = (_minimumActiveStake === null || _minimumActiveStake === void 0 ? void 0 : _minimumActiveStake.toString()) || '0';
       const minNominatorBond = _minNominatorBond.toString();
       const bnMinActiveStake = new _util.BN(minActiveStake);
@@ -72,7 +80,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.calculateChainStakedReturn)(inflation, bnTotalEraStake, bnTotalIssuance, chainInfo.slug);
+      const expectedReturn = (0, _utils.calculateChainStakedReturnV2)(chainInfo, rawTotalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, 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/nomination-pool/index.js

@@ -86,7 +86,15 @@ class NominationPoolHandler extends _base.default {
       const currentEra = _currentEra.toString();
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
-      const [_totalEraStake, _totalIssuance, _auctionCounter, _minPoolJoin] = await Promise.all([substrateApi.api.query.staking.erasTotalStake(parseInt(currentEra)), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que2 = substrateApi.api.query.auctions) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.auctionCounter(), (_substrateApi$api$que3 = substrateApi.api.query) === null || _substrateApi$api$que3 === void 0 ? void 0 : (_substrateApi$api$que4 = _substrateApi$api$que3.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond()]);
+      const maxSupportedEras = substrateApi.api.consts.staking.historyDepth.toString();
+      const erasPerDay = 24 / _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug]; // Can be exactly calculate from epochDuration, blockTime, sessionsPerEra
+
+      const supportedDays = (0, _utils.getSupportedDaysByHistoryDepth)(erasPerDay, parseInt(maxSupportedEras));
+      const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
+      const [_EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que2 = substrateApi.api.query.auctions) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.auctionCounter(), (_substrateApi$api$que3 = substrateApi.api.query) === null || _substrateApi$api$que3 === void 0 ? void 0 : (_substrateApi$api$que4 = _substrateApi$api$que3.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays).keys()].map(i => i + startEra))]);
+      const [_totalEraStake, _lastTotalStaked] = _EraStakeInfo;
+      const validatorEraReward = (0, _utils.getAvgValidatorEraReward)(supportedDays, _eraReward[0]);
+      const lastTotalStaked = _lastTotalStaked.toString();
       const rawTotalEraStake = _totalEraStake.toString();
       const rawTotalIssuance = _totalIssuance.toString();
       const numAuctions = _auctionCounter ? _auctionCounter.toHuman() : 0;
@@ -94,7 +102,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.calculateChainStakedReturn)(inflation, bnTotalEraStake, bnTotalIssuance, chainInfo.slug);
+      const expectedReturn = (0, _utils.calculateChainStakedReturnV2)(chainInfo, rawTotalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, 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