@subwallet/extension-base 1.3.26-0 → 1.3.27-1

package/background/KoniTypes.d.ts

@@ -15,7 +15,7 @@ import { AuthUrls } from '@subwallet/extension-base/services/request-service/typ
 import { CrowdloanContributionsResponse } from '@subwallet/extension-base/services/subscan-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalSwapPathParams, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitYieldStepData, SubnetYieldPositionInfo, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalSwapPath, CommonOptimalTransferPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalSwapPathParamsV2, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitYieldStepData, SubnetYieldPositionInfo, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { RequestSubmitTransfer, RequestSubscribeTransfer, ResponseSubscribeTransfer } from '@subwallet/extension-base/types/balance/transfer';
 import { RequestClaimBridge } from '@subwallet/extension-base/types/bridge';
 import { GetNotificationParams, RequestIsClaimedPolygonBridge, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
@@ -1696,7 +1696,7 @@ export interface KoniRequestSignatures {
     'pri(freeBalance.subscribe)': [RequestFreeBalance, AmountDataWithId, AmountDataWithId];
     'pri(accounts.checkTransfer)': [RequestCheckTransfer, ValidateTransactionResponse];
     'pri(accounts.transfer)': [RequestSubmitTransfer, SWTransactionResponse];
-    'pri(accounts.getOptimalTransferProcess)': [RequestOptimalTransferProcess, CommonOptimalPath];
+    'pri(accounts.getOptimalTransferProcess)': [RequestOptimalTransferProcess, CommonOptimalTransferPath];
     'pri(accounts.approveSpending)': [TokenSpendingApprovalParams, SWTransactionResponse];
     'pri(accounts.checkCrossChainTransfer)': [RequestCheckCrossChainTransfer, ValidateTransactionResponse];
     'pri(accounts.crossChainTransfer)': [RequestCrossChainTransfer, SWTransactionResponse];
@@ -1778,8 +1778,9 @@ export interface KoniRequestSignatures {
     'pri(database.setLocalStorage)': [StorageDataInterface, boolean];
     'pri(database.getLocalStorage)': [string, string | null];
     'pri(swapService.subscribePairs)': [null, SwapPair[], SwapPair[]];
-    'pri(swapService.generateOptimalProcess)': [OptimalSwapPathParams, CommonOptimalPath];
+    'pri(swapService.getOptimalProcessOnSelectQuote)': [OptimalSwapPathParamsV2, CommonOptimalSwapPath];
     'pri(swapService.handleSwapRequest)': [SwapRequest, SwapRequestResult];
+    'pri(swapService.handleSwapRequestV2)': [SwapRequest, SwapRequestResult];
     'pri(swapService.handleSwapStep)': [SwapSubmitParams, SWTransactionResponse];
     'pri(swapService.getLatestQuote)': [SwapRequest, SwapQuoteResponse];
     'pri(swapService.validateSwapProcess)': [ValidateSwapProcessParams, TransactionError[]];

package/background/warnings/TransactionWarning.d.ts

@@ -1,6 +1,8 @@
 import { SWWarning } from '@subwallet/extension-base/background/warnings/SWWarning';
 import { TransactionWarningType } from '@subwallet/extension-base/types';
+import { TransactionError } from '../errors/TransactionError';
 export declare class TransactionWarning extends SWWarning {
     warningType: TransactionWarningType;
     constructor(warningType: TransactionWarningType, message?: string, code?: number, data?: unknown);
+    toError(): TransactionError | null;
 }

package/background/warnings/TransactionWarning.js

@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { SWWarning } from '@subwallet/extension-base/background/warnings/SWWarning';
-import { BasicTxWarningCode } from '@subwallet/extension-base/types';
+import { BasicTxErrorType, BasicTxWarningCode } from '@subwallet/extension-base/types';
 import { detectTranslate } from '@subwallet/extension-base/utils';
 import { t } from 'i18next';
+import { TransactionError } from "../errors/TransactionError.js";
 const defaultWarningMap = {
   [BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT]: {
     message: detectTranslate('Insufficient balance to cover existential deposit. Please decrease the transaction amount or increase your current balance'),
@@ -22,4 +23,18 @@ export class TransactionWarning extends SWWarning {
     super(warningType, warningMessage, (_defaultWarningMap$wa2 = defaultWarningMap[warningType]) === null || _defaultWarningMap$wa2 === void 0 ? void 0 : _defaultWarningMap$wa2.code, data);
     this.warningType = warningType;
   }
+  toError() {
+    const type = (() => {
+      switch (this.warningType) {
+        case BasicTxWarningCode.IS_BOUNCEABLE_ADDRESS:
+          return null;
+        case BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT:
+          return BasicTxErrorType.NOT_ENOUGH_EXISTENTIAL_DEPOSIT;
+      }
+    })();
+    if (!type) {
+      return null;
+    }
+    return new TransactionError(type, this.message, this.data);
+  }
 }

package/cjs/background/warnings/TransactionWarning.js

@@ -8,6 +8,7 @@ var _SWWarning = require("@subwallet/extension-base/background/warnings/SWWarnin
 var _types = require("@subwallet/extension-base/types");
 var _utils = require("@subwallet/extension-base/utils");
 var _i18next = require("i18next");
+var _TransactionError = require("../errors/TransactionError");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -28,5 +29,19 @@ class TransactionWarning extends _SWWarning.SWWarning {
     super(warningType, warningMessage, (_defaultWarningMap$wa2 = defaultWarningMap[warningType]) === null || _defaultWarningMap$wa2 === void 0 ? void 0 : _defaultWarningMap$wa2.code, data);
     this.warningType = warningType;
   }
+  toError() {
+    const type = (() => {
+      switch (this.warningType) {
+        case _types.BasicTxWarningCode.IS_BOUNCEABLE_ADDRESS:
+          return null;
+        case _types.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT:
+          return _types.BasicTxErrorType.NOT_ENOUGH_EXISTENTIAL_DEPOSIT;
+      }
+    })();
+    if (!type) {
+      return null;
+    }
+    return new _TransactionError.TransactionError(type, this.message, this.data);
+  }
 }
 exports.TransactionWarning = TransactionWarning;

package/cjs/core/logic-validation/index.js

@@ -3,9 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  validateSpendingAndFeePayment: true
+};
+exports.validateSpendingAndFeePayment = validateSpendingAndFeePayment;
+var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _types = require("@subwallet/extension-base/types");
+var _i18next = require("i18next");
 var _swap = require("./swap");
 Object.keys(_swap).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _swap[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -17,6 +26,7 @@ Object.keys(_swap).forEach(function (key) {
 var _request = require("./request");
 Object.keys(_request).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _request[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -28,6 +38,7 @@ Object.keys(_request).forEach(function (key) {
 var _earning = require("./earning");
 Object.keys(_earning).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _earning[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -39,6 +50,7 @@ Object.keys(_earning).forEach(function (key) {
 var _transfer = require("./transfer");
 Object.keys(_transfer).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _transfer[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -46,4 +58,23 @@ Object.keys(_transfer).forEach(function (key) {
       return _transfer[key];
     }
   });
-});
+});
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+// apply for all tx: transfer, xcm, swap, earning
+function validateSpendingAndFeePayment(spendingToken, feeToken, bnSpendingAmount, bnFromTokenBalance, bnFeeAmount, bnFeeTokenBalance) {
+  if (spendingToken.slug === feeToken.slug) {
+    if (bnFromTokenBalance.lte(bnSpendingAmount.plus(bnFeeAmount).plus((0, _utils._isNativeToken)(spendingToken) ? '0' : (0, _utils._getTokenMinAmount)(spendingToken)))) {
+      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE, (0, _i18next.t)(`Insufficient balance. Deposit ${spendingToken.symbol} and try again.`))];
+    }
+  } else {
+    if (bnFromTokenBalance.lte(bnSpendingAmount.plus((0, _utils._isNativeToken)(spendingToken) ? '0' : (0, _utils._getTokenMinAmount)(spendingToken)))) {
+      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE, (0, _i18next.t)(`Insufficient balance. Deposit ${spendingToken.symbol} and try again.`))];
+    }
+    if (bnFeeTokenBalance.lte(bnFeeAmount.plus((0, _utils._isNativeToken)(feeToken) ? '0' : (0, _utils._getTokenMinAmount)(feeToken)))) {
+      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE, (0, _i18next.t)(`Insufficient balance. Deposit ${feeToken.symbol} and try again.`))];
+    }
+  }
+  return [];
+}

package/cjs/core/utils.js

@@ -7,6 +7,7 @@ exports._getAppliedExistentialDeposit = _getAppliedExistentialDeposit;
 exports._isAddress = _isAddress;
 exports._isNotDuplicateAddress = _isNotDuplicateAddress;
 exports._isNotNull = _isNotNull;
+exports._isSufficientToken = void 0;
 exports._isSupportLedgerAccount = _isSupportLedgerAccount;
 exports._isValidAddressForEcosystem = _isValidAddressForEcosystem;
 exports._isValidCardanoAddressFormat = _isValidCardanoAddressFormat;
@@ -15,9 +16,11 @@ exports._isValidTonAddressFormat = _isValidTonAddressFormat;
 exports.getMaxBigInt = getMaxBigInt;
 exports.getStrictMode = getStrictMode;
 exports.ledgerMustCheckNetwork = ledgerMustCheckNetwork;
+var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _types = require("@subwallet/extension-base/core/substrate/types");
+var _types2 = require("@subwallet/extension-base/core/substrate/types");
 var _utils = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils");
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
@@ -26,7 +29,7 @@ var _utilCrypto = require("@polkadot/util-crypto");
 // SPDX-License-Identifier: Apache-2.0
 
 function getStrictMode(type, extrinsicType) {
-  if (type === _types.BalanceAccountType.FrameSystemAccountInfo) {
+  if (type === _types2.BalanceAccountType.FrameSystemAccountInfo) {
     return !extrinsicType || ![_KoniTypes.ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType);
   }
   return false;
@@ -146,4 +149,23 @@ function _isSupportLedgerAccount(validateRecipientParams) {
     }
   }
   return '';
-}
+}
+const _isSufficientToken = async (tokenInfo, substrateApi) => {
+  if (_constants.SUFFICIENT_CHAIN.includes(tokenInfo.originChain) && tokenInfo.assetType !== _types._AssetType.NATIVE) {
+    const assetId = (0, _utils2._isBridgedToken)(tokenInfo) ? (0, _utils2._getXcmAssetMultilocation)(tokenInfo) : (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
+    const queryParams = {
+      section: 'query',
+      module: 'foreignAssets',
+      method: 'asset',
+      args: [assetId]
+    };
+    if (!(0, _utils2._isBridgedToken)(tokenInfo)) {
+      queryParams.module = 'assets';
+    }
+    const metadata = await substrateApi.makeRpcQuery(queryParams);
+    return metadata.isSufficient;
+  } else {
+    return false;
+  }
+};
+exports._isSufficientToken = _isSufficientToken;