@subwallet/extension-base 1.3.43-0 → 1.3.45-0

package/cjs/core/utils.js

@@ -76,7 +76,7 @@ function _isValidAddressForEcosystem(validateRecipientParams) {
   } = validateRecipientParams;
   if (!(0, _utils3.isAddressAndChainCompatible)(toAddress, destChainInfo)) {
     if ((0, _utils2._isChainEvmCompatible)(destChainInfo) || (0, _utils2._isChainSubstrateCompatible)(destChainInfo) || (0, _utils2._isChainTonCompatible)(destChainInfo) || (0, _utils2._isChainCardanoCompatible)(destChainInfo) || (0, _utils2._isChainBitcoinCompatible)(destChainInfo)) {
-      return 'Recipient address must be the same type as sender address';
+      return `Recipient address must be a valid ${destChainInfo.name} address`;
     }
     return 'Unknown chain type';
   }
@@ -89,8 +89,8 @@ function _isValidSubstrateAddressFormat(validateRecipientParams) {
     toAddress
   } = validateRecipientParams;
   const addressPrefix = (_destChainInfo$substr = destChainInfo === null || destChainInfo === void 0 ? void 0 : (_destChainInfo$substr2 = destChainInfo.substrateInfo) === null || _destChainInfo$substr2 === void 0 ? void 0 : _destChainInfo$substr2.addressPrefix) !== null && _destChainInfo$substr !== void 0 ? _destChainInfo$substr : 42;
