@subwallet/extension-base 1.1.35-beta.2 → 1.1.36-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/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.35-0'
+  version: '1.1.36-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -44,7 +44,7 @@ class BalanceService {
     if (!chainInfo || !chainState || !chainState.active) {
       return Promise.reject(new _BalanceError.BalanceError(_KoniTypes.BalanceErrorType.NETWORK_ERROR, (0, _i18next.t)('{{chain}} is inactive. Please enable network', {
         replace: {
-          chain
+          chain: chainInfo.name
         }
       })));
     }

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

@@ -58,7 +58,7 @@ const _NFT_CHAIN_GROUP = {
   rmrk: ['kusama'],
   statemine: ['statemine'],
   statemint: ['statemint'],
-  unique_network: ['unique_network'],
+  unique_network: ['unique_network', 'quartz', 'opal'],
   bitcountry: ['bitcountry', 'pioneer'],
   vara: ['vara_network']
 };

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

@@ -417,7 +417,6 @@ class ChainService {
 
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
-    this.updateChainStateMapSubscription();
     this.assetRegistrySubject.next(this.getAssetRegistry());
     this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     await this.initApis();
@@ -447,9 +446,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() {
@@ -932,7 +928,9 @@ class ChainService {
     }
   }
   updateChainStateMapSubscription() {
-    this.chainStateMapSubject.next(this.getChainStateMap());
+    (0, _utils2.addLazy)('updateChainStateMapSubscription', () => {
+      this.chainStateMapSubject.next(this.getChainStateMap());
+    }, 300, 900);
   }
   updateChainInfoMapSubscription() {
     this.chainInfoMapSubject.next(this.getChainInfoMap());

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
 

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));
@@ -410,12 +411,11 @@ class EarningService {
     return Promise.resolve(this.yieldPositionListSubject.getValue());
   }
   yieldPositionPersistQueue = [];
-  resetYieldPositionQueue() {
-    this.yieldPositionPersistQueue = [];
-  }
-  resetYieldPosition() {
+  async resetYieldPosition() {
     this.yieldPositionSubject.next({});
     this.yieldPositionPersistQueue = [];
+    (0, _utils2.removeLazy)('persistYieldPositionInfo');
+    await this.dbService.stores.yieldPosition.clear();
   }
   _getYieldPositionKey(slug, address) {
     return `${slug}---${address}`;
@@ -443,7 +443,7 @@ class EarningService {
     this.runUnsubscribePoolsPosition();
     this.runUnsubscribeStakingRewardInterval();
     this.runUnsubscribeEarningRewardHistoryInterval();
-    reset && this.resetYieldPosition();
+    reset && (await this.resetYieldPosition());
     await this.runSubscribePoolsPosition();
     this.runSubscribeStakingRewardInterval();
     this.runSubscribeEarningRewardHistoryInterval();
@@ -461,6 +461,7 @@ class EarningService {
   runUnsubscribePoolsPosition() {
     var _this$yieldPositionUn;
     (_this$yieldPositionUn = this.yieldPositionUnsub) === null || _this$yieldPositionUn === void 0 ? void 0 : _this$yieldPositionUn.call(this);
+    (0, _utils2.removeLazy)('persistYieldPositionInfo');
     this.yieldPositionPersistQueue = [];
   }
 
@@ -468,12 +469,19 @@ class EarningService {
 
   /* Get pools' reward */
 
+  earningsRewardQueue = [];
   updateEarningReward(stakingRewardData) {
-    const stakingRewardState = this.earningRewardSubject.getValue();
-    stakingRewardState.ready = true;
-    const key = `${stakingRewardData.slug}---${stakingRewardData.address}`;
-    stakingRewardState.data[key] = stakingRewardData;
-    this.earningRewardSubject.next(stakingRewardState);
+    this.earningsRewardQueue.push(stakingRewardData);
+    (0, _utils2.addLazy)('updateEarningReward', () => {
+      const stakingRewardState = this.earningRewardSubject.getValue();
+      this.earningsRewardQueue.forEach(item => {
+        const key = `${item.slug}---${item.address}`;
+        stakingRewardState.data[key] = item;
+      });
+      stakingRewardState.ready = true;
+      this.earningRewardSubject.next(stakingRewardState);
+      this.earningsRewardQueue = [];
+    });
   }
   async getPoolReward(addresses, callback) {
     let cancel = false;
@@ -522,6 +530,8 @@ class EarningService {
     }, _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
   }
   runUnsubscribeStakingRewardInterval() {
+    (0, _utils2.removeLazy)('updateEarningReward');
+    this.earningsRewardQueue = [];
     this.earningsRewardInterval && clearInterval(this.earningsRewardInterval);
   }
   async fetchPoolRewardHistory(addresses, callback) {
@@ -550,11 +560,18 @@ class EarningService {
       });
     };
   }
+  earningRewardHistoryQueue = [];
   updateEarningRewardHistory(earningRewardHistory) {
-    const earningRewardHistoryState = this.earningRewardHistorySubject.getValue();
-    const key = `${earningRewardHistory.slug}---${earningRewardHistory.address}---${earningRewardHistory.eventIndex}`;
-    earningRewardHistoryState[key] = earningRewardHistory;
-    this.earningRewardHistorySubject.next(earningRewardHistoryState);
+    this.earningRewardHistoryQueue.push(earningRewardHistory);
+    (0, _utils2.addLazy)('updateEarningRewardHistory', () => {
+      const earningRewardHistoryState = this.earningRewardHistorySubject.getValue();
+      this.earningRewardHistoryQueue.forEach(item => {
+        const key = `${item.slug}---${item.address}---${item.eventIndex}`;
+        earningRewardHistoryState[key] = item;
+      });
+      this.earningRewardHistorySubject.next(earningRewardHistoryState);
+      this.earningRewardHistoryQueue = [];
+    }, 300, 1800);
   }
   subscribeEarningRewardHistory() {
     return this.earningRewardHistorySubject;
@@ -578,6 +595,8 @@ class EarningService {
     }, _constants.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL);
   }
   runUnsubscribeEarningRewardHistoryInterval() {
+    (0, _utils2.removeLazy)('updateEarningRewardHistory');
+    this.earningRewardHistoryQueue = [];
     this.earningsRewardHistoryInterval && clearInterval(this.earningsRewardHistoryInterval);
   }
 
@@ -729,5 +748,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/constants.js

@@ -7,5 +7,5 @@ exports.TRANSACTION_TIMEOUT = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const TRANSACTION_TIMEOUT = 2 * 60 * 1000;
+const TRANSACTION_TIMEOUT = 5 * 60 * 1000;
 exports.TRANSACTION_TIMEOUT = TRANSACTION_TIMEOUT;