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

package/cjs/services/earning-service/handlers/special.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _chainList = require("@subwallet/chain-list");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
@@ -208,13 +207,16 @@ class BaseSpecialStakingPoolHandler extends _base.default {
         const altInputTokenBalance = await this.state.balanceService.getTokenFreeBalance(address, altInputTokenInfo.originChain, altInputTokenSlug);
         const bnAltInputTokenBalance = new _util.BN(altInputTokenBalance.value || '0');
         if (bnAltInputTokenBalance.gt(_util.BN_ZERO)) {
+          const altChainInfo = this.state.getChainInfo(altInputTokenInfo.originChain);
+          const symbol = altInputTokenInfo.symbol;
+          const networkName = altChainInfo.name;
           const step = {
             metadata: {
               sendingValue: bnAmount.toString(),
               originTokenInfo: altInputTokenInfo,
               destinationTokenInfo: inputTokenInfo
             },
-            name: 'Transfer DOT from Polkadot',
+            name: `Transfer ${symbol} from ${networkName}`,
             type: _types.YieldStepType.XCM
           };
           const xcmOriginSubstrateApi = await this.state.getSubstrateApi(altInputTokenInfo.originChain).isReady;
@@ -411,7 +413,9 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       amount
     } = data;
     const destinationTokenSlug = this.inputAsset;
-    const originChainInfo = this.state.getChainInfo(_chainList.COMMON_CHAIN_SLUGS.POLKADOT);
+    const altInputTokenSlug = this.altInputAsset || '';
+    const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
+    const originChainInfo = this.state.getChainInfo(altInputTokenInfo.originChain);
     const originTokenSlug = (0, _utils2._getChainNativeTokenSlug)(originChainInfo);
     const originTokenInfo = this.state.getAssetBySlug(originTokenSlug);
     const destinationTokenInfo = this.state.getAssetBySlug(destinationTokenSlug);

package/cjs/services/earning-service/service.js

@@ -74,6 +74,7 @@ class EarningService {
       if (_constants2._STAKING_CHAIN_GROUP.liquidStaking.includes(chain)) {
         if (chain === 'bifrost_dot') {
           handlers.push(new _handlers.BifrostLiquidStakingPoolHandler(this.state, chain));
+          handlers.push(new _handlers.BifrostMantaLiquidStakingPoolHandler(this.state, chain));
         }
         if (chain === 'acala') {
           handlers.push(new _handlers.AcalaLiquidStakingPoolHandler(this.state, chain));
@@ -413,9 +414,10 @@ class EarningService {
   resetYieldPositionQueue() {
     this.yieldPositionPersistQueue = [];
   }
-  resetYieldPosition() {
+  async resetYieldPosition() {
     this.yieldPositionSubject.next({});
     this.yieldPositionPersistQueue = [];
+    await this.dbService.stores.yieldPosition.clear();
   }
   _getYieldPositionKey(slug, address) {
     return `${slug}---${address}`;
@@ -443,7 +445,7 @@ class EarningService {
     this.runUnsubscribePoolsPosition();
     this.runUnsubscribeStakingRewardInterval();
     this.runUnsubscribeEarningRewardHistoryInterval();
-    reset && this.resetYieldPosition();
+    reset && (await this.resetYieldPosition());
     await this.runSubscribePoolsPosition();
     this.runSubscribeStakingRewardInterval();
     this.runSubscribeEarningRewardHistoryInterval();
@@ -729,5 +731,10 @@ class EarningService {
   /* Other */
 
   /* Handle actions */
+
+  // Clear wallet data
+  async resetWallet() {
+    await this.resetYieldPosition();
+  }
 }
 exports.default = EarningService;

package/cjs/services/notification-service/NotificationService.js

@@ -36,15 +36,18 @@ class NotificationService {
     const link = action === null || action === void 0 ? void 0 : action.url;
     const onClick = action === null || action === void 0 ? void 0 : action.click;
     const onButtonClick = action === null || action === void 0 ? void 0 : action.buttonClick;
-    (_chrome = chrome) === null || _chrome === void 0 ? void 0 : (_chrome$notifications = _chrome.notifications) === null || _chrome$notifications === void 0 ? void 0 : _chrome$notifications.create({
+    const options = {
       type: 'basic',
       title,
       message,
       iconUrl: '/images/icon-128.png',
       priority: 2,
-      isClickable: !!link || !!onClick,
-      buttons: _utils.isFirefox ? undefined : buttons
-    }, notificationId => {
+      isClickable: !!link || !!onClick
+    };
+    if (!_utils.isFirefox) {
+      options.buttons = buttons;
+    }
+    (_chrome = chrome) === null || _chrome === void 0 ? void 0 : (_chrome$notifications = _chrome.notifications) === null || _chrome$notifications === void 0 ? void 0 : _chrome$notifications.create(options, notificationId => {
       if (link || onClick) {
         chrome.notifications.onClicked.addListener(nId => {
           if (nId === notificationId) {

package/cjs/services/request-service/handler/EvmRequestHandler.js

@@ -5,14 +5,14 @@ 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 _EvmProviderError = require("@subwallet/extension-base/background/errors/EvmProviderError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _eth = require("@subwallet/extension-base/utils/eth");
 var _request = require("@subwallet/extension-base/utils/request");
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
-var _bn = _interopRequireDefault(require("bn.js"));
-var _ethereumjsTx = require("ethereumjs-tx");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethereumjsUtil = require("ethereumjs-util");
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
@@ -137,35 +137,48 @@ class EvmRequestHandler {
   }
   configToTransaction(config) {
     function formatField(input) {
-      if (typeof input === 'string') {
-        if (input.startsWith('0x')) {
-          return input;
-        } else {
-          return new _bn.default(input);
-        }
+      if (typeof input === 'string' || typeof input === 'number') {
+        return (0, _util.hexAddPrefix)(new _bignumber.default(input).toString(16));
+      } else if (typeof input === 'undefined') {
+        return undefined;
       }
-      return input;
+      return (0, _util.bnToHex)(input);
     }
-
-    // Convert any string, number to number with BigN exclude hex string
-    const txData = {
-      from: config.from,
-      nonce: formatField(config.nonce),
-      gasPrice: formatField(config.gasPrice),
-      gasLimit: formatField(config.gas),
-      to: config.to,
-      value: formatField(config.value),
-      data: (0, _ethereumjsUtil.toBuffer)(config.data)
-    };
-    const common = _common.default.custom({
+    const common = _common.Common.custom({
       chainId: config.chainId,
-      defaultHardfork: 'petersburg'
-    });
-
-    // @ts-ignore
-    return new _ethereumjsTx.Transaction(txData, {
-      common
+      defaultHardfork: 'london',
+      networkId: config.chainId
+    }, {
+      eips: [1559]
     });
+    if (config.maxFeePerGas) {
+      const txData = {
+        nonce: formatField(config.nonce),
+        gasLimit: formatField(config.gas),
+        to: config.to,
+        value: formatField(config.value),
+        data: (0, _ethereumjsUtil.toBuffer)(config.data),
+        maxFeePerGas: formatField(config.maxFeePerGas),
+        maxPriorityFeePerGas: formatField(config.maxPriorityFeePerGas),
+        chainId: config.chainId
+      };
+      return new _tx.FeeMarketEIP1559Transaction(txData, {
+        common
+      });
+    } else {
+      // Convert any string, number to number with BigN exclude hex string
+      const txData = {
+        nonce: formatField(config.nonce),
+        gasLimit: formatField(config.gas),
+        gasPrice: formatField(config.gasPrice),
+        to: config.to,
+        value: formatField(config.value),
+        data: (0, _ethereumjsUtil.toBuffer)(config.data)
+      };
+      return new _tx.LegacyTransaction(txData, {
+        common
+      });
+    }
   }
   async signTransaction(confirmation) {
     const transaction = confirmation.payload;
@@ -174,6 +187,8 @@ class EvmRequestHandler {
       from,
       gas,
       gasPrice,
+      maxFeePerGas,
+      maxPriorityFeePerGas,
       value
     } = transaction;
     const pair = _uiKeyring.default.getPair(from);
@@ -182,7 +197,9 @@ class EvmRequestHandler {
       gas: (0, _eth.anyNumberToBN)(gas).toNumber(),
       value: (0, _eth.anyNumberToBN)(value).toNumber(),
       gasPrice: (0, _eth.anyNumberToBN)(gasPrice).toNumber(),
-      gasLimit: (0, _eth.anyNumberToBN)(estimateGas).toNumber()
+      gasLimit: (0, _eth.anyNumberToBN)(estimateGas).toNumber(),
+      maxFeePerGas: (0, _eth.anyNumberToBN)(maxFeePerGas).toNumber(),
+      maxPriorityFeePerGas: (0, _eth.anyNumberToBN)(maxPriorityFeePerGas).toNumber()
       // nonce: await web3.eth.getTransactionCount(from) // Todo: fill this value from transaction service
     };
 

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

@@ -22,6 +22,7 @@ var _utils3 = require("@subwallet/extension-base/utils");
 var _eth = require("@subwallet/extension-base/utils/eth");
 var _mergeTransactionAndSignature = require("@subwallet/extension-base/utils/eth/mergeTransactionAndSignature");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
+var _number = require("@subwallet/extension-base/utils/number");
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethereumjsUtil = require("ethereumjs-util");
@@ -100,7 +101,8 @@ class TransactionService {
     const estimateFee = {
       symbol: '',
       decimals: 0,
-      value: ''
+      value: '',
+      tooHigh: false
     };
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     if (!chainInfo) {
@@ -121,10 +123,16 @@ class TransactionService {
             if (!web3) {
               validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
             } else {
-              const _price = await web3.api.eth.getGasPrice();
-              const gasPrice = (0, _eth.recalculateGasPrice)(_price, chainInfo.slug);
               const gasLimit = await web3.api.eth.estimateGas(transaction);
-              estimateFee.value = (gasLimit * parseInt(gasPrice)).toString();
+              const priority = await (0, _eth.calculateGasFeeParams)(web3, chainInfo.slug);
+              if (priority.baseGasFee) {
+                const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
+                const maxFee = priority.maxFeePerGas.lte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+                estimateFee.value = maxFee.multipliedBy(gasLimit).toFixed(0);
+              } else {
+                estimateFee.value = new _bignumber.default(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
+              }
+              estimateFee.tooHigh = priority.busyNetwork;
             }
           }
         } catch (e) {
@@ -529,6 +537,7 @@ class TransactionService {
       case _KoniTypes.ExtrinsicType.MINT_QDOT:
       case _KoniTypes.ExtrinsicType.MINT_LDOT:
       case _KoniTypes.ExtrinsicType.MINT_SDOT:
+      case _KoniTypes.ExtrinsicType.MINT_VMANTA:
 
       // eslint-disable-next-line no-fallthrough
       case _KoniTypes.ExtrinsicType.MINT_VDOT:
@@ -582,12 +591,14 @@ class TransactionService {
           break;
         }
       case _KoniTypes.ExtrinsicType.UNSTAKE_VDOT:
+      case _KoniTypes.ExtrinsicType.UNSTAKE_VMANTA:
       case _KoniTypes.ExtrinsicType.UNSTAKE_LDOT:
       case _KoniTypes.ExtrinsicType.UNSTAKE_SDOT:
       case _KoniTypes.ExtrinsicType.UNSTAKE_STDOT:
       case _KoniTypes.ExtrinsicType.REDEEM_STDOT:
       case _KoniTypes.ExtrinsicType.REDEEM_LDOT:
       case _KoniTypes.ExtrinsicType.REDEEM_SDOT:
+      case _KoniTypes.ExtrinsicType.REDEEM_VMANTA:
 
       // eslint-disable-next-line no-fallthrough
       case _KoniTypes.ExtrinsicType.REDEEM_VDOT:
@@ -850,17 +861,33 @@ class TransactionService {
     this.eventService.emit('transaction.timeout', transaction);
   }
   generateHashPayload(chain, transaction) {
-    var _transaction$nonce;
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
-    const txObject = {
-      nonce: (_transaction$nonce = transaction.nonce) !== null && _transaction$nonce !== void 0 ? _transaction$nonce : 0,
-      gasPrice: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gasPrice).toString(16)),
-      gasLimit: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gas).toString(16)),
-      to: transaction.to !== undefined ? transaction.to : '',
-      value: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.value).toString(16)),
-      data: transaction.data,
-      chainId: (0, _utils._getEvmChainId)(chainInfo)
-    };
+    let txObject;
+    const max = (0, _eth.anyNumberToBN)(transaction.maxFeePerGas);
+    if (max.gt(_number.BN_ZERO)) {
+      var _transaction$nonce;
+      txObject = {
+        nonce: (_transaction$nonce = transaction.nonce) !== null && _transaction$nonce !== void 0 ? _transaction$nonce : 0,
+        maxFeePerGas: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.maxFeePerGas).toString(16)),
+        maxPriorityFeePerGas: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.maxPriorityFeePerGas).toString(16)),
+        gasLimit: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gas).toString(16)),
+        to: transaction.to !== undefined ? transaction.to : '',
+        value: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.value).toString(16)),
+        data: transaction.data,
+        chainId: (0, _utils._getEvmChainId)(chainInfo)
+      };
+    } else {
+      var _transaction$nonce2;
+      txObject = {
+        nonce: (_transaction$nonce2 = transaction.nonce) !== null && _transaction$nonce2 !== void 0 ? _transaction$nonce2 : 0,
+        gasPrice: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gasPrice).toString(16)),
+        gasLimit: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gas).toString(16)),
+        to: transaction.to !== undefined ? transaction.to : '',
+        value: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.value).toString(16)),
+        data: transaction.data,
+        chainId: (0, _utils._getEvmChainId)(chainInfo)
+      };
+    }
     return _ethers.ethers.Transaction.from(txObject).unsignedSerialized;
   }
   async signAndSendEvmTransaction(_ref7) {
@@ -926,6 +953,8 @@ class TransactionService {
       nonce: (_payload$nonce = payload.nonce) !== null && _payload$nonce !== void 0 ? _payload$nonce : 0,
       from: payload.from,
       gasPrice: (0, _eth.anyNumberToBN)(payload.gasPrice).toNumber(),
+      maxFeePerGas: (0, _eth.anyNumberToBN)(payload.maxFeePerGas).toNumber(),
+      maxPriorityFeePerGas: (0, _eth.anyNumberToBN)(payload.maxPriorityFeePerGas).toNumber(),
       gasLimit: (0, _eth.anyNumberToBN)(payload.gas).toNumber(),
       to: payload.to !== undefined ? payload.to : '',
       value: (0, _eth.anyNumberToBN)(payload.value).toNumber(),

package/cjs/signers/web3/QrSigner.js

@@ -33,6 +33,8 @@ class QrSigner {
       const txObject = {
         nonce: (_tx$nonce = tx.nonce) !== null && _tx$nonce !== void 0 ? _tx$nonce : 0,
         gasPrice: (0, _ethereumjsUtil.addHexPrefix)(tx.gasPrice.toString(16)),
+        maxPriorityFeePerGas: (0, _ethereumjsUtil.addHexPrefix)(tx.maxPriorityFeePerGas.toString(16)),
+        maxFeePerGas: (0, _ethereumjsUtil.addHexPrefix)(tx.maxFeePerGas.toString(16)),
         gasLimit: (0, _ethereumjsUtil.addHexPrefix)(tx.gasLimit.toString(16)),
         to: tx.to !== undefined ? tx.to : '',
         value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),

package/cjs/types/yield/actions/join/step.js

@@ -39,6 +39,7 @@ exports.YieldStepType = YieldStepType;
   YieldStepType["NOMINATE"] = "NOMINATE";
   YieldStepType["JOIN_NOMINATION_POOL"] = "JOIN_NOMINATION_POOL";
   YieldStepType["MINT_VDOT"] = "MINT_VDOT";
+  YieldStepType["MINT_VMANTA"] = "MINT_VMANTA";
   YieldStepType["MINT_LDOT"] = "MINT_LDOT";
   YieldStepType["MINT_QDOT"] = "MINT_QDOT";
   YieldStepType["MINT_SDOT"] = "MINT_SDOT";

package/cjs/utils/eth/mergeTransactionAndSignature.js

@@ -16,16 +16,31 @@ const mergeTransactionAndSignature = (tx, _rawSignature) => {
     s: `0x${_signature.substring(64, 128)}`,
     v: parseInt(`0x${_signature.substring(128)}`)
   };
-  const transaction = {
-    nonce: tx.nonce,
-    gasPrice: (0, _ethereumjsUtil.addHexPrefix)(tx.gasPrice.toString(16)),
-    gasLimit: (0, _ethereumjsUtil.addHexPrefix)(tx.gasLimit.toString(16)),
-    to: tx.to,
-    value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),
-    data: tx.data,
-    chainId: tx.chainId,
-    signature: signature
-  };
+  let transaction;
+  if (tx.maxFeePerGas) {
+    transaction = {
+      nonce: tx.nonce,
+      maxFeePerGas: (0, _ethereumjsUtil.addHexPrefix)(tx.maxFeePerGas.toString(16)),
+      maxPriorityFeePerGas: (0, _ethereumjsUtil.addHexPrefix)(tx.maxPriorityFeePerGas.toString(16)),
+      gasLimit: (0, _ethereumjsUtil.addHexPrefix)(tx.gasLimit.toString(16)),
+      to: tx.to,
+      value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),
+      data: tx.data,
+      chainId: tx.chainId,
+      signature: signature
+    };
+  } else {
+    transaction = {
+      nonce: tx.nonce,
+      gasPrice: (0, _ethereumjsUtil.addHexPrefix)(tx.gasPrice.toString(16)),
+      gasLimit: (0, _ethereumjsUtil.addHexPrefix)(tx.gasLimit.toString(16)),
+      to: tx.to,
+      value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),
+      data: tx.data,
+      chainId: tx.chainId,
+      signature: signature
+    };
+  }
   return _ethers.ethers.Transaction.from(transaction).serialized;
 };
 exports.mergeTransactionAndSignature = mergeTransactionAndSignature;

package/cjs/utils/eth.js

@@ -4,11 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.signatureToHex = exports.recalculateGasPrice = exports.createTransactionFromRLP = exports.anyNumberToBN = exports.Transaction = void 0;
+exports.signatureToHex = exports.recalculateGasPrice = exports.createTransactionFromRLP = exports.calculateGasFeeParams = exports.anyNumberToBN = exports.Transaction = void 0;
 var _constants = require("@subwallet/extension-base/constants");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethers = require("ethers");
 var _util = require("@polkadot/util");
+var _number = require("./number");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -75,4 +76,52 @@ const recalculateGasPrice = (_price, chain) => {
   const needMulti = _constants.NETWORK_MULTI_GAS_FEE.includes(chain) || _constants.NETWORK_MULTI_GAS_FEE.includes('*');
   return needMulti ? new _bignumber.default(_price).multipliedBy(_constants.GAS_PRICE_RATIO).toFixed(0) : _price;
 };
-exports.recalculateGasPrice = recalculateGasPrice;
+exports.recalculateGasPrice = recalculateGasPrice;
+const calculateGasFeeParams = async (web3, networkKey) => {
+  try {
+    const numBlock = 20;
+    const history = await web3.api.eth.getFeeHistory(numBlock, 'latest', [0, 25, 50, 75, 100]);
+    const baseGasFee = new _bignumber.default(history.baseFeePerGas[history.baseFeePerGas.length - 1]); // Last element is latest
+
+    const blocksBusy = history.reward.reduce((previous, rewards, currentIndex) => {
+      const [priority] = rewards;
+      const base = history.baseFeePerGas[currentIndex];
+      const priorityBN = new _bignumber.default(priority);
+      const baseBN = new _bignumber.default(base);
+      const blockIsBusy = priorityBN.dividedBy(baseBN).gte(0.3) ? 1 : 0; // True if priority >= 0.5 * base
+
+      return previous + blockIsBusy;
+    }, 0);
+    const busyNetwork = blocksBusy >= numBlock / 2; // True if half of block is busy
+
+    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards) => {
+      const [first, second] = rewards;
+      const firstBN = new _bignumber.default(first);
+      const secondBN = new _bignumber.default(second);
+      if (busyNetwork) {
+        const current = secondBN.dividedBy(2).gte(firstBN) ? firstBN : secondBN; // second too larger than first (> 2 times), use first else use second
+
+        return current.gte(previous) ? current : previous; // get max priority
+      } else {
+        const current = firstBN;
+        return current.lte(previous) ? current : previous; // get min priority
+      }
+    }, _number.BN_ZERO);
+    const maxFeePerGas = baseGasFee.plus(maxPriorityFeePerGas).multipliedBy(busyNetwork ? 2 : 1.5).decimalPlaces(0); // Max gas =(base + priority) * 1.5(if not busy or 2 when busy);
+
+    return {
+      maxFeePerGas,
+      maxPriorityFeePerGas,
+      baseGasFee,
+      busyNetwork
+    };
+  } catch (e) {
+    const _price = await web3.api.eth.getGasPrice();
+    const gasPrice = recalculateGasPrice(_price, networkKey);
+    return {
+      gasPrice,
+      busyNetwork: false
+    };
+  }
+};
+exports.calculateGasFeeParams = calculateGasFeeParams;

package/cjs/utils/number.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toBNString = exports.formatNumber = exports.balanceFormatter = exports.PREDEFINED_FORMATTER = exports.BN_ZERO = exports.BN_TEN = void 0;
+exports.toBNString = exports.formatNumber = exports.balanceFormatter = exports.PREDEFINED_FORMATTER = exports.BN_ZERO = exports.BN_WEI = exports.BN_TEN = exports.BN_ONE = void 0;
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -13,6 +13,10 @@ const BN_ZERO = new _bignumber.default(0);
 exports.BN_ZERO = BN_ZERO;
 const BN_TEN = new _bignumber.default(10);
 exports.BN_TEN = BN_TEN;
+const BN_ONE = new _bignumber.default(1);
+exports.BN_ONE = BN_ONE;
+const BN_WEI = BN_TEN.pow(9);
+exports.BN_WEI = BN_WEI;
 // Clear zero from end, use with decimal only
 const clearZero = result => {
   let index = result.length - 1;

package/cjs/utils/yield/index.js

@@ -0,0 +1,3 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+"use strict";

package/koni/api/staking/bonding/utils.d.ts

@@ -3,7 +3,9 @@ import { _ChainInfo } from '@subwallet/chain-list/types';
 import { NominationInfo, NominatorMetadata, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateInflationParams } from '@subwallet/extension-base/services/chain-service/constants';
 import { EarningStatus, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
+import BigNumber from 'bignumber.js';
 import { ApiPromise } from '@polkadot/api';
+import { Codec } from '@polkadot/types/types';
 import { BN } from '@polkadot/util';
 export interface PalletDappsStakingDappInfo {
     address: string;
@@ -97,6 +99,7 @@ export declare function calcInflationUniformEraPayout(totalIssuance: BN, yearlyI
 export declare function calcInflationRewardCurve(minInflation: number, stakedFraction: number, idealStake: number, idealInterest: number, falloff: number): number;
 export declare function calculateInflation(totalEraStake: BN, totalIssuance: BN, numAuctions: number, networkKey: string): number;
 export declare function calculateChainStakedReturn(inflation: number, totalEraStake: BN, totalIssuance: BN, networkKey: string): number;
+export declare function calculateChainStakedReturnV2(chainInfo: _ChainInfo, totalIssuance: string, erasPerDay: number, lastTotalStaked: string, validatorEraReward: BigNumber, isCompound?: boolean): number;
 export declare function calculateAlephZeroValidatorReturn(chainStakedReturn: number, commission: number): number;
 export declare function calculateTernoaValidatorReturn(rewardPerValidator: number, validatorStake: number, commission: number): number;
 export declare function calculateValidatorStakedReturn(chainStakedReturn: number, totalValidatorStake: BN, avgStake: BN, commission: number): number;
@@ -154,6 +157,8 @@ export declare function isActionFromValidator(stakingType: StakingType, chain: s
 export declare function getWithdrawalInfo(nominatorMetadata: NominatorMetadata): UnstakingInfo | undefined;
 export declare function getEarningStatusByNominations(bnTotalActiveStake: BN, nominationList: NominationInfo[]): EarningStatus;
 export declare function getValidatorLabel(chain: string): "dApp" | "Validator" | "Collator";
+export declare function getAvgValidatorEraReward(supportedDays: number, eraRewardHistory: Codec[]): BigNumber;
+export declare function getSupportedDaysByHistoryDepth(erasPerDay: number, maxSupportedEras: number): 15 | 30;
 export declare const getMinStakeErrorMessage: (chainInfo: _ChainInfo, bnMinStake: BN) => string;
 export declare const getMaxValidatorErrorMessage: (chainInfo: _ChainInfo, max: number) => string;
 export declare const getExistUnstakeErrorMessage: (chain: string, type?: StakingType, isStakeMore?: boolean) => string;

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

@@ -9,6 +9,7 @@ import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning
 import { EarningStatus, UnstakingStatus, YieldPoolType } from '@subwallet/extension-base/types';
 import { detectTranslate, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
+import BigNumber from 'bignumber.js';
 import { t } from 'i18next';
 import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';
 export let PalletParachainStakingRequestType;
@@ -71,6 +72,24 @@ export function calculateChainStakedReturn(inflation, totalEraStake, totalIssuan
 
   return stakedReturn;
 }
+export function calculateChainStakedReturnV2(chainInfo, totalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, isCompound) {
+  const DAYS_PER_YEAR = 365;
+  // @ts-ignore
+  const DECIMAL = chainInfo.substrateInfo.decimals;
+  const lastTotalStakedUnit = new BigNumber(lastTotalStaked).dividedBy(new BigNumber(10 ** DECIMAL));
+  const totalIssuanceUnit = new BigNumber(totalIssuance).dividedBy(new BigNumber(10 ** DECIMAL));
+  const supplyStaked = lastTotalStakedUnit.dividedBy(totalIssuanceUnit);
+  const dayRewardRate = validatorEraReward.multipliedBy(erasPerDay).dividedBy(totalIssuance).multipliedBy(100);
+  let inflationToStakers = new BigNumber(0);
+  if (!isCompound) {
+    inflationToStakers = dayRewardRate.multipliedBy(DAYS_PER_YEAR);
+  } else {
+    const multiplier = dayRewardRate.dividedBy(100).plus(1).exponentiatedBy(365);
+    inflationToStakers = new BigNumber(100).multipliedBy(multiplier).minus(100);
+  }
+  const averageRewardRate = inflationToStakers.dividedBy(supplyStaked);
+  return averageRewardRate.toNumber();
+}
 export function calculateAlephZeroValidatorReturn(chainStakedReturn, commission) {
   return chainStakedReturn * (100 - commission) / 100;
 }
@@ -310,6 +329,27 @@ export function getValidatorLabel(chain) {
   }
   return 'Collator';
 }
+export function getAvgValidatorEraReward(supportedDays, eraRewardHistory) {
+  let sumEraReward = new BigNumber(0);
+  let failEra = 0;
+  for (const _item of eraRewardHistory) {
+    const item = _item.toString();
+    if (!item) {
+      failEra += 1;
+    } else {
+      const eraReward = new BigNumber(item);
+      sumEraReward = sumEraReward.plus(eraReward);
+    }
+  }
+  return sumEraReward.dividedBy(new BigNumber(supportedDays - failEra));
+}
+export function getSupportedDaysByHistoryDepth(erasPerDay, maxSupportedEras) {
+  if (maxSupportedEras / erasPerDay > 30) {
+    return 30;
+  } else {
+    return 15;
+  }
+}
 export const getMinStakeErrorMessage = (chainInfo, bnMinStake) => {
   const tokenInfo = _getChainNativeTokenBasicInfo(chainInfo);
   const number = formatNumber(bnMinStake.toString(), tokenInfo.decimals || 0, balanceFormatter);