@subwallet/extension-base 1.3.17-0 → 1.3.18-1

package/cjs/services/swap-service/handler/simpleswap-handler.js

@@ -11,6 +11,7 @@ var _swap = require("@subwallet/extension-base/core/logic-validation/swap");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
+var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireWildcard(require("bignumber.js"));
 var _smartContract = require("../../balance-service/transfer/smart-contract");
 var _token = require("../../balance-service/transfer/token");
@@ -125,10 +126,11 @@ const createSwapRequest = async params => {
   };
 };
 class SimpleSwapHandler {
-  constructor(chainService, balanceService) {
+  constructor(chainService, balanceService, feeService) {
     this.swapBaseHandler = new _baseHandler.SwapBaseHandler({
       chainService,
       balanceService,
+      feeService,
       providerName: 'SimpleSwap',
       providerSlug: _types.SwapProviderId.SIMPLE_SWAP
     });
@@ -241,7 +243,7 @@ class SimpleSwapHandler {
     }
   }
   generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep]);
+    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep.bind(this)]);
   }
   async getSubmitStep(params) {
     if (params.selectedQuote) {
@@ -423,11 +425,29 @@ class SimpleSwapHandler {
       });
       extrinsic = submittableExtrinsic;
     } else {
+      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee((0, _getId.getId)(), chainInfo.slug, 'evm');
       if ((0, _utils._isNativeToken)(fromAsset)) {
-        const [transactionConfig] = await (0, _smartContract.getEVMTransactionObject)(chainInfo, address, addressFrom, quote.fromAmount, false, this.chainService.getEvmApi(chainInfo.slug));
+        const [transactionConfig] = await (0, _smartContract.getEVMTransactionObject)({
+          evmApi: this.chainService.getEvmApi(chainInfo.slug),
+          transferAll: false,
+          value: quote.fromAmount,
+          from: address,
+          to: addressFrom,
+          chain: chainInfo.slug,
+          feeInfo
+        });
         extrinsic = transactionConfig;
       } else {
-        const [transactionConfig] = await (0, _smartContract.getERC20TransactionObject)((0, _utils._getContractAddressOfToken)(fromAsset), chainInfo, address, addressFrom, quote.fromAmount, false, this.chainService.getEvmApi(chainInfo.slug));
+        const [transactionConfig] = await (0, _smartContract.getERC20TransactionObject)({
+          assetAddress: (0, _utils._getContractAddressOfToken)(fromAsset),
+          chain: chainInfo.slug,
+          evmApi: this.chainService.getEvmApi(chainInfo.slug),
+          feeInfo,
+          from: address,
+          to: addressFrom,
+          value: quote.fromAmount,
+          transferAll: false
+        });
         extrinsic = transactionConfig;
       }
     }

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

@@ -145,28 +145,28 @@ class SwapService {
     _swap._SUPPORTED_SWAP_PROVIDERS.forEach(providerId => {
       switch (providerId) {
         case _swap.SwapProviderId.CHAIN_FLIP_TESTNET:
-          this.handlers[providerId] = new _chainflipHandler.ChainflipSwapHandler(this.chainService, this.state.balanceService);
+          this.handlers[providerId] = new _chainflipHandler.ChainflipSwapHandler(this.chainService, this.state.balanceService, this.state.feeService);
           break;
         case _swap.SwapProviderId.CHAIN_FLIP_MAINNET:
-          this.handlers[providerId] = new _chainflipHandler.ChainflipSwapHandler(this.chainService, this.state.balanceService, false);
+          this.handlers[providerId] = new _chainflipHandler.ChainflipSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, false);
           break;
         case _swap.SwapProviderId.HYDRADX_TESTNET:
-          this.handlers[providerId] = new _hydradxHandler.HydradxHandler(this.chainService, this.state.balanceService);
+          this.handlers[providerId] = new _hydradxHandler.HydradxHandler(this.chainService, this.state.balanceService, this.state.feeService);
           break;
         case _swap.SwapProviderId.HYDRADX_MAINNET:
-          this.handlers[providerId] = new _hydradxHandler.HydradxHandler(this.chainService, this.state.balanceService, false);
+          this.handlers[providerId] = new _hydradxHandler.HydradxHandler(this.chainService, this.state.balanceService, this.state.feeService, false);
           break;
         case _swap.SwapProviderId.POLKADOT_ASSET_HUB:
-          this.handlers[providerId] = new _assetHub.AssetHubSwapHandler(this.chainService, this.state.balanceService, 'statemint');
+          this.handlers[providerId] = new _assetHub.AssetHubSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, 'statemint');
           break;
         case _swap.SwapProviderId.KUSAMA_ASSET_HUB:
-          this.handlers[providerId] = new _assetHub.AssetHubSwapHandler(this.chainService, this.state.balanceService, 'statemine');
+          this.handlers[providerId] = new _assetHub.AssetHubSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, 'statemine');
           break;
         case _swap.SwapProviderId.ROCOCO_ASSET_HUB:
-          this.handlers[providerId] = new _assetHub.AssetHubSwapHandler(this.chainService, this.state.balanceService, 'rococo_assethub');
+          this.handlers[providerId] = new _assetHub.AssetHubSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, 'rococo_assethub');
           break;
         case _swap.SwapProviderId.SIMPLE_SWAP:
