@subwallet/extension-base 1.1.40-0 → 1.1.41-0

package/cjs/services/fee-service/utils/index.js

@@ -0,0 +1,209 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.recalculateGasPrice = exports.parseInfuraFee = exports.fetchSubWalletFeeData = exports.fetchOnlineFeeData = exports.fetchInfuraFeeData = exports.calculateGasFeeParams = void 0;
+var _constants = require("@subwallet/extension-base/constants");
+var _utils = require("@subwallet/extension-base/utils");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const INFURA_API_KEY = process.env.INFURA_API_KEY || '';
+const INFURA_API_KEY_SECRET = process.env.INFURA_API_KEY_SECRET || '';
+const INFURA_AUTH = 'Basic ' + Buffer.from(INFURA_API_KEY + ':' + INFURA_API_KEY_SECRET).toString('base64');
+const parseInfuraFee = info => {
+  const base = new _bignumber.default(info.estimatedBaseFee).multipliedBy(_utils.BN_WEI);
+  const low = new _bignumber.default(info.low.suggestedMaxPriorityFeePerGas).multipliedBy(_utils.BN_WEI);
+  const busyNetwork = base.gt(_utils.BN_ZERO) ? low.dividedBy(base).gte(0.3) : false;
+  const data = !busyNetwork ? info.low : info.medium;
+  return {
+    busyNetwork,
+    gasPrice: undefined,
+    baseGasFee: base,
+    maxFeePerGas: new _bignumber.default(data.suggestedMaxFeePerGas).multipliedBy(_utils.BN_WEI).integerValue(_bignumber.default.ROUND_UP),
+    maxPriorityFeePerGas: new _bignumber.default(data.suggestedMaxPriorityFeePerGas).multipliedBy(_utils.BN_WEI).integerValue(_bignumber.default.ROUND_UP)
+  };
+};
+exports.parseInfuraFee = parseInfuraFee;
+const fetchInfuraFeeData = async (chainId, infuraAuth) => {
+  return await new Promise(resolve => {
+    const baseUrl = 'https://gas.api.infura.io/networks/{{chainId}}/suggestedGasFees';
+    const url = baseUrl.replaceAll('{{chainId}}', chainId.toString());
+    fetch(url, {
+      method: 'GET',
+      headers: {
+        Authorization: infuraAuth || INFURA_AUTH
+      }
+    }).then(rs => {
+      return rs.json();
+    }).then(info => {
+      resolve(parseInfuraFee(info));
+    }).catch(e => {
+      console.warn(e);
+      resolve(null);
+    });
+  });
+};
+exports.fetchInfuraFeeData = fetchInfuraFeeData;
+const fetchSubWalletFeeData = async (chainId, networkKey) => {
+  return await new Promise(resolve => {
+    const baseUrl = 'https://api-cache.subwallet.app/sw-evm-gas/{{chain}}';
+    const url = baseUrl.replaceAll('{{chain}}', networkKey);
+    fetch(url, {
+      method: 'GET'
+    }).then(rs => {
+      return rs.json();
+    }).then(info => {
+      if (info.gasPrice !== undefined) {
+        resolve(info);
+      } else {
+        resolve({
+          busyNetwork: info.busyNetwork,
+          gasPrice: info.gasPrice,
+          baseGasFee: new _bignumber.default(info.baseGasFee),
+          maxFeePerGas: new _bignumber.default(info.maxFeePerGas),
+          maxPriorityFeePerGas: new _bignumber.default(info.maxPriorityFeePerGas)
+        });
+      }
+    }).catch(e => {
+      console.warn(e);
+      resolve(null);
+    });
+  });
+};
+exports.fetchSubWalletFeeData = fetchSubWalletFeeData;
+const fetchOnlineFeeData = async function (chainId, networkKey) {
+  let useInfura = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  return await new Promise(resolve => {
+    const fetchFunction = useInfura ? fetchInfuraFeeData : fetchSubWalletFeeData;
+    fetchFunction(chainId, networkKey).then(info => {
+      resolve(info);
+    }).catch(e => {
+      console.warn(e);
+      resolve(null);
+    });
+  });
+};
+exports.fetchOnlineFeeData = fetchOnlineFeeData;
+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 function (web3, networkKey) {
+  let useOnline = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  let useInfura = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  if (useOnline) {
+    try {
+      const chainId = await web3.api.eth.getChainId();
+      const onlineData = await fetchOnlineFeeData(chainId, networkKey, useInfura);
+      if (onlineData) {
+        return onlineData;
+      }
+    } catch (e) {}
+  }
+  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(_utils.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 = _utils.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(_utils.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(_utils.BN_ZERO)) {
+          return current; // get min priority
+        } else if (current.eq(_utils.BN_ZERO)) {
+          return previous;
+        }
+        return current.lte(previous) ? current : previous; // get min priority
+      }
+    }, _utils.BN_ZERO);
+    if (maxPriorityFeePerGas.eq(_utils.BN_ZERO)) {
+      const _price = await web3.api.eth.getGasPrice();
+      const gasPrice = recalculateGasPrice(_price, networkKey);
+      return {
+        gasPrice,
+        maxFeePerGas: undefined,
+        maxPriorityFeePerGas: undefined,
+        baseGasFee: undefined,
+        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 {
+      gasPrice: undefined,
+      maxFeePerGas,
+      maxPriorityFeePerGas,
+      baseGasFee,
+      busyNetwork
+    };
+  } catch (e) {
+    const _price = await web3.api.eth.getGasPrice();
+    const gasPrice = recalculateGasPrice(_price, networkKey);
+    return {
+      gasPrice,
+      maxFeePerGas: undefined,
+      maxPriorityFeePerGas: undefined,
+      baseGasFee: undefined,
+      busyNetwork: false
+    };
+  }
+};
+exports.calculateGasFeeParams = calculateGasFeeParams;

package/cjs/services/migration-service/scripts/DeleteChainStaking.js

@@ -0,0 +1,23 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class DeleteChainStaking extends _Base.default {
+  async run() {
+    try {
+      await this.state.dbService.stores.yieldPoolInfo.table.where({
+        slug: 'CAPS___native_staking___ternoa_alphanet'
+      }).delete();
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = DeleteChainStaking;

package/cjs/services/migration-service/scripts/index.js

@@ -13,6 +13,7 @@ var _MigrateProvidersV1M1P = _interopRequireDefault(require("./providers/Migrate
 var _MigratePolygonUSDCProvider = _interopRequireDefault(require("./tokens/MigratePolygonUSDCProvider"));
 var _AutoEnableChainsTokens = _interopRequireDefault(require("./AutoEnableChainsTokens"));
 var _DeleteChain = _interopRequireDefault(require("./DeleteChain"));
+var _DeleteChainStaking = _interopRequireDefault(require("./DeleteChainStaking"));
 var _EnableVaraChain = _interopRequireDefault(require("./EnableVaraChain"));
 var _MigrateAuthUrls = _interopRequireDefault(require("./MigrateAuthUrls"));
 var _MigrateAutoLock = _interopRequireDefault(require("./MigrateAutoLock"));
@@ -49,7 +50,8 @@ var _default = {
   '1.1.17-03': _EnableVaraChain.default,
   '1.1.24-01': _MigrateProvidersV1M1P.default,
   '1.1.26-01': _MigratePolygonUSDCProvider.default,
-  '1.1.28-01': _MigrateEarningVersion.default
+  '1.1.28-01': _MigrateEarningVersion.default,
+  '1.1.41-01': _DeleteChainStaking.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

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;