@subwallet/extension-base 1.3.70-2 → 1.3.72-0

package/cjs/types/substrateProxyAccount/index.js

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

package/cjs/types/swap/index.js

@@ -55,7 +55,8 @@ exports.SwapFeeType = SwapFeeType;
   SwapFeeType["PLATFORM_FEE"] = "PLATFORM_FEE";
   SwapFeeType["NETWORK_FEE"] = "NETWORK_FEE";
   SwapFeeType["WALLET_FEE"] = "WALLET_FEE";
-})(SwapFeeType || (exports.SwapFeeType = SwapFeeType = {}));
+})(SwapFeeType || (exports.SwapFeeType = SwapFeeType = {})); // todo: will be more
+// parameters & responses
 let DynamicSwapType;
 exports.DynamicSwapType = DynamicSwapType;
 (function (DynamicSwapType) {

package/cjs/types/transaction/process.js

@@ -25,4 +25,6 @@ exports.StepStatus = StepStatus;
   StepStatus["TIMEOUT"] = "TIMEOUT";
 })(StepStatus || (exports.StepStatus = StepStatus = {}));
 const PROCESSING_STEP_STATUS = [StepStatus.PREPARE, StepStatus.SUBMITTING, StepStatus.PROCESSING];
+
+// temp for avoid conflict // todo: recheck to refactor BriefXcmStepV2 and BriefSwapStepV2 later;
 exports.PROCESSING_STEP_STATUS = PROCESSING_STEP_STATUS;

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

@@ -45,4 +45,20 @@ exports.YieldStepType = YieldStepType;
   YieldStepType["MINT_SDOT"] = "MINT_SDOT";
   YieldStepType["MINT_STDOT"] = "MINT_STDOT";
   YieldStepType["TOKEN_APPROVAL"] = "TOKEN_APPROVAL";
-})(YieldStepType || (exports.YieldStepType = YieldStepType = {}));
+})(YieldStepType || (exports.YieldStepType = YieldStepType = {}));
+/**
+ * @interface YieldStepDetail
+ * @extends BaseYieldStepDetail
+ * @description Detail of a step
+ * @prop {number} id - Step's id
+ * */
+/**
+ * @interface YieldTokenBaseInfo
+ * @prop {string} slug - Token's slug
+ * @prop {string} [amount] - Token's amount
+ * */
+/** Base info and fee of a step */
+/**
+ * @interface OptimalYieldPath
+ * @description Result after generate steps
+ * */

package/cjs/utils/account/common.js

@@ -7,7 +7,6 @@ exports.getAccountJsonByAddress = exports.getAccountChainTypeForAddress = export
 exports.getAddressesByChainType = getAddressesByChainType;
 exports.getAddressesByChainTypeMap = getAddressesByChainTypeMap;
 exports.isAccountAll = isAccountAll;
-exports.modifyAccountName = void 0;
 exports.quickFormatAddressToCompare = quickFormatAddressToCompare;
 exports.reformatAddress = reformatAddress;
 var _constants = require("@subwallet/extension-base/constants");
@@ -80,7 +79,6 @@ function getAddressesByChainType(addresses, chainTypes, chainInfo) {
     return addressByChainTypeMap[chainType];
   }).flat(); // todo: recheck
 }
