@subwallet/extension-base 1.3.71-0 → 1.3.73-0

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

@@ -127,18 +127,26 @@ class TransactionService {
     const isNonNativeTokenPayFee = tokenPayFeeSlug && !(0, _utils2._isNativeTokenBySlug)(tokenPayFeeSlug);
     const nonNativeTokenPayFeeInfo = isNonNativeTokenPayFee ? this.state.chainService.getAssetBySlug(tokenPayFeeSlug) : undefined;
     const priceMap = (await this.state.priceService.getPrice()).priceMap;
+
+    // Get signer account
+    let signer = address;
+    const signerSubstrateProxyAddress = transactionInput.signerSubstrateProxyAddress;
     if (!transactionInput.skipFeeRecalculation) {
-      validationResponse.estimateFee = await (0, _transfer.estimateFeeForTransaction)(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, transactionInput.isTransferLocalTokenAndPayThatTokenAsFee);
+      validationResponse.estimateFee = await (0, _transfer.estimateFeeForTransaction)(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, transactionInput.isTransferLocalTokenAndPayThatTokenAsFee, signerSubstrateProxyAddress);
     }
     const chainInfoMap = this.state.chainService.getChainInfoMap();
+    let substrateProxyAccountNativeTokenAvailable;
+    if (signerSubstrateProxyAddress && !(0, _utils4.isSameAddress)(signerSubstrateProxyAddress, address)) {
+      signer = signerSubstrateProxyAddress;
+      substrateProxyAccountNativeTokenAvailable = await this.state.balanceService.getTransferableBalance(signerSubstrateProxyAddress, chain, nativeTokenInfo.slug, extrinsicType);
+    }
 
     // Check account signing transaction
-
-    (0, _transfer.checkSigningAccountForTransaction)(validationResponse, chainInfoMap);
+    (0, _transfer.checkSigningAccountForTransaction)(validationResponse, chainInfoMap, signer);
     const nativeTokenAvailable = await this.state.balanceService.getBalanceByType(address, chain, nativeTokenInfo.slug, transactionInput.balanceType, extrinsicType);
 
     // Check available balance against transaction fee
-    (0, _transfer.checkBalanceWithTransactionFee)(validationResponse, transactionInput, nativeTokenInfo, nativeTokenAvailable);
+    (0, _transfer.checkBalanceWithTransactionFee)(validationResponse, transactionInput, nativeTokenInfo, nativeTokenAvailable, substrateProxyAccountNativeTokenAvailable);
 
     // Warnings Ton address if bounceable and not active
     // if (transaction && isTonTransaction(transaction) && tonApi) {
@@ -753,8 +761,10 @@ class TransactionService {
       // Will be added in next step
       nonce: nonce !== null && nonce !== void 0 ? nonce : 0,
       startBlock: startBlock || 0,
-      processId: (_transaction$step3 = transaction.step) === null || _transaction$step3 === void 0 ? void 0 : _transaction$step3.processId
+      processId: (_transaction$step3 = transaction.step) === null || _transaction$step3 === void 0 ? void 0 : _transaction$step3.processId,
+      substrateProxyAddresses: []
     };
+    const substrateProxyHistories = [];
     const nativeAsset = (0, _utils2._getChainNativeTokenBasicInfo)(chainInfo);
     const baseNativeAmount = {
       value: '0',
@@ -1121,6 +1131,55 @@ class TransactionService {
           };
           break;
         }
+      case _KoniTypes.ExtrinsicType.ADD_SUBSTRATE_PROXY_ACCOUNT:
+        {
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
+          const substrateProxyAddress = data.substrateProxyAddress;
+          historyItem.substrateProxyAddresses = [substrateProxyAddress];
+          substrateProxyHistories.push({
+            ...historyItem,
+            substrateProxyAddresses: [substrateProxyAddress]
+          });
+          try {
+            const substrateProxyAccount = _uiKeyring.default.getPair(substrateProxyAddress);
+            if (substrateProxyAccount) {
+              substrateProxyHistories.push({
+                ...historyItem,
+                address: substrateProxyAccount.address,
+                direction: _KoniTypes.TransactionDirection.RECEIVED,
+                substrateProxyAddresses: [substrateProxyAddress]
+              });
+            }
+          } catch (e) {
+            // skip
+          }
+          break;
+        }
+      case _KoniTypes.ExtrinsicType.REMOVE_SUBSTRATE_PROXY_ACCOUNT:
+        {
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
+          for (const substrateProxyItem of data.selectedSubstrateProxyAccounts || []) {
+            const substrateProxyAddress = substrateProxyItem.substrateProxyAddress;
+            substrateProxyHistories.push({
+              ...historyItem,
+              substrateProxyAddresses: [substrateProxyAddress]
+            });
+            try {
+              const substrateProxyAccount = _uiKeyring.default.getPair(substrateProxyAddress);
+              if (substrateProxyAccount) {
+                substrateProxyHistories.push({
+                  ...historyItem,
+                  address: substrateProxyAccount.address,
+                  direction: _KoniTypes.TransactionDirection.RECEIVED,
+                  substrateProxyAddresses: [substrateProxyAddress]
+                });
+              }
+            } catch (e) {
+              // skip
+            }
+          }
+          break;
+        }
       case _KoniTypes.ExtrinsicType.UNKNOWN:
         break;
     }
