@subwallet/extension-base 1.3.45-1 → 1.3.46-0

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

@@ -16,6 +16,7 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _transfer = require("@subwallet/extension-base/core/logic-validation/transfer");
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
+var _types2 = require("@subwallet/extension-base/core/types");
 var _utils = require("@subwallet/extension-base/core/utils");
 var _defaults = require("@subwallet/extension-base/defaults");
 var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
@@ -42,7 +43,7 @@ var _polygonBridge = require("@subwallet/extension-base/services/balance-service
 var _posBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge");
 var _utils5 = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
-var _types2 = require("@subwallet/extension-base/services/chain-service/types");
+var _types3 = require("@subwallet/extension-base/services/chain-service/types");
 var _utils6 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils7 = require("@subwallet/extension-base/services/fee-service/utils");
 var _tokenPayFee = require("@subwallet/extension-base/services/fee-service/utils/tokenPayFee");
@@ -51,12 +52,12 @@ var _constants4 = require("@subwallet/extension-base/services/setting-service/co
 var _helpers2 = require("@subwallet/extension-base/services/wallet-connect-service/helpers");
 var _storage = require("@subwallet/extension-base/storage");
 var _stores = require("@subwallet/extension-base/stores");
-var _types3 = require("@subwallet/extension-base/types");
+var _types4 = require("@subwallet/extension-base/types");
 var _utils8 = require("@subwallet/extension-base/utils");
 var _parseTransaction2 = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _keyring = require("@subwallet/keyring");
-var _types4 = require("@subwallet/keyring/types");
+var _types5 = require("@subwallet/keyring/types");
 var _utils9 = require("@subwallet/keyring/utils");
 var _validate = require("@subwallet/keyring/utils/address/validate");
 var _uiKeyring = require("@subwallet/ui-keyring");
@@ -65,7 +66,7 @@ var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var bitcoin = _interopRequireWildcard(require("bitcoinjs-lib"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
-var _types5 = require("@polkadot/types");
+var _types6 = require("@polkadot/types");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _utils11 = require("../utils");
@@ -217,7 +218,7 @@ class KoniExtension {
     const {
       reject
     } = queued;
-    reject(new _TransactionError.TransactionError(_types3.BasicTxErrorType.USER_REJECT_REQUEST));
+    reject(new _TransactionError.TransactionError(_types4.BasicTxErrorType.USER_REJECT_REQUEST));
     return true;
   }
 
@@ -313,16 +314,32 @@ class KoniExtension {
   }
   async subscribeInputAddressData(request, id, port) {
     const {
+      actionType,
       chain,
-      data
+      data,
+      token
     } = request;
     const cb = (0, _subscriptions.createSubscription)(id, port);
-    const combineFunction = async (chainInfoMap, accountProxyMap, _contacts) => {
+    const combineFunction = async (chainInfoMap, tokenInfoMap, accountProxyMap, _contacts) => {
       const accountProxies = Object.values(accountProxyMap);
       const contacts = (0, _utils8.transformAddresses)(_contacts);
       const chainInfo = chainInfoMap[chain];
+      const tokenInfo = tokenInfoMap[token || ''];
       const substrateApi = this.#koniState.chainService.getSubstrateApi(chain);
-      const rs = await (0, _utils8._analyzeAddress)(data, accountProxies, contacts, chainInfo, substrateApi);
+      const accountProxiesFiltered = accountProxies.filter(accountProxy => {
+        var _accountProxy$account;
+        const signMode = (_accountProxy$account = accountProxy.accounts[0]) === null || _accountProxy$account === void 0 ? void 0 : _accountProxy$account.signMode;
+        if (signMode === _types4.AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {
+          if (actionType === _types2.ActionType.SEND_NFT) {
+            return false;
+          }
+          if (tokenInfo) {
+            return (0, _utils8.isSubstrateEcdsaLedgerAssetSupported)(tokenInfo, chainInfo);
+          }
+        }
+        return true;
+      });
+      const rs = await (0, _utils8._analyzeAddress)(data, accountProxiesFiltered, contacts, chainInfo, substrateApi);
       return {
         id,
         ...rs
@@ -331,17 +348,20 @@ class KoniExtension {
     const accountObservable = this.#koniState.keyringService.context.observable.accounts;
     const contactObservable = this.#koniState.keyringService.context.observable.contacts;
     const chainInfoMapObservable = this.#koniState.chainService.subscribeChainInfoMap().asObservable();
+    const tokenInfoMapObservable = this.#koniState.chainService.subscribeAssetRegistry().asObservable();
     const subscription = (0, _rxjs.combineLatest)({
       chainInfoMap: chainInfoMapObservable,
+      tokenInfoMap: tokenInfoMapObservable,
       accountProxies: accountObservable,
       contacts: contactObservable
     }).subscribe(_ref8 => {
       let {
         accountProxies,
         chainInfoMap,
-        contacts
+        contacts,
+        tokenInfoMap
       } = _ref8;
-      combineFunction(chainInfoMap, accountProxies, contacts).then(rs => cb(rs)).catch(console.error);
+      combineFunction(chainInfoMap, tokenInfoMap, accountProxies, contacts).then(rs => cb(rs)).catch(console.error);
     });
     this.createUnsubscriptionHandle(id, () => {
       subscription.unsubscribe();
@@ -352,7 +372,8 @@ class KoniExtension {
     const accountProxyMap = this.#koniState.keyringService.context.value.accounts;
     const contacts = this.#koniState.keyringService.context.value.contacts;
     const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
-    return combineFunction(chainInfoMap, accountProxyMap, contacts);
+    const tokenInfoMap = this.#koniState.chainService.getAssetRegistry();
+    return combineFunction(chainInfoMap, tokenInfoMap, accountProxyMap, contacts);
   }
 
   /**
@@ -588,11 +609,11 @@ class KoniExtension {
   isAddressValidWithAuthType(address, accountAuthTypes) {
     const type = (0, _keyring.getKeypairTypeByAddress)(address);
     const validTypes = {
-      evm: _types4.EthereumKeypairTypes,
-      substrate: _types4.SubstrateKeypairTypes,
-      ton: _types4.TonKeypairTypes,
-      cardano: _types4.CardanoKeypairTypes,
-      bitcoin: _types4.BitcoinKeypairTypes
+      evm: _types5.EthereumKeypairTypes,
+      substrate: _types5.SubstrateKeypairTypes,
+      ton: _types5.TonKeypairTypes,
+      cardano: _types5.CardanoKeypairTypes,
+      bitcoin: _types5.BitcoinKeypairTypes
     };
     return !!accountAuthTypes && accountAuthTypes.some(authType => {
       var _validTypes$authType;
@@ -1292,6 +1313,8 @@ class KoniExtension {
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNativeToken && tokenPayFeeSlug === tokenSlug;
     const isCustomTokenPayFeeAssetHub = tokenPayFeeSlug && !(0, _utils6._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain);
     const isCustomTokenPayFeeHydration = tokenPayFeeSlug && !(0, _utils6._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain);
+    const pairFrom = _uiKeyring.keyring.getPair(from);
+    const isSubstrateECDSATransaction = pairFrom.meta.isSubstrateECDSA;
     const extrinsicType = isTransferNativeToken ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.TRANSFER_TOKEN;
     let chainType = _KoniTypes.ChainType.SUBSTRATE;
     const transferAmount = {
@@ -1308,7 +1331,7 @@ class KoniExtension {
       extrinsicType
     });
     try {
-      if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils6._isTokenTransferredByEvm)(transferTokenInfo)) {
+      if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils6._isTokenTransferredByEvm)(transferTokenInfo) && !isSubstrateECDSATransaction) {
         chainType = _KoniTypes.ChainType.EVM;
         const txVal = transferAll ? transferTokenAvailable.value : value || '0';
         const evmApi = this.#koniState.getEvmApi(chain);
@@ -1446,7 +1469,7 @@ class KoniExtension {
         const nonNativeTokenPayFeeInfo = await this.#koniState.balanceService.getTokensHasBalance((0, _utils8.reformatAddress)(from), chain, tokenPayFeeSlug);
         const nonNativeTokenPayFeeBalance = BigInt(((_nonNativeTokenPayFee = nonNativeTokenPayFeeInfo[tokenPayFeeSlug]) === null || _nonNativeTokenPayFee === void 0 ? void 0 : _nonNativeTokenPayFee.free) || '0');
         if (nonNativeFee > nonNativeTokenPayFeeBalance) {
-          inputTransaction.errors.push(new _TransactionError.TransactionError(_types3.BasicTxErrorType.NOT_ENOUGH_BALANCE));
+          inputTransaction.errors.push(new _TransactionError.TransactionError(_types4.BasicTxErrorType.NOT_ENOUGH_BALANCE));
         }
       }
 
@@ -1485,10 +1508,10 @@ class KoniExtension {
     };
     const ignoreWarnings = [];
     if (transferAll) {
-      ignoreWarnings.push(_types3.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
+      ignoreWarnings.push(_types4.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
     }
     if (transferBounceable) {
-      ignoreWarnings.push(_types3.BasicTxWarningCode.IS_BOUNCEABLE_ADDRESS);
+      ignoreWarnings.push(_types4.BasicTxWarningCode.IS_BOUNCEABLE_ADDRESS);
     }
     return this.#koniState.transactionService.handleTransaction({
       errors,
@@ -1668,7 +1691,7 @@ class KoniExtension {
         if (isSubstrateXcm) {
           const isDryRunSuccess = await (0, _xcm.dryRunXcmExtrinsicV2)(params);
           if (!isDryRunSuccess) {
-            inputTransaction.errors.push(new _TransactionError.TransactionError(_types3.BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again'));
+            inputTransaction.errors.push(new _TransactionError.TransactionError(_types4.BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again'));
           }
         }
       };
@@ -1691,10 +1714,10 @@ class KoniExtension {
     }
     const ignoreWarnings = [];
     if (transferAll) {
-      ignoreWarnings.push(_types3.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
+      ignoreWarnings.push(_types4.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
     }
     if (transferBounceable) {
-      ignoreWarnings.push(_types3.BasicTxWarningCode.IS_BOUNCEABLE_ADDRESS);
+      ignoreWarnings.push(_types4.BasicTxWarningCode.IS_BOUNCEABLE_ADDRESS);
     }
     return await this.#koniState.transactionService.handleTransaction({
       url: _constants3.EXTENSION_REQUEST_URL,
@@ -2730,7 +2753,7 @@ class KoniExtension {
           chainName: chainInfo.name
         }
       });
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.StakingTxErrorType.CAN_NOT_GET_METADATA, errMessage)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.StakingTxErrorType.CAN_NOT_GET_METADATA, errMessage)]);
     }
     const bondingValidation = (0, _bonding.validateBondingCondition)(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata);
     if (!amount || !selectedValidators || bondingValidation.length > 0) {
@@ -2758,7 +2781,7 @@ class KoniExtension {
     } = inputData;
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, _KoniTypes.StakingType.NOMINATED);
     if (!chainStakingMetadata || !nominatorMetadata) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.BasicTxErrorType.INTERNAL_ERROR)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const unbondingValidation = (0, _bonding.validateUnbondingCondition)(nominatorMetadata, amount, chain, chainStakingMetadata, validatorAddress);
     if (!amount || unbondingValidation.length > 0) {
@@ -2783,10 +2806,10 @@ class KoniExtension {
     } = inputData;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
     if (!address || !poolHandler) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.BasicTxErrorType.INVALID_PARAMS)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INVALID_PARAMS)]);
     }
     const chain = poolHandler.chain;
-    const stakingType = poolHandler.type === _types3.YieldPoolType.NOMINATION_POOL ? _KoniTypes.StakingType.POOLED : _KoniTypes.StakingType.NOMINATED;
+    const stakingType = poolHandler.type === _types4.YieldPoolType.NOMINATION_POOL ? _KoniTypes.StakingType.POOLED : _KoniTypes.StakingType.NOMINATED;
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await (0, _bonding.getClaimRewardExtrinsic)(substrateApi, chain, address, stakingType, bondReward);
     return await this.#koniState.transactionService.handleTransaction({
@@ -2807,7 +2830,7 @@ class KoniExtension {
     } = inputData;
     const chain = (_this$koniState$earni = this.#koniState.earningService.getPoolHandler(slug)) === null || _this$koniState$earni === void 0 ? void 0 : _this$koniState$earni.chain;
     if (!chain || !selectedUnstaking) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.BasicTxErrorType.INVALID_PARAMS)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INVALID_PARAMS)]);
     }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     // @ts-ignore
@@ -2837,7 +2860,7 @@ class KoniExtension {
           chainName: chainInfo.name
         }
       });
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.StakingTxErrorType.CAN_NOT_GET_METADATA, errMessage)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.StakingTxErrorType.CAN_NOT_GET_METADATA, errMessage)]);
     }
     const bondingValidation = (0, _relayChain.validatePoolBondingCondition)(chainInfo, amount, selectedPool, address, chainStakingMetadata, nominatorMetadata);
     if (!amount || bondingValidation.length > 0) {
@@ -2869,7 +2892,7 @@ class KoniExtension {
           chainName: chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.name
         }
       });
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.StakingTxErrorType.CAN_NOT_GET_METADATA, errMessage)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.StakingTxErrorType.CAN_NOT_GET_METADATA, errMessage)]);
     }
     const unbondingValidation = (0, _relayChain.validateRelayUnbondingCondition)(amount, chainStakingMetadata, nominatorMetadata);
     if (!amount || unbondingValidation.length > 0) {
@@ -2906,7 +2929,7 @@ class KoniExtension {
       networkKey
     } = inputData;
     if (!address) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.BasicTxErrorType.INVALID_PARAMS)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INVALID_PARAMS)]);
     }
     const dotSamaApi = this.#koniState.getSubstrateApi(networkKey);
     const chainInfo = this.#koniState.getChainInfo(networkKey);
@@ -3089,7 +3112,7 @@ class KoniExtension {
     const {
       payload
     } = request;
-    let registry = new _types5.TypeRegistry();
+    let registry = new _types6.TypeRegistry();
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
       const registries = await Promise.all([(0, _utils11.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils11.setupDatabaseRegistry)(chainInfo, payload, this.#koniState), (0, _utils11.setupDappRegistry)(payload, this.#koniState)]);
@@ -3534,7 +3557,7 @@ class KoniExtension {
       const {
         connectionStatus
       } = this.#koniState.chainService.getChainStatusByKey(_constants2._DEFAULT_MANTA_ZK_CHAIN);
-      if (connectionStatus !== _types2._ChainConnectionStatus.CONNECTED) {
+      if (connectionStatus !== _types3._ChainConnectionStatus.CONNECTED) {
         // TODO: do better
         await timeout();
       }
@@ -3758,10 +3781,10 @@ class KoniExtension {
     if (!data) {
       if (step) {
         this.#koniState.transactionService.updateProcessStepStatus(step, {
-          status: _types3.StepStatus.FAILED
+          status: _types4.StepStatus.FAILED
         });
       }
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.BasicTxErrorType.INTERNAL_ERROR)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const isLastStep = inputData.currentStep + 1 === path.steps.length;
     const yieldValidation = await this.#koniState.earningService.validateYieldJoin({
@@ -3772,7 +3795,7 @@ class KoniExtension {
     if (yieldValidation.length > 0) {
       if (step) {
         this.#koniState.transactionService.updateProcessStepStatus(step, {
-          status: _types3.StepStatus.FAILED
+          status: _types4.StepStatus.FAILED
         });
       }
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(yieldValidation);
@@ -3783,7 +3806,7 @@ class KoniExtension {
     } catch (e) {
       if (step) {
         this.#koniState.transactionService.updateProcessStepStatus(step, {
-          status: _types3.StepStatus.FAILED
+          status: _types4.StepStatus.FAILED
         });
       }
       throw e;
@@ -3812,7 +3835,7 @@ class KoniExtension {
           feeComponent: [{
             amount: fee.amount || '0',
             // TODO: Add fee type
-            feeType: _types3.SwapFeeType.NETWORK_FEE,
+            feeType: _types4.SwapFeeType.NETWORK_FEE,
             tokenSlug: fee.slug
           }],
           defaultFeeToken: fee.slug,
@@ -3823,7 +3846,7 @@ class KoniExtension {
         const lastStep = path.steps[path.steps.length - 1];
         const combineInfo = {
           // In real case, only `YIELD` have multiple steps
-          type: lastStep.type === _types3.YieldStepType.JOIN_NOMINATION_POOL ? _types3.EarningProcessType.NOMINATION_POOL : lastStep.type === _types3.YieldStepType.NOMINATE ? _types3.EarningProcessType.NATIVE_STAKING : _types3.EarningProcessType.YIELD,
+          type: lastStep.type === _types4.YieldStepType.JOIN_NOMINATION_POOL ? _types4.EarningProcessType.NOMINATION_POOL : lastStep.type === _types4.YieldStepType.NOMINATE ? _types4.EarningProcessType.NATIVE_STAKING : _types4.EarningProcessType.YIELD,
           data,
           brief: {
             amount: data.amount,
@@ -3835,16 +3858,16 @@ class KoniExtension {
         await this.#koniState.transactionService.createProcessIfNeed({
           id: processId,
           address: (0, _utils8.reformatAddress)(address),
-          type: _types3.ProcessType.EARNING,
+          type: _types4.ProcessType.EARNING,
           combineInfo,
           currentStepId: step.stepId,
           steps: path.steps.map((step, index) => {
             const fee = convertFee(path.totalFee[index]);
-            if (![_types3.YieldStepType.XCM, _types3.YieldStepType.DEFAULT, _types3.YieldStepType.TOKEN_APPROVAL].includes(step.type)) {
+            if (![_types4.YieldStepType.XCM, _types4.YieldStepType.DEFAULT, _types4.YieldStepType.TOKEN_APPROVAL].includes(step.type)) {
               const metadata = data;
               return {
                 ...step,
-                status: _types3.StepStatus.QUEUED,
+                status: _types4.StepStatus.QUEUED,
                 fee,
                 metadata: metadata
               };
@@ -3852,10 +3875,10 @@ class KoniExtension {
             return {
               ...step,
               fee,
-              status: _types3.StepStatus.QUEUED
+              status: _types4.StepStatus.QUEUED
             };
-          }).filter(step => step.type !== _types3.YieldStepType.DEFAULT),
-          status: _types3.StepStatus.QUEUED
+          }).filter(step => step.type !== _types4.YieldStepType.DEFAULT),
+          status: _types4.StepStatus.QUEUED
         });
       }
     }
@@ -3975,7 +3998,7 @@ class KoniExtension {
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
     if (!poolHandler) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.BasicTxErrorType.INVALID_PARAMS)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INVALID_PARAMS)]);
     }
     const extrinsic = await this.#koniState.earningService.handleYieldWithdraw(params);
     return await this.#koniState.transactionService.handleTransaction({
@@ -3995,7 +4018,7 @@ class KoniExtension {
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
     if (!poolHandler || !selectedUnstaking) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.BasicTxErrorType.INVALID_PARAMS)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INVALID_PARAMS)]);
     }
     const chain = poolHandler.chain;
     const extrinsic = await this.#koniState.earningService.handleYieldCancelUnstake(params);
@@ -4015,7 +4038,7 @@ class KoniExtension {
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
     if (!address || !poolHandler) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.BasicTxErrorType.INVALID_PARAMS)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INVALID_PARAMS)]);
     }
     const extrinsic = await this.#koniState.earningService.handleYieldClaimReward(params);
     return await this.#koniState.transactionService.handleTransaction({
@@ -4033,7 +4056,7 @@ class KoniExtension {
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
     if (!poolHandler) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.BasicTxErrorType.INVALID_PARAMS)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INVALID_PARAMS)]);
     }
     const slippage = await this.#koniState.earningService.yieldGetEarningSlippage(params);
     return slippage;
@@ -4258,10 +4281,10 @@ class KoniExtension {
     if (!quote || !address || !process) {
       if (step) {
         this.#koniState.transactionService.updateProcessStepStatus(step, {
-          status: _types3.StepStatus.FAILED
+          status: _types4.StepStatus.FAILED
         });
       }
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.BasicTxErrorType.INTERNAL_ERROR)]);
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const isLastStep = inputData.currentStep + 1 === process.steps.length;
     const swapValidations = await this.#koniState.swapService.validateSwapProcessV2({
@@ -4274,7 +4297,7 @@ class KoniExtension {
     if (swapValidations.length > 0) {
       if (step) {
         this.#koniState.transactionService.updateProcessStepStatus(step, {
-          status: _types3.StepStatus.FAILED
+          status: _types4.StepStatus.FAILED
         });
       }
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(swapValidations);
@@ -4285,7 +4308,7 @@ class KoniExtension {
     } catch (e) {
       if (step) {
         this.#koniState.transactionService.updateProcessStepStatus(step, {
-          status: _types3.StepStatus.FAILED
+          status: _types4.StepStatus.FAILED
         });
       }
       console.log('Error handling process step', e);
@@ -4321,7 +4344,7 @@ class KoniExtension {
         await this.#koniState.transactionService.createProcessIfNeed({
           id: processId,
           address: (0, _utils8.reformatAddress)(address),
-          type: _types3.ProcessType.SWAP,
+          type: _types4.ProcessType.SWAP,
           currentStepId: step.stepId,
           combineInfo,
           steps: inputData.process.steps.map((step, index) => {
@@ -4329,10 +4352,10 @@ class KoniExtension {
             return {
               ...step,
               fee,
-              status: _types3.StepStatus.QUEUED
+              status: _types4.StepStatus.QUEUED
             };
-          }).filter(step => step.type !== _types3.CommonStepType.DEFAULT),
-          status: _types3.StepStatus.QUEUED
+          }).filter(step => step.type !== _types4.CommonStepType.DEFAULT),
+          status: _types4.StepStatus.QUEUED
         });
       }
     }
@@ -4529,7 +4552,7 @@ class KoniExtension {
       throw new Error('Pair not found');
     }
     const signMode = (0, _utils8.getAccountSignMode)(address, pair.meta);
-    if (signMode !== _types3.AccountSignMode.PASSWORD) {
+    if (signMode !== _types4.AccountSignMode.PASSWORD) {
       throw new Error('Account can not use this feature');
     }
     const setting = await new Promise(resolve => this.#koniState.settingService.getSettings(resolve));
@@ -4537,16 +4560,16 @@ class KoniExtension {
       throw new Error('Wallet not enable this feature');
     }
     switch (type) {
-      case _types3.ProcessType.EARNING:
+      case _types4.ProcessType.EARNING:
 
       // eslint-disable-next-line no-fallthrough
-      case _types3.ProcessType.SWAP:
+      case _types4.ProcessType.SWAP:
         {
           const currentStep = requestData.currentStep;
           let stepNums;
           let submitData;
           let waitXcmData;
-          if (type === _types3.ProcessType.EARNING) {
+          if (type === _types4.ProcessType.EARNING) {
             const data = requestData;
             const poolHandler = this.#koniState.earningService.getPoolHandler(data.data.slug);
             if (poolHandler) {

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

@@ -39,6 +39,7 @@ function transformAccountsV2(accounts) {
   let anyType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   let authInfo = arguments.length > 2 ? arguments[2] : undefined;
   let accountAuthTypes = arguments.length > 3 ? arguments[3] : undefined;
+  let isSubstrateConnector = arguments.length > 4 ? arguments[4] : undefined;
   const accountSelected = authInfo ? authInfo.isAllowed ? Object.keys(authInfo.isAllowedMap).filter(address => authInfo.isAllowedMap[address]) : [] : [];
   const authTypeFilter = _ref => {
     let {
@@ -68,6 +69,12 @@ function transformAccountsV2(accounts) {
       if (type === 'cardano' && json.meta.isReadOnly) {
         return false;
       }
+      const canConnectSubstrateEcdsa = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.canConnectSubstrateEcdsa) && isSubstrateConnector;
+
+      // If the dApp has not connected to the Substrate type yet, we do not return Substrate ECDSA accounts.
+      if (type === 'ethereum' && json.meta.isSubstrateECDSA && !canConnectSubstrateEcdsa) {
+        return false;
+      }
       return true;
     } else {
       return true;
@@ -297,7 +304,8 @@ class KoniTabs {
   async accountsListV2(url, _ref7) {
     let {
       accountAuthType,
-      anyType
+      anyType,
+      isSubstrateConnector
     } = _ref7;
     const authInfo = await this.getAuthInfo(url);
     const accountAuthTypes = [];
@@ -317,7 +325,7 @@ class KoniTabs {
         accountAuthTypes.push('cardano');
       }
     }
-    return transformAccountsV2(this.#koniState.keyringService.context.pairs, anyType, authInfo, accountAuthTypes);
+    return transformAccountsV2(this.#koniState.keyringService.context.pairs, anyType, authInfo, accountAuthTypes, isSubstrateConnector);
   }
 
   // TODO: Update logic
@@ -342,7 +350,7 @@ class KoniTabs {
             }
           }
           const accounts = this.#koniState.keyringService.context.pairs;
-          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthTypes));
+          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthTypes, true));
         }).catch(console.error);
       }),
       url

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.45-1'
+  version: '1.3.46-0'
 };
 exports.packageInfo = packageInfo;