-
 function getAddressesByChainTypeMap(addresses, chainInfo) {
   const addressByChainType = {
     substrate: [],
@@ -120,29 +118,6 @@ function quickFormatAddressToCompare(address) {
   return reformatAddress(address, 42).toLowerCase();
 }
 
-/** @deprecated */
-const modifyAccountName = (type, name, modify) => {
-  if (!modify) {
-    return name;
-  }
-  let network = '';
-  switch (type) {
-    case 'sr25519':
-    case 'ed25519':
-    case 'ecdsa':
-      network = 'Substrate';
-      break;
-    case 'ethereum':
-      network = 'EVM';
-      break;
-    case 'ton':
-    case 'ton-native':
-      network = 'Ton';
-      break;
-  }
-  return network ? [name, network].join(' - ') : name;
-};
-
 /**
  * @function getAccountJsonByAddress
  * @desc Get account info by address
@@ -152,7 +127,6 @@ const modifyAccountName = (type, name, modify) => {
  * @param {string} address - Address
  * @returns {AccountJson|null}  - Account info or null if not found
  */
-exports.modifyAccountName = modifyAccountName;
 const getAccountJsonByAddress = address => {
   try {
     const pair = _uiKeyring.keyring.getPair(address);

package/cjs/utils/account/derive/info/solo.js

@@ -59,7 +59,7 @@ const parseUnifiedSuriToDerivationPath = (suri, type) => {
         return path.replace('{firstIndex}', firstIndex);
       }
     }
-    if (_types.SubstrateKeypairTypes.includes(type)) {
+    if (_types.DefaultSubstrateKeypairTypes.includes(type)) {
       return suri;
     }
   }
@@ -120,7 +120,7 @@ const getSoloDerivationInfo = function (type) {
         };
       }
     } else {
-      if (_types.SubstrateKeypairTypes.includes(type)) {
+      if (_types.DefaultSubstrateKeypairTypes.includes(type)) {
         const _type = type;
         const validateTypeFunc = _type === 'sr25519' ? _validate.validateSr25519DerivationPath : raw => (0, _validate.validateOtherSubstrateDerivationPath)(raw, _type);
         const validateTypeRs = validateTypeFunc(suri);
@@ -256,7 +256,7 @@ const findSoloNextDerive = parentAddress => {
       break;
     }
   }
-  const isSubstrate = _types.SubstrateKeypairTypes.includes(parentPair.type);
+  const isSubstrate = _types.DefaultSubstrateKeypairTypes.includes(parentPair.type);
   const indexes = currentDepth > 0 ? deriveInfo.autoIndexes || [] : [];
   indexes.push(index);
   const suri = isSubstrate ? [deriveInfo.suri || '', index].join('//') : '//'.concat(indexes.join('//'));
@@ -296,7 +296,10 @@ const derivePair = (parentPair, name, suri, derivationPath) => {
 };
 exports.derivePair = derivePair;
 const getSuri = (seed, type) => {
-  const extraPath = type ? (0, _keyring.getDerivePath)(type)(0) : '';
+  if (!type) {
+    return seed;
+  }
+  const extraPath = (0, _keyring.getDerivePath)(type)(0);
   return seed + (extraPath ? '/' + extraPath : '');
 };
 exports.getSuri = getSuri;

package/cjs/utils/account/derive/validate.js

@@ -259,7 +259,7 @@ const validateDerivationPath = (raw, type) => {
       return validateTonDerivationPath(raw);
     } else if (type === 'sr25519') {
       return validateSr25519DerivationPath(raw);
-    } else if (type === 'ed25519' || type === 'ecdsa') {
+    } else if (type === 'ed25519' || type === 'ed25519-tw' || type === 'ecdsa') {
       return validateOtherSubstrateDerivationPath(raw, type);
     } else if (type === 'cardano') {
       return validateCardanoDerivationPath(raw);

package/cjs/utils/account/transform.js

@@ -115,7 +115,10 @@ const getAccountActions = (signMode, networkType, type, _meta, parentAccount) =>
   // QR
   if (signMode === _types2.AccountSignMode.PASSWORD) {
     if (networkType === _types2.AccountChainType.ETHEREUM || networkType === _types2.AccountChainType.SUBSTRATE) {
-      result.push(_types2.AccountActions.EXPORT_QR);
+      if (type !== 'ed25519-tw') {
+        // todo: recheck if can export this account type
+        result.push(_types2.AccountActions.EXPORT_QR);
+      }
     }
   }
 
@@ -165,14 +168,15 @@ const EARN_VMANTA_ACTIONS = [_KoniTypes.ExtrinsicType.MINT_VMANTA, _KoniTypes.Ex
 const EVM_ACTIONS = [_KoniTypes.ExtrinsicType.TOKEN_SPENDING_APPROVAL, _KoniTypes.ExtrinsicType.EVM_EXECUTE];
 const CLAIM_AVAIL_BRIDGE = [_KoniTypes.ExtrinsicType.CLAIM_BRIDGE];
 const OPEN_GOV_ACTIONS = [_KoniTypes.ExtrinsicType.GOV_VOTE, _KoniTypes.ExtrinsicType.GOV_UNVOTE, _KoniTypes.ExtrinsicType.GOV_UNLOCK_VOTE];
+const SUBSTRATE_PROXY_ACTION = [_KoniTypes.ExtrinsicType.ADD_SUBSTRATE_PROXY_ACCOUNT, _KoniTypes.ExtrinsicType.REMOVE_SUBSTRATE_PROXY_ACCOUNT];
 const OTHER_ACTIONS = [_KoniTypes.ExtrinsicType.TRANSFER_XCM, _KoniTypes.ExtrinsicType.SEND_NFT, _KoniTypes.ExtrinsicType.SWAP, _KoniTypes.ExtrinsicType.CROWDLOAN];
 const getAccountTransactionActions = (signMode, networkType, type, _meta, _specialNetwork) => {
   if ([_types2.AccountSignMode.PASSWORD, _types2.AccountSignMode.INJECTED].includes(signMode)) {
     switch (networkType) {
       case _types2.AccountChainType.SUBSTRATE:
-        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_LDOT_ACTIONS, ...EARN_SDOT_ACTIONS, ...EARN_QDOT_ACTIONS, ...EARN_VMANTA_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...OPEN_GOV_ACTIONS, ...OTHER_ACTIONS];
+        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_LDOT_ACTIONS, ...EARN_SDOT_ACTIONS, ...EARN_QDOT_ACTIONS, ...EARN_VMANTA_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...OPEN_GOV_ACTIONS, ...SUBSTRATE_PROXY_ACTION, ...OTHER_ACTIONS];
       case _types2.AccountChainType.ETHEREUM:
-        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_STDOT_ACTIONS, ...OTHER_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...EVM_ACTIONS];
+        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_STDOT_ACTIONS, ...OTHER_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...SUBSTRATE_PROXY_ACTION, ...EVM_ACTIONS];
       case _types2.AccountChainType.TON:
         return [...BASE_TRANSFER_ACTIONS];
       case _types2.AccountChainType.CARDANO:
@@ -183,7 +187,7 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
   } else if (signMode === _types2.AccountSignMode.QR) {
     switch (networkType) {
       case _types2.AccountChainType.SUBSTRATE:
-        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_LDOT_ACTIONS, ...EARN_SDOT_ACTIONS, ...EARN_QDOT_ACTIONS, ...EARN_VMANTA_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...OPEN_GOV_ACTIONS, ...OTHER_ACTIONS];
+        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_LDOT_ACTIONS, ...EARN_SDOT_ACTIONS, ...EARN_QDOT_ACTIONS, ...EARN_VMANTA_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...OPEN_GOV_ACTIONS, ...SUBSTRATE_PROXY_ACTION, ...OTHER_ACTIONS];
       case _types2.AccountChainType.ETHEREUM:
         return [...(_constants.isProductionMode ? [] : [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_STDOT_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...OTHER_ACTIONS, ...EVM_ACTIONS])];
       case _types2.AccountChainType.TON:
@@ -198,7 +202,7 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
       case _types2.AccountChainType.SUBSTRATE:
         return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_VMANTA_ACTIONS, ...EARN_LDOT_ACTIONS, ...EARN_SDOT_ACTIONS,
         // ...EARN_QDOT_ACTIONS,
-        ...OPEN_GOV_ACTIONS, ...OTHER_ACTIONS];
+        ...OPEN_GOV_ACTIONS, ...SUBSTRATE_PROXY_ACTION, ...OTHER_ACTIONS];
       case _types2.AccountChainType.ETHEREUM:
         return [...BASE_TRANSFER_ACTIONS, ...EARN_STDOT_ACTIONS, ...EVM_ACTIONS, ...CLAIM_AVAIL_BRIDGE, _KoniTypes.ExtrinsicType.STAKING_WITHDRAW,
         // For liquid staking
@@ -259,6 +263,7 @@ const getAccountTokenTypes = type => {
       return [_types._AssetType.NATIVE, _types._AssetType.LOCAL, _types._AssetType.ERC20, _types._AssetType.ERC721];
     case 'sr25519':
     case 'ed25519':
+    case 'ed25519-tw':
     case 'ecdsa':
       return [_types._AssetType.NATIVE, _types._AssetType.LOCAL, _types._AssetType.PSP22, _types._AssetType.PSP34, _types._AssetType.GRC20, _types._AssetType.ERC721, _types._AssetType.VFT];
     case 'ton':

package/cjs/utils/auth.js

@@ -13,7 +13,7 @@ const isAddressValidWithAuthType = (address, accountAuthTypes) => {
   const keypairType = (0, _keyring.getKeypairTypeByAddress)(address);
   const validTypes = {
     evm: _types.EthereumKeypairTypes,
-    substrate: _types.SubstrateKeypairTypes,
+    substrate: _types.AllSubstrateKeypairTypes,
     ton: _types.TonKeypairTypes,
     cardano: _types.CardanoKeypairTypes,
     bitcoin: _types.BitcoinKeypairTypes

package/cjs/utils/bitcoin/utxo-management.js

@@ -249,7 +249,6 @@ async function getRuneUtxos(bitcoinApi, address) {
         status: {
           confirmed: true // not use in filter out rune utxos
         },
-
         value: utxoValue
       };
       runeUtxos.push(item);

package/cjs/utils/environment.js

@@ -11,7 +11,8 @@ var _mv = require("@subwallet/extension-base/utils/mv3");
 var _bowser = _interopRequireDefault(require("bowser"));
 var _KoniTypes = require("../background/KoniTypes");
 var _constants = require("../constants");
-var _navigator3;
+var _navigator3; // Copyright 2019-2022 @polkadot/extension authors & contributors
+// SPDX-License-Identifier: Apache-2.0
 function detectRuntimeEnvironment() {
   if (_mv.isSupportWindow && typeof document !== 'undefined') {
     var _navigator, _window$location, _window$location2;

package/cjs/utils/fee/transfer.js

@@ -31,8 +31,7 @@ var bitcoin = _interopRequireWildcard(require("bitcoinjs-lib"));
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _combine = require("./combine");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -330,7 +329,8 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
     feeType: feeChainType,
     id: id,
     error,
-    isEvmRpcError: isEvmRpcError
+    isEvmRpcError: isEvmRpcError,
+    maxTransferableWithoutFee: freeBalance.value
   };
 };
 exports.calculateTransferMaxTransferable = calculateTransferMaxTransferable;
@@ -522,7 +522,8 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
     feeOptions: feeOptions,
     feeType: feeChainType,
     id: id,
-    error
+    error,
+    maxTransferableWithoutFee: freeBalance.value
   };
 };
 exports.calculateXcmMaxTransferable = calculateXcmMaxTransferable;

package/cjs/utils/index.js

@@ -602,7 +602,6 @@ function isSameAddress(address1, address2) {
   }
   return (0, _account.reformatAddress)(address1, 0) === (0, _account.reformatAddress)(address2, 0); // TODO: maybe there's a better way
 }
-
 function isSameAddressType(address1, address2) {
   const isSameEvmAddress = (0, _utilCrypto.isEthereumAddress)(address1) && (0, _utilCrypto.isEthereumAddress)(address2);
   const isSameTonAddress = (0, _keyring.isTonAddress)(address1) && (0, _keyring.isTonAddress)(address2);
@@ -614,7 +613,7 @@ function isAddressAndChainCompatible(address, chain) {
   const keypairType = (0, _keyring.getKeypairTypeByAddress)(address);
   const isEvmCompatible = (0, _utils._isChainEvmCompatible)(chain) && _types.EthereumKeypairTypes.includes(keypairType); // some chains compatible to substrate and evm, and use evm-address
   const isTonCompatible = (0, _utils._isPureTonChain)(chain) && _types.TonKeypairTypes.includes(keypairType);
-  const isSubstrateCompatible = (0, _utils._isPureSubstrateChain)(chain) && _types.SubstrateKeypairTypes.includes(keypairType);
+  const isSubstrateCompatible = (0, _utils._isPureSubstrateChain)(chain) && _types.AllSubstrateKeypairTypes.includes(keypairType);
   const isCardanoCompatible = (0, _utils._isPureCardanoChain)(chain) && _types.CardanoKeypairTypes.includes(keypairType);
   const isBitcoinCompatible = (0, _utils._isPureBitcoinChain)(chain) && _types.BitcoinKeypairTypes.includes(keypairType);
   return isEvmCompatible || isSubstrateCompatible || isTonCompatible || isCardanoCompatible || isBitcoinCompatible;

package/constants/blocked-actions.js

@@ -9,6 +9,9 @@ export const APP_VER = packageInfo.version;
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'koni-dev';
 const targetFolder = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list' : 'preview';
+
+// todo: check if can check exactly App Environment, Browser Type, OS Type
+
 export async function fetchBlockedConfigObjects() {
   const targetFile = `${targetFolder}/envConfig.json`;
   return await fetchStaticData('blocked-actions', targetFile);

package/core/logic-validation/recipientAddress.js

@@ -17,7 +17,7 @@ function getConditions(validateRecipientParams) {
     toAddress
   } = validateRecipientParams;
   const conditions = [];
-  const isSendAction = [ActionType.SEND_FUND, ActionType.SEND_NFT].includes(actionType);
+  const isSendAction = [ActionType.SEND_FUND, ActionType.SEND_NFT, ActionType.MANAGE_SUBSTRATE_PROXY_ACCOUNT].includes(actionType);
   conditions.push(ValidationCondition.IS_NOT_NULL);
   conditions.push(ValidationCondition.IS_ADDRESS);
   conditions.push(ValidationCondition.IS_VALID_ADDRESS_FOR_ECOSYSTEM);

package/core/logic-validation/swap.js

@@ -34,7 +34,6 @@ export function _validateBalanceToSwapOnAssetHub(fromToken, feeToken, feeTokenCh
       return new TransactionError(SwapErrorType.SWAP_NOT_ENOUGH_BALANCE, `Insufficient balance. You need more than ${parsedMinSwapValue} ${fromToken.symbol} to start swapping. Deposit ${fromToken.symbol} and try again.`); // todo: min swap or amount?
     }
   }
-
   if (new BigN(swapAmount).gte(fromTokenBalance)) {
     const parsedMaxBalanceSwap = formatNumber(fromTokenBalance, _getAssetDecimals(fromToken));
     return new TransactionError(SwapErrorType.SWAP_EXCEED_ALLOWANCE, `Amount too high. Lower your amount ${bnFromTokenBalance.gt(0) ? `below ${parsedMaxBalanceSwap} ${fromToken.symbol}` : ''} and try again`);
@@ -62,7 +61,6 @@ export function _validateBalanceToSwap(fromToken, feeToken, feeTokenChainInfo, f
       return new TransactionError(SwapErrorType.SWAP_NOT_ENOUGH_BALANCE, `Insufficient balance. You need more than ${parsedMinSwapValue} ${fromToken.symbol} to start swapping. Deposit ${fromToken.symbol} and try again.`); // todo: min swap or amount?
     }
   }
-
   if (new BigN(swapAmount).gte(fromTokenBalance)) {
     const parsedMaxBalanceSwap = formatNumber(fromTokenBalance, _getAssetDecimals(fromToken));
     return new TransactionError(SwapErrorType.SWAP_EXCEED_ALLOWANCE, `Amount too high. Lower your amount ${bnFromTokenBalance.gt(0) ? `below ${parsedMaxBalanceSwap} ${fromToken.symbol}` : ''} and try again`);
@@ -206,7 +204,6 @@ export function _validateBalanceToSwapV2(request) {
       return new TransactionError(SwapErrorType.SWAP_NOT_ENOUGH_BALANCE, `Insufficient balance. You need more than ${parsedMinSwapValue} ${fromToken.symbol} to start swapping. Deposit ${fromToken.symbol} and try again.`); // todo: min swap or amount?
     }
   }
-
   return undefined;
 }
 export function _validateSwapRecipientV2(destChainInfo, recipient) {

package/core/logic-validation/transfer.d.ts

@@ -13,8 +13,8 @@ export declare function validateXcmTransferRequest(destTokenInfo: _ChainAsset |
 export declare function checkSupportForFeature(validationResponse: SWTransactionResponse, blockedFeaturesList: string[], chainInfo: _ChainInfo): void;
 export declare function checkSupportForAction(validationResponse: SWTransactionResponse, blockedActionsMap: Record<ExtrinsicType, string[]>): void;
 export declare function checkSupportForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction): void;
-export declare function estimateFeeForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction, chainInfo: _ChainInfo, evmApi: _EvmApi, substrateApi: _SubstrateApi, priceMap: Record<string, number>, feeInfo: FeeInfo, nativeTokenInfo: _ChainAsset, nonNativeTokenPayFeeInfo: _ChainAsset | undefined, isTransferLocalTokenAndPayThatTokenAsFee: boolean | undefined): Promise<FeeData>;
-export declare function checkSigningAccountForTransaction(validationResponse: SWTransactionResponse, chainInfoMap: Record<string, _ChainInfo>): void;
-export declare function checkBalanceWithTransactionFee(validationResponse: SWTransactionResponse, transactionInput: SWTransactionInput, nativeTokenInfo: _ChainAsset, nativeTokenAvailable: AmountData): void;
+export declare function estimateFeeForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction, chainInfo: _ChainInfo, evmApi: _EvmApi, substrateApi: _SubstrateApi, priceMap: Record<string, number>, feeInfo: FeeInfo, nativeTokenInfo: _ChainAsset, nonNativeTokenPayFeeInfo: _ChainAsset | undefined, isTransferLocalTokenAndPayThatTokenAsFee: boolean | undefined, signerSubstrateProxyAddress?: string): Promise<FeeData>;
+export declare function checkSigningAccountForTransaction(validationResponse: SWTransactionResponse, chainInfoMap: Record<string, _ChainInfo>, signer: string): void;
+export declare function checkBalanceWithTransactionFee(validationResponse: SWTransactionResponse, transactionInput: SWTransactionInput, nativeTokenInfo: _ChainAsset, nativeTokenAvailable: AmountData, substrateProxyAccountNativeTokenAvailable?: AmountData): void;
 export declare function checkTonAddressBounceableAndAccountNotActive(tonApi: _TonApi, validationResponse: SWTransactionResponse): Promise<void>;
 export declare function validateXcmMinAmountToMythos(destChain: string, destToken: string, amount: string): TransactionError | undefined;

package/core/logic-validation/transfer.js

@@ -13,7 +13,7 @@ import { _getAssetDecimals, _getAssetPriceId, _getAssetSymbol, _getChainNativeTo
 import { calculateToAmountByReservePool, FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE } from '@subwallet/extension-base/services/fee-service/utils';
 import { isBitcoinTransaction, isCardanoTransaction, isSubstrateTransaction, isTonTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, TransferTxErrorType } from '@subwallet/extension-base/types';
-import { balanceFormatter, combineBitcoinFee, combineEthFee, formatNumber, getSizeInfo, pairToAccount } from '@subwallet/extension-base/utils';
+import { balanceFormatter, combineBitcoinFee, combineEthFee, formatNumber, getAccountJsonByAddress, getSizeInfo, isSameAddress, pairToAccount } from '@subwallet/extension-base/utils';
 import { isCardanoAddress, isTonAddress } from '@subwallet/keyring';
 import { keyring } from '@subwallet/ui-keyring';
 import BigN from 'bignumber.js';
@@ -310,7 +310,7 @@ export function checkSupportForTransaction(validationResponse, transaction) {
     }
   }
 }
-export async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, isTransferLocalTokenAndPayThatTokenAsFee) {
+export async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, isTransferLocalTokenAndPayThatTokenAsFee, signerSubstrateProxyAddress) {
   const estimateFee = {
     symbol: '',
     decimals: 0,
@@ -331,8 +331,14 @@ export async function estimateFeeForTransaction(validationResponse, transaction,
   if (transaction) {
     try {
       if (isSubstrateTransaction(transaction)) {
-        var _validationResponse$x;
-        estimateFee.value = (_validationResponse$x = validationResponse.xcmFeeDryRun) !== null && _validationResponse$x !== void 0 ? _validationResponse$x : (await transaction.paymentInfo(validationResponse.address)).partialFee.toString();
+        if (signerSubstrateProxyAddress && !isSameAddress(signerSubstrateProxyAddress, address)) {
+          await substrateApi.isReady;
+          const estimateExtrinsic = substrateApi.api.tx.proxy.proxy(address, null, transaction);
+          estimateFee.value = (await estimateExtrinsic.paymentInfo(signerSubstrateProxyAddress)).partialFee.toString();
+        } else {
+          var _validationResponse$x;
+          estimateFee.value = (_validationResponse$x = validationResponse.xcmFeeDryRun) !== null && _validationResponse$x !== void 0 ? _validationResponse$x : (await transaction.paymentInfo(validationResponse.address)).partialFee.toString();
+        }
       } else if (isTonTransaction(transaction)) {
         estimateFee.value = transaction.estimateFee; // todo: might need to update logic estimate fee inside for future actions excluding normal transfer Ton and Jetton
       } else if (isCardanoTransaction(transaction)) {
@@ -399,14 +405,13 @@ export async function estimateFeeForTransaction(validationResponse, transaction,
   }
   return estimateFee;
 }
-export function checkSigningAccountForTransaction(validationResponse, chainInfoMap) {
+export function checkSigningAccountForTransaction(validationResponse, chainInfoMap, signer) {
   const {
-    address,
     chain,
     chainType,
     extrinsicType
   } = validationResponse;
-  const pair = keyring.getPair(address);
+  const pair = keyring.getPair(signer);
   if (!pair) {
     validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, t('bg.TRANSACTION.core.validation.transfer.unableToFindAccount')));
   } else {
@@ -426,7 +431,7 @@ export function checkSigningAccountForTransaction(validationResponse, chainInfoM
     }
   }
 }
-export function checkBalanceWithTransactionFee(validationResponse, transactionInput, nativeTokenInfo, nativeTokenAvailable) {
+export function checkBalanceWithTransactionFee(validationResponse, transactionInput, nativeTokenInfo, nativeTokenAvailable, substrateProxyAccountNativeTokenAvailable) {
   if (!validationResponse.estimateFee) {
     // todo: estimateFee should be must-have, need to refactor interface
     return;
@@ -435,6 +440,7 @@ export function checkBalanceWithTransactionFee(validationResponse, transactionIn
     edAsWarning,
     extrinsicType,
     isTransferAll,
+    signerSubstrateProxyAddress,
     skipFeeValidation,
     tokenPayFeeSlug
   } = transactionInput;
@@ -445,12 +451,29 @@ export function checkBalanceWithTransactionFee(validationResponse, transactionIn
   const bnFee = new BigN(validationResponse.estimateFee.value);
   const bnNativeTokenAvailable = new BigN(nativeTokenAvailable.value);
   const bnNativeTokenTransferAmount = new BigN(validationResponse.transferNativeAmount || '0');
-  if (!bnNativeTokenAvailable.gt(0)) {
+  if (!bnNativeTokenAvailable.gt(0) && !substrateProxyAccountNativeTokenAvailable) {
     validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE));
   }
   const isChainNotSupportTransferAll = [..._TRANSFER_CHAIN_GROUP.acala, ..._TRANSFER_CHAIN_GROUP.genshiro, ..._TRANSFER_CHAIN_GROUP.bitcountry, ..._TRANSFER_CHAIN_GROUP.statemine].includes(nativeTokenInfo.originChain);
-  if (bnNativeTokenTransferAmount.plus(bnFee).gt(bnNativeTokenAvailable) && (!isTransferAll || isChainNotSupportTransferAll)) {
-    validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE)); // todo: should be generalized and reused in all features
+  if (!substrateProxyAccountNativeTokenAvailable) {
+    if (bnNativeTokenTransferAmount.plus(bnFee).gt(bnNativeTokenAvailable) && (!isTransferAll || isChainNotSupportTransferAll)) {
+      validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE)); // todo: should be generalized and reused in all features
+    }
+  } else {
+    const bnSubstrateProxyAccountNativeTokenAvailable = new BigN(substrateProxyAccountNativeTokenAvailable.value);
+    if (bnNativeTokenTransferAmount.gt(bnNativeTokenAvailable) && (!isTransferAll || isChainNotSupportTransferAll) || bnFee.gt(bnSubstrateProxyAccountNativeTokenAvailable)) {
+      if (signerSubstrateProxyAddress) {
+        const account = getAccountJsonByAddress(signerSubstrateProxyAddress);
+        const accountName = account === null || account === void 0 ? void 0 : account.name;
+        validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, t('bg.TRANSACTION.core.validation.transfer.proxyAccountNotEnoughBalance', {
+          replace: {
+            accountName: accountName || signerSubstrateProxyAddress
+          }
+        })));
+      } else {
+        validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE));
+      }
+    }
   }
 
   // todo: only system.pallet has metadata, we should add for other pallets and mechanisms as well

