@subwallet/extension-base 1.1.40-1 → 1.1.42-0

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

@@ -11,15 +11,15 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _TransactionWarning = require("@subwallet/extension-base/background/warnings/TransactionWarning");
 var _constants = require("@subwallet/extension-base/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils2 = require("@subwallet/extension-base/services/fee-service/utils");
 var _constants2 = require("@subwallet/extension-base/services/request-service/constants");
 var _constants3 = require("@subwallet/extension-base/services/transaction-service/constants");
 var _eventParser = require("@subwallet/extension-base/services/transaction-service/event-parser");
 var _helpers = require("@subwallet/extension-base/services/transaction-service/helpers");
-var _utils2 = require("@subwallet/extension-base/services/transaction-service/utils");
+var _utils3 = require("@subwallet/extension-base/services/transaction-service/utils");
 var _helpers2 = require("@subwallet/extension-base/services/wallet-connect-service/helpers");
 var _types = require("@subwallet/extension-base/types");
-var _utils3 = require("@subwallet/extension-base/utils");
-var _eth = require("@subwallet/extension-base/utils/eth");
+var _utils4 = require("@subwallet/extension-base/utils");
 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");
@@ -124,7 +124,7 @@ class TransactionService {
               validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
             } else {
               const gasLimit = await web3.api.eth.estimateGas(transaction);
-              const priority = await (0, _eth.calculateGasFeeParams)(web3, chainInfo.slug);
+              const priority = await (0, _utils2.calculateGasFeeParams)(web3, chainInfo.slug);
               if (priority.baseGasFee) {
                 const maxFee = priority.maxFeePerGas; // TODO: Need review
 
@@ -341,13 +341,13 @@ class TransactionService {
   getTransactionLink(id) {
     const transaction = this.getTransaction(id);
     const chainInfo = this.state.chainService.getChainInfoByKey(transaction.chain);
-    return (0, _utils2.getExplorerLink)(chainInfo, transaction.extrinsicHash, 'tx');
+    return (0, _utils3.getExplorerLink)(chainInfo, transaction.extrinsicHash, 'tx');
   }
   transactionToHistories(id, startBlock, nonce, eventLogs) {
     const transaction = this.getTransaction(id);
     const extrinsicType = transaction.extrinsicType;
     const chainInfo = this.state.chainService.getChainInfoByKey(transaction.chain);
-    const formattedTransactionAddress = (0, _utils3.reformatAddress)(transaction.address);
+    const formattedTransactionAddress = (0, _utils4.reformatAddress)(transaction.address);
     const historyItem = {
       origin: 'app',
       chain: transaction.chain,
@@ -380,7 +380,7 @@ class TransactionService {
     switch (extrinsicType) {
       case _KoniTypes.ExtrinsicType.TRANSFER_BALANCE:
         {
-          const inputData = (0, _utils2.parseTransactionData)(transaction.data);
+          const inputData = (0, _utils3.parseTransactionData)(transaction.data);
           historyItem.to = inputData.to;
           const sendingTokenInfo = this.state.chainService.getAssetBySlug(inputData.tokenSlug);
           historyItem.amount = {
@@ -393,7 +393,7 @@ class TransactionService {
         break;
       case _KoniTypes.ExtrinsicType.TRANSFER_TOKEN:
         {
-          const inputData = (0, _utils2.parseTransactionData)(transaction.data);
+          const inputData = (0, _utils3.parseTransactionData)(transaction.data);
           historyItem.to = inputData.to;
           const sendingTokenInfo = this.state.chainService.getAssetBySlug(inputData.tokenSlug);
           historyItem.amount = {
@@ -406,7 +406,7 @@ class TransactionService {
         break;
       case _KoniTypes.ExtrinsicType.TRANSFER_XCM:
         {
-          const inputData = (0, _utils2.parseTransactionData)(transaction.data);
+          const inputData = (0, _utils3.parseTransactionData)(transaction.data);
           historyItem.to = inputData.to;
           const sendingTokenInfo = this.state.chainService.getAssetBySlug(inputData.tokenSlug);
           historyItem.amount = {
@@ -426,7 +426,7 @@ class TransactionService {
         break;
       case _KoniTypes.ExtrinsicType.SEND_NFT:
         {
-          const inputData = (0, _utils2.parseTransactionData)(transaction.data);
+          const inputData = (0, _utils3.parseTransactionData)(transaction.data);
           historyItem.to = inputData.recipientAddress;
           historyItem.amount = {
             decimals: 0,
@@ -437,7 +437,7 @@ class TransactionService {
         break;
       case _KoniTypes.ExtrinsicType.STAKING_BOND:
         {
-          const data = (0, _utils2.parseTransactionData)(transaction.data);
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
           historyItem.amount = {
             ...baseNativeAmount,
             value: data.amount || '0'
@@ -446,7 +446,7 @@ class TransactionService {
         break;
       case _KoniTypes.ExtrinsicType.STAKING_JOIN_POOL:
         {
-          const data = (0, _utils2.parseTransactionData)(transaction.data);
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
           historyItem.amount = {
             ...baseNativeAmount,
             value: data.amount || '0'
@@ -456,7 +456,7 @@ class TransactionService {
         break;
       case _KoniTypes.ExtrinsicType.STAKING_UNBOND:
         {
-          const data = (0, _utils2.parseTransactionData)(transaction.data);
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
           if (data.isLiquidStaking && data.derivativeTokenInfo && data.exchangeRate && data.inputTokenInfo) {
             historyItem.amount = {
               decimals: (0, _utils._getAssetDecimals)(data.derivativeTokenInfo),
@@ -478,7 +478,7 @@ class TransactionService {
         break;
       case _KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL:
         {
-          const data = (0, _utils2.parseTransactionData)(transaction.data);
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
           historyItem.to = data.address || '';
           historyItem.amount = {
             ...baseNativeAmount,
@@ -488,7 +488,7 @@ class TransactionService {
         break;
       case _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD:
         {
-          const data = (0, _utils2.parseTransactionData)(transaction.data);
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
           historyItem.amount = {
             ...baseNativeAmount,
             value: data.unclaimedReward || '0'
@@ -497,7 +497,7 @@ class TransactionService {
         break;
       case _KoniTypes.ExtrinsicType.STAKING_WITHDRAW:
         {
-          const data = (0, _utils2.parseTransactionData)(transaction.data);
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
           const slug = data.slug;
           const poolHandler = this.state.earningService.getPoolHandler(slug);
           const amount = {
@@ -517,7 +517,7 @@ class TransactionService {
         }
       case _KoniTypes.ExtrinsicType.STAKING_CANCEL_UNSTAKE:
         {
-          const data = (0, _utils2.parseTransactionData)(transaction.data);
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
           historyItem.amount = {
             ...baseNativeAmount,
             value: data.selectedUnstaking.claimable || '0'
@@ -527,7 +527,7 @@ class TransactionService {
       case _KoniTypes.ExtrinsicType.EVM_EXECUTE:
         {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-          const data = (0, _utils2.parseTransactionData)(transaction.data);
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
 
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
           historyItem.to = (data === null || data === void 0 ? void 0 : data.to) || '';
@@ -542,7 +542,7 @@ class TransactionService {
       // eslint-disable-next-line no-fallthrough
       case _KoniTypes.ExtrinsicType.MINT_VDOT:
         {
-          const params = (0, _utils2.parseTransactionData)(transaction.data);
+          const params = (0, _utils3.parseTransactionData)(transaction.data);
           const inputTokenInfo = this.state.chainService.getAssetBySlug(params.inputTokenSlug);
           const isFeePaidWithInputAsset = params.feeTokenSlug === params.inputTokenSlug;
           historyItem.amount = {
@@ -564,7 +564,7 @@ class TransactionService {
       // eslint-disable-next-line no-fallthrough
       case _KoniTypes.ExtrinsicType.REDEEM_QDOT:
         {
-          const data = (0, _utils2.parseTransactionData)(transaction.data);
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
           const yieldPoolInfo = data.poolInfo;
           if (yieldPoolInfo.metadata.derivativeAssets) {
             const inputTokenSlug = yieldPoolInfo.metadata.inputAsset;
@@ -603,7 +603,7 @@ class TransactionService {
       // eslint-disable-next-line no-fallthrough
       case _KoniTypes.ExtrinsicType.REDEEM_VDOT:
         {
-          const data = (0, _utils2.parseTransactionData)(transaction.data);
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
           const yieldPoolInfo = data.poolInfo;
           const minAmountPercents = this.state.earningService.getMinAmountPercent();
           if (yieldPoolInfo.metadata.derivativeAssets) {
@@ -637,7 +637,7 @@ class TransactionService {
         }
       case _KoniTypes.ExtrinsicType.TOKEN_APPROVE:
         {
-          const data = (0, _utils2.parseTransactionData)(transaction.data);
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
           const inputAsset = this.state.chainService.getAssetBySlug(data.inputTokenSlug);
           historyItem.amount = {
             value: '0',
@@ -661,7 +661,7 @@ class TransactionService {
         switch (extrinsicType) {
           case _KoniTypes.ExtrinsicType.TRANSFER_XCM:
             {
-              const inputData = (0, _utils2.parseTransactionData)(transaction.data);
+              const inputData = (0, _utils3.parseTransactionData)(transaction.data);
               receiverHistory.chain = inputData.destinationNetworkKey;
               break;
             }
@@ -722,7 +722,7 @@ class TransactionService {
     // must be done after success/failure to make sure the transaction is finalized
     const transaction = this.getTransaction(id);
     if (transaction.extrinsicType === _KoniTypes.ExtrinsicType.SEND_NFT) {
-      const inputData = (0, _utils2.parseTransactionData)(transaction.data);
+      const inputData = (0, _utils3.parseTransactionData)(transaction.data);
       try {
         const sender = _uiKeyring.default.getPair(inputData.senderAddress);
         sender && this.state.dbService.handleNftTransfer(transaction.chain, [sender.address, _constants.ALL_ACCOUNT_KEY], inputData.nftItem).then(() => {
@@ -863,16 +863,16 @@ class TransactionService {
   generateHashPayload(chain, transaction) {
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     let txObject;
-    const max = (0, _eth.anyNumberToBN)(transaction.maxFeePerGas);
+    const max = (0, _utils4.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)),
+        maxFeePerGas: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.maxFeePerGas).toString(16)),
+        maxPriorityFeePerGas: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.maxPriorityFeePerGas).toString(16)),
+        gasLimit: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.gas).toString(16)),
         to: transaction.to !== undefined ? transaction.to : '',
-        value: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.value).toString(16)),
+        value: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.value).toString(16)),
         data: transaction.data,
         chainId: (0, _utils._getEvmChainId)(chainInfo),
         type: 2
@@ -881,10 +881,10 @@ class TransactionService {
       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)),
+        gasPrice: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.gasPrice).toString(16)),
+        gasLimit: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.gas).toString(16)),
         to: transaction.to !== undefined ? transaction.to : '',
-        value: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.value).toString(16)),
+        value: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.value).toString(16)),
         data: transaction.data,
         chainId: (0, _utils._getEvmChainId)(chainInfo),
         type: 0
@@ -954,12 +954,12 @@ class TransactionService {
     const txObject = {
       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(),
+      gasPrice: (0, _utils4.anyNumberToBN)(payload.gasPrice).toNumber(),
+      maxFeePerGas: (0, _utils4.anyNumberToBN)(payload.maxFeePerGas).toNumber(),
+      maxPriorityFeePerGas: (0, _utils4.anyNumberToBN)(payload.maxPriorityFeePerGas).toNumber(),
+      gasLimit: (0, _utils4.anyNumberToBN)(payload.gas).toNumber(),
       to: payload.to !== undefined ? payload.to : '',
-      value: (0, _eth.anyNumberToBN)(payload.value).toNumber(),
+      value: (0, _utils4.anyNumberToBN)(payload.value).toNumber(),
       data: payload.data,
       chainId: payload.chainId
     };

package/cjs/types/fee/index.js

@@ -0,0 +1 @@
+"use strict";

package/cjs/types/index.js

@@ -36,6 +36,17 @@ Object.keys(_campaigns).forEach(function (key) {
     }
   });
 });
+var _fee = require("./fee");
+Object.keys(_fee).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _fee[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _fee[key];
+    }
+  });
+});
 var _ordinal = require("./ordinal");
 Object.keys(_ordinal).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/cjs/utils/eth.js

@@ -4,12 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.signatureToHex = exports.recalculateGasPrice = exports.createTransactionFromRLP = exports.calculateGasFeeParams = exports.anyNumberToBN = exports.Transaction = void 0;
-var _constants = require("@subwallet/extension-base/constants");
+exports.signatureToHex = exports.createTransactionFromRLP = exports.anyNumberToBN = exports.Transaction = void 0;
 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
 
@@ -71,105 +69,4 @@ const signatureToHex = sig => {
   const hexV = (0, _util.hexStripPrefix)((0, _util.numberToHex)(v));
   return hexR + hexS + hexV;
 };
-exports.signatureToHex = signatureToHex;
-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;
-const calculateGasFeeParams = async (web3, networkKey) => {
-  try {
-    const numBlock = 20;
-    const rewardPercent = [];
-    for (let i = 0; i <= 100; i = i + 5) {
-      rewardPercent.push(i);
-    }
-    const history = await web3.api.eth.getFeeHistory(numBlock, 'latest', rewardPercent);
-    const baseGasFee = new _bignumber.default(history.baseFeePerGas[history.baseFeePerGas.length - 1]); // Last element is latest
-
-    const blocksBusy = history.reward.reduce((previous, rewards, currentIndex) => {
-      const [firstPriority] = rewards;
-      const base = history.baseFeePerGas[currentIndex];
-      const priorityBN = new _bignumber.default(firstPriority);
-      const baseBN = new _bignumber.default(base);
-
-      /*
-      * True if priority >= 0.3 * base
-      *  */
-      const blockIsBusy = baseBN.gt(_number.BN_ZERO) ? priorityBN.dividedBy(baseBN).gte(0.3) ? 1 : 0 : 0; // Special for bsc, base fee = 0
-
-      return previous + blockIsBusy;
-    }, 0);
-    const busyNetwork = blocksBusy >= numBlock / 2; // True, if half of block is busy
-
-    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards) => {
-      let firstBN = _number.BN_ZERO;
-      let firstIndex = 0;
-
-      /* Get first priority which greater than 0 */
-      for (let i = 0; i < rewards.length; i++) {
-        firstIndex = i;
-        const current = rewards[i];
-        const currentBN = new _bignumber.default(current);
-        if (currentBN.gt(_number.BN_ZERO)) {
-          firstBN = currentBN;
-          break;
-        }
-      }
-      let secondBN = firstBN;
-
-      /* Get second priority which greater than first priority */
-      for (let i = firstIndex; i < rewards.length; i++) {
-        const current = rewards[i];
-        const currentBN = new _bignumber.default(current);
-        if (currentBN.gt(firstBN)) {
-          secondBN = currentBN;
-          break;
-        }
-      }
-      let current;
-      if (busyNetwork) {
-        current = secondBN.dividedBy(2).gte(firstBN) ? firstBN : secondBN; // second too larger than first (> 2 times), use first else use second
-      } else {
-        current = firstBN;
-      }
-      if (busyNetwork) {
-        /* Get max value */
-        return current.gte(previous) ? current : previous; // get max priority
-      } else {
-        /* Get min value which greater than 0 */
-        if (previous.eq(_number.BN_ZERO)) {
-          return current; // get min priority
-        } else if (current.eq(_number.BN_ZERO)) {
-          return previous;
-        }
-        return current.lte(previous) ? current : previous; // get min priority
-      }
-    }, _number.BN_ZERO);
-    if (maxPriorityFeePerGas.eq(_number.BN_ZERO)) {
-      const _price = await web3.api.eth.getGasPrice();
-      const gasPrice = recalculateGasPrice(_price, networkKey);
-      return {
-        gasPrice,
-        busyNetwork: false
-      };
-    }
-
-    /* Max gas = (base + priority) * 1.5 (if not busy or 2 when busy); */
-    const maxFeePerGas = baseGasFee.plus(maxPriorityFeePerGas).multipliedBy(busyNetwork ? 2 : 1.5).decimalPlaces(0);
-    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;
+exports.signatureToHex = signatureToHex;

package/cjs/utils/index.js

@@ -116,6 +116,18 @@ Object.keys(_environment).forEach(function (key) {
     }
   });
 });
+var _eth = require("./eth");
+Object.keys(_eth).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _eth[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _eth[key];
+    }
+  });
+});
 var _number = require("./number");
 Object.keys(_number).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/cjs/utils/reportError.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.reportError = void 0;
+var _environment = require("@subwallet/extension-base/utils/environment");
+var _crossFetch = _interopRequireDefault(require("cross-fetch"));
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const EXTENSION_REPORT_ERROR_URL = 'https://extension-feedback.subwallet.app/gelf';
+const WEBAPP_REPORT_ERROR_URL = 'https://web-feedback.subwallet.app/gelf';
+const reportError = async (e, pathName) => {
+  const errorContent = JSON.stringify(e.stack);
+  const errorShortMessage = e.message;
+  const body = {
+    content: errorContent,
+    short_message: errorShortMessage,
+    platform: _environment.TARGET_ENV,
+    device_version: '',
+    app_version: JSON.stringify(process.env.PKG_VERSION),
+    current_routes: pathName
+  };
+  await (0, _crossFetch.default)(_environment.TARGET_ENV === 'extension' ? EXTENSION_REPORT_ERROR_URL : WEBAPP_REPORT_ERROR_URL, {
+    method: 'POST',
+    body: JSON.stringify(body)
+  });
+};
+exports.reportError = reportError;

package/constants/index.d.ts

@@ -11,7 +11,7 @@ export declare const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
 export declare const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 90000;
 export declare const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export declare const CRON_GET_API_MAP_STATUS = 10000;
-export declare const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
+export declare const CRON_REFRESH_CHAIN_STAKING_METADATA = 90000;
 export declare const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export declare const CRON_RECOVER_HISTORY_INTERVAL = 30000;
 export declare const CRON_SYNC_MANTA_PAY = 300000;

package/constants/index.js

@@ -14,7 +14,7 @@ export const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
 export const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 90000;
 export const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export const CRON_GET_API_MAP_STATUS = 10000;
-export const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
+export const CRON_REFRESH_CHAIN_STAKING_METADATA = 90000;
 export const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export const CRON_RECOVER_HISTORY_INTERVAL = 30000;
 export const CRON_SYNC_MANTA_PAY = 300000;

package/koni/api/dotsama/transfer.js

@@ -181,7 +181,7 @@ export const createTransferExtrinsic = async ({
   } else if (_TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
     transfer = api.tx.assets.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
   } else if (isTxBalancesSupported && _isNativeToken(tokenInfo)) {
-    if (networkKey === 'invarch') {
+    if (_TRANSFER_CHAIN_GROUP.disable_transfer.includes(networkKey)) {
       return [null, transferAmount || value];
     }
     if (transferAll) {

package/koni/api/nft/bit.country/index.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { BIT_COUNTRY_IPFS_SERVER, BIT_COUNTRY_LAND_ESTATE_METADATA_API } from '@subwallet/extension-base/koni/api/nft/config';
+import { BIT_AVATAR_API, BIT_COUNTRY_IPFS_SERVER, BIT_COUNTRY_LAND_ESTATE_METADATA_API } from '@subwallet/extension-base/koni/api/nft/config';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
@@ -53,6 +53,8 @@ export class BitCountryNftApi extends BaseNftApi {
     // check if NFT is Land/Estate
     if (onChainMeta.data.attributes['MetaverseId:']) {
       return await fetch(`${BIT_COUNTRY_LAND_ESTATE_METADATA_API}/${assetId.classId}/${assetId.tokenId}/metadata.json`).then(resp => resp.json());
+    } else if (onChainMeta.metadata.startsWith('/avatar/')) {
+      return await fetch(BIT_AVATAR_API + onChainMeta.metadata).then(resp => resp.json());
     } else {
       return await fetch(BIT_COUNTRY_IPFS_SERVER + onChainMeta.metadata).then(resp => resp.json());
     }

package/koni/api/nft/config.d.ts

@@ -7,6 +7,7 @@ export declare const SINGULAR_V2_COLLECTION_ENDPOINT = "https://singular.app/api
 export declare const KANARIA_EXTERNAL_SERVER = "https://kanaria.rmrk.app/catalogue/";
 export declare const CLOUDFLARE_PINATA_SERVER = "https://cloudflare-ipfs.com/ipfs/";
 export declare const BIT_COUNTRY_IPFS_SERVER = "https://ipfs-cdn.bit.country/";
+export declare const BIT_AVATAR_API = "https://api.bitavatar.io/v1";
 export declare const BIT_COUNTRY_LAND_ESTATE_METADATA_API = "https://pioneer-api.bit.country/metadata/landTokenUriPioneer";
 export declare const BIT_COUNTRY_THUMBNAIL_RESOLVER = "https://res.cloudinary.com/ddftctzph/image/upload/c_scale,q_100,w_250/production-ipfs/asset/";
 export declare const CF_IPFS_GATEWAY = "https://cf-ipfs.com/ipfs/";

package/koni/api/nft/config.js

@@ -13,6 +13,7 @@ export const SINGULAR_V2_COLLECTION_ENDPOINT = 'https://singular.app/api/rmrk2/c
 export const KANARIA_EXTERNAL_SERVER = 'https://kanaria.rmrk.app/catalogue/';
 export const CLOUDFLARE_PINATA_SERVER = 'https://cloudflare-ipfs.com/ipfs/';
 export const BIT_COUNTRY_IPFS_SERVER = 'https://ipfs-cdn.bit.country/';
+export const BIT_AVATAR_API = 'https://api.bitavatar.io/v1';
 export const BIT_COUNTRY_LAND_ESTATE_METADATA_API = 'https://pioneer-api.bit.country/metadata/landTokenUriPioneer';
 export const BIT_COUNTRY_THUMBNAIL_RESOLVER = 'https://res.cloudinary.com/ddftctzph/image/upload/c_scale,q_100,w_250/production-ipfs/asset/';
 

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

@@ -5,7 +5,7 @@ import { ExternalRequestPromiseStatus } from '@subwallet/extension-base/backgrou
 import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
 import { _BALANCE_PARSING_CHAIN_GROUP, EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ERC721_ABI } from '@subwallet/extension-base/services/chain-service/helper';
-import { calculateGasFeeParams } from '@subwallet/extension-base/utils/eth';
+import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import BigN from 'bignumber.js';
 import { hexToBn } from '@polkadot/util';
 export const handleTransferBalanceResult = ({

package/koni/background/handlers/Extension.d.ts

@@ -185,6 +185,7 @@ export default class KoniExtension {
     private getListDeriveAccounts;
     private subscribeChainInfoMap;
     private subscribeChainStateMap;
+    private subscribeChainStatusMap;
     private subscribeAssetRegistry;
     private subscribeMultiChainAssetMap;
     private subscribeXcmRefMap;

package/koni/background/handlers/Extension.js

@@ -26,14 +26,14 @@ import { YIELD_EXTRINSIC_TYPES } from '@subwallet/extension-base/koni/api/yield/
 import { _API_OPTIONS_CHAIN_GROUP, _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _getTokenMinAmount, _isAssetSmartContractNft, _isChainEvmCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isTokenEvmSmartContract, _isTokenTransferredByEvm } from '@subwallet/extension-base/services/chain-service/utils';
+import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
 import { WALLET_CONNECT_EIP155_NAMESPACE } from '@subwallet/extension-base/services/wallet-connect-service/constants';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { AccountsStore } from '@subwallet/extension-base/stores';
 import { YieldPoolType } from '@subwallet/extension-base/types';
-import { convertSubjectInfoToAddresses, isSameAddress, reformatAddress, uniqueStringArray } from '@subwallet/extension-base/utils';
-import { calculateGasFeeParams, createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
+import { convertSubjectInfoToAddresses, createTransactionFromRLP, isSameAddress, reformatAddress, signatureToHex, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { createPair } from '@subwallet/keyring';
@@ -3169,6 +3169,19 @@ export default class KoniExtension {
     });
     return this.#koniState.getChainStateMap();
   }
+  subscribeChainStatusMap(id, port) {
+    const cb = createSubscription(id, port);
+    const chainStateMapSubscription = this.#koniState.chainService.subscribeChainStatusMap().subscribe({
+      next: rs => {
+        cb(rs);
+      }
+    });
+    this.createUnsubscriptionHandle(id, chainStateMapSubscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.chainService.getChainStatusMap();
+  }
   async subscribeAssetRegistry(id, port) {
     const cb = createSubscription(id, port);
     let ready = false;
@@ -3458,7 +3471,7 @@ export default class KoniExtension {
       });
       const {
         connectionStatus
-      } = this.#koniState.chainService.getChainStateByKey(_DEFAULT_MANTA_ZK_CHAIN);
+      } = this.#koniState.chainService.getChainStatusByKey(_DEFAULT_MANTA_ZK_CHAIN);
       if (connectionStatus !== _ChainConnectionStatus.CONNECTED) {
         // TODO: do better
         await timeout();
@@ -4194,6 +4207,8 @@ export default class KoniExtension {
         return this.subscribeChainInfoMap(id, port);
       case 'pri(chainService.subscribeChainStateMap)':
         return this.subscribeChainStateMap(id, port);
+      case 'pri(chainService.subscribeChainStatusMap)':
+        return this.subscribeChainStatusMap(id, port);
       case 'pri(chainService.subscribeXcmRefMap)':
         return this.subscribeXcmRefMap(id, port);
       case 'pri(chainService.getSupportedContractTypes)':

package/koni/background/handlers/State.d.ts

@@ -9,6 +9,7 @@ import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest } from '@subwallet/extension-base/services/chain-service/types';
 import EarningService from '@subwallet/extension-base/services/earning-service/service';
 import { EventService } from '@subwallet/extension-base/services/event-service';
+import FeeService from '@subwallet/extension-base/services/fee-service/service';
 import { HistoryService } from '@subwallet/extension-base/services/history-service';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import MigrationService from '@subwallet/extension-base/services/migration-service';
@@ -22,7 +23,7 @@ import DatabaseService from '@subwallet/extension-base/services/storage-service/
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
-import { BalanceItem, BalanceJson, BalanceMap } from '@subwallet/extension-base/types';
+import { BalanceItem, BalanceJson, BalanceMap, EvmFeeInfo } from '@subwallet/extension-base/types';
 import { MetadataDef, ProviderMeta } from '@subwallet/extension-inject/types';
 import SimpleKeyring from 'eth-simple-keyring';
 import { BehaviorSubject, Subject } from 'rxjs';
@@ -70,6 +71,7 @@ export default class KoniState {
     readonly campaignService: CampaignService;
     readonly buyService: BuyService;
     readonly earningService: EarningService;
+    readonly feeService: FeeService;
     private generalStatus;
     private waitSleeping;
     private waitStarting;
@@ -223,6 +225,7 @@ export default class KoniState {
     checkPublicAndSecretKey({ publicKey, secretKey }: RequestCheckPublicAndSecretKey): ResponseCheckPublicAndSecretKey;
     getEthKeyring(address: string, password: string): Promise<SimpleKeyring>;
     evmSign(id: string, url: string, method: string, params: any, allowedAccounts: string[]): Promise<string | undefined>;
+    calculateAllGasFeeOnChain(activeEvmChains: string[], timeout?: number): Promise<Record<string, EvmFeeInfo | null>>;
     evmSendTransaction(id: string, url: string, networkKey: string, allowedAccounts: string[], transactionParams: EvmSendTransactionParams): Promise<string | undefined>;
     getConfirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;