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

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(() => {