@subwallet/extension-base 1.1.38-1 → 1.1.39-beta.0

package/cjs/services/transaction-service/index.js

@@ -346,13 +346,14 @@ class TransactionService {
   transactionToHistories(id, startBlock, nonce, eventLogs) {
     const transaction = this.getTransaction(id);
     const extrinsicType = transaction.extrinsicType;
+    const chainInfo = this.state.chainService.getChainInfoByKey(transaction.chain);
     const formattedTransactionAddress = (0, _utils3.reformatAddress)(transaction.address);
     const historyItem = {
       origin: 'app',
       chain: transaction.chain,
       direction: _KoniTypes.TransactionDirection.SEND,
       type: transaction.extrinsicType,
-      from: formattedTransactionAddress,
+      from: transaction.address,
       to: '',
       chainType: transaction.chainType,
       address: formattedTransactionAddress,
@@ -368,7 +369,6 @@ class TransactionService {
       nonce: nonce !== null && nonce !== void 0 ? nonce : 0,
       startBlock: startBlock || 0
     };
-    const chainInfo = this.state.chainService.getChainInfoByKey(transaction.chain);
     const nativeAsset = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
     const baseNativeAmount = {
       value: '0',
@@ -874,7 +874,8 @@ class TransactionService {
         to: transaction.to !== undefined ? transaction.to : '',
         value: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.value).toString(16)),
         data: transaction.data,
-        chainId: (0, _utils._getEvmChainId)(chainInfo)
+        chainId: (0, _utils._getEvmChainId)(chainInfo),
+        type: 2
       };
     } else {
       var _transaction$nonce2;
@@ -885,7 +886,8 @@ class TransactionService {
         to: transaction.to !== undefined ? transaction.to : '',
         value: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.value).toString(16)),
         data: transaction.data,
-        chainId: (0, _utils._getEvmChainId)(chainInfo)
+        chainId: (0, _utils._getEvmChainId)(chainInfo),
+        type: 0
       };
     }
     return _ethers.ethers.Transaction.from(txObject).unsignedSerialized;

package/cjs/types.js

@@ -0,0 +1 @@
+"use strict";

package/cjs/utils/address.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.convertSubjectInfoToAddresses = void 0;
+exports.quickFormatAddressToCompare = quickFormatAddressToCompare;
+exports.simpleAddress = void 0;
+var _index = require("@subwallet/extension-base/utils/index");
+var _utilCrypto = require("@polkadot/util-crypto");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const simpleAddress = address => {
+  if ((0, _utilCrypto.isEthereumAddress)(address)) {
+    return address;
+  }
+  return (0, _utilCrypto.encodeAddress)((0, _utilCrypto.decodeAddress)(address));
+};
+exports.simpleAddress = simpleAddress;
+function quickFormatAddressToCompare(address) {
+  if (!(0, _utilCrypto.isAddress)(address)) {
+    return address;
+  }
+  return (0, _index.reformatAddress)(address, 42).toLowerCase();
+}
+const convertSubjectInfoToAddresses = subjectInfo => {
+  return Object.values(subjectInfo).map(info => ({
+    address: info.json.address,
+    type: info.type,
+    ...info.json.meta
+  }));
+};
+exports.convertSubjectInfoToAddresses = convertSubjectInfoToAddresses;

package/cjs/utils/eth/mergeTransactionAndSignature.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mergeTransactionAndSignature = void 0;
+var _utils = require("@subwallet/extension-base/utils");
+var _eth = require("@subwallet/extension-base/utils/eth");
 var _ethereumjsUtil = require("ethereumjs-util");
 var _ethers = require("ethers");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -17,7 +19,8 @@ const mergeTransactionAndSignature = (tx, _rawSignature) => {
     v: parseInt(`0x${_signature.substring(128)}`)
   };
   let transaction;