package/core/substrate/system-pallet.js

@@ -18,7 +18,6 @@ export function _getSystemPalletTransferable(accountInfo, existentialDeposit, ex
 export function _canAccountBeReaped(accountInfo) {
   return accountInfo.consumers === 0; // might need to check refCount
 }
-
 export function _isAccountActive(accountInfo) {
   return !(accountInfo.consumers === 0 && accountInfo.providers === 0 && accountInfo.sufficients === 0);
 }
@@ -46,7 +45,6 @@ function _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMo
   }
   return _canAccountBeReaped(accountInfo) ? BigInt(0) : bnExistentialDeposit; // account for ED here will go better with max transfer logic
 }
-
 function _getSystemPalletTransferableV2(accountInfo, existentialDeposit, strictMode) {
   const bnLocked = BigInt(accountInfo.data.frozen) - BigInt(accountInfo.data.reserved); // locked can go below 0 but this shouldn't matter
   const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode);

package/core/types.d.ts

@@ -15,7 +15,8 @@ export declare enum ValidationCondition {
 export declare enum ActionType {
     SEND_FUND = "SEND_FUND",
     SEND_NFT = "SEND_NFT",
-    SWAP = "SWAP"
+    SWAP = "SWAP",
+    MANAGE_SUBSTRATE_PROXY_ACCOUNT = "MANAGE_SUBSTRATE_PROXY_ACCOUNT"
 }
 export interface ValidateRecipientParams {
     srcChain: string;

package/core/types.js

@@ -18,4 +18,5 @@ export let ActionType;
   ActionType["SEND_FUND"] = "SEND_FUND";
   ActionType["SEND_NFT"] = "SEND_NFT";
   ActionType["SWAP"] = "SWAP";
+  ActionType["MANAGE_SUBSTRATE_PROXY_ACCOUNT"] = "MANAGE_SUBSTRATE_PROXY_ACCOUNT";
 })(ActionType || (ActionType = {}));

