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

package/services/swap-service/handler/uniswap-handler.js

@@ -39,7 +39,6 @@ async function fetchCheckApproval(request) {
     if (!output) {
       return undefined; // todo: recheck
     }
-
     chainId = dutchQuote.orderInfo.chainId;
     tokenIn = dutchQuote.orderInfo.input.token;
     tokenOut = output.token;
@@ -60,7 +59,6 @@ async function fetchCheckApproval(request) {
       tokenOutChainId: chainId // swap in-chain
     })
   });
-
   return await response.json();
 }
 export class UniswapHandler {
@@ -802,7 +800,6 @@ export class UniswapHandler {
     if (swap) {
       return this.swapBaseHandler.validateSwapOnlyProcess(params, swapIndex); // todo: create interface for input request
     }
-
     if (swapXcm) {
       return this.swapBaseHandler.validateSwapXcmProcess(params, swapIndex, bridgeIndex);
     }

package/services/transaction-service/event-parser/index.js

@@ -87,10 +87,10 @@ export function parseLiquidStakingEvents(historyItem, eventLogs, inputTokenInfo,
       if (record.event.section === section && record.event.method.toLowerCase() === eventMethod) {
         var _record$event$data$9;
         if ((_record$event$data$9 = record.event.data[2]) !== null && _record$event$data$9 !== void 0 && _record$event$data$9.toString()) {
-          var _record$event$data$10;
+          var _record$event$data$0;
           // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
           historyItem.fee = {
-            value: ((_record$event$data$10 = record.event.data[2]) === null || _record$event$data$10 === void 0 ? void 0 : _record$event$data$10.toString()) || '0',
+            value: ((_record$event$data$0 = record.event.data[2]) === null || _record$event$data$0 === void 0 ? void 0 : _record$event$data$0.toString()) || '0',
             symbol: nativeSymbol,
             decimals: nativeDecimals
           };
@@ -109,12 +109,12 @@ export function parseLiquidStakingFastUnstakeEvents(historyItem, eventLogs, chai
     const section = extrinsicType === ExtrinsicType.REDEEM_QDOT ? 'tokens' : 'balances';
     const eventMethod = extrinsicType === ExtrinsicType.REDEEM_QDOT ? 'withdrawn' : 'withdraw';
     if (record.event.section === section && record.event.method.toLowerCase() === eventMethod) {
-      var _record$event$data$11;
-      if ((_record$event$data$11 = record.event.data[2]) !== null && _record$event$data$11 !== void 0 && _record$event$data$11.toString()) {
-        var _record$event$data$12;
+      var _record$event$data$1;
+      if ((_record$event$data$1 = record.event.data[2]) !== null && _record$event$data$1 !== void 0 && _record$event$data$1.toString()) {
+        var _record$event$data$10;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         historyItem.fee = {
-          value: ((_record$event$data$12 = record.event.data[2]) === null || _record$event$data$12 === void 0 ? void 0 : _record$event$data$12.toString()) || '0',
+          value: ((_record$event$data$10 = record.event.data[2]) === null || _record$event$data$10 === void 0 ? void 0 : _record$event$data$10.toString()) || '0',
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };

package/services/wallet-connect-service/index.js

@@ -138,6 +138,9 @@ export default class WalletConnectService {
     var _classPrivateFieldLoo;
     return ((_classPrivateFieldLoo = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo === void 0 ? void 0 : _classPrivateFieldLoo.session.values) || [];
   }
+
+  // Remove old listener
+
   getSession(topic) {
     var _classPrivateFieldLoo2;
     const session = (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo2 === void 0 ? void 0 : _classPrivateFieldLoo2.session.get(topic);
@@ -191,7 +194,7 @@ export default class WalletConnectService {
     await ((_classPrivateFieldLoo7 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo7 === void 0 ? void 0 : _classPrivateFieldLoo7.respond(response));
   }
   async resetWallet(resetAll) {
-    var _classPrivateFieldLoo8, _classPrivateFieldLoo10, _classPrivateFieldLoo12;
+    var _classPrivateFieldLoo8, _classPrivateFieldLoo0, _classPrivateFieldLoo10;
     _classPrivateFieldLooseBase(this, _removeListener)[_removeListener]();
 
     // Disconnect session
@@ -209,11 +212,11 @@ export default class WalletConnectService {
     }
 
     // Disconnect pair
-    const pairs = ((_classPrivateFieldLoo10 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.pairing.values) || [];
+    const pairs = ((_classPrivateFieldLoo0 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo0 === void 0 ? void 0 : _classPrivateFieldLoo0.pairing.values) || [];
     for (const pair of pairs) {
       try {
-        var _classPrivateFieldLoo11;
-        await ((_classPrivateFieldLoo11 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.disconnect({
+        var _classPrivateFieldLoo1;
+        await ((_classPrivateFieldLoo1 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo1 === void 0 ? void 0 : _classPrivateFieldLoo1.disconnect({
           topic: pair.topic,
           reason: getSdkError('USER_DISCONNECTED')
         }));
@@ -221,12 +224,12 @@ export default class WalletConnectService {
         console.error(e);
       }
     }
-    const keys = (await ((_classPrivateFieldLoo12 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.core.storage.getKeys())) || [];
+    const keys = (await ((_classPrivateFieldLoo10 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.core.storage.getKeys())) || [];
     const deleteKeys = resetAll ? keys : keys.filter(key => key.startsWith('wc@'));
     for (const key of deleteKeys) {
       try {
-        var _classPrivateFieldLoo13;
-        await ((_classPrivateFieldLoo13 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.core.storage.removeItem(key));
+        var _classPrivateFieldLoo11;
+        await ((_classPrivateFieldLoo11 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.core.storage.removeItem(key));
       } catch (e) {
         console.error(e);
       }
@@ -235,8 +238,8 @@ export default class WalletConnectService {
     _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
   }
   async disconnect(topic) {
-    var _classPrivateFieldLoo14;
-    await ((_classPrivateFieldLoo14 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.disconnect({
+    var _classPrivateFieldLoo12;
+    await ((_classPrivateFieldLoo12 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.disconnect({
       topic: topic,
       reason: getSdkError('USER_DISCONNECTED')
     }));
@@ -343,18 +346,18 @@ async function _onPingReply2({
   }
 }
 function _createListener2() {
-  var _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19, _classPrivateFieldLoo20;
-  (_classPrivateFieldLoo15 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_proposal', _classPrivateFieldLooseBase(this, _onSessionProposal)[_onSessionProposal].bind(this));
-  (_classPrivateFieldLoo16 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_request', _classPrivateFieldLooseBase(this, _onSessionRequest)[_onSessionRequest].bind(this));
-  (_classPrivateFieldLoo17 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_ping', _classPrivateFieldLooseBase(this, _onPingReply)[_onPingReply].bind(this));
-  (_classPrivateFieldLoo18 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_event', data => console.log('event', data));
-  (_classPrivateFieldLoo19 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.on('session_update', data => console.log('update', data));
-  (_classPrivateFieldLoo20 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo20 === void 0 ? void 0 : _classPrivateFieldLoo20.on('session_delete', _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions].bind(this));
+  var _classPrivateFieldLoo13, _classPrivateFieldLoo14, _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18;
+  (_classPrivateFieldLoo13 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.on('session_proposal', _classPrivateFieldLooseBase(this, _onSessionProposal)[_onSessionProposal].bind(this));
+  (_classPrivateFieldLoo14 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.on('session_request', _classPrivateFieldLooseBase(this, _onSessionRequest)[_onSessionRequest].bind(this));
+  (_classPrivateFieldLoo15 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_ping', _classPrivateFieldLooseBase(this, _onPingReply)[_onPingReply].bind(this));
+  (_classPrivateFieldLoo16 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_event', data => console.log('event', data));
+  (_classPrivateFieldLoo17 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_update', data => console.log('update', data));
+  (_classPrivateFieldLoo18 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_delete', _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions].bind(this));
 }
 function _removeListener2() {
   ALL_WALLET_CONNECT_EVENT.forEach(event => {
-    var _classPrivateFieldLoo21;
-    (_classPrivateFieldLoo21 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo21 === void 0 ? void 0 : _classPrivateFieldLoo21.removeAllListeners(event);
+    var _classPrivateFieldLoo19;
+    (_classPrivateFieldLoo19 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.removeAllListeners(event);
   });
 }
 function _checkClient2() {

package/services/wallet-connect-service/types.js

@@ -17,4 +17,4 @@ export let POLKADOT_SIGNING_METHODS;
 (function (POLKADOT_SIGNING_METHODS) {
   POLKADOT_SIGNING_METHODS["POLKADOT_SIGN_TRANSACTION"] = "polkadot_signTransaction";
   POLKADOT_SIGNING_METHODS["POLKADOT_SIGN_MESSAGE"] = "polkadot_signMessage";
-})(POLKADOT_SIGNING_METHODS || (POLKADOT_SIGNING_METHODS = {}));
+})(POLKADOT_SIGNING_METHODS || (POLKADOT_SIGNING_METHODS = {})); // payload and address

package/types/account/action/add/mnemonic.d.ts

@@ -1,6 +1,6 @@
 import { SeedLengths } from '@subwallet/extension-base/background/types';
 import { KeypairType } from '@subwallet/keyring/types';
-export declare type MnemonicType = 'general' | 'ton';
+export declare type MnemonicType = 'general' | 'trust-wallet' | 'ton';
 /**
  * @interface RequestMnemonicCreateV2
  * @description Represents a request to create a new mnemonic phrase.
@@ -36,6 +36,7 @@ export interface ResponseMnemonicCreateV2 {
  */
 export interface RequestMnemonicValidateV2 {
     mnemonic: string;
+    mnemonicType: MnemonicType;
 }
 /**
  * @interface ResponseMnemonicValidateV2
@@ -67,7 +68,7 @@ export interface RequestAccountCreateSuriV2 {
     name: string;
     password?: string;
     suri: string;
-    type?: KeypairType;
+    types: KeypairType[];
     isAllowed: boolean;
 }
 /**

package/types/account/info/keyring.js

@@ -95,4 +95,12 @@ export let AccountActions;
   AccountActions["EXPORT_JSON"] = "EXPORT_JSON";
   AccountActions["EXPORT_QR"] = "EXPORT_QR";
   AccountActions["TON_CHANGE_WALLET_CONTRACT_VERSION"] = "TON_CHANGE_WALLET_CONTRACT_VERSION";
-})(AccountActions || (AccountActions = {}));
+})(AccountActions || (AccountActions = {}));
+/**
+ * @interface AccountJson
+ * @extends AbstractAddressJson
+ * @extends AccountMetadataData
+ * @extends AccountActionData
+ * @prop {boolean} [isSubWallet] - Import from SubWallet
+ * @prop {boolean} [pendingMigrate] - Pending migrate password
+ * */

package/types/balance/index.js

@@ -18,4 +18,8 @@ export let BalanceType;
   BalanceType["TOTAL"] = "total";
   BalanceType["TOTAL_MINUS_RESERVED"] = "totalMinusReserved";
   BalanceType["KEEP_ALIVE"] = "keepAlive";
-})(BalanceType || (BalanceType = {}));
+})(BalanceType || (BalanceType = {}));
+/** Balance info of all tokens on an address */
+// Key is tokenSlug
+/** Balance info of all addresses */
+// Key is address

package/types/swap/index.js

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

package/types/transaction/process.js

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

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

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

package/utils/account/common.d.ts

@@ -1,7 +1,6 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { ChainType } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountChainType, AccountJson } from '@subwallet/extension-base/types';
-import { KeypairType } from '@subwallet/keyring/types';
 export declare function isAccountAll(address?: string): boolean;
 export declare function reformatAddress(address: string, networkPrefix?: number, isEthereum?: boolean, ignoreError?: boolean): string;
 export declare const _reformatAddressWithChain: (address: string, chainInfo: _ChainInfo) => string;
@@ -15,8 +14,6 @@ interface ExtendAddressesByChainType extends AddressesByChainType {
 export declare function getAddressesByChainType(addresses: string[], chainTypes: ChainType[], chainInfo?: _ChainInfo): string[];
 export declare function getAddressesByChainTypeMap(addresses: string[], chainInfo?: _ChainInfo): ExtendAddressesByChainType;
 export declare function quickFormatAddressToCompare(address?: string): string | undefined;
-/** @deprecated */
-export declare const modifyAccountName: (type: KeypairType, name: string, modify: boolean) => string;
 /**
  * @function getAccountJsonByAddress
  * @desc Get account info by address

package/utils/account/common.js

@@ -63,7 +63,6 @@ export function getAddressesByChainType(addresses, chainTypes, chainInfo) {
     return addressByChainTypeMap[chainType];
   }).flat(); // todo: recheck
 }
-
 export function getAddressesByChainTypeMap(addresses, chainInfo) {
   const addressByChainType = {
     substrate: [],
@@ -103,29 +102,6 @@ export function quickFormatAddressToCompare(address) {
   return reformatAddress(address, 42).toLowerCase();
 }
 
-/** @deprecated */
-export const modifyAccountName = (type, name, modify) => {
-  if (!modify) {
-    return name;
-  }
-  let network = '';
-  switch (type) {
-    case 'sr25519':
-    case 'ed25519':
-    case 'ecdsa':
-      network = 'Substrate';
-      break;
-    case 'ethereum':
-      network = 'EVM';
-      break;
-    case 'ton':
-    case 'ton-native':
-      network = 'Ton';
-      break;
-  }
-  return network ? [name, network].join(' - ') : name;
-};
-
 /**
  * @function getAccountJsonByAddress
  * @desc Get account info by address

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { getDerivePath } from '@subwallet/keyring';
-import { BitcoinKeypairTypes, EthereumKeypairTypes, SubstrateKeypairTypes } from '@subwallet/keyring/types';
+import { BitcoinKeypairTypes, DefaultSubstrateKeypairTypes, EthereumKeypairTypes } from '@subwallet/keyring/types';
 import { keyring } from '@subwallet/ui-keyring';
 import { t } from 'i18next';
 import { assert } from '@polkadot/util';
@@ -53,7 +53,7 @@ export const parseUnifiedSuriToDerivationPath = (suri, type) => {
         return path.replace('{firstIndex}', firstIndex);
       }
     }
-    if (SubstrateKeypairTypes.includes(type)) {
+    if (DefaultSubstrateKeypairTypes.includes(type)) {
       return suri;
     }
   }
@@ -112,7 +112,7 @@ export const getSoloDerivationInfo = (type, metadata = {}) => {
         };
       }
     } else {
-      if (SubstrateKeypairTypes.includes(type)) {
+      if (DefaultSubstrateKeypairTypes.includes(type)) {
         const _type = type;
         const validateTypeFunc = _type === 'sr25519' ? validateSr25519DerivationPath : raw => validateOtherSubstrateDerivationPath(raw, _type);
         const validateTypeRs = validateTypeFunc(suri);
@@ -243,7 +243,7 @@ export const findSoloNextDerive = parentAddress => {
       break;
     }
   }
-  const isSubstrate = SubstrateKeypairTypes.includes(parentPair.type);
+  const isSubstrate = DefaultSubstrateKeypairTypes.includes(parentPair.type);
   const indexes = currentDepth > 0 ? deriveInfo.autoIndexes || [] : [];
   indexes.push(index);
   const suri = isSubstrate ? [deriveInfo.suri || '', index].join('//') : '//'.concat(indexes.join('//'));
@@ -281,6 +281,9 @@ export const derivePair = (parentPair, name, suri, derivationPath) => {
   }
 };
 export const getSuri = (seed, type) => {
-  const extraPath = type ? getDerivePath(type)(0) : '';
+  if (!type) {
+    return seed;
+  }
+  const extraPath = getDerivePath(type)(0);
   return seed + (extraPath ? '/' + extraPath : '');
 };

package/utils/account/derive/validate.d.ts

@@ -1,10 +1,10 @@
 import { DerivePathInfo, IDerivePathInfo_ } from '@subwallet/extension-base/types';
-import { KeypairType, SubstrateKeypairType } from '@subwallet/keyring/types';
+import { DefaultSubstrateKeypairType, KeypairType, TrustWalletSubstrateKeypairType } from '@subwallet/keyring/types';
 export declare const validateUnifiedDerivationPath: (raw: string) => DerivePathInfo | undefined;
 export declare const validateEvmDerivationPath: (raw: string) => IDerivePathInfo_ | undefined;
 export declare const validateTonDerivationPath: (raw: string) => IDerivePathInfo_ | undefined;
 export declare const validateBitcoinDerivationPath: (raw: string) => IDerivePathInfo_ | undefined;
 export declare const validateCardanoDerivationPath: (raw: string) => IDerivePathInfo_ | undefined;
 export declare const validateSr25519DerivationPath: (raw: string) => IDerivePathInfo_ | undefined;
-export declare const validateOtherSubstrateDerivationPath: (raw: string, type: Exclude<SubstrateKeypairType, 'sr25519'>) => IDerivePathInfo_ | undefined;
+export declare const validateOtherSubstrateDerivationPath: (raw: string, type: Exclude<DefaultSubstrateKeypairType | TrustWalletSubstrateKeypairType, 'sr25519'>) => IDerivePathInfo_ | undefined;
 export declare const validateDerivationPath: (raw: string, type?: KeypairType) => DerivePathInfo | undefined;

package/utils/account/derive/validate.js

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

package/utils/account/transform.js

@@ -105,7 +105,10 @@ export const getAccountActions = (signMode, networkType, type, _meta, parentAcco
   // QR
   if (signMode === AccountSignMode.PASSWORD) {
     if (networkType === AccountChainType.ETHEREUM || networkType === AccountChainType.SUBSTRATE) {
-      result.push(AccountActions.EXPORT_QR);
+      if (type !== 'ed25519-tw') {
+        // todo: recheck if can export this account type
+        result.push(AccountActions.EXPORT_QR);
+      }
     }
   }
 
@@ -247,6 +250,7 @@ export const getAccountTokenTypes = type => {
       return [_AssetType.NATIVE, _AssetType.LOCAL, _AssetType.ERC20, _AssetType.ERC721];
     case 'sr25519':
     case 'ed25519':
+    case 'ed25519-tw':
     case 'ecdsa':
       return [_AssetType.NATIVE, _AssetType.LOCAL, _AssetType.PSP22, _AssetType.PSP34, _AssetType.GRC20, _AssetType.ERC721, _AssetType.VFT];
     case 'ton':

package/utils/auth.js

@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { getKeypairTypeByAddress } from '@subwallet/keyring';
-import { BitcoinKeypairTypes, CardanoKeypairTypes, EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
+import { AllSubstrateKeypairTypes, BitcoinKeypairTypes, CardanoKeypairTypes, EthereumKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
 export const isAddressValidWithAuthType = (address, accountAuthTypes) => {
   const keypairType = getKeypairTypeByAddress(address);
   const validTypes = {
     evm: EthereumKeypairTypes,
-    substrate: SubstrateKeypairTypes,
+    substrate: AllSubstrateKeypairTypes,
     ton: TonKeypairTypes,
     cardano: CardanoKeypairTypes,
     bitcoin: BitcoinKeypairTypes

package/utils/bitcoin/utxo-management.js

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

package/utils/index.js

@@ -6,7 +6,7 @@ import { getRandomIpfsGateway, SUBWALLET_IPFS } from '@subwallet/extension-base/
 import { _isChainEvmCompatible, _isPureBitcoinChain, _isPureCardanoChain, _isPureSubstrateChain, _isPureTonChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { reformatAddress } from '@subwallet/extension-base/utils/account';
 import { decodeAddress, encodeAddress, getKeypairTypeByAddress, isTonAddress } from '@subwallet/keyring';
-import { BitcoinKeypairTypes, CardanoKeypairTypes, EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
+import { AllSubstrateKeypairTypes, BitcoinKeypairTypes, CardanoKeypairTypes, EthereumKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
 import { t } from 'i18next';
 import { assert, BN, hexToU8a, isHex } from '@polkadot/util';
 import { ethereumEncode, isEthereumAddress } from '@polkadot/util-crypto';
@@ -244,7 +244,6 @@ export function isSameAddress(address1, address2) {
   }
   return reformatAddress(address1, 0) === reformatAddress(address2, 0); // TODO: maybe there's a better way
 }
-
 export function isSameAddressType(address1, address2) {
   const isSameEvmAddress = isEthereumAddress(address1) && isEthereumAddress(address2);
   const isSameTonAddress = isTonAddress(address1) && isTonAddress(address2);
@@ -256,7 +255,7 @@ export function isAddressAndChainCompatible(address, chain) {
   const keypairType = getKeypairTypeByAddress(address);
   const isEvmCompatible = _isChainEvmCompatible(chain) && EthereumKeypairTypes.includes(keypairType); // some chains compatible to substrate and evm, and use evm-address
   const isTonCompatible = _isPureTonChain(chain) && TonKeypairTypes.includes(keypairType);
-  const isSubstrateCompatible = _isPureSubstrateChain(chain) && SubstrateKeypairTypes.includes(keypairType);
+  const isSubstrateCompatible = _isPureSubstrateChain(chain) && AllSubstrateKeypairTypes.includes(keypairType);
   const isCardanoCompatible = _isPureCardanoChain(chain) && CardanoKeypairTypes.includes(keypairType);
   const isBitcoinCompatible = _isPureBitcoinChain(chain) && BitcoinKeypairTypes.includes(keypairType);
   return isEvmCompatible || isSubstrateCompatible || isTonCompatible || isCardanoCompatible || isBitcoinCompatible;
@@ -319,7 +318,6 @@ export const baseParseIPFSUrl = (input, customDomain) => {
   }
   return selectedDomain + input.split('ipfs://ipfs/')[1]; // starts with ipfs://ipfs/
 };
-
 export const swParseIPFSUrl = input => {
   if (!input || input.length === 0) {
     return undefined;
@@ -343,7 +341,6 @@ export const swParseIPFSUrl = input => {
   }
   return SUBWALLET_IPFS + input.split('ipfs://ipfs/')[1]; // starts with ipfs://ipfs/
 };
-
 export function wait(milliseconds) {
   return new Promise(resolve => {
     setTimeout(() => {