-  if (tx.maxFeePerGas) {
+  const max = (0, _eth.anyNumberToBN)(tx.maxFeePerGas);
+  if (max.gt(_utils.BN_ZERO)) {
     transaction = {
       nonce: tx.nonce,
       maxFeePerGas: (0, _ethereumjsUtil.addHexPrefix)(tx.maxFeePerGas.toString(16)),
@@ -27,7 +30,8 @@ const mergeTransactionAndSignature = (tx, _rawSignature) => {
       value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),
       data: tx.data,
       chainId: tx.chainId,
-      signature: signature
+      signature: signature,
+      type: 2
     };
   } else {
     transaction = {
@@ -38,7 +42,8 @@ const mergeTransactionAndSignature = (tx, _rawSignature) => {
       value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),
       data: tx.data,
       chainId: tx.chainId,
-      signature: signature
+      signature: signature,
+      type: 0
     };
   }
   return _ethers.ethers.Transaction.from(transaction).serialized;

package/cjs/utils/index.js

@@ -510,7 +510,8 @@ const stripUrl = url => {
   return parts[2];
 };
 exports.stripUrl = stripUrl;
-const baseParseIPFSUrl = input => {
+const baseParseIPFSUrl = (input, customDomain) => {
+  const selectedDomain = customDomain || (0, _config.getRandomIpfsGateway)();
   if (!input || input.length === 0) {
     return undefined;
   }
@@ -521,17 +522,17 @@ const baseParseIPFSUrl = input => {
     return input;
   }
   if (input.startsWith('/ipfs/')) {
-    return (0, _config.getRandomIpfsGateway)() + input.split('/ipfs/')[1];
+    return selectedDomain + input.split('/ipfs/')[1];
   }
   if (!input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
     // just the IPFS hash
-    return (0, _config.getRandomIpfsGateway)() + input;
+    return selectedDomain + input;
   }
   if (input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
     // starts with ipfs://
-    return (0, _config.getRandomIpfsGateway)() + input.split('ipfs://')[1];
+    return selectedDomain + input.split('ipfs://')[1];
   }
-  return (0, _config.getRandomIpfsGateway)() + input.split('ipfs://ipfs/')[1]; // starts with ipfs://ipfs/
+  return selectedDomain + input.split('ipfs://ipfs/')[1]; // starts with ipfs://ipfs/
 };
 exports.baseParseIPFSUrl = baseParseIPFSUrl;
 const swParseIPFSUrl = input => {

package/cjs/utils/keyring.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.extractPrivateKey = extractPrivateKey;
+exports.unlockAccount = exports.lockAccount = void 0;
+var _uiKeyring = require("@subwallet/ui-keyring");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+// import _decode from '@polkadot/keyring/pair/decode';
+
+function extract(address) {
+  // @ts-ignore
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+  const rs = this.getPair(address);
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+  console.log(rs.publicKey);
+}
+function extractPrivateKey(keyring, address, password) {
+  extract.call(keyring, address);
+}
+const unlockAccount = signAddress => {
+  let publicKey;
+  try {
+    publicKey = _uiKeyring.keyring.decodeAddress(signAddress);
+  } catch (error) {
+    console.error(error);
+    return 'Unable to decode address';
+  }
+  const pair = _uiKeyring.keyring.getPair(publicKey);
+  if (!pair) {
+    return 'Unable to find pair';
+  }
+  if (pair.isLocked) {
+    try {
+      _uiKeyring.keyring.unlockPair(pair.address);
+    } catch (e) {
+      return e.message;
+    }
+  }
+  return null;
+};
+exports.unlockAccount = unlockAccount;
+const lockAccount = address => {
+  try {
+    const pair = _uiKeyring.keyring.getPair(address);
+    if (pair) {
+      pair.lock();
+    }
+  } catch (error) {
+    console.error('Unable to lock account', error);
+  }
+};
+exports.lockAccount = lockAccount;

package/cjs/utils/staticData/index.js

@@ -3,20 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.termAndCondition = exports.staticData = exports.marketingCampaigns = exports.crowdloanFunds = exports.chains = exports.buyTokenConfigs = exports.buyServiceInfos = exports.StaticKey = void 0;
+exports.termAndCondition = exports.staticData = exports.marketingCampaigns = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.StaticKey = void 0;
+var _chainList = require("@subwallet/chain-list");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-var-requires
 const buyServiceInfos = require('./buyServiceInfos.json');
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.buyServiceInfos = buyServiceInfos;
 const buyTokenConfigs = require('./buyTokenConfigs.json');
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.buyTokenConfigs = buyTokenConfigs;
-const chains = require('./chains.json');
-// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
-exports.chains = chains;
 const crowdloanFunds = require('./crowdloanFunds.json');
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.crowdloanFunds = crowdloanFunds;
@@ -36,7 +36,7 @@ exports.StaticKey = StaticKey;
   StaticKey["BUY_TOKEN_CONFIGS"] = "buy-token-configs";
 })(StaticKey || (exports.StaticKey = StaticKey = {}));
 const staticData = {
-  [StaticKey.CHAINS]: chains,
+  [StaticKey.CHAINS]: Object.values(_chainList.ChainInfoMap),
   [StaticKey.BUY_SERVICE_INFOS]: buyServiceInfos,
   [StaticKey.CROWDLOAN_FUNDS]: crowdloanFunds,
   [StaticKey.MARKETING_CAMPAINGS]: marketingCampaigns,

package/koni/api/nft/unique_network_nft/index.d.ts

@@ -1,6 +1,7 @@
 import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
 export declare class UniqueNftApi extends BaseNftApi {
     constructor(chain: string, addresses: string[]);
+    parseUrl(input: string): string | undefined;
     private handleProperties;
     private static parseNftRequest;
     private getNftByAccount;

package/koni/api/nft/unique_network_nft/index.js

@@ -1,14 +1,18 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { OPAL_SCAN_ENDPOINT, QUARTZ_SCAN_ENDPOINT, UNIQUE_SCAN_ENDPOINT } from '@subwallet/extension-base/koni/api/nft/config';
+import { OPAL_SCAN_ENDPOINT, QUARTZ_SCAN_ENDPOINT, UNIQUE_IPFS_GATEWAY, UNIQUE_SCAN_ENDPOINT } from '@subwallet/extension-base/koni/api/nft/config';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
+import { baseParseIPFSUrl } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
 import { decodeAddress, encodeAddress } from '@polkadot/util-crypto';
 export class UniqueNftApi extends BaseNftApi {
   constructor(chain, addresses) {
     super(chain, undefined, addresses);
   }
+  parseUrl(input) {
+    return baseParseIPFSUrl(input, UNIQUE_IPFS_GATEWAY);
+  }
   handleProperties(nft) {
     const propertiesMap = {};
     const attRecord = nft.attributes;

package/koni/api/staking/bonding/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { NominationInfo, NominatorMetadata, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateInflationParams } from '@subwallet/extension-base/services/chain-service/constants';

package/koni/background/handlers/Extension.d.ts

@@ -185,6 +185,7 @@ export default class KoniExtension {
     private getListDeriveAccounts;
     private subscribeChainInfoMap;
     private subscribeChainStateMap;
+    private subscribeChainStatusMap;
     private subscribeAssetRegistry;
     private subscribeMultiChainAssetMap;
     private subscribeXcmRefMap;

package/koni/background/handlers/Extension.js

@@ -30,6 +30,7 @@ import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/reques
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
 import { WALLET_CONNECT_EIP155_NAMESPACE } from '@subwallet/extension-base/services/wallet-connect-service/constants';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
+import { AccountsStore } from '@subwallet/extension-base/stores';
 import { YieldPoolType } from '@subwallet/extension-base/types';
 import { convertSubjectInfoToAddresses, isSameAddress, reformatAddress, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { calculateGasFeeParams, createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
@@ -517,11 +518,16 @@ export default class KoniExtension {
   }
   subscribeAddresses(id, port) {
     const _cb = createSubscription(id, port);
+    let old = '';
     const subscription = this.#koniState.keyringService.addressesSubject.subscribe(subjectInfo => {
       const addresses = convertSubjectInfoToAddresses(subjectInfo);
-      _cb({
-        addresses: addresses
-      });
+      const _new = JSON.stringify(addresses);
+      if (old !== _new) {
+        _cb({
+          addresses: addresses
+        });
+        old = _new;
+      }
     });
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
@@ -533,16 +539,42 @@ export default class KoniExtension {
     };
   }
   saveRecentAccount({
-    accountId
+    accountId,
+    chain
   }) {
     if (isAddress(accountId)) {
       const address = reformatAddress(accountId);
       const account = keyring.getAccount(address);
-      const contact = keyring.getAddress(address);
-      return account || contact || {
-        ...keyring.saveRecent(address).json,
-        publicKey: decodeAddress(address)
-      };
+      const contact = keyring.getAddress(address, 'address');
+      if (account) {
+        return account;
+      } else {
+        let metadata;
+        if (contact) {
+          metadata = contact.meta;
+        } else {
+          const _new = keyring.saveRecent(address);
+          metadata = _new.json.meta;
+        }
+        if (contact && !metadata.isRecent) {
+          return contact;
+        }
+        const recentChainSlugs = metadata.recentChainSlugs || [];
+        if (chain) {
+          if (!recentChainSlugs.includes(chain)) {
+            recentChainSlugs.push(chain);
+          }
+        }
+        metadata.recentChainSlugs = recentChainSlugs;
+        const result = keyring.addresses.add(new AccountsStore(), address, {
+          address: address,
+          meta: metadata
+        });
+        return {
+          ...result.json,
+          publicKey: decodeAddress(address)
+        };
+      }
     } else {
       throw Error(t('This is not an address'));
     }
@@ -1594,7 +1626,9 @@ export default class KoniExtension {
       // Check ed for receiver
       if (new BigN(receiverBalance).plus(transferAmount.value).lt(minAmount)) {
         const atLeast = new BigN(minAmount).minus(receiverBalance).plus((tokenInfo.decimals || 0) === 0 ? 0 : 1);
-        const atLeastStr = formatNumber(atLeast, tokenInfo.decimals || 0, balanceFormatter);
+        const atLeastStr = formatNumber(atLeast, tokenInfo.decimals || 0, balanceFormatter, {
+          maxNumberFormat: tokenInfo.decimals || 6
+        });
         inputTransaction.errors.push(new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
           replace: {
             amount: atLeastStr,
@@ -1663,7 +1697,9 @@ export default class KoniExtension {
 
         // Check ed for receiver
         if (new BigN(value).lt(atLeast)) {
-          const atLeastStr = formatNumber(atLeast, destinationTokenInfo.decimals || 0, balanceFormatter);
+          const atLeastStr = formatNumber(atLeast, destinationTokenInfo.decimals || 0, balanceFormatter, {
+            maxNumberFormat: destinationTokenInfo.decimals || 6
+          });
           inputTransaction.errors.push(new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
             replace: {
               amount: atLeastStr,
@@ -2919,7 +2955,7 @@ export default class KoniExtension {
       if (chainInfo && (_API_OPTIONS_CHAIN_GROUP.avail.includes(chainInfo.slug) || _API_OPTIONS_CHAIN_GROUP.goldberg.includes(chainInfo.slug))) {
         const isChainActive = this.#koniState.getChainStateByKey(chainInfo.slug).active;
         if (!isChainActive) {
-          reject(new Error('Please active chain {{chain}} before sign'.replaceAll('{{chain}}', chainInfo.name)));
+          reject(new Error('Please activate {{chain}} network before signing'.replaceAll('{{chain}}', chainInfo.name)));
           return false;
         } else {
           registry = this.#koniState.getSubstrateApi(chainInfo.slug).api.registry;
@@ -3133,6 +3169,19 @@ export default class KoniExtension {
     });
     return this.#koniState.getChainStateMap();
   }
+  subscribeChainStatusMap(id, port) {
+    const cb = createSubscription(id, port);
+    const chainStateMapSubscription = this.#koniState.chainService.subscribeChainStatusMap().subscribe({
+      next: rs => {
+        cb(rs);
+      }
+    });
+    this.createUnsubscriptionHandle(id, chainStateMapSubscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.chainService.getChainStatusMap();
+  }
   async subscribeAssetRegistry(id, port) {
     const cb = createSubscription(id, port);
     let ready = false;
@@ -3422,7 +3471,7 @@ export default class KoniExtension {
       });
       const {
         connectionStatus
-      } = this.#koniState.chainService.getChainStateByKey(_DEFAULT_MANTA_ZK_CHAIN);
+      } = this.#koniState.chainService.getChainStatusByKey(_DEFAULT_MANTA_ZK_CHAIN);
       if (connectionStatus !== _ChainConnectionStatus.CONNECTED) {
         // TODO: do better
         await timeout();
@@ -4158,6 +4207,8 @@ export default class KoniExtension {
         return this.subscribeChainInfoMap(id, port);
       case 'pri(chainService.subscribeChainStateMap)':
         return this.subscribeChainStateMap(id, port);
+      case 'pri(chainService.subscribeChainStatusMap)':
+        return this.subscribeChainStatusMap(id, port);
       case 'pri(chainService.subscribeXcmRefMap)':
         return this.subscribeXcmRefMap(id, port);
       case 'pri(chainService.getSupportedContractTypes)':

package/koni/background/handlers/State.js

@@ -37,10 +37,11 @@ import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
 import { keyring } from '@subwallet/ui-keyring';
 import BigN from 'bignumber.js';
+import BN from 'bn.js';
 import SimpleKeyring from 'eth-simple-keyring';
 import { t } from 'i18next';
 import { Subject } from 'rxjs';
-import { assert, BN, hexStripPrefix, hexToU8a, isHex, logger as createLogger, u8aToHex } from '@polkadot/util';
+import { assert, hexStripPrefix, hexToU8a, isHex, logger as createLogger, u8aToHex } from '@polkadot/util';
 import { base64Decode, isEthereumAddress, keyExtractSuri } from '@polkadot/util-crypto';
 import { KoniCron } from "../cron.js";
 import { KoniSubscription } from "../subscription.js";

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.38-1",
+  "version": "1.1.39-beta.0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -670,6 +670,31 @@
       "require": "./cjs/services/chain-service/health-check/index.js",
       "default": "./services/chain-service/health-check/index.js"
     },
+    "./services/chain-service/health-check/constants": {
+      "types": "./services/chain-service/health-check/constants/index.d.ts",
+      "require": "./cjs/services/chain-service/health-check/constants/index.js",
+      "default": "./services/chain-service/health-check/constants/index.js"
+    },
+    "./services/chain-service/health-check/utils": {
+      "types": "./services/chain-service/health-check/utils/index.d.ts",
+      "require": "./cjs/services/chain-service/health-check/utils/index.js",
+      "default": "./services/chain-service/health-check/utils/index.js"
+    },
+    "./services/chain-service/health-check/utils/asset-info": {
+      "types": "./services/chain-service/health-check/utils/asset-info.d.ts",
+      "require": "./cjs/services/chain-service/health-check/utils/asset-info.js",
+      "default": "./services/chain-service/health-check/utils/asset-info.js"
+    },
+    "./services/chain-service/health-check/utils/chain-info": {
+      "types": "./services/chain-service/health-check/utils/chain-info.d.ts",
+      "require": "./cjs/services/chain-service/health-check/utils/chain-info.js",
+      "default": "./services/chain-service/health-check/utils/chain-info.js"
+    },
+    "./services/chain-service/health-check/utils/provider": {
+      "types": "./services/chain-service/health-check/utils/provider.d.ts",
+      "require": "./cjs/services/chain-service/health-check/utils/provider.js",
+      "default": "./services/chain-service/health-check/utils/provider.js"
+    },
     "./services/chain-service/helper": {
       "types": "./services/chain-service/helper/index.d.ts",
       "require": "./cjs/services/chain-service/helper/index.js",
@@ -1719,28 +1744,28 @@
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
-    "@polkadot/api": "^10.11.1",
+    "@polkadot/api": "^10.11.2",
     "@polkadot/api-base": "^10.9.1",
-    "@polkadot/api-contract": "^10.11.1",
-    "@polkadot/api-derive": "^10.11.1",
+    "@polkadot/api-contract": "^10.11.2",
+    "@polkadot/api-derive": "^10.11.2",
     "@polkadot/apps-config": "^0.133.1",
-    "@polkadot/hw-ledger": "^12.6.1",
-    "@polkadot/networks": "^12.6.1",
+    "@polkadot/hw-ledger": "^12.6.2",
+    "@polkadot/networks": "^12.6.2",
     "@polkadot/phishing": "^0.22.1",
-    "@polkadot/rpc-provider": "^10.11.1",
-    "@polkadot/types": "^10.11.1",
-    "@polkadot/types-augment": "^10.11.1",
+    "@polkadot/rpc-provider": "^10.11.2",
+    "@polkadot/types": "^10.11.2",
+    "@polkadot/types-augment": "^10.11.2",
     "@polkadot/ui-settings": "^3.6.4",
-    "@polkadot/util": "^12.6.1",
-    "@polkadot/util-crypto": "^12.6.1",
+    "@polkadot/util": "^12.6.2",
+    "@polkadot/util-crypto": "^12.6.2",
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.41",
-    "@subwallet/extension-base": "^1.1.38-1",
-    "@subwallet/extension-chains": "^1.1.38-1",
-    "@subwallet/extension-dapp": "^1.1.38-1",
-    "@subwallet/extension-inject": "^1.1.38-1",
+    "@subwallet/chain-list": "0.2.42-beta.0",
+    "@subwallet/extension-base": "^1.1.39-0",
+    "@subwallet/extension-chains": "^1.1.39-0",
+    "@subwallet/extension-dapp": "^1.1.39-0",
+    "@subwallet/extension-inject": "^1.1.39-0",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",
@@ -1777,4 +1802,4 @@
     "web3-eth-contract": "^1.10.0",
     "web3-utils": "^1.10.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.1.38-1'
+  version: '1.1.39-0'
 };

package/services/balance-service/helpers/subscribe/balance.js

@@ -40,7 +40,7 @@ const filterAddress = (addresses, chainInfo) => {
   const isEvmChain = _isChainEvmCompatible(chainInfo);
   const [substrateAddresses, evmAddresses] = categoryAddresses(addresses);
   if (isEvmChain) {
-    return [evmAddresses, []];
+    return [evmAddresses, substrateAddresses];
   } else {
     const fetchList = [];
     const unfetchList = [];

package/services/chain-service/health-check/constants/index.d.ts

@@ -0,0 +1,4 @@
+import BigN from 'bignumber.js';
+export declare const chainProvider: Record<string, number>;
+export declare const chainProviderBackup: Record<string, number>;
+export declare const BIG_TEN: BigN;

package/services/chain-service/health-check/constants/index.js

@@ -0,0 +1,26 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BigN from 'bignumber.js';
+export const chainProvider = {
+  default: 0,
+  ethereum: 1,
+  polygon: 2,
+  shidenEvm: 2,
+  shiden: 2,
+  ajunaPolkadot: 1,
+  crabParachain: 1,
+  astarEvm: 1,
+  shibuya: 1,
+  shibuyaEvm: 0
+};
+export const chainProviderBackup = {
+  default: 1,
+  pangolin: 0,
+  moonbeam: 0,
+  moonbase: 0,
+  moonriver: 3,
+  darwinia2: 2,
+  crabParachain: 1
+};
+export const BIG_TEN = new BigN(10);

package/services/chain-service/health-check/utils/asset-info.d.ts

@@ -0,0 +1,14 @@
+import { _ChainAsset } from '@subwallet/chain-list/types';
+import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
+import { ApiPromise } from '@polkadot/api';
+export interface AssetSpec {
+    minAmount: string;
+    symbol: string;
+    decimals: number;
+}
+export declare const getLocalAssetInfo: (chain: string, asset: _ChainAsset, api: ApiPromise) => Promise<AssetSpec>;
+export declare const getSubstrateNativeInfo: (api: ApiPromise) => Promise<AssetSpec>;
+export declare const getPsp22AssetInfo: (asset: _ChainAsset, api: ApiPromise) => Promise<AssetSpec>;
+export declare const getEvmNativeInfo: (api: _EvmApi) => Promise<AssetSpec>;
+export declare const getErc20AssetInfo: (asset: _ChainAsset, api: _EvmApi) => Promise<AssetSpec>;
+export declare const compareAsset: (assetInfo: AssetSpec, asset: _ChainAsset, errors: string[]) => void;