-          this.handlers[providerId] = new _simpleswapHandler.SimpleSwapHandler(this.chainService, this.state.balanceService);
+          this.handlers[providerId] = new _simpleswapHandler.SimpleSwapHandler(this.chainService, this.state.balanceService, this.state.feeService);
           break;
         default:
           throw new Error('Unsupported provider');

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

@@ -22,8 +22,10 @@ var _types = require("@subwallet/extension-base/types");
 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 _getId = require("@subwallet/extension-base/utils/getId");
 var _number = require("@subwallet/extension-base/utils/number");
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethereumjsUtil = require("ethereumjs-util");
 var _ethers = require("ethers");
 var _eventemitter = _interopRequireDefault(require("eventemitter3"));
@@ -90,6 +92,8 @@ class TransactionService {
       (0, _transfer.checkSupportForAction)(validationResponse, blockedActionsMap);
     }
     const transaction = transactionInput.transaction;
+    const nativeTokenInfo = this.state.chainService.getNativeTokenInfo(chain);
+    const tokenPayFeeInfo = transactionInput.nonNativeTokenPayFeeSlug ? this.chainService.getAssetBySlug(transactionInput.nonNativeTokenPayFeeSlug) : undefined;
 
     // Check duplicated transaction
     validationResponse.errors.push(...this.checkDuplicate(transactionInput));
@@ -99,6 +103,7 @@ class TransactionService {
     if (!chainInfo) {
       validationResponse.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR, (0, _i18next.t)('Cannot find network')));
     }
+    const substrateApi = this.state.chainService.getSubstrateApi(chainInfo.slug);
     const evmApi = this.state.chainService.getEvmApi(chainInfo.slug);
     const tonApi = this.state.chainService.getTonApi(chainInfo.slug);
     const isNoEvmApi = transaction && !(0, _helpers.isSubstrateTransaction)(transaction) && !(0, _helpers.isTonTransaction)(transaction) && !evmApi; // todo: should split isEvmTx && isNoEvmApi. Because other chains type also has no Evm Api
@@ -108,12 +113,13 @@ class TransactionService {
     }
 
     // Estimate fee for transaction
-    validationResponse.estimateFee = await (0, _transfer.estimateFeeForTransaction)(validationResponse, transaction, chainInfo, evmApi);
+    const id = (0, _getId.getId)();
+    const feeInfo = await this.state.feeService.subscribeChainFee(id, chain, 'evm');
+    validationResponse.estimateFee = await (0, _transfer.estimateFeeForTransaction)(validationResponse, transaction, chainInfo, evmApi, substrateApi, feeInfo, nativeTokenInfo, tokenPayFeeInfo, transactionInput.isTransferLocalTokenAndPayThatTokenAsFee);
     const chainInfoMap = this.state.chainService.getChainInfoMap();
 
     // Check account signing transaction
     (0, _transfer.checkSigningAccountForTransaction)(validationResponse, chainInfoMap);
-    const nativeTokenInfo = this.state.chainService.getNativeTokenInfo(chain);
     const nativeTokenAvailable = await this.state.balanceService.getTransferableBalance(address, chain, nativeTokenInfo.slug, extrinsicType);
 
     // Check available balance against transaction fee