package/koni/api/nft/wasm_nft/index.js

@@ -398,7 +398,6 @@ export class WasmNftApi extends BaseNftApi {
             }
           }
         }));
-
         nftOwnerMap[address] = nftIds;
       } catch (e) {
         console.error(`${this.chain}`, e);

package/koni/api/staking/bonding/astar.js

@@ -114,7 +114,6 @@ export async function subscribeAstarNominatorMetadata(chainInfo, address, substr
       }
     }
   }
-
   const unlockingChunks = ledger.unbondingInfo.unlockingChunks;
   if (unlockingChunks.length > 0) {
     for (const unlockingChunk of unlockingChunks) {
@@ -200,7 +199,6 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
       }
     }
   }
-
   const unlockingChunks = ledger.unbondingInfo.unlockingChunks;
   if (unlockingChunks.length > 0) {
     for (const unlockingChunk of unlockingChunks) {

package/koni/api/staking/bonding/paraChain.js

@@ -132,7 +132,6 @@ export async function getParaChainStakingMetadata(chain, substrateApi) {
   if (unvestedAllocation) {
     totalIssuance.add(unvestedAllocation); // for Turing network, read more at https://hackmd.io/@sbAqOuXkRvyiZPOB3Ryn6Q/Sypr3ZJh5
   }
-
   const inflationConfig = _inflation.toHuman();
   const inflation = getParaCurrentInflation(parseRawNumber(totalStake.toString()), inflationConfig);
   const unstakingPeriod = parseInt(unstakingDelay) * _STAKING_ERA_LENGTH_MAP[chain];
@@ -185,7 +184,6 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
         }
       }
     }
