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

package/background/KoniTypes.d.ts

@@ -35,6 +35,7 @@ import { SignerResult } from '@polkadot/types/types/extrinsic';
 import { HexString } from '@polkadot/util/types';
 import { EarningImpactResult } from '../services/earning-service/handlers/native-staking/dtao';
 import { GovVoteRequest, GovVotingInfo, RemoveVoteRequest, UnlockVoteRequest } from '../services/open-gov/interface';
+import { RequestAddSubstrateProxyAccount, RequestGetSubstrateProxyAccountGroup, RequestRemoveSubstrateProxyAccount, SubstrateProxyAccountGroup } from '../types/substrateProxyAccount';
 import { TransactionWarning } from './warnings/TransactionWarning';
 export declare enum RuntimeEnvironment {
     Web = "Web",
@@ -450,8 +451,10 @@ export declare enum ExtrinsicType {
     CLAIM_BRIDGE = "claim.claim_bridge",
     GOV_VOTE = "gov.vote",
     GOV_UNVOTE = "gov.unvote",
-    GOV_UNLOCK_VOTE = "gov.unlock-vote",
+    GOV_UNLOCK_VOTE = "gov.unlock_vote",
     EVM_EXECUTE = "evm.execute",
+    ADD_SUBSTRATE_PROXY_ACCOUNT = "substrateProxyAccount.add",
+    REMOVE_SUBSTRATE_PROXY_ACCOUNT = "substrateProxyAccount.remove",
     UNKNOWN = "unknown"
 }
 export interface ExtrinsicDataTypeMap {
@@ -494,9 +497,12 @@ export interface ExtrinsicDataTypeMap {
     [ExtrinsicType.CLAIM_BRIDGE]: RequestClaimBridge;
     [ExtrinsicType.EVM_EXECUTE]: TransactionConfig;
     [ExtrinsicType.CROWDLOAN]: any;
+    [ExtrinsicType.SWAP]: SwapTxData;
     [ExtrinsicType.GOV_VOTE]: GovVoteRequest;
     [ExtrinsicType.GOV_UNVOTE]: RemoveVoteRequest;
     [ExtrinsicType.GOV_UNLOCK_VOTE]: UnlockVoteRequest;
+    [ExtrinsicType.ADD_SUBSTRATE_PROXY_ACCOUNT]: RequestAddSubstrateProxyAccount;
+    [ExtrinsicType.REMOVE_SUBSTRATE_PROXY_ACCOUNT]: RequestRemoveSubstrateProxyAccount;
     [ExtrinsicType.SWAP]: SwapTxData;
     [ExtrinsicType.UNKNOWN]: any;
 }
@@ -607,6 +613,7 @@ export interface TransactionHistoryItem<ET extends ExtrinsicType = ExtrinsicType
     addressPrefix?: number;
     processId?: string;
     apiTxIndex?: number;
+    substrateProxyAddresses?: string[];
 }
 export interface SWWarning {
     errorType: string;
@@ -766,7 +773,7 @@ export declare type TxResultType = {
     fee?: string;
     feeSymbol?: string;
 };
-export interface NftTransactionRequest {
+export interface NftTransactionRequest extends BaseRequestSign {
     networkKey: string;
     senderAddress: string;
     recipientAddress: string;
@@ -834,6 +841,7 @@ export interface SubstrateNftSubmitTransaction extends BaseRequestSign {
     senderAddress: string;
     nftItemName?: string;
     recipientAddress: string;
+    nftItem: NftItem;
 }
 export declare type RequestSubstrateNftSubmitTransaction = InternalRequestSign<SubstrateNftSubmitTransaction>;
 export interface RequestAccountMeta {
@@ -2095,6 +2103,9 @@ export interface KoniRequestSignatures {
     'pri(openGov.unvote)': [RemoveVoteRequest, SWTransactionResponse];
     'pri(openGov.subscribeGovLockedInfo)': [null, GovVotingInfo[], GovVotingInfo[]];
     'pri(openGov.unlockVote)': [UnlockVoteRequest, SWTransactionResponse];
+    'pri(substrateProxyAccount.getGroupInfo)': [RequestGetSubstrateProxyAccountGroup, SubstrateProxyAccountGroup];
+    'pri(substrateProxyAccount.add)': [RequestAddSubstrateProxyAccount, SWTransactionResponse];
+    'pri(substrateProxyAccount.remove)': [RequestRemoveSubstrateProxyAccount, SWTransactionResponse];
 }
 export interface ApplicationMetadataType {
     version: string;

package/background/KoniTypes.js

@@ -117,8 +117,10 @@ export let ExtrinsicType;
   ExtrinsicType["CLAIM_BRIDGE"] = "claim.claim_bridge";
   ExtrinsicType["GOV_VOTE"] = "gov.vote";
   ExtrinsicType["GOV_UNVOTE"] = "gov.unvote";
-  ExtrinsicType["GOV_UNLOCK_VOTE"] = "gov.unlock-vote";
+  ExtrinsicType["GOV_UNLOCK_VOTE"] = "gov.unlock_vote";
   ExtrinsicType["EVM_EXECUTE"] = "evm.execute";
+  ExtrinsicType["ADD_SUBSTRATE_PROXY_ACCOUNT"] = "substrateProxyAccount.add";
+  ExtrinsicType["REMOVE_SUBSTRATE_PROXY_ACCOUNT"] = "substrateProxyAccount.remove";
   ExtrinsicType["UNKNOWN"] = "unknown";
 })(ExtrinsicType || (ExtrinsicType = {}));
 export let ExtrinsicStatus;

package/cjs/background/KoniTypes.js

@@ -132,8 +132,10 @@ exports.ExtrinsicType = ExtrinsicType;
   ExtrinsicType["CLAIM_BRIDGE"] = "claim.claim_bridge";
   ExtrinsicType["GOV_VOTE"] = "gov.vote";
   ExtrinsicType["GOV_UNVOTE"] = "gov.unvote";
-  ExtrinsicType["GOV_UNLOCK_VOTE"] = "gov.unlock-vote";
+  ExtrinsicType["GOV_UNLOCK_VOTE"] = "gov.unlock_vote";
   ExtrinsicType["EVM_EXECUTE"] = "evm.execute";
+  ExtrinsicType["ADD_SUBSTRATE_PROXY_ACCOUNT"] = "substrateProxyAccount.add";
+  ExtrinsicType["REMOVE_SUBSTRATE_PROXY_ACCOUNT"] = "substrateProxyAccount.remove";
   ExtrinsicType["UNKNOWN"] = "unknown";
 })(ExtrinsicType || (exports.ExtrinsicType = ExtrinsicType = {}));
 let ExtrinsicStatus;

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

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

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

@@ -326,7 +326,7 @@ function checkSupportForTransaction(validationResponse, transaction) {
     }
   }
 }