@@ -912,6 +918,13 @@ class TransactionService {
     if (!payload.from) {
       payload.from = address;
     }
+    if (!payload.estimateGas) {
+      if (payload.maxFeePerGas) {
+        payload.estimateGas = new _bignumber.default((0, _utils4.anyNumberToBN)(payload.maxFeePerGas).toNumber()).multipliedBy(payload.gas || '0').toFixed(0);
+      } else {
+        payload.estimateGas = new _bignumber.default((0, _utils4.anyNumberToBN)(payload.gasPrice).toNumber()).multipliedBy(payload.gas || '0').toFixed(0);
+      }
+    }
     const isExternal = !!account.isExternal;
     const isInjected = !!account.isInjected;
     if (!hasError) {
@@ -1064,13 +1077,18 @@ class TransactionService {
     return emitter;
   }
   signAndSendSubstrateTransaction(_ref10) {
+    var _this$state$chainServ;
     let {
       address,
       chain,
+      feeCustom,
       id,
+      nonNativeTokenPayFeeSlug,
       transaction,
       url
     } = _ref10;
+    const tip = (feeCustom === null || feeCustom === void 0 ? void 0 : feeCustom.tip) || '0';
+    const feeAssetId = nonNativeTokenPayFeeSlug ? (_this$state$chainServ = this.state.chainService.getAssetBySlug(nonNativeTokenPayFeeSlug).metadata) === null || _this$state$chainServ === void 0 ? void 0 : _this$state$chainServ.multilocation : undefined;
     const emitter = new _eventemitter.default();
     const eventData = {
       id,
@@ -1096,7 +1114,9 @@ class TransactionService {
           };
         }
       },
-      withSignedTransaction: true
+      tip,
+      withSignedTransaction: true,
+      assetId: feeAssetId
     };
 
     // if (_isRuntimeUpdated(signedExtensions)) {

package/cjs/types/balance/transfer.js

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

package/cjs/types/fee/base.js

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

package/cjs/types/fee/evm.js

@@ -1 +1,16 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FeeOptionKey = void 0;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+let FeeOptionKey;
+exports.FeeOptionKey = FeeOptionKey;
+(function (FeeOptionKey) {
+  FeeOptionKey["SLOW"] = "slow";
+  FeeOptionKey["AVERAGE"] = "average";
+  FeeOptionKey["FAST"] = "fast";
+  FeeOptionKey["DEFAULT"] = "default";
+})(FeeOptionKey || (exports.FeeOptionKey = FeeOptionKey = {}));

package/cjs/types/fee/index.js

@@ -3,6 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _base = require("./base");
+Object.keys(_base).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _base[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _base[key];
+    }
+  });
+});
 var _evm = require("./evm");
 Object.keys(_evm).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -14,14 +25,36 @@ Object.keys(_evm).forEach(function (key) {
     }
   });
 });
-var _fee = require("./fee");
-Object.keys(_fee).forEach(function (key) {
+var _option = require("./option");
+Object.keys(_option).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _option[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _option[key];
+    }
+  });
+});
+var _subscription = require("./subscription");
+Object.keys(_subscription).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _subscription[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _subscription[key];
+    }
+  });
+});
+var _substrate = require("./substrate");
+Object.keys(_substrate).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _fee[key]) return;
+  if (key in exports && exports[key] === _substrate[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _fee[key];
+      return _substrate[key];
     }
   });
 });

package/cjs/types/fee/option.js

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

package/cjs/types/fee/subscription.js

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

package/cjs/types/fee/substrate.js

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

package/cjs/types/fee/ton.js

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

package/cjs/utils/fee/combine.js

@@ -0,0 +1,50 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.combineSubstrateFee = exports.combineEthFee = void 0;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const combineEthFee = (feeInfo, feeOptions, feeCustom) => {
+  let maxFeePerGas;
+  let maxPriorityFeePerGas;
+  if (feeOptions && feeOptions !== 'custom') {
+    var _feeInfo$options, _feeInfo$options2;
+    maxFeePerGas = (_feeInfo$options = feeInfo.options) === null || _feeInfo$options === void 0 ? void 0 : _feeInfo$options[feeOptions].maxFeePerGas;
+    maxPriorityFeePerGas = (_feeInfo$options2 = feeInfo.options) === null || _feeInfo$options2 === void 0 ? void 0 : _feeInfo$options2[feeOptions].maxPriorityFeePerGas;
+  } else if (feeOptions === 'custom' && feeCustom) {
+    maxFeePerGas = feeCustom.maxFeePerGas;
+    maxPriorityFeePerGas = feeCustom.maxPriorityFeePerGas;
+  } else {
+    var _feeInfo$options3, _feeInfo$options4;
+    maxFeePerGas = (_feeInfo$options3 = feeInfo.options) === null || _feeInfo$options3 === void 0 ? void 0 : _feeInfo$options3[feeInfo.options.default].maxFeePerGas;
+    maxPriorityFeePerGas = (_feeInfo$options4 = feeInfo.options) === null || _feeInfo$options4 === void 0 ? void 0 : _feeInfo$options4[feeInfo.options.default].maxPriorityFeePerGas;
+  }
+  if (feeInfo.gasPrice) {
+    return {
+      gasPrice: feeInfo.gasPrice
+    };
+  } else {
+    return {
+      maxFeePerGas,
+      maxPriorityFeePerGas
+    };
+  }
+};
+exports.combineEthFee = combineEthFee;
+const combineSubstrateFee = (_fee, _feeOptions, feeCustom) => {
+  let tip;
+  if (_feeOptions && _feeOptions !== 'custom') {
+    tip = _fee.options[_feeOptions].tip;
+  } else if (_feeOptions === 'custom' && feeCustom && 'tip' in feeCustom) {
+    tip = feeCustom.tip;
+  } else {
+    tip = _fee.options[_fee.options.default].tip;
+  }
+  return {
+    tip
+  };
+};
+exports.combineSubstrateFee = combineSubstrateFee;

package/cjs/utils/fee/index.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _combine = require("./combine");
+Object.keys(_combine).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _combine[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _combine[key];
+    }
+  });
+});
+var _transfer = require("./transfer");
+Object.keys(_transfer).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _transfer[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _transfer[key];
+    }
+  });
+});