-
     const bnStake = new BN(delegation.amount);
     const bnUnstakeBalance = unstakingMap[delegation.owner] ? new BN(unstakingMap[delegation.owner].claimable) : BN_ZERO;
     const bnActiveStake = bnStake.sub(bnUnstakeBalance);
@@ -279,7 +277,6 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
         }
       }
     }
-
     const bnStake = new BN(delegation.amount);
     const bnUnstakeBalance = unstakingMap[delegation.owner] ? new BN(unstakingMap[delegation.owner].claimable) : BN_ZERO;
     const bnActiveStake = bnStake.sub(bnUnstakeBalance);

package/koni/api/staking/bonding/relayChain.js

@@ -221,7 +221,6 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
       });
     }));
   }
-
   let stakingStatus = EarningStatus.NOT_EARNING;
   const bnActiveStake = new BN(activeStake);
   let waitingNominationCount = 0;
@@ -273,13 +272,13 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
  * Deprecated
  * */
 export async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi) {
-  var _chainApi$api$query10, _chainApi$api$query11, _chainApi$api$query12, _chainApi$api$query13, _chainApi$api$query14, _chainApi$api$query15, _chainApi$api$query16, _chainApi$api$query17, _chainApi$api$query18, _chainApi$api$query19, _chainApi$api$query20, _chainApi$api$query21, _chainApi$api$query22, _chainApi$api$query23;
+  var _chainApi$api$query0, _chainApi$api$query0$, _chainApi$api$query1, _chainApi$api$query1$, _chainApi$api$query10, _chainApi$api$query11, _chainApi$api$query12, _chainApi$api$query13, _chainApi$api$query14, _chainApi$api$query15, _chainApi$api$query16, _chainApi$api$query17, _chainApi$api$query18, _chainApi$api$query19;
   if (isEthereumAddress(address)) {
     return;
   }
   const chain = chainInfo.slug;
   const chainApi = await substrateApi.isReady;
-  const [_ledger, _nominations, _currentEra, _bonded, _minimumActiveStake, _minNominatorBond] = await Promise.all([(_chainApi$api$query10 = chainApi.api.query) === null || _chainApi$api$query10 === void 0 ? void 0 : (_chainApi$api$query11 = _chainApi$api$query10.staking) === null || _chainApi$api$query11 === void 0 ? void 0 : _chainApi$api$query11.ledger(address), (_chainApi$api$query12 = chainApi.api.query) === null || _chainApi$api$query12 === void 0 ? void 0 : (_chainApi$api$query13 = _chainApi$api$query12.staking) === null || _chainApi$api$query13 === void 0 ? void 0 : _chainApi$api$query13.nominators(address), (_chainApi$api$query14 = chainApi.api.query) === null || _chainApi$api$query14 === void 0 ? void 0 : (_chainApi$api$query15 = _chainApi$api$query14.staking) === null || _chainApi$api$query15 === void 0 ? void 0 : _chainApi$api$query15.currentEra(), (_chainApi$api$query16 = chainApi.api.query) === null || _chainApi$api$query16 === void 0 ? void 0 : (_chainApi$api$query17 = _chainApi$api$query16.staking) === null || _chainApi$api$query17 === void 0 ? void 0 : _chainApi$api$query17.bonded(address), ((_chainApi$api$query18 = chainApi.api.query) === null || _chainApi$api$query18 === void 0 ? void 0 : (_chainApi$api$query19 = _chainApi$api$query18.staking) === null || _chainApi$api$query19 === void 0 ? void 0 : _chainApi$api$query19.minimumActiveStake) && ((_chainApi$api$query20 = chainApi.api.query) === null || _chainApi$api$query20 === void 0 ? void 0 : (_chainApi$api$query21 = _chainApi$api$query20.staking) === null || _chainApi$api$query21 === void 0 ? void 0 : _chainApi$api$query21.minimumActiveStake()), (_chainApi$api$query22 = chainApi.api.query) === null || _chainApi$api$query22 === void 0 ? void 0 : (_chainApi$api$query23 = _chainApi$api$query22.staking) === null || _chainApi$api$query23 === void 0 ? void 0 : _chainApi$api$query23.minNominatorBond()]);
+  const [_ledger, _nominations, _currentEra, _bonded, _minimumActiveStake, _minNominatorBond] = await Promise.all([(_chainApi$api$query0 = chainApi.api.query) === null || _chainApi$api$query0 === void 0 ? void 0 : (_chainApi$api$query0$ = _chainApi$api$query0.staking) === null || _chainApi$api$query0$ === void 0 ? void 0 : _chainApi$api$query0$.ledger(address), (_chainApi$api$query1 = chainApi.api.query) === null || _chainApi$api$query1 === void 0 ? void 0 : (_chainApi$api$query1$ = _chainApi$api$query1.staking) === null || _chainApi$api$query1$ === void 0 ? void 0 : _chainApi$api$query1$.nominators(address), (_chainApi$api$query10 = chainApi.api.query) === null || _chainApi$api$query10 === void 0 ? void 0 : (_chainApi$api$query11 = _chainApi$api$query10.staking) === null || _chainApi$api$query11 === void 0 ? void 0 : _chainApi$api$query11.currentEra(), (_chainApi$api$query12 = chainApi.api.query) === null || _chainApi$api$query12 === void 0 ? void 0 : (_chainApi$api$query13 = _chainApi$api$query12.staking) === null || _chainApi$api$query13 === void 0 ? void 0 : _chainApi$api$query13.bonded(address), ((_chainApi$api$query14 = chainApi.api.query) === null || _chainApi$api$query14 === void 0 ? void 0 : (_chainApi$api$query15 = _chainApi$api$query14.staking) === null || _chainApi$api$query15 === void 0 ? void 0 : _chainApi$api$query15.minimumActiveStake) && ((_chainApi$api$query16 = chainApi.api.query) === null || _chainApi$api$query16 === void 0 ? void 0 : (_chainApi$api$query17 = _chainApi$api$query16.staking) === null || _chainApi$api$query17 === void 0 ? void 0 : _chainApi$api$query17.minimumActiveStake()), (_chainApi$api$query18 = chainApi.api.query) === null || _chainApi$api$query18 === void 0 ? void 0 : (_chainApi$api$query19 = _chainApi$api$query18.staking) === null || _chainApi$api$query19 === void 0 ? void 0 : _chainApi$api$query19.minNominatorBond()]);
   const minActiveStake = (_minimumActiveStake === null || _minimumActiveStake === void 0 ? void 0 : _minimumActiveStake.toString()) || '0';
   const minNominatorBond = _minNominatorBond.toString();
   const bnMinActiveStake = new BN(minActiveStake);
@@ -334,7 +333,6 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
       });
     }));
   }
