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

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

@@ -3,7 +3,7 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ExtrinsicType, StakingTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
-import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getSupportedDaysByHistoryDepth } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _EXPECTED_BLOCK_TIME, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
@@ -53,7 +53,15 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       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 / _STAKING_ERA_LENGTH_MAP[chainInfo.slug]; // Can be exactly calculate from epochDuration, blockTime, sessionsPerEra
+
+      const supportedDays = 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 = 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 BN(minActiveStake);
@@ -65,7 +73,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       const bnTotalEraStake = new BN(rawTotalEraStake);
       const bnTotalIssuance = new BN(rawTotalIssuance);
       const inflation = calculateInflation(bnTotalEraStake, bnTotalIssuance, numAuctions, chainInfo.slug);
-      const expectedReturn = calculateChainStakedReturn(inflation, bnTotalEraStake, bnTotalIssuance, chainInfo.slug);
+      const expectedReturn = calculateChainStakedReturnV2(chainInfo, rawTotalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, true);
       const eraTime = _STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default; // in hours
       const unlockingPeriod = parseInt(unlockingEras) * eraTime; // in hours
       const farmerCount = _counterForNominators.toPrimitive();

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

@@ -3,7 +3,7 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { APIItemState, BasicTxErrorType, ChainType, ExtrinsicType, StakingTxErrorType, StakingType } from '@subwallet/extension-base/background/KoniTypes';
-import { calculateChainStakedReturn, calculateInflation, getExistUnstakeErrorMessage, getMinStakeErrorMessage, parsePoolStashAddress } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { calculateChainStakedReturnV2, calculateInflation, getAvgValidatorEraReward, getExistUnstakeErrorMessage, getMinStakeErrorMessage, getSupportedDaysByHistoryDepth, parsePoolStashAddress } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _EXPECTED_BLOCK_TIME, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { EarningStatus, UnstakingStatus, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
@@ -78,7 +78,15 @@ export default class NominationPoolHandler extends BasePoolHandler {
       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 / _STAKING_ERA_LENGTH_MAP[chainInfo.slug]; // Can be exactly calculate from epochDuration, blockTime, sessionsPerEra
+
+      const supportedDays = 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 = getAvgValidatorEraReward(supportedDays, _eraReward[0]);
+      const lastTotalStaked = _lastTotalStaked.toString();
       const rawTotalEraStake = _totalEraStake.toString();
       const rawTotalIssuance = _totalIssuance.toString();
       const numAuctions = _auctionCounter ? _auctionCounter.toHuman() : 0;
@@ -86,7 +94,7 @@ export default class NominationPoolHandler extends BasePoolHandler {
       const bnTotalIssuance = new BN(rawTotalIssuance);
       const inflation = calculateInflation(bnTotalEraStake, bnTotalIssuance, numAuctions, chainInfo.slug);
       const minPoolJoin = (_minPoolJoin === null || _minPoolJoin === void 0 ? void 0 : _minPoolJoin.toString()) || undefined;
-      const expectedReturn = calculateChainStakedReturn(inflation, bnTotalEraStake, bnTotalIssuance, chainInfo.slug);
+      const expectedReturn = calculateChainStakedReturnV2(chainInfo, rawTotalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, true);
       const eraTime = _STAKING_ERA_LENGTH_MAP[this.chain] || _STAKING_ERA_LENGTH_MAP.default; // in hours
       const unlockingPeriod = parseInt(unlockingEras) * eraTime; // in hours
 

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

@@ -1,7 +1,6 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
@@ -201,13 +200,16 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
         const altInputTokenBalance = await this.state.balanceService.getTokenFreeBalance(address, altInputTokenInfo.originChain, altInputTokenSlug);
         const bnAltInputTokenBalance = new BN(altInputTokenBalance.value || '0');
         if (bnAltInputTokenBalance.gt(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: YieldStepType.XCM
           };
           const xcmOriginSubstrateApi = await this.state.getSubstrateApi(altInputTokenInfo.originChain).isReady;
@@ -404,7 +406,9 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
       amount
     } = data;
     const destinationTokenSlug = this.inputAsset;
-    const originChainInfo = this.state.getChainInfo(COMMON_CHAIN_SLUGS.POLKADOT);
+    const altInputTokenSlug = this.altInputAsset || '';
+    const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
+    const originChainInfo = this.state.getChainInfo(altInputTokenInfo.originChain);
     const originTokenSlug = _getChainNativeTokenSlug(originChainInfo);
     const originTokenInfo = this.state.getAssetBySlug(originTokenSlug);
     const destinationTokenInfo = this.state.getAssetBySlug(destinationTokenSlug);

package/services/earning-service/service.d.ts

@@ -54,7 +54,7 @@ export default class EarningService implements StoppableServiceInterface, Persis
     getYieldPositionInfo(): Promise<YieldPositionInfo[]>;
     yieldPositionPersistQueue: YieldPositionInfo[];
     resetYieldPositionQueue(): void;
-    resetYieldPosition(): void;
+    resetYieldPosition(): Promise<void>;
     private _getYieldPositionKey;
     updateYieldPosition(data: YieldPositionInfo): void;
     reloadEarning(reset?: boolean): Promise<void>;
@@ -91,4 +91,5 @@ export default class EarningService implements StoppableServiceInterface, Persis
     handleYieldWithdraw(params: RequestYieldWithdrawal): Promise<TransactionData>;
     handleYieldCancelUnstake(params: RequestStakeCancelWithdrawal): Promise<TransactionData>;
     handleYieldClaimReward(params: RequestStakeClaimReward): Promise<TransactionData>;
+    resetWallet(): Promise<void>;
 }

package/services/earning-service/service.js

@@ -12,7 +12,7 @@ import { YieldPoolType } from '@subwallet/extension-base/types';
 import { addLazy, categoryAddresses, createPromiseHandler } from '@subwallet/extension-base/utils';
 import { fetchStaticCache } from '@subwallet/extension-base/utils/fetchStaticCache';
 import { BehaviorSubject } from 'rxjs';
-import { AcalaLiquidStakingPoolHandler, AmplitudeNativeStakingPoolHandler, AstarNativeStakingPoolHandler, BifrostLiquidStakingPoolHandler, InterlayLendingPoolHandler, NominationPoolHandler, ParallelLiquidStakingPoolHandler, ParaNativeStakingPoolHandler, RelayNativeStakingPoolHandler, StellaSwapLiquidStakingPoolHandler } from "./handlers/index.js";
+import { AcalaLiquidStakingPoolHandler, AmplitudeNativeStakingPoolHandler, AstarNativeStakingPoolHandler, BifrostLiquidStakingPoolHandler, BifrostMantaLiquidStakingPoolHandler, InterlayLendingPoolHandler, NominationPoolHandler, ParallelLiquidStakingPoolHandler, ParaNativeStakingPoolHandler, RelayNativeStakingPoolHandler, StellaSwapLiquidStakingPoolHandler } from "./handlers/index.js";
 const fetchPoolsData = async () => {
   const fetchData = await fetchStaticCache('earning/yield-pools.json', {
     data: {}
@@ -67,6 +67,7 @@ export default class EarningService {
       if (_STAKING_CHAIN_GROUP.liquidStaking.includes(chain)) {
         if (chain === 'bifrost_dot') {
           handlers.push(new BifrostLiquidStakingPoolHandler(this.state, chain));
+          handlers.push(new BifrostMantaLiquidStakingPoolHandler(this.state, chain));
         }
         if (chain === 'acala') {
           handlers.push(new AcalaLiquidStakingPoolHandler(this.state, chain));
@@ -404,9 +405,10 @@ export default 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}`;
@@ -433,7 +435,7 @@ export default class EarningService {
     this.runUnsubscribePoolsPosition();
     this.runUnsubscribeStakingRewardInterval();
     this.runUnsubscribeEarningRewardHistoryInterval();
-    reset && this.resetYieldPosition();
+    reset && (await this.resetYieldPosition());
     await this.runSubscribePoolsPosition();
     this.runSubscribeStakingRewardInterval();
     this.runSubscribeEarningRewardHistoryInterval();
@@ -719,4 +721,9 @@ export default class EarningService {
   /* Other */
 
   /* Handle actions */
+
+  // Clear wallet data
+  async resetWallet() {
+    await this.resetYieldPosition();
+  }
 }

package/services/notification-service/NotificationService.js

@@ -30,15 +30,18 @@ export default 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: isFirefox ? undefined : buttons
-    }, notificationId => {
+      isClickable: !!link || !!onClick
+    };
+    if (!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/services/request-service/handler/EvmRequestHandler.d.ts

@@ -1,6 +1,6 @@
+import { TypedTransaction } from '@ethereumjs/tx';
 import { ConfirmationDefinitions, ConfirmationsQueue, ConfirmationsQueueItemOptions, ConfirmationType, RequestConfirmationComplete } from '@subwallet/extension-base/background/KoniTypes';
 import RequestService from '@subwallet/extension-base/services/request-service';
-import { Transaction } from 'ethereumjs-tx';
 import { BehaviorSubject } from 'rxjs';
 import { TransactionConfig } from 'web3-core';
 export default class EvmRequestHandler {
@@ -13,7 +13,7 @@ export default class EvmRequestHandler {
     addConfirmation<CT extends ConfirmationType>(id: string, url: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): Promise<ConfirmationDefinitions[CT][1]>;
     updateConfirmation<CT extends ConfirmationType>(id: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): void;
     private signMessage;
-    configToTransaction(config: TransactionConfig): Transaction;
+    configToTransaction(config: TransactionConfig): TypedTransaction;
     private signTransaction;
     private decorateResult;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;

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

@@ -1,18 +1,18 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import Common from '@ethereumjs/common';
+import { Common } from '@ethereumjs/common';
+import { FeeMarketEIP1559Transaction, LegacyTransaction } from '@ethereumjs/tx';
 import { EvmProviderError } from '@subwallet/extension-base/background/errors/EvmProviderError';
 import { EvmProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { anyNumberToBN } from '@subwallet/extension-base/utils/eth';
 import { isInternalRequest } from '@subwallet/extension-base/utils/request';
 import keyring from '@subwallet/ui-keyring';
-import BN from 'bn.js';
-import { Transaction } from 'ethereumjs-tx';
+import BigN from 'bignumber.js';
 import { toBuffer } from 'ethereumjs-util';
 import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
-import { logger as createLogger } from '@polkadot/util';
+import { bnToHex, hexAddPrefix, logger as createLogger } from '@polkadot/util';
 export default class EvmRequestHandler {
   #requestService;
   #logger;
@@ -126,35 +126,48 @@ export default class EvmRequestHandler {
   }
   configToTransaction(config) {
     function formatField(input) {
-      if (typeof input === 'string') {
-        if (input.startsWith('0x')) {
-          return input;
-        } else {
-          return new BN(input);
-        }
+      if (typeof input === 'string' || typeof input === 'number') {
+        return hexAddPrefix(new BigN(input).toString(16));
+      } else if (typeof input === 'undefined') {
+        return undefined;
       }
-      return input;
+      return 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: toBuffer(config.data)
-    };
     const common = Common.custom({
       chainId: config.chainId,
-      defaultHardfork: 'petersburg'
-    });
-
-    // @ts-ignore
-    return new 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: toBuffer(config.data),
+        maxFeePerGas: formatField(config.maxFeePerGas),
+        maxPriorityFeePerGas: formatField(config.maxPriorityFeePerGas),
+        chainId: config.chainId
+      };
+      return new 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: toBuffer(config.data)
+      };
+      return new LegacyTransaction(txData, {
+        common
+      });
+    }
   }
   async signTransaction(confirmation) {
     const transaction = confirmation.payload;
@@ -163,6 +176,8 @@ export default class EvmRequestHandler {
       from,
       gas,
       gasPrice,
+      maxFeePerGas,
+      maxPriorityFeePerGas,
       value
     } = transaction;
     const pair = keyring.getPair(from);
@@ -171,7 +186,9 @@ export default class EvmRequestHandler {
       gas: anyNumberToBN(gas).toNumber(),
       value: anyNumberToBN(value).toNumber(),
       gasPrice: anyNumberToBN(gasPrice).toNumber(),
-      gasLimit: anyNumberToBN(estimateGas).toNumber()
+      gasLimit: anyNumberToBN(estimateGas).toNumber(),
+      maxFeePerGas: anyNumberToBN(maxFeePerGas).toNumber(),
+      maxPriorityFeePerGas: anyNumberToBN(maxPriorityFeePerGas).toNumber()
       // nonce: await web3.eth.getTransactionCount(from) // Todo: fill this value from transaction service
     };
 

package/services/transaction-service/index.js

@@ -15,9 +15,10 @@ import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base
 import { isWalletConnectRequest } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { YieldPoolType } from '@subwallet/extension-base/types';
 import { reformatAddress } from '@subwallet/extension-base/utils';
-import { anyNumberToBN, recalculateGasPrice } from '@subwallet/extension-base/utils/eth';
+import { anyNumberToBN, calculateGasFeeParams } from '@subwallet/extension-base/utils/eth';
 import { mergeTransactionAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
+import { BN_ZERO } from '@subwallet/extension-base/utils/number';
 import keyring from '@subwallet/ui-keyring';
 import BigN from 'bignumber.js';
 import { addHexPrefix } from 'ethereumjs-util';
@@ -93,7 +94,8 @@ export default class TransactionService {
     const estimateFee = {
       symbol: '',
       decimals: 0,
-      value: ''
+      value: '',
+      tooHigh: false
     };
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     if (!chainInfo) {
@@ -114,10 +116,16 @@ export default class TransactionService {
             if (!web3) {
               validationResponse.errors.push(new TransactionError(BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
             } else {
-              const _price = await web3.api.eth.getGasPrice();
-              const gasPrice = recalculateGasPrice(_price, chainInfo.slug);
               const gasLimit = await web3.api.eth.estimateGas(transaction);
-              estimateFee.value = (gasLimit * parseInt(gasPrice)).toString();
+              const priority = await 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 BigN(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
+              }
+              estimateFee.tooHigh = priority.busyNetwork;
             }
           }
         } catch (e) {
@@ -522,6 +530,7 @@ export default class TransactionService {
       case ExtrinsicType.MINT_QDOT:
       case ExtrinsicType.MINT_LDOT:
       case ExtrinsicType.MINT_SDOT:
+      case ExtrinsicType.MINT_VMANTA:
 
       // eslint-disable-next-line no-fallthrough
       case ExtrinsicType.MINT_VDOT:
@@ -575,12 +584,14 @@ export default class TransactionService {
           break;
         }
       case ExtrinsicType.UNSTAKE_VDOT:
+      case ExtrinsicType.UNSTAKE_VMANTA:
       case ExtrinsicType.UNSTAKE_LDOT:
       case ExtrinsicType.UNSTAKE_SDOT:
       case ExtrinsicType.UNSTAKE_STDOT:
       case ExtrinsicType.REDEEM_STDOT:
       case ExtrinsicType.REDEEM_LDOT:
       case ExtrinsicType.REDEEM_SDOT:
+      case ExtrinsicType.REDEEM_VMANTA:
 
       // eslint-disable-next-line no-fallthrough
       case ExtrinsicType.REDEEM_VDOT:
@@ -837,17 +848,33 @@ export default 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: addHexPrefix(anyNumberToBN(transaction.gasPrice).toString(16)),
-      gasLimit: addHexPrefix(anyNumberToBN(transaction.gas).toString(16)),
-      to: transaction.to !== undefined ? transaction.to : '',
-      value: addHexPrefix(anyNumberToBN(transaction.value).toString(16)),
-      data: transaction.data,
-      chainId: _getEvmChainId(chainInfo)
-    };
+    let txObject;
+    const max = anyNumberToBN(transaction.maxFeePerGas);
+    if (max.gt(BN_ZERO)) {
+      var _transaction$nonce;
+      txObject = {
+        nonce: (_transaction$nonce = transaction.nonce) !== null && _transaction$nonce !== void 0 ? _transaction$nonce : 0,
+        maxFeePerGas: addHexPrefix(anyNumberToBN(transaction.maxFeePerGas).toString(16)),
+        maxPriorityFeePerGas: addHexPrefix(anyNumberToBN(transaction.maxPriorityFeePerGas).toString(16)),
+        gasLimit: addHexPrefix(anyNumberToBN(transaction.gas).toString(16)),
+        to: transaction.to !== undefined ? transaction.to : '',
+        value: addHexPrefix(anyNumberToBN(transaction.value).toString(16)),
+        data: transaction.data,
+        chainId: _getEvmChainId(chainInfo)
+      };
+    } else {
+      var _transaction$nonce2;
+      txObject = {
+        nonce: (_transaction$nonce2 = transaction.nonce) !== null && _transaction$nonce2 !== void 0 ? _transaction$nonce2 : 0,
+        gasPrice: addHexPrefix(anyNumberToBN(transaction.gasPrice).toString(16)),
+        gasLimit: addHexPrefix(anyNumberToBN(transaction.gas).toString(16)),
+        to: transaction.to !== undefined ? transaction.to : '',
+        value: addHexPrefix(anyNumberToBN(transaction.value).toString(16)),
+        data: transaction.data,
+        chainId: _getEvmChainId(chainInfo)
+      };
+    }
     return ethers.Transaction.from(txObject).unsignedSerialized;
   }
   async signAndSendEvmTransaction({
@@ -912,6 +939,8 @@ export default class TransactionService {
       nonce: (_payload$nonce = payload.nonce) !== null && _payload$nonce !== void 0 ? _payload$nonce : 0,
       from: payload.from,
       gasPrice: anyNumberToBN(payload.gasPrice).toNumber(),
+      maxFeePerGas: anyNumberToBN(payload.maxFeePerGas).toNumber(),
+      maxPriorityFeePerGas: anyNumberToBN(payload.maxPriorityFeePerGas).toNumber(),
       gasLimit: anyNumberToBN(payload.gas).toNumber(),
       to: payload.to !== undefined ? payload.to : '',
       value: anyNumberToBN(payload.value).toNumber(),

package/services/transaction-service/types.d.ts

@@ -1,4 +1,4 @@
-import { AmountData, BaseRequestSign, ChainType, ExtrinsicDataTypeMap, ExtrinsicStatus, ExtrinsicType, ValidateTransactionResponse } from '@subwallet/extension-base/background/KoniTypes';
+import { BaseRequestSign, ChainType, ExtrinsicDataTypeMap, ExtrinsicStatus, ExtrinsicType, FeeData, ValidateTransactionResponse } from '@subwallet/extension-base/background/KoniTypes';
 import EventEmitter from 'eventemitter3';
 import { TransactionConfig } from 'web3-core';
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
@@ -16,7 +16,7 @@ export interface SWTransaction extends ValidateTransactionResponse, Partial<Pick
     extrinsicType: ExtrinsicType;
     createdAt: number;
     updatedAt: number;
-    estimateFee?: AmountData;
+    estimateFee?: FeeData;
     transaction: SubmittableExtrinsic | TransactionConfig;
     additionalValidator?: (inputTransaction: SWTransactionResponse) => Promise<void>;
     eventsHandler?: (eventEmitter: TransactionEmitter) => void;

package/signers/types.d.ts

@@ -8,6 +8,8 @@ export interface QrState {
 export interface Web3TransactionBase {
     to: string;
     gasPrice: number;
+    maxFeePerGas: number;
+    maxPriorityFeePerGas: number;
     gasLimit: number;
     nonce: number;
     chainId: number;

package/signers/web3/QrSigner.js

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

package/types/yield/actions/join/step.d.ts

@@ -39,6 +39,7 @@ export declare enum YieldStepType {
     NOMINATE = "NOMINATE",
     JOIN_NOMINATION_POOL = "JOIN_NOMINATION_POOL",
     MINT_VDOT = "MINT_VDOT",
+    MINT_VMANTA = "MINT_VMANTA",
     MINT_LDOT = "MINT_LDOT",
     MINT_QDOT = "MINT_QDOT",
     MINT_SDOT = "MINT_SDOT",

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

@@ -38,6 +38,7 @@ export let 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/utils/environment.js

@@ -1,3 +1,4 @@
+var _navigator3;
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -5,20 +6,22 @@ import { isSupportWindow } from '@subwallet/extension-base/utils/mv3';
 import Bowser from 'bowser';
 import { RuntimeEnvironment } from "../background/KoniTypes.js";
 function detectRuntimeEnvironment() {
-  if (isSupportWindow) {
+  if (isSupportWindow && typeof document !== 'undefined') {
+    var _navigator, _window$location, _window$location2;
     // Web environment
     return {
       environment: RuntimeEnvironment.Web,
-      version: navigator.userAgent,
-      host: window.location.host,
-      protocol: window.location.protocol
+      version: (_navigator = navigator) === null || _navigator === void 0 ? void 0 : _navigator.userAgent,
+      host: (_window$location = window.location) === null || _window$location === void 0 ? void 0 : _window$location.host,
+      protocol: (_window$location2 = window.location) === null || _window$location2 === void 0 ? void 0 : _window$location2.protocol
     };
   } else if (typeof self !== 'undefined' && typeof importScripts !== 'undefined') {
+    var _navigator2, _self$location;
     // Service Worker environment
     return {
       environment: RuntimeEnvironment.ServiceWorker,
-      version: navigator.userAgent,
-      host: self.location.host,
+      version: (_navigator2 = navigator) === null || _navigator2 === void 0 ? void 0 : _navigator2.userAgent,
+      host: (_self$location = self.location) === null || _self$location === void 0 ? void 0 : _self$location.host,
       protocol: 'https'
     };
   } else if (typeof process !== 'undefined' && process.versions && process.versions.node) {
@@ -28,20 +31,22 @@ function detectRuntimeEnvironment() {
       version: process.versions.node
     };
   } else if (typeof chrome !== 'undefined' && typeof chrome.runtime !== 'undefined') {
+    var _window$location3, _window$location4;
     // Extension environment (Chrome)
     return {
       environment: RuntimeEnvironment.ExtensionChrome,
       version: chrome.runtime.getManifest().version,
-      host: window.location.host,
-      protocol: window.location.protocol
+      host: (_window$location3 = window.location) === null || _window$location3 === void 0 ? void 0 : _window$location3.host,
+      protocol: (_window$location4 = window.location) === null || _window$location4 === void 0 ? void 0 : _window$location4.protocol
     };
   } else if (typeof browser !== 'undefined' && typeof browser.runtime !== 'undefined') {
+    var _window$location5, _window$location6;
     // Extension environment (Firefox)
     return {
       environment: RuntimeEnvironment.ExtensionFirefox,
       version: browser.runtime.getManifest().version,
-      host: window.location.host,
-      protocol: window.location.protocol
+      host: (_window$location5 = window.location) === null || _window$location5 === void 0 ? void 0 : _window$location5.host,
+      protocol: (_window$location6 = window.location) === null || _window$location6 === void 0 ? void 0 : _window$location6.protocol
     };
     // @ts-ignore
   } else if (typeof WorkerGlobalScope !== 'undefined') {
@@ -61,7 +66,7 @@ function detectRuntimeEnvironment() {
 export const RuntimeInfo = detectRuntimeEnvironment();
 
 // Todo: Support more in backend case
-export const BowserParser = Bowser.getParser(typeof navigator !== 'undefined' ? navigator.userAgent : '');
+export const BowserParser = Bowser.getParser(typeof navigator !== 'undefined' ? ((_navigator3 = navigator) === null || _navigator3 === void 0 ? void 0 : _navigator3.userAgent) + '' : '');
 export const isFirefox = BowserParser.getBrowserName(true) === 'firefox';
 export const osName = BowserParser.getOSName();
 export const isMobile = BowserParser.getPlatform().type === 'mobile';

package/utils/eth/mergeTransactionAndSignature.js

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

package/utils/eth.d.ts

@@ -1,3 +1,4 @@
+import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
 import BigN from 'bignumber.js';
 import BNEther from 'bn.js';
 import { SignedTransaction } from 'web3-core';
@@ -16,3 +17,16 @@ export declare const anyNumberToBN: (value?: string | number | BNEther) => BigN;
 export declare const createTransactionFromRLP: (rlp: string) => Transaction | null;
 export declare const signatureToHex: (sig: SignedTransaction) => string;
 export declare const recalculateGasPrice: (_price: string, chain: string) => string;
+export declare const calculateGasFeeParams: (web3: _EvmApi, networkKey: string) => Promise<{
+    maxFeePerGas: BigN;
+    maxPriorityFeePerGas: BigN;
+    baseGasFee: BigN;
+    busyNetwork: boolean;
+    gasPrice?: undefined;
+} | {
+    gasPrice: string;
+    busyNetwork: boolean;
+    maxFeePerGas?: undefined;
+    maxPriorityFeePerGas?: undefined;
+    baseGasFee?: undefined;
+}>;