@@ -1148,7 +1207,7 @@ class TransactionService {
     } catch (e) {
       console.warn(e);
     }
-    return [historyItem];
+    return [historyItem, ...substrateProxyHistories];
   }
   onSigned(_ref) {
     let {
@@ -1741,7 +1800,7 @@ class TransactionService {
     });
     return emitter;
   }
-  signAndSendSubstrateTransaction(_ref12) {
+  async signAndSendSubstrateTransaction(_ref12) {
     var _this$state$chainServ;
     let {
       address,
@@ -1749,6 +1808,7 @@ class TransactionService {
       feeCustom,
       id,
       signAfterCreate,
+      signerSubstrateProxyAddress,
       step,
       tokenPayFeeSlug,
       transaction,
@@ -1764,7 +1824,15 @@ class TransactionService {
       extrinsicHash: id,
       processId: step === null || step === void 0 ? void 0 : step.processId
     };
-    const extrinsic = transaction;
+    let extrinsic = transaction;
+    let signer = address;
+    if (signerSubstrateProxyAddress && signerSubstrateProxyAddress !== address) {
+      const substrateApi = this.state.chainService.getSubstrateApi(chain);
+      await substrateApi.isReady;
+      signer = signerSubstrateProxyAddress;
+      extrinsic = substrateApi.api.tx.proxy.proxy(address, null, transaction);
+    }
+
     // const registry = extrinsic.registry;
     // const signedExtensions = registry.signedExtensions;
 
@@ -1774,7 +1842,7 @@ class TransactionService {
           const {
             signature,
             signedTransaction
-          } = await this.state.requestService.signInternalTransaction(id, address, url || _constants2.EXTENSION_REQUEST_URL, payload, signAfterCreate);
+          } = await this.state.requestService.signInternalTransaction(id, signer, url || _constants2.EXTENSION_REQUEST_URL, payload, signAfterCreate);
           return {
             id: new Date().getTime(),
             signature,
@@ -1796,7 +1864,7 @@ class TransactionService {
     //   }
     // }
 
-    extrinsic.signAsync(address, signerOption).then(async rs => {
+    extrinsic.signAsync(signer, signerOption).then(async rs => {
       // Emit signed event
       emitter.emit('signed', eventData);
 

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

@@ -33,6 +33,9 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('devnet-explorer.mosaicchain.io')) {
     return 'accounts';
   }
+  if (explorerLink.includes('mainnet-gw2.mosaicchain.io')) {
+    return 'accounts';
+  }
   if (explorerLink.includes('statescan.io')) {
     return '#/accounts';
   }
@@ -61,7 +64,7 @@ function getBlockExplorerAccountRoute(explorerLink) {
     return 'account';
   }
   if (explorerLink.includes('node.xode.net')) {
-    return 'account';
+    return 'polkadot/account';
   }
   if (explorerLink.includes('tonviewer.com')) {
     return '';
@@ -90,7 +93,10 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (['edgeware', 'commune'].includes(chainInfo.slug)) {
     return 'extrinsics';
   }
-  if (['mosaicTest', 'polkadex'].includes(chainInfo.slug)) {
+  if (['xode'].includes(chainInfo.slug)) {
+    return 'polkadot/extrinsics';
+  }
+  if (['mosaicTest', 'polkadex', 'mosaic'].includes(chainInfo.slug)) {
     return 'transactions';
   }
   const explorerLink = (0, _utils._getBlockExplorerFromChain)(chainInfo);
@@ -134,9 +140,6 @@ function getExplorerLink(chainInfo, value, type) {
     if (chainInfo.slug === 'tangle') {
       return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}extrinsic/${value}${route}/${value}`;
     }
-    if (chainInfo.slug === 'xode') {
-      return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}polkadot-chain-transaction?search=${value}`;
-    }
     if (['truth_network', 'aventus'].includes(chainInfo.slug)) {
       // getTransactionId(value)
       //   .then((transactionId) => {

package/cjs/types/index.js

@@ -178,4 +178,15 @@ Object.keys(_bitcoin).forEach(function (key) {
       return _bitcoin[key];
     }
   });
+});
+var _substrateProxyAccount = require("./substrateProxyAccount");
+Object.keys(_substrateProxyAccount).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _substrateProxyAccount[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _substrateProxyAccount[key];
+    }
+  });
 });

package/cjs/types/substrateProxyAccount/actions/index.js

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

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/utils/account/transform.js

@@ -168,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:
@@ -186,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:
@@ -201,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

package/cjs/utils/fee/transfer.js

@@ -329,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;
@@ -521,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/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/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/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/background/handlers/Extension.d.ts

@@ -291,6 +291,9 @@ export default class KoniExtension {
     private migrateUnifiedAndFetchEligibleSoloAccounts;
     private migrateSoloAccount;
     private pingSession;
+    private getSubstrateProxyAccountGroup;
+    private handleAddSubstrateProxyAccount;
+    private handleRemoveSubstrateProxyAccount;
     private handleVote;
     private handleRemoveVote;
     private handleUnlockVote;