-  const toAddressFormatted = (0, _utils3.reformatAddress)(toAddress, addressPrefix);
-  if (toAddressFormatted !== toAddress) {
+  const toAddressFormatted = (0, _utils3.reformatAddress)(toAddress, addressPrefix, undefined, false);
+  if (toAddressFormatted && toAddressFormatted !== toAddress) {
     return `Recipient address must be a valid ${destChainInfo.name} address`;
   }
   return '';

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.43-0'
+  version: '1.3.45-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/utils/account/common.js

@@ -26,6 +26,7 @@ function isAccountAll(address) {
 function reformatAddress(address) {
   let networkPrefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 42;
   let isEthereum = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  let ignoreError = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   try {
     if (!address || address === '') {
       return '';
@@ -47,6 +48,9 @@ function reformatAddress(address) {
     return (0, _keyring.encodeAddress)(publicKey, networkPrefix, type);
   } catch (e) {
     console.warn('Get error while reformat address', address, e);
+    if (!ignoreError) {
+      return '';
+    }
     return address;
   }
 }

package/cjs/utils/index.js

@@ -74,7 +74,7 @@ var _config = require("@subwallet/extension-base/koni/api/nft/config");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _account = require("@subwallet/extension-base/utils/account");
 var _keyring = require("@subwallet/keyring");
-var _validate = require("@subwallet/keyring/utils/address/validate");
+var _types = require("@subwallet/keyring/types");
 var _i18next = require("i18next");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -599,11 +599,12 @@ function isSameAddressType(address1, address2) {
   return isSameEvmAddress || isSameTonAddress || isSameSubstrateAddress;
 }
 function isAddressAndChainCompatible(address, chain) {
-  const isEvmCompatible = (0, _utilCrypto.isEthereumAddress)(address) && (0, _utils._isChainEvmCompatible)(chain);
-  const isTonCompatible = (0, _keyring.isTonAddress)(address) && (0, _utils._isChainTonCompatible)(chain);
-  const isSubstrateCompatible = !(0, _utilCrypto.isEthereumAddress)(address) && !(0, _keyring.isTonAddress)(address) && (0, _utils._isChainSubstrateCompatible)(chain); // todo: need isSubstrateAddress util function to check exactly
-  const isCardanoCompatible = (0, _keyring.isCardanoAddress)(address) && (0, _utils._isChainCardanoCompatible)(chain);
-  const isBitcoinCompatible = (0, _validate.isBitcoinAddress)(address) && (0, _utils._isChainBitcoinCompatible)(chain);
+  const keypairType = (0, _keyring.getKeypairTypeByAddress)(address);
+  const isEvmCompatible = (0, _utils._isChainEvmCompatible)(chain) && _types.EthereumKeypairTypes.includes(keypairType); // some chains compatible to substrate and evm, and use evm-address
+  const isTonCompatible = (0, _utils._isPureTonChain)(chain) && _types.TonKeypairTypes.includes(keypairType);
+  const isSubstrateCompatible = (0, _utils._isPureSubstrateChain)(chain) && _types.SubstrateKeypairTypes.includes(keypairType);
+  const isCardanoCompatible = (0, _utils._isPureCardanoChain)(chain) && _types.CardanoKeypairTypes.includes(keypairType);
+  const isBitcoinCompatible = (0, _utils._isPureBitcoinChain)(chain) && _types.BitcoinKeypairTypes.includes(keypairType);
   return isEvmCompatible || isSubstrateCompatible || isTonCompatible || isCardanoCompatible || isBitcoinCompatible;
 }
 function getDomainFromUrl(url) {

package/core/utils.js

@@ -57,7 +57,7 @@ export function _isValidAddressForEcosystem(validateRecipientParams) {
   } = validateRecipientParams;
   if (!isAddressAndChainCompatible(toAddress, destChainInfo)) {
     if (_isChainEvmCompatible(destChainInfo) || _isChainSubstrateCompatible(destChainInfo) || _isChainTonCompatible(destChainInfo) || _isChainCardanoCompatible(destChainInfo) || _isChainBitcoinCompatible(destChainInfo)) {
-      return 'Recipient address must be the same type as sender address';
+      return `Recipient address must be a valid ${destChainInfo.name} address`;
     }
     return 'Unknown chain type';
   }
@@ -70,8 +70,8 @@ export function _isValidSubstrateAddressFormat(validateRecipientParams) {
     toAddress
   } = validateRecipientParams;
   const addressPrefix = (_destChainInfo$substr = destChainInfo === null || destChainInfo === void 0 ? void 0 : (_destChainInfo$substr2 = destChainInfo.substrateInfo) === null || _destChainInfo$substr2 === void 0 ? void 0 : _destChainInfo$substr2.addressPrefix) !== null && _destChainInfo$substr !== void 0 ? _destChainInfo$substr : 42;
-  const toAddressFormatted = reformatAddress(toAddress, addressPrefix);
-  if (toAddressFormatted !== toAddress) {
+  const toAddressFormatted = reformatAddress(toAddress, addressPrefix, undefined, false);
+  if (toAddressFormatted && toAddressFormatted !== toAddress) {
     return `Recipient address must be a valid ${destChainInfo.name} address`;
   }
   return '';

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.43-0",
+  "version": "1.3.45-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2855,12 +2855,12 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.107",
-    "@subwallet/extension-base": "^1.3.43-0",
-    "@subwallet/extension-chains": "^1.3.43-0",
-    "@subwallet/extension-dapp": "^1.3.43-0",
-    "@subwallet/extension-inject": "^1.3.43-0",
+    "@subwallet/extension-base": "^1.3.45-0",
+    "@subwallet/extension-chains": "^1.3.45-0",
+    "@subwallet/extension-dapp": "^1.3.45-0",
+    "@subwallet/extension-inject": "^1.3.45-0",
     "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.43-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.45-0",
     "@subwallet/ui-keyring": "^0.1.12",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.43-0'
+  version: '1.3.45-0'
 };

package/utils/account/common.d.ts

@@ -3,7 +3,7 @@ import { ChainType } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountChainType } 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): string;
+export declare function reformatAddress(address: string, networkPrefix?: number, isEthereum?: boolean, ignoreError?: boolean): string;
 export declare const _reformatAddressWithChain: (address: string, chainInfo: _ChainInfo) => string;
 export declare const getAccountChainTypeForAddress: (address: string) => AccountChainType;
 declare type AddressesByChainType = {

package/utils/account/common.js

@@ -11,7 +11,7 @@ import { ethereumEncode, isEthereumAddress } from '@polkadot/util-crypto';
 export function isAccountAll(address) {
   return address === ALL_ACCOUNT_KEY;
 }
-export function reformatAddress(address, networkPrefix = 42, isEthereum = false) {
+export function reformatAddress(address, networkPrefix = 42, isEthereum = false, ignoreError = true) {
   try {
     if (!address || address === '') {
       return '';
@@ -33,6 +33,9 @@ export function reformatAddress(address, networkPrefix = 42, isEthereum = false)
     return encodeAddress(publicKey, networkPrefix, type);
   } catch (e) {
     console.warn('Get error while reformat address', address, e);
+    if (!ignoreError) {
+      return '';
+    }
     return address;
   }
 }

package/utils/index.js

@@ -3,10 +3,10 @@
 
 import { CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
 import { getRandomIpfsGateway, SUBWALLET_IPFS } from '@subwallet/extension-base/koni/api/nft/config';
-import { _isChainBitcoinCompatible, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+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, isCardanoAddress, isTonAddress } from '@subwallet/keyring';
-import { isBitcoinAddress } from '@subwallet/keyring/utils/address/validate';
+import { decodeAddress, encodeAddress, getKeypairTypeByAddress, isTonAddress } from '@subwallet/keyring';
+import { BitcoinKeypairTypes, CardanoKeypairTypes, EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
 import { t } from 'i18next';
 import { assert, BN, hexToU8a, isHex } from '@polkadot/util';
 import { ethereumEncode, isEthereumAddress } from '@polkadot/util-crypto';
@@ -253,11 +253,12 @@ export function isSameAddressType(address1, address2) {
   return isSameEvmAddress || isSameTonAddress || isSameSubstrateAddress;
 }
 export function isAddressAndChainCompatible(address, chain) {
-  const isEvmCompatible = isEthereumAddress(address) && _isChainEvmCompatible(chain);
-  const isTonCompatible = isTonAddress(address) && _isChainTonCompatible(chain);
-  const isSubstrateCompatible = !isEthereumAddress(address) && !isTonAddress(address) && _isChainSubstrateCompatible(chain); // todo: need isSubstrateAddress util function to check exactly
-  const isCardanoCompatible = isCardanoAddress(address) && _isChainCardanoCompatible(chain);
-  const isBitcoinCompatible = isBitcoinAddress(address) && _isChainBitcoinCompatible(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 isCardanoCompatible = _isPureCardanoChain(chain) && CardanoKeypairTypes.includes(keypairType);
+  const isBitcoinCompatible = _isPureBitcoinChain(chain) && BitcoinKeypairTypes.includes(keypairType);
   return isEvmCompatible || isSubstrateCompatible || isTonCompatible || isCardanoCompatible || isBitcoinCompatible;
 }
 export function getDomainFromUrl(url) {