-
   let stakingStatus = EarningStatus.NOT_EARNING;
   const bnActiveStake = new BN(activeStake);
   let waitingNominationCount = 0;

package/koni/api/staking/bonding/utils.js

@@ -69,7 +69,6 @@ export function calculateChainStakedReturn(inflation, totalEraStake, totalIssuan
   if (_STAKING_CHAIN_GROUP.aleph.includes(networkKey)) {
     stakedReturn *= 0.9; // 10% goes to treasury
   }
-
   return stakedReturn;
 }
 export async function calculateChainStakedReturnV2(chainInfo, totalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, inflation, isCompound) {
@@ -136,11 +135,9 @@ export function calculateValidatorStakedReturn(chainStakedReturn, totalValidator
   const stakedReturn = (adjusted > Number.MAX_SAFE_INTEGER ? Number.MAX_SAFE_INTEGER : adjusted) / 100;
   return stakedReturn * (100 - commission) / 100; // Deduct commission
 }
-
 export function getCommission(commissionString) {
   return parseFloat(commissionString.split('%')[0]); // Example: 12%
 }
-
 export function getParaCurrentInflation(totalStaked, inflationConfig) {
   // read more at https://hackmd.io/@sbAqOuXkRvyiZPOB3Ryn6Q/Sypr3ZJh5
   const expectMin = parseRawNumber(inflationConfig.expect.min);
@@ -263,7 +260,6 @@ export function getYieldAvailableActionsByPosition(yieldPosition, yieldPoolInfo,
     result.push(YieldAction.START_EARNING);
     result.push(YieldAction.WITHDRAW_EARNING); // TODO
   }
-
   return result;
 }
 export let StakingAction;

package/koni/background/cron.js

@@ -13,7 +13,6 @@ export class KoniCron {
     this.state = state;
     // this.init();
   }
-
   cronMap = {};
   subjectMap = {};
   getCron = name => {