-async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, isTransferLocalTokenAndPayThatTokenAsFee) {
+async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, isTransferLocalTokenAndPayThatTokenAsFee, signerSubstrateProxyAddress) {
   const estimateFee = {
     symbol: '',
     decimals: 0,
@@ -347,8 +347,14 @@ async function estimateFeeForTransaction(validationResponse, transaction, chainI
   if (transaction) {
     try {
       if ((0, _helpers.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 && !(0, _utils5.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 ((0, _helpers.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 ((0, _helpers.isCardanoTransaction)(transaction)) {
@@ -415,14 +421,13 @@ async function estimateFeeForTransaction(validationResponse, transaction, chainI
   }
   return estimateFee;
 }
-function checkSigningAccountForTransaction(validationResponse, chainInfoMap) {
+function checkSigningAccountForTransaction(validationResponse, chainInfoMap, signer) {
   const {
-    address,
     chain,
     chainType,
     extrinsicType
   } = validationResponse;
-  const pair = _uiKeyring.keyring.getPair(address);
+  const pair = _uiKeyring.keyring.getPair(signer);
   if (!pair) {
     validationResponse.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR, (0, _i18next.t)('bg.TRANSACTION.core.validation.transfer.unableToFindAccount')));
   } else {
@@ -442,7 +447,7 @@ function checkSigningAccountForTransaction(validationResponse, chainInfoMap) {
     }
   }
 }
-function checkBalanceWithTransactionFee(validationResponse, transactionInput, nativeTokenInfo, nativeTokenAvailable) {
+function checkBalanceWithTransactionFee(validationResponse, transactionInput, nativeTokenInfo, nativeTokenAvailable, substrateProxyAccountNativeTokenAvailable) {
   if (!validationResponse.estimateFee) {
     // todo: estimateFee should be must-have, need to refactor interface
     return;
@@ -451,6 +456,7 @@ function checkBalanceWithTransactionFee(validationResponse, transactionInput, na
     edAsWarning,
     extrinsicType,
     isTransferAll,
+    signerSubstrateProxyAddress,
     skipFeeValidation,
     tokenPayFeeSlug
   } = transactionInput;
@@ -461,12 +467,29 @@ function checkBalanceWithTransactionFee(validationResponse, transactionInput, na
   const bnFee = new _bignumber.default(validationResponse.estimateFee.value);
   const bnNativeTokenAvailable = new _bignumber.default(nativeTokenAvailable.value);
   const bnNativeTokenTransferAmount = new _bignumber.default(validationResponse.transferNativeAmount || '0');
-  if (!bnNativeTokenAvailable.gt(0)) {
+  if (!bnNativeTokenAvailable.gt(0) && !substrateProxyAccountNativeTokenAvailable) {
     validationResponse.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE));
   }
   const isChainNotSupportTransferAll = [..._constants2._TRANSFER_CHAIN_GROUP.acala, ..._constants2._TRANSFER_CHAIN_GROUP.genshiro, ..._constants2._TRANSFER_CHAIN_GROUP.bitcountry, ..._constants2._TRANSFER_CHAIN_GROUP.statemine].includes(nativeTokenInfo.originChain);
-  if (bnNativeTokenTransferAmount.plus(bnFee).gt(bnNativeTokenAvailable) && (!isTransferAll || isChainNotSupportTransferAll)) {
-    validationResponse.errors.push(new _TransactionError.TransactionError(_types.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.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE)); // todo: should be generalized and reused in all features
+    }
+  } else {
+    const bnSubstrateProxyAccountNativeTokenAvailable = new _bignumber.default(substrateProxyAccountNativeTokenAvailable.value);
+    if (bnNativeTokenTransferAmount.gt(bnNativeTokenAvailable) && (!isTransferAll || isChainNotSupportTransferAll) || bnFee.gt(bnSubstrateProxyAccountNativeTokenAvailable)) {
+      if (signerSubstrateProxyAddress) {
+        const account = (0, _utils5.getAccountJsonByAddress)(signerSubstrateProxyAddress);
+        const accountName = account === null || account === void 0 ? void 0 : account.name;
+        validationResponse.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE, (0, _i18next.t)('bg.TRANSACTION.core.validation.transfer.proxyAccountNotEnoughBalance', {
+          replace: {
+            accountName: accountName || signerSubstrateProxyAddress
+          }
+        })));
+      } else {
+        validationResponse.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE));
+      }
+    }
   }
 
   // todo: only system.pallet has metadata, we should add for other pallets and mechanisms as well

package/cjs/core/types.js

@@ -25,4 +25,5 @@ exports.ActionType = ActionType;
   ActionType["SEND_FUND"] = "SEND_FUND";
   ActionType["SEND_NFT"] = "SEND_NFT";
   ActionType["SWAP"] = "SWAP";
+  ActionType["MANAGE_SUBSTRATE_PROXY_ACCOUNT"] = "MANAGE_SUBSTRATE_PROXY_ACCOUNT";
 })(ActionType || (exports.ActionType = ActionType = {}));

package/cjs/koni/background/handlers/Extension.js

@@ -1304,6 +1304,7 @@ class KoniExtension {
       feeCustom,
       feeOption,
       from,
+      signerSubstrateProxyAddress,
       to,
       tokenPayFeeSlug,
       tokenSlug,
@@ -1537,6 +1538,7 @@ class KoniExtension {
       isTransferAll: isTransferNativeToken ? transferAll : false,
       isTransferLocalTokenAndPayThatTokenAsFee,
       edAsWarning: isTransferNativeToken,
+      signerSubstrateProxyAddress,
       additionalValidator: additionalValidator
     });
   }
@@ -1548,6 +1550,7 @@ class KoniExtension {
       from,
       isPassConfirmation,
       originNetworkKey,
+      signerSubstrateProxyAddress,
       to,
       tokenPayFeeSlug,
       tokenSlug,
@@ -1743,7 +1746,8 @@ class KoniExtension {
       xcmFeeDryRun,
       errors,
       additionalValidator: additionalValidator,
-      eventsHandler: eventsHandler
+      eventsHandler: eventsHandler,
+      signerSubstrateProxyAddress
     });
   }
   async makeBitcoinDappTransferConfirmation(inputData) {
@@ -2393,7 +2397,8 @@ class KoniExtension {
         feeOptions: feeOptions,
         feeType,
         error,
-        id
+        id,
+        maxTransferableWithoutFee: freeBalance.value
       };
     };
     const subscription = (0, _rxjs.combineLatest)({
@@ -2480,7 +2485,8 @@ class KoniExtension {
     const {
       params,
       recipientAddress,
-      senderAddress
+      senderAddress,
+      signerSubstrateProxyAddress
     } = inputData;
     const isSendingSelf = (0, _transfer2.isRecipientSelf)(senderAddress, recipientAddress);
 
@@ -2501,7 +2507,8 @@ class KoniExtension {
         isSendingSelf
       },
       extrinsicType: _KoniTypes.ExtrinsicType.SEND_NFT,
-      chainType: _KoniTypes.ChainType.SUBSTRATE
+      chainType: _KoniTypes.ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress
     });
     return {
       ...rs,
@@ -3390,8 +3397,6 @@ class KoniExtension {
       return await this.#koniState.reloadStaking();
     } else if (data === 'balance') {
       return await this.#koniState.reloadBalance();
-    } else if (data === 'crowdloan') {
-      return await this.#koniState.reloadCrowdloan();
     }
     return Promise.resolve(false);
   }
@@ -3834,7 +3839,8 @@ class KoniExtension {
       isPassConfirmation,
       onSend,
       path,
-      processId
+      processId,
+      signerSubstrateProxyAddress
     } = inputData;
     const {
       address
@@ -3965,6 +3971,7 @@ class KoniExtension {
       // change this depends on step
       chainType,
       resolveOnDone: !isLastStep,
+      signerSubstrateProxyAddress,
       transferNativeAmount,
       balanceType: balanceTypeForPool,
       skipFeeValidation: isMintingStep && isPoolSupportAlternativeFee,
@@ -3977,6 +3984,7 @@ class KoniExtension {
   async handleYieldLeave(params) {
     const {
       address,
+      signerSubstrateProxyAddress,
       slug
     } = params;
     const leaveValidation = await this.#koniState.earningService.validateYieldLeave(params);
@@ -3992,6 +4000,7 @@ class KoniExtension {
       data: params,
       // TODO
       extrinsicType,
+      signerSubstrateProxyAddress,
       chainType: (handler === null || handler === void 0 ? void 0 : handler.transactionChainType) || _KoniTypes.ChainType.SUBSTRATE
     });
   }
@@ -4068,6 +4077,7 @@ class KoniExtension {
   async yieldSubmitWithdrawal(params) {
     const {
       address,
+      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -4081,6 +4091,7 @@ class KoniExtension {
       transaction: extrinsic,
       data: params,
       extrinsicType: _KoniTypes.ExtrinsicType.STAKING_WITHDRAW,
+      signerSubstrateProxyAddress,
       chainType: (poolHandler === null || poolHandler === void 0 ? void 0 : poolHandler.transactionChainType) || _KoniTypes.ChainType.SUBSTRATE
     });
   }
@@ -4088,6 +4099,7 @@ class KoniExtension {
     const {
       address,
       selectedUnstaking,
+      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -4102,12 +4114,14 @@ class KoniExtension {
       transaction: extrinsic,
       data: params,
       extrinsicType: _KoniTypes.ExtrinsicType.STAKING_CANCEL_UNSTAKE,
+      signerSubstrateProxyAddress,
       chainType: (poolHandler === null || poolHandler === void 0 ? void 0 : poolHandler.transactionChainType) || _KoniTypes.ChainType.SUBSTRATE
     });
   }
   async yieldSubmitClaimReward(params) {
     const {
       address,
+      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -4120,6 +4134,7 @@ class KoniExtension {
       chain: poolHandler.chain,
       transaction: extrinsic,
       data: params,
+      signerSubstrateProxyAddress,
       extrinsicType: _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD,
       chainType: (poolHandler === null || poolHandler === void 0 ? void 0 : poolHandler.transactionChainType) || _KoniTypes.ChainType.SUBSTRATE
     });
@@ -4138,6 +4153,7 @@ class KoniExtension {
   async handleYieldChangeValidator(params) {
     const {
       address,
+      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -4150,6 +4166,7 @@ class KoniExtension {
       chain: poolHandler.chain,
       transaction: extrinsic,
       data: params,
+      signerSubstrateProxyAddress,
       extrinsicType: _KoniTypes.ExtrinsicType.CHANGE_EARNING_VALIDATOR,
       chainType: _KoniTypes.ChainType.SUBSTRATE
     });
@@ -4836,6 +4853,48 @@ class KoniExtension {
   pingSession(request) {
     return this.#koniState.keyringService.context.pingSession(request);
   }
+  getSubstrateProxyAccountGroup(request) {
+    return this.#koniState.substrateProxyAccountService.getSubstrateProxyAccountGroup(request);
+  }
+  async handleAddSubstrateProxyAccount(params) {
+    const {
+      address,
+      chain,
+      signerSubstrateProxyAddress
+    } = params;
+    const validationErrors = await this.#koniState.substrateProxyAccountService.validateAddSubstrateProxyAccount(params, signerSubstrateProxyAddress);
+    if (validationErrors.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(validationErrors);
+    }
+    const extrinsic = await this.#koniState.substrateProxyAccountService.addSubstrateProxyAccounts(params);
+    return await this.#koniState.transactionService.handleTransaction({
+      address,
+      chain,
+      transaction: extrinsic,
+      data: params,
+      extrinsicType: _KoniTypes.ExtrinsicType.ADD_SUBSTRATE_PROXY_ACCOUNT,
+      chainType: _KoniTypes.ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress
+    });
+  }
+  async handleRemoveSubstrateProxyAccount(params) {
+    const {
+      address,
+      chain,
+      signerSubstrateProxyAddress
+    } = params;
+    const extrinsic = await this.#koniState.substrateProxyAccountService.removeSubstrateProxyAccounts(params);
+    return await this.#koniState.transactionService.handleTransaction({
+      address,
+      chain,
+      transaction: extrinsic,
+      data: params,
+      extrinsicType: _KoniTypes.ExtrinsicType.REMOVE_SUBSTRATE_PROXY_ACCOUNT,
+      chainType: _KoniTypes.ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress
+    });
+  }
+
   /* Migrate Unified Account */
 
   /* Open Gov */
@@ -4848,7 +4907,8 @@ class KoniExtension {
       transaction: extrinsic,
       data: request,
       extrinsicType: _KoniTypes.ExtrinsicType.GOV_VOTE,
-      chainType: _KoniTypes.ChainType.SUBSTRATE
+      chainType: _KoniTypes.ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress: request.signerSubstrateProxyAddress
     });
   }
   async handleRemoveVote(request) {
@@ -4859,7 +4919,8 @@ class KoniExtension {
       transaction: extrinsic,
       data: request,
       extrinsicType: _KoniTypes.ExtrinsicType.GOV_UNVOTE,
-      chainType: _KoniTypes.ChainType.SUBSTRATE
+      chainType: _KoniTypes.ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress: request.signerSubstrateProxyAddress
     });
   }
   async handleUnlockVote(request) {
@@ -4870,7 +4931,8 @@ class KoniExtension {
       transaction: extrinsic,
       data: request,
       extrinsicType: _KoniTypes.ExtrinsicType.GOV_UNLOCK_VOTE,
-      chainType: _KoniTypes.ChainType.SUBSTRATE
+      chainType: _KoniTypes.ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress: request.signerSubstrateProxyAddress
     });
   }
   async subscribeGovLockedInfo(id, port) {
@@ -5558,6 +5620,15 @@ class KoniExtension {
         return this.handleUnlockVote(request);
       case 'pri(openGov.subscribeGovLockedInfo)':
         return this.subscribeGovLockedInfo(id, port);
+
+      // Proxy
+      case 'pri(substrateProxyAccount.getGroupInfo)':
+        return this.getSubstrateProxyAccountGroup(request);
+      case 'pri(substrateProxyAccount.add)':
+        return this.handleAddSubstrateProxyAccount(request);
+      case 'pri(substrateProxyAccount.remove)':
+        return this.handleRemoveSubstrateProxyAccount(request);
+
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);

package/cjs/koni/background/handlers/State.js

@@ -42,6 +42,7 @@ var _helper = require("@subwallet/extension-base/services/request-service/helper
 var _SettingService = _interopRequireDefault(require("@subwallet/extension-base/services/setting-service/SettingService"));
 var _DatabaseService = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/DatabaseService"));
 var _subscanService = require("@subwallet/extension-base/services/subscan-service");
+var _substrateProxyService = _interopRequireDefault(require("@subwallet/extension-base/services/substrate-proxy-service"));
 var _swapService = require("@subwallet/extension-base/services/swap-service");
 var _transactionService = _interopRequireDefault(require("@subwallet/extension-base/services/transaction-service"));
 var _walletConnectService = _interopRequireDefault(require("@subwallet/extension-base/services/wallet-connect-service"));
@@ -132,6 +133,7 @@ class KoniState {
     this.inappNotificationService = new _inappNotificationService.InappNotificationService(this.dbService, this.keyringService, this.eventService, this.chainService);
     this.chainOnlineService = new _chainOnlineService.ChainOnlineService(this.chainService, this.settingService, this.eventService, this.dbService);
     this.openGovService = new _openGov.default(this);
+    this.substrateProxyAccountService = new _substrateProxyService.default(this);
     this.subscription = new _subscription.KoniSubscription(this, this.dbService);
     this.cron = new _cron.KoniCron(this, this.subscription, this.dbService);
     this.logger = (0, _util.logger)('State');
@@ -1822,10 +1824,6 @@ class KoniState {
     await this.balanceService.reloadBalance();
     return true;
   }
-  async reloadCrowdloan() {
-    await this.subscription.reloadCrowdloan();
-    return true;
-  }
   async approvePassPhishingPage(_url) {
     return new Promise(resolve => {
       this.settingService.getPassPhishingList(value => {

package/cjs/koni/background/subscription.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.KoniSubscription = void 0;
 var _crowdloan = require("@subwallet/extension-base/koni/api/dotsama/crowdloan");
 var _nft = require("@subwallet/extension-base/koni/api/nft");
-var _types = require("@subwallet/extension-base/services/event-service/types");
 var _utils = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -47,26 +46,7 @@ class KoniSubscription {
     }
   }
   async start() {
-    var _this$state$keyringSe;
     await Promise.all([this.state.eventService.waitCryptoReady, this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
-    const currentAddress = (_this$state$keyringSe = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.proxyId;
-    if (currentAddress) {
-      this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
-    }
-    this.eventHandler = (events, eventTypes) => {
-      var _serviceInfo$currentA;
-      const serviceInfo = this.state.getServiceInfo();
-      const needReload = eventTypes.some(eventType => _types.COMMON_RELOAD_EVENTS.includes(eventType));
-      if (!needReload) {
-        return;
-      }
-      const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.proxyId;
-      if (!address) {
-        return;
-      }
-      this.subscribeCrowdloans(address, serviceInfo.chainApiMap.substrate);
-    };
-    this.state.eventService.onLazy(this.eventHandler.bind(this));
   }
   async stop() {
     if (this.eventHandler) {
@@ -117,8 +97,8 @@ class KoniSubscription {
     }).catch(this.logger.log);
   }
   async reloadCrowdloan() {
-    var _this$state$keyringSe2;
-    const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.proxyId;
+    var _this$state$keyringSe;
+    const currentAddress = (_this$state$keyringSe = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.proxyId;
     this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
     await (0, _utils.waitTimeout)(1800);
   }

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.71-0'
+  version: '1.3.73-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -437,16 +437,27 @@ const subscribeAssetsAccountPallet = async _ref7 => {
     }
   });
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
+    if (tokenInfo.slug === 'energy_web_x-LOCAL-stEWT') {
+      return (0, _rxjs.timer)(0, _constants.CRON_REFRESH_PRICE_INTERVAL).subscribe(() => {
+        const getEwtFrozenBalance = async () => {
+          const ewtTokenBalances = await queryEwtFrozenBalance(substrateApi, addresses, assetMap[tokenInfo.slug], extrinsicType);
+          callback(ewtTokenBalances);
+        };
+        getEwtFrozenBalance().catch(console.error);
+      });
+    }
     try {
       const assetIndex = (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
-      if (assetIndex === '-1') {
+      if (assetIndex === '-1' && !_constants2.USE_MULTILOCATION_INDEX.includes(chainInfo.slug)) {
         return undefined;
       }
+      const version = ['statemint', 'statemine', 'westend_assethub'].includes(chainInfo.slug) ? 4 : 3;
+      const index = _constants2.USE_MULTILOCATION_INDEX.includes(chainInfo.slug) ? (0, _xcmParser._adaptX1Interior)((0, _utils2._getXcmAssetMultilocation)(tokenInfo), version) : assetIndex;
       const params = [{
         section: 'query',
         module: assetsAccountKey.split('_')[1],
         method: assetsAccountKey.split('_')[2],
-        args: addresses.map(address => [assetIndex, address])
+        args: addresses.map(address => [index, address])
       }];
 
       // Get Token Balance
@@ -610,4 +621,37 @@ async function queryGigaTokenBalance(substrateApi, addresses, tokenInfo, extrins
       locked: totalLockedFromTransfer.toString()
     };
   }));
+}
+async function queryEwtFrozenBalance(substrateApi, addresses, tokenInfo, extrinsicType) {
+  const multilocation = (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
+  return await Promise.all(addresses.map(async address => {
+    const [_frozenBalance, _balanceInfo] = await Promise.all([substrateApi.api.query.assetsFreezer.frozenBalances(multilocation, address), substrateApi.api.query.assets.account(multilocation, address)]);
+    const balanceInfo = _balanceInfo.toPrimitive();
+    if (!balanceInfo) {
+      // no balance info response
+      return {
+        address: address,
+        tokenSlug: tokenInfo.slug,
+        free: '0',
+        locked: '0',
+        state: _KoniTypes.APIItemState.READY
+      };
+    }
+    const transferableBalance = (0, _assetsPallet._getAssetsPalletTransferable)(balanceInfo, (0, _utils2._getAssetExistentialDeposit)(tokenInfo), extrinsicType);
+    const totalLockedFromTransfer = (0, _assetsPallet._getAssetsPalletLocked)(balanceInfo);
+    let freeBalance = transferableBalance;
+    let lockedBalance = totalLockedFromTransfer;
+    const frozenBalance = _frozenBalance.toPrimitive();
+    if (frozenBalance) {
+      freeBalance = transferableBalance - BigInt(frozenBalance);
+      lockedBalance = totalLockedFromTransfer + BigInt(frozenBalance);
+    }
+    return {
+      address: address,
+      tokenSlug: tokenInfo.slug,
+      free: freeBalance.toString(),
+      locked: lockedBalance.toString(),
+      state: _KoniTypes.APIItemState.READY
+    };
+  }));
 }