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

package/koni/background/handlers/Extension.js

@@ -42,13 +42,16 @@ import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain
 import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _isAssetSmartContractNft, _isChainBitcoinCompatible, _isChainCompatibleLedgerEvm, _isChainEnabled, _isChainEvmCompatible, _isChainSubstrateCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isNativeTokenBySlug, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByBitcoin, _isTokenTransferredByCardano, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateToAmountByReservePool } from '@subwallet/extension-base/services/fee-service/utils';
 import { batchExtrinsicSetFeeHydration, getAssetHubTokensCanPayFee, getHydrationTokensCanPayFee } from '@subwallet/extension-base/services/fee-service/utils/tokenPayFee';
+import { calcDepositAmount, createInitMultisigExtrinsic, decodeCallData, DEFAULT_MAX_WEIGHT } from '@subwallet/extension-base/services/multisig-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
+import { createInitSubstrateProxyExtrinsic } from '@subwallet/extension-base/services/substrate-proxy-service';
+import { SubstrateTransactionWrappingStatus } from '@subwallet/extension-base/services/transaction-service/types';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
-import { AccountChainType, AccountSignMode, BalanceType, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
-import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, combineBitcoinFee, createPromiseHandler, createTransactionFromRLP, detectTransferTxType, filterUneconomicalUtxos, getAccountSignMode, getSizeInfo, getTransferableBitcoinUtxos, isSameAddress, isSubstrateEcdsaLedgerAssetSupported, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
+import { AccountChainType, AccountSignMode, BalanceType, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, MultisigTxErrorType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
+import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, combineBitcoinFee, createPromiseHandler, createTransactionFromRLP, detectTransferTxType, filterUneconomicalUtxos, getAccountJsonByAddress, getAccountSignMode, getSizeInfo, getTransferableBitcoinUtxos, isSameAddress, isSubstrateEcdsaLedgerAssetSupported, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import { getKeypairTypeByAddress, isAddress, isCardanoAddress, isSubstrateAddress, isTonAddress } from '@subwallet/keyring';
@@ -63,7 +66,7 @@ import { t } from 'i18next';
 import { combineLatest, Subject } from 'rxjs';
 import { TypeRegistry } from '@polkadot/types';
 import { assert, hexStripPrefix, hexToU8a, isAscii, isHex, noop, u8aToHex } from '@polkadot/util';
-import { decodeAddress, isEthereumAddress } from '@polkadot/util-crypto';
+import { decodeAddress, isEthereumAddress, sortAddresses } from '@polkadot/util-crypto';
 import { getSuitableRegistry, setupApiRegistry, setupDappRegistry, setupDatabaseRegistry } from "../utils.js";
 export function isJsonPayload(value) {
   return value.genesisHash !== undefined;
@@ -1255,7 +1258,6 @@ export default class KoniExtension {
       feeCustom,
       feeOption,
       from,
-      signerSubstrateProxyAddress,
       to,
       tokenPayFeeSlug,
       tokenSlug,
@@ -1489,7 +1491,6 @@ export default class KoniExtension {
       isTransferAll: isTransferNativeToken ? transferAll : false,
       isTransferLocalTokenAndPayThatTokenAsFee,
       edAsWarning: isTransferNativeToken,
-      signerSubstrateProxyAddress,
       additionalValidator: additionalValidator
     });
   }
@@ -1501,7 +1502,6 @@ export default class KoniExtension {
       from,
       isPassConfirmation,
       originNetworkKey,
-      signerSubstrateProxyAddress,
       to,
       tokenPayFeeSlug,
       tokenSlug,
@@ -1697,8 +1697,7 @@ export default class KoniExtension {
       xcmFeeDryRun,
       errors,
       additionalValidator: additionalValidator,
-      eventsHandler: eventsHandler,
-      signerSubstrateProxyAddress
+      eventsHandler: eventsHandler
     });
   }
   async makeBitcoinDappTransferConfirmation(inputData) {
@@ -2423,8 +2422,7 @@ export default class KoniExtension {
     const {
       params,
       recipientAddress,
-      senderAddress,
-      signerSubstrateProxyAddress
+      senderAddress
     } = inputData;
     const isSendingSelf = isRecipientSelf(senderAddress, recipientAddress);
 
@@ -2445,8 +2443,7 @@ export default class KoniExtension {
         isSendingSelf
       },
       extrinsicType: ExtrinsicType.SEND_NFT,
-      chainType: ChainType.SUBSTRATE,
-      signerSubstrateProxyAddress
+      chainType: ChainType.SUBSTRATE
     });
     return {
       ...rs,
@@ -2483,6 +2480,9 @@ export default class KoniExtension {
     }
     return result;
   }
+  async accountsCreateMultisig(request) {
+    return this.#koniState.keyringService.context.accountsCreateMultisig(request);
+  }
 
   /// External account
 
@@ -2918,6 +2918,439 @@ export default class KoniExtension {
     });
   }
 
+  // Multisig handlers
+  async approvePendingTx(inputData) {
+    const {
+      address,
+      callHash,
+      chain,
+      multisigMetadata,
+      timepoint
+    } = inputData;
+    if (!address || !chain || !multisigMetadata || !callHash || !timepoint) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(MultisigTxErrorType.INVALID_PARAMS)]);
+    }
+    const api = this.#koniState.getSubstrateApi(chain).api;
+    if (!api || !api.tx || !api.tx.multisig) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(MultisigTxErrorType.LACK_MULTISIG_PALLET)]);
+    }
+    const otherSignatories = multisigMetadata.signers.filter(s => !isSameAddress(s, address));
+    const extrinsic = api.tx.multisig.approveAsMulti(multisigMetadata.threshold, sortAddresses(otherSignatories), timepoint, callHash, DEFAULT_MAX_WEIGHT);
+    return await this.#koniState.transactionService.handleTransaction({
+      address,
+      chain,
+      chainType: ChainType.SUBSTRATE,
+      data: inputData,
+      extrinsicType: ExtrinsicType.MULTISIG_APPROVE_TX,
+      transaction: extrinsic,
+      url: EXTENSION_REQUEST_URL
+    });
+  }
+  async executePendingTx(inputData) {
+    const {
+      address,
+      call,
+      chain,
+      decodedCallData,
+      multisigMetadata,
+      timepoint
+    } = inputData;
+    if (!address || !chain || !multisigMetadata || !timepoint || !call || !decodedCallData) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(MultisigTxErrorType.INVALID_PARAMS)]);
+    }
+    try {
+      const api = this.#koniState.getSubstrateApi(chain).api;
+      if (!api || !api.tx || !api.tx.multisig) {
+        return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(MultisigTxErrorType.LACK_MULTISIG_PALLET)]);
+      }
+      const otherSignatories = multisigMetadata.signers.filter(s => !isSameAddress(s, address));
+      const originalCall = api.createType('Call', call);
+      const originalExtrinsic = api.tx(originalCall);
+      const {
+        weight
+      } = await originalExtrinsic.paymentInfo(otherSignatories[0]); // estimate max weight for execute multisig tx
+
+      const extrinsic = api.tx.multisig.asMulti(multisigMetadata.threshold, sortAddresses(otherSignatories), timepoint, call, weight);
+      return await this.#koniState.transactionService.handleTransaction({
+        address,
+        chain,
+        chainType: ChainType.SUBSTRATE,
+        data: inputData,
+        extrinsicType: ExtrinsicType.MULTISIG_EXECUTE_TX,
+        transaction: extrinsic,
+        url: EXTENSION_REQUEST_URL
+      });
+    } catch (e) {
+      const errMsg = e.message;
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(MultisigTxErrorType.UNABLE_TO_CONSTRUCT_TX, errMsg)]);
+    }
+  }
+  async cancelPendingTx(inputData) {
+    const {
+      address,
+      callHash,
+      chain,
+      multisigMetadata,
+      timepoint
+    } = inputData;
+    if (!address || !chain || !multisigMetadata || !callHash) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(MultisigTxErrorType.INVALID_PARAMS)]);
+    }
+    const api = this.#koniState.getSubstrateApi(chain).api;
+    if (!api || !api.tx || !api.tx.multisig) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(MultisigTxErrorType.LACK_MULTISIG_PALLET)]);
+    }
+    const otherSignatories = multisigMetadata.signers.filter(s => !isSameAddress(s, address));
+    const extrinsic = api.tx.multisig.cancelAsMulti(multisigMetadata.threshold, sortAddresses(otherSignatories), timepoint, callHash);
+    return await this.#koniState.transactionService.handleTransaction({
+      address,
+      chain,
+      chainType: ChainType.SUBSTRATE,
+      data: inputData,
+      extrinsicType: ExtrinsicType.MULTISIG_CANCEL_TX,
+      transaction: extrinsic,
+      url: EXTENSION_REQUEST_URL
+    });
+  }
+
+  // Multisig Account
+  async initMultisigTx(request) {
+    const {
+      chain,
+      multisigMetadata: {
+        signers,
+        threshold
+      },
+      signer,
+      transactionId
+    } = request;
+
+    /**
+     * ─────────────────────────────
+     * Prepare original transaction
+     * ─────────────────────────────
+     */
+    const substrateApi = await this.#koniState.chainService.getSubstrateApi(chain).isReady;
+    const originTransaction = this.#koniState.transactionService.getTransaction(transactionId);
+    if (!(originTransaction !== null && originTransaction !== void 0 && originTransaction.transaction)) {
+      throw new Error(`[initMultisigTx] Origin transaction not found: ${transactionId}`);
+    }
+    const extrinsicOriginTransaction = originTransaction.transaction;
+    const callData = extrinsicOriginTransaction.method.toHex();
+
+    /**
+     * ─────────────────────────────
+     * Create multisig wrapped extrinsic
+     * ─────────────────────────────
+     */
+    const multisigExtrinsic = createInitMultisigExtrinsic(substrateApi.api, threshold, signers, signer, extrinsicOriginTransaction);
+    const decodedCallData = decodeCallData({
+      api: substrateApi.api,
+      callData
+    });
+
+    /**
+     * ─────────────────────────────
+     * Fee & deposit calculation
+     * ─────────────────────────────
+     */
+    const networkFee = (await multisigExtrinsic.paymentInfo(signer)).partialFee.toString();
+    const depositBase = substrateApi.api.consts.multisig.depositBase.toString();
+    const depositFactor = substrateApi.api.consts.multisig.depositFactor.toString();
+    const depositAmount = calcDepositAmount(depositBase, threshold, depositFactor);
+
+    /**
+     * ─────────────────────────────
+     * Additional validation
+     * ─────────────────────────────
+     * Validate signer balance:
+     * - multisig deposit
+     * - network fee
+     */
+    const additionalValidator = async inputTransaction => {
+      const signerBalance = await this.getAddressTransferableBalance({
+        address: signer,
+        networkKey: chain,
+        token: this.#koniState.chainService.getNativeTokenInfo(chain).slug,
+        extrinsicType: ExtrinsicType.TRANSFER_TOKEN
+      });
+
+      // Hydration: token fee setting is not supported
+      // todo: check and return better error for the case set token fee on hydration
+      if (_SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain)) {
+        var _substrateApi$api$que3;
+        const setTokenPayFee = await ((_substrateApi$api$que3 = substrateApi.api.query.multiTransactionPayment) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.accountCurrencyMap(signer));
+        if (setTokenPayFee.toPrimitive()) {
+          inputTransaction.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, t('bg.koni.handler.Extension.notEnoughBalanceForMultisigDepositAndFee')));
+        }
+      }
+      const requiredBalance = BigInt(depositAmount) + BigInt(networkFee);
+      if (BigInt(signerBalance.value) < requiredBalance) {
+        inputTransaction.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, t('bg.koni.handler.Extension.notEnoughBalanceForMultisigDepositAndFee')));
+      }
+    };
+
+    /**
+     * ─────────────────────────────
+     * Event forwarding
+     * ─────────────────────────────
+     * Multisig INIT transaction:
+     * - `signed` is forwarded to notify that the multisig initialization
+     *   has been successfully submitted.
+     * - `error` / `timeout` are forwarded to propagate failures.
+     *
+     * Note:
+     * Multisig execution requires collecting enough approvals,
+     * so the transaction is not finalized at this stage.
+     * These forwarded events are only used to resolve
+     * the original wrapped transaction promise.
+     */
+    const eventsHandler = eventEmitter => {
+      const originEmitter = originTransaction === null || originTransaction === void 0 ? void 0 : originTransaction.emitterTransaction;
+      if (!originEmitter) {
+        return;
+      }
+      eventEmitter.on('signed', data => {
+        originEmitter.emit('signed', data);
+      });
+      eventEmitter.on('error', data => {
+        if (data.errors.length > 0) {
+          originEmitter.emit('error', data);
+        }
+      });
+      eventEmitter.on('timeout', data => {
+        if (data.errors.length > 0 && data.errors.some(e => e.errorType === BasicTxErrorType.TIMEOUT)) {
+          originEmitter.emit('timeout', data);
+        }
+      });
+    };
+
+    /**
+     * ─────────────────────────────
+     * Submit wrapped transaction
+     * ─────────────────────────────
+     */
+    return this.#koniState.transactionService.handleWrappedTransaction({
+      address: signer,
+      chain,
+      chainType: ChainType.SUBSTRATE,
+      extrinsicType: ExtrinsicType.MULTISIG_INIT_TX,
+      transaction: multisigExtrinsic,
+      skipFeeValidation: true,
+      wrappingStatus: SubstrateTransactionWrappingStatus.WRAP_RESULT,
+      data: {
+        // input
+        ...request,
+        // output
+        submittedCallData: multisigExtrinsic.toHex(),
+        callData,
+        decodedCallData,
+        depositAmount,
+        networkFee
+      },
+      additionalValidator,
+      eventsHandler
+    });
+  }
+
+  // Substrate Proxy Account
+  async handleSubstrateProxyWrappedTx(request) {
+    const {
+      chain,
+      proxyMetadata,
+      signer,
+      transactionId
+    } = request;
+    const {
+      proxiedAddress
+    } = proxyMetadata;
+
+    /**
+     * ─────────────────────────────
+     * Prepare original transaction
+     * ─────────────────────────────
+     */
+    const substrateApi = await this.#koniState.chainService.getSubstrateApi(chain).isReady;
+    const originTransaction = this.#koniState.transactionService.getTransaction(transactionId);
+    const extrinsicOriginTransaction = originTransaction === null || originTransaction === void 0 ? void 0 : originTransaction.transaction;
+    const callData = extrinsicOriginTransaction.method.toHex();
+    const decodedCallData = decodeCallData({
+      api: substrateApi.api,
+      callData
+    });
+
+    /**
+     * ─────────────────────────────
+     * Determine proxy execution
+     * ─────────────────────────────
+     * If signer is the proxied address itself,
+     * a substrate proxy transaction is NOT required.
+     */
+    const isSignerProxiedAccount = isSameAddress(signer, proxiedAddress);
+
+    /**
+     * ─────────────────────────────
+     * Fee calculation
+     * ─────────────────────────────
+     */
+
+    const substrateProxyExtrinsic = isSignerProxiedAccount ? extrinsicOriginTransaction : createInitSubstrateProxyExtrinsic(substrateApi.api, proxiedAddress, extrinsicOriginTransaction);
+    const networkFee = (await substrateProxyExtrinsic.paymentInfo(signer)).partialFee.toString();
+
+    /**
+     * ─────────────────────────────
+     * Additional validation
+     * ─────────────────────────────
+     * Validate signer balance for proxy execution fee.
+     */
+    const additionalValidator = async inputTransaction => {
+      const signerBalance = await this.getAddressTransferableBalance({
+        address: signer,
+        networkKey: chain,
+        token: this.#koniState.chainService.getNativeTokenInfo(chain).slug,
+        extrinsicType: ExtrinsicType.TRANSFER_TOKEN
+      });
+
+      // todo: check and return better error for the case set token fee on hydration
+      if (_SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain)) {
+        var _substrateApi$api$que4;
+        const setTokenPayFee = await ((_substrateApi$api$que4 = substrateApi.api.query.multiTransactionPayment) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.accountCurrencyMap(signer));
+        if (setTokenPayFee.toPrimitive()) {
+          const account = getAccountJsonByAddress(signer);
+          inputTransaction.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, t('bg.koni.handler.Extension.proxyAccountNotEnoughBalance', {
+            replace: {
+              accountName: account === null || account === void 0 ? void 0 : account.name
+            }
+          })));
+        }
+      }
+      if (BigInt(signerBalance.value) < BigInt(networkFee)) {
+        const account = getAccountJsonByAddress(signer);
+        inputTransaction.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, t('bg.koni.handler.Extension.proxyAccountNotEnoughBalance', {
+          replace: {
+            accountName: account === null || account === void 0 ? void 0 : account.name
+          }
+        })));
+      }
+    };
+
+    /**
+     * ─────────────────────────────
+     * Event forwarding
+     * ─────────────────────────────
+     * The substrate proxy transaction acts as a wrapper.
+     * Its lifecycle events are forwarded to the original
+     * transaction to resolve the wrapped transaction promise.
+     * update history transaction accordingly.
+     */
+    const eventsHandler = eventEmitter => {
+      if (!(originTransaction !== null && originTransaction !== void 0 && originTransaction.emitterTransaction)) {
+        return;
+      }
+      const originEmitter = originTransaction.emitterTransaction;
+      eventEmitter.on('send', data => {
+        originEmitter.emit('send', {
+          ...data,
+          id: originTransaction.id
+        });
+      });
+      eventEmitter.on('signed', data => {
+        originEmitter.emit('signed', {
+          ...data,
+          id: originTransaction.id
+        });
+      });
+      eventEmitter.on('extrinsicHash', data => {
+        originEmitter.emit('extrinsicHash', {
+          ...data,
+          id: originTransaction.id
+        });
+      });
+      eventEmitter.on('success', data => {
+        originEmitter.emit('success', {
+          ...data,
+          id: originTransaction.id
+        });
+      });
+      eventEmitter.on('error', data => {
+        if (data.errors.length > 0) {
+          originEmitter.emit('error', {
+            ...data,
+            id: originTransaction.id
+          });
+        }
+      });
+      eventEmitter.on('timeout', data => {
+        if (data.errors.some(error => error.errorType === BasicTxErrorType.TIMEOUT)) {
+          originEmitter.emit('timeout', {
+            ...data,
+            id: originTransaction.id
+          });
+        }
+      });
+    };
+
+    /**
+     * ─────────────────────────────
+     * Execute wrapped transaction
+     * ─────────────────────────────
+     */
+
+    // Case 1: signer === proxied address → handle original transaction
+    if (isSignerProxiedAccount) {
+      let callDataFinal = callData;
+      let decodedCallDataFinal = decodedCallData;
+      const pendingMultisigTxRequest = originTransaction.data;
+      if (pendingMultisigTxRequest.call && pendingMultisigTxRequest.decodedCallData) {
+        callDataFinal = pendingMultisigTxRequest.call;
+        decodedCallDataFinal = pendingMultisigTxRequest.decodedCallData;
+      }
+      const response = await this.#koniState.transactionService.handleWrappedTransaction({
+        ...originTransaction,
+        skipFeeValidation: false,
+        data: {
+          ...originTransaction.data,
+          // output
+          decodedCallData: decodedCallDataFinal,
+          submittedCallData: substrateProxyExtrinsic.toHex(),
+          callData: callDataFinal,
+          networkFee
+        },
+        errors: [],
+        // Clear previous errors
+        wrappingStatus: SubstrateTransactionWrappingStatus.WRAP_RESULT,
+        eventsHandler
+      });
+
+      // Clear wrappingStatus since no wrapping is needed
+      delete response.wrappingStatus;
+      return response;
+    }
+
+    // Case 2: create and handle substrate proxy transaction
+    return await this.#koniState.transactionService.handleWrappedTransaction({
+      address: signer,
+      chain,
+      chainType: ChainType.SUBSTRATE,
+      extrinsicType: ExtrinsicType.SUBSTRATE_PROXY_INIT_TX,
+      transaction: substrateProxyExtrinsic,
+      skipFeeValidation: true,
+      transferNativeAmount: originTransaction.transferNativeAmount,
+      data: {
+        // input
+        ...request,
+        // output
+        decodedCallData,
+        submittedCallData: substrateProxyExtrinsic.toHex(),
+        callData,
+        networkFee
+      },
+      wrappingStatus: SubstrateTransactionWrappingStatus.WRAP_RESULT,
+      additionalValidator,
+      eventsHandler
+    });
+  }
+
   // EVM Transaction
   async parseContractInput({
     chainId,
@@ -3747,8 +4180,7 @@ export default class KoniExtension {
       isPassConfirmation,
       onSend,
       path,
-      processId,
-      signerSubstrateProxyAddress
+      processId
     } = inputData;
     const {
       address
@@ -3879,7 +4311,6 @@ export default class KoniExtension {
       // change this depends on step
       chainType,
       resolveOnDone: !isLastStep,
-      signerSubstrateProxyAddress,
       transferNativeAmount,
       balanceType: balanceTypeForPool,
       skipFeeValidation: isMintingStep && isPoolSupportAlternativeFee,
@@ -3892,7 +4323,6 @@ export default class KoniExtension {
   async handleYieldLeave(params) {
     const {
       address,
-      signerSubstrateProxyAddress,
       slug
     } = params;
     const leaveValidation = await this.#koniState.earningService.validateYieldLeave(params);
@@ -3908,7 +4338,6 @@ export default class KoniExtension {
       data: params,
       // TODO
       extrinsicType,
-      signerSubstrateProxyAddress,
       chainType: (handler === null || handler === void 0 ? void 0 : handler.transactionChainType) || ChainType.SUBSTRATE
     });
   }
@@ -3985,7 +4414,6 @@ export default class KoniExtension {
   async yieldSubmitWithdrawal(params) {
     const {
       address,
-      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -3999,7 +4427,6 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: params,
       extrinsicType: ExtrinsicType.STAKING_WITHDRAW,
-      signerSubstrateProxyAddress,
       chainType: (poolHandler === null || poolHandler === void 0 ? void 0 : poolHandler.transactionChainType) || ChainType.SUBSTRATE
     });
   }
@@ -4007,7 +4434,6 @@ export default class KoniExtension {
     const {
       address,
       selectedUnstaking,
-      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -4022,14 +4448,12 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: params,
       extrinsicType: ExtrinsicType.STAKING_CANCEL_UNSTAKE,
-      signerSubstrateProxyAddress,
       chainType: (poolHandler === null || poolHandler === void 0 ? void 0 : poolHandler.transactionChainType) || ChainType.SUBSTRATE
     });
   }
   async yieldSubmitClaimReward(params) {
     const {
       address,
-      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -4042,7 +4466,6 @@ export default class KoniExtension {
       chain: poolHandler.chain,
       transaction: extrinsic,
       data: params,
-      signerSubstrateProxyAddress,
       extrinsicType: ExtrinsicType.STAKING_CLAIM_REWARD,
       chainType: (poolHandler === null || poolHandler === void 0 ? void 0 : poolHandler.transactionChainType) || ChainType.SUBSTRATE
     });
@@ -4061,7 +4484,6 @@ export default class KoniExtension {
   async handleYieldChangeValidator(params) {
     const {
       address,
-      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -4074,7 +4496,6 @@ export default class KoniExtension {
       chain: poolHandler.chain,
       transaction: extrinsic,
       data: params,
-      signerSubstrateProxyAddress,
       extrinsicType: ExtrinsicType.CHANGE_EARNING_VALIDATOR,
       chainType: ChainType.SUBSTRATE
     });
@@ -4444,8 +4865,8 @@ export default class KoniExtension {
     });
     return await this.#koniState.inappNotificationService.getUnreadNotificationsCountMap();
   }
-  markAllReadNotification(proxyId) {
-    return this.#koniState.inappNotificationService.markAllRead(proxyId);
+  markAllReadNotification(params) {
+    return this.#koniState.inappNotificationService.markAllRead(params);
   }
   switchReadNotificationStatus(params) {
     return this.#koniState.inappNotificationService.switchReadStatus(params);
@@ -4762,10 +5183,9 @@ export default class KoniExtension {
   async handleAddSubstrateProxyAccount(params) {
     const {
       address,
-      chain,
-      signerSubstrateProxyAddress
+      chain
     } = params;
-    const validationErrors = await this.#koniState.substrateProxyAccountService.validateAddSubstrateProxyAccount(params, signerSubstrateProxyAddress);
+    const validationErrors = await this.#koniState.substrateProxyAccountService.validateAddSubstrateProxyAccount(params);
     if (validationErrors.length > 0) {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(validationErrors);
     }
@@ -4776,15 +5196,13 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: params,
       extrinsicType: ExtrinsicType.ADD_SUBSTRATE_PROXY_ACCOUNT,
-      chainType: ChainType.SUBSTRATE,
-      signerSubstrateProxyAddress
+      chainType: ChainType.SUBSTRATE
     });
   }
   async handleRemoveSubstrateProxyAccount(params) {
     const {
       address,
-      chain,
-      signerSubstrateProxyAddress
+      chain
     } = params;
     const extrinsic = await this.#koniState.substrateProxyAccountService.removeSubstrateProxyAccounts(params);
     return await this.#koniState.transactionService.handleTransaction({
@@ -4793,8 +5211,7 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: params,
       extrinsicType: ExtrinsicType.REMOVE_SUBSTRATE_PROXY_ACCOUNT,
-      chainType: ChainType.SUBSTRATE,
-      signerSubstrateProxyAddress
+      chainType: ChainType.SUBSTRATE
     });
   }
 
@@ -4810,8 +5227,7 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: request,
       extrinsicType: ExtrinsicType.GOV_VOTE,
-      chainType: ChainType.SUBSTRATE,
-      signerSubstrateProxyAddress: request.signerSubstrateProxyAddress
+      chainType: ChainType.SUBSTRATE
     });
   }
   async handleRemoveVote(request) {
@@ -4822,8 +5238,7 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: request,
       extrinsicType: ExtrinsicType.GOV_UNVOTE,
-      chainType: ChainType.SUBSTRATE,
-      signerSubstrateProxyAddress: request.signerSubstrateProxyAddress
+      chainType: ChainType.SUBSTRATE
     });
   }
   async handleUnlockVote(request) {
@@ -4834,8 +5249,7 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: request,
       extrinsicType: ExtrinsicType.GOV_UNLOCK_VOTE,
-      chainType: ChainType.SUBSTRATE,
-      signerSubstrateProxyAddress: request.signerSubstrateProxyAddress
+      chainType: ChainType.SUBSTRATE
     });
   }
   async subscribeGovLockedInfo(id, port) {
@@ -4855,6 +5269,25 @@ export default class KoniExtension {
 
   /* Open Gov */
 
+  /* Multisig Acocunt */
+
+  async subscribePendingMultisigTx(id, port) {
+    const cb = createSubscription(id, port);
+    await this.#koniState.multisigService.waitForStarted();
+    const pendingTxSubscription = this.#koniState.multisigService.subscribePendingMultisigTxMap().subscribe({
+      next: rs => {
+        cb(rs);
+      }
+    });
+    this.createUnsubscriptionHandle(id, pendingTxSubscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.multisigService.getPendingMultisigTxMap();
+  }
+
+  /* Multisig Acocunt */
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -5061,6 +5494,8 @@ export default class KoniExtension {
         return this.accountsCreateSuriV2(request);
       case 'pri(accounts.create.externalV2)':
         return await this.accountsCreateExternalV2(request);
+      case 'pri(accounts.create.multisig)':
+        return await this.accountsCreateMultisig(request);
       case 'pri(accounts.create.hardwareV2)':
         return await this.accountsCreateHardwareV2(request);
       case 'pri(accounts.create.hardwareMultiple)':
@@ -5513,6 +5948,7 @@ export default class KoniExtension {
         return this.migrateSoloAccount(request);
       case 'pri(migrate.pingSession)':
         return this.pingSession(request);
+      /* Migrate Unified Account */
 
       /* Gov */
       case 'pri(openGov.vote)':
@@ -5523,6 +5959,24 @@ export default class KoniExtension {
         return this.handleUnlockVote(request);
       case 'pri(openGov.subscribeGovLockedInfo)':
         return this.subscribeGovLockedInfo(id, port);
+      /* Gov */
+
+      /* Multisig Account */
+      case 'pri(multisig.subscribePendingMultisigTxs)':
+        return await this.subscribePendingMultisigTx(id, port);
+      case 'pri(multisig.getPendingMultisigTxs)':
+        return this.#koniState.multisigService.getPendingTxsForMultisigAddress(request);
+      case 'pri(multisig.approvePendingTx)':
+        return await this.approvePendingTx(request);
+      case 'pri(multisig.executePendingTx)':
+        return await this.executePendingTx(request);
+      case 'pri(multisig.cancelPendingTx)':
+        return await this.cancelPendingTx(request);
+      case 'pri(multisig.initMultisigTx)':
+        return await this.initMultisigTx(request);
+      case 'pri(multisig.getSignableAccountInfos)':
+        return this.#koniState.keyringService.context.getSignableAccountInfos(request);
+      /* Multisig Account */
 
       // Proxy
       case 'pri(substrateProxyAccount.getGroupInfo)':
@@ -5531,7 +5985,8 @@ export default class KoniExtension {
         return this.handleAddSubstrateProxyAccount(request);
       case 'pri(substrateProxyAccount.remove)':
         return this.handleRemoveSubstrateProxyAccount(request);
-
+      case 'pri(substrateProxyAccount.handleProxyWrappedTx)':
+        return this.handleSubstrateProxyWrappedTx(request);
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);