@subwallet/extension-base 1.2.25-0 → 1.2.25-1

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

@@ -10,6 +10,7 @@ var _helpers = require("@subwallet/extension-base/background/handlers/helpers");
 var _subscriptions = require("@subwallet/extension-base/background/handlers/subscriptions");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
+var _logicValidation = require("@subwallet/extension-base/core/logic-validation");
 var _balanceService = require("@subwallet/extension-base/services/balance-service");
 var _types = require("@subwallet/extension-base/services/base/types");
 var _buyService = _interopRequireDefault(require("@subwallet/extension-base/services/buy-service"));
@@ -39,11 +40,9 @@ var _walletConnectService = _interopRequireDefault(require("@subwallet/extension
 var _storage = require("@subwallet/extension-base/storage");
 var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stores/AccountRef"));
 var _utils3 = require("@subwallet/extension-base/utils");
-var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _decode = require("@subwallet/keyring/pair/decode");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _bn = _interopRequireDefault(require("bn.js"));
 var _ethSimpleKeyring = _interopRequireDefault(require("eth-simple-keyring"));
 var _i18next = require("i18next");
@@ -58,6 +57,7 @@ var _subscription = require("../subscription");
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 const passworder = require('browser-passworder');
 const ETH_DERIVE_DEFAULT = '/m/44\'/60\'/0\'/0/0';
+const ERROR_CONFIRMATION_TYPE = ['errorConnectNetwork'];
 
 // List of providers passed into constructor. This is the list of providers
 // exposed by the extension.
@@ -1099,7 +1099,7 @@ class KoniState {
       resolve(ethKeyring);
     });
   }
-  async evmSign(id, url, method, params, allowedAccounts) {
+  async evmSign(id, url, method, params, topic) {
     let address = '';
     let payload;
     const [p1, p2] = params;
@@ -1110,60 +1110,21 @@ class KoniState {
       address = p2;
       payload = p1;
     }
-    if (address === '' || !payload) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found address or payload to sign'));
-    }
-    if (['eth_sign', 'personal_sign', 'eth_signTypedData', 'eth_signTypedData_v1', 'eth_signTypedData_v3', 'eth_signTypedData_v4'].indexOf(method) < 0) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Unsupported action'));
-    }
-    if (['eth_signTypedData_v3', 'eth_signTypedData_v4'].indexOf(method) > -1) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-assignment
-      payload = JSON.parse(payload);
-    }
-
-    // Check sign abiblity
-    if (!allowedAccounts.find(acc => acc.toLowerCase() === address.toLowerCase())) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('You have rescinded allowance for this account in wallet'));
-    }
-    const pair = _uiKeyring.keyring.getPair(address);
-    if (!pair) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Unable to find account'));
-    }
-    const account = {
-      address: pair.address,
-      ...pair.meta
+    const payloadValidation = {
+      address,
+      payloadAfterValidated: payload,
+      method,
+      errors: [],
+      networkKey: ''
     };
-    let hashPayload = '';
-    let canSign = false;
-    switch (method) {
-      case 'personal_sign':
-        canSign = true;
-        hashPayload = payload;
-        break;
-      case 'eth_sign':
-      case 'eth_signTypedData':
-      case 'eth_signTypedData_v1':
-      case 'eth_signTypedData_v3':
-      case 'eth_signTypedData_v4':
-        if (!account.isExternal) {
-          canSign = true;
-        }
-        break;
-      default:
-        throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Unsupported action'));
-    }
-    const signPayload = {
-      account: account,
-      type: method,
-      payload: payload,
-      hashPayload: hashPayload,
-      canSign: canSign,
+    const validationSteps = [topic ? _logicValidation.validationAuthWCMiddleware : _logicValidation.validationAuthMiddleware, _logicValidation.validationEvmSignMessageMiddleware];
+    const result = await (0, _logicValidation.generateValidationProcess)(this, url, payloadValidation, validationSteps, topic);
+    const payloadAfterValidated = {
+      ...result.payloadAfterValidated,
+      errors: result.errors,
       id
     };
-    return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', signPayload, {
-      requiredPassword: false,
-      address
-    }).then(_ref9 => {
+    return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', payloadAfterValidated, {}).then(_ref9 => {
       let {
         isApproved,
         payload
@@ -1209,117 +1170,36 @@ class KoniState {
     });
     return Object.fromEntries(await Promise.all(promiseList));
   }
-  async evmSendTransaction(id, url, networkKey, allowedAccounts, transactionParams) {
-    const evmApi = this.getEvmApi(networkKey);
-    const evmNetwork = this.getChainInfo(networkKey);
-    const web3 = evmApi.api;
-    const autoFormatNumber = val => {
-      if (typeof val === 'string' && val.startsWith('0x')) {
-        return new _bn.default(val.replace('0x', ''), 16).toString();
-      } else if (typeof val === 'number') {
-        return val.toString();
-      }
-      return val;
+  async evmSendTransaction(id, url, transactionParams, networkKeyInit, topic) {
+    const payloadValidation = {
+      errors: [],
+      networkKey: networkKeyInit || '',
+      payloadAfterValidated: transactionParams,
+      address: transactionParams.from
     };
-    if (transactionParams.from === transactionParams.to) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Receiving address must be different from sending address'));
-    }
-    const transaction = {
-      from: transactionParams.from,
-      to: transactionParams.to,
-      value: autoFormatNumber(transactionParams.value),
-      gas: autoFormatNumber(transactionParams.gas),
-      gasPrice: autoFormatNumber(transactionParams.gasPrice || transactionParams.gasLimit),
-      maxPriorityFeePerGas: autoFormatNumber(transactionParams.maxPriorityFeePerGas),
-      maxFeePerGas: autoFormatNumber(transactionParams.maxFeePerGas),
-      data: transactionParams.data
-    };
-    if (!transactionParams.gas) {
-      const getTransactionGas = async () => {
-        try {
-          transaction.gas = await web3.eth.estimateGas({
-            ...transaction
-          });
-        } catch (e) {
-          // @ts-ignore
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-          throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
-        }
-      };
-
-      // Calculate transaction data
-      try {
-        await Promise.race([getTransactionGas(), (0, _utils3.wait)(3000).then(async () => {
-          if (!transaction.gas) {
-            await this.chainService.initSingleApi(networkKey);
-            await getTransactionGas();
-          }
-        })]);
-      } catch (e) {
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
-      }
-    }
-    if (!transaction.gas) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS);
-    }
-    let estimateGas;
-
-    // TODO: Review, If not override, transaction maybe fail because fee too low
-    if (transactionParams.maxPriorityFeePerGas && transactionParams.maxFeePerGas) {
-      const maxFee = new _bignumber.default(transactionParams.maxFeePerGas);
-      estimateGas = maxFee.multipliedBy(transaction.gas).toFixed(0);
-    } else if (transactionParams.gasPrice) {
-      estimateGas = new _bignumber.default(transactionParams.gasPrice).multipliedBy(transaction.gas).toFixed(0);
-    } else {
-      const priority = await (0, _utils2.calculateGasFeeParams)(evmApi, networkKey);
-      if (priority.baseGasFee) {
-        transaction.maxPriorityFeePerGas = priority.maxPriorityFeePerGas.toString();
-        transaction.maxFeePerGas = priority.maxFeePerGas.toString();
-        const maxFee = priority.maxFeePerGas;
-        estimateGas = maxFee.multipliedBy(transaction.gas).toFixed(0);
-      } else {
-        transaction.gasPrice = priority.gasPrice;
-        estimateGas = new _bignumber.default(priority.gasPrice).multipliedBy(transaction.gas).toFixed(0);
+    const validationSteps = [topic ? _logicValidation.validationAuthWCMiddleware : _logicValidation.validationAuthMiddleware, _logicValidation.validationConnectMiddleware, _logicValidation.validationEvmDataTransactionMiddleware];
+    const result = await (0, _logicValidation.generateValidationProcess)(this, url, payloadValidation, validationSteps, topic);
+    const {
+      confirmationType,
+      errors,
+      networkKey: networkKey_
+    } = result;
+    if (errors && errors.length > 0 && confirmationType) {
+      if (ERROR_CONFIRMATION_TYPE.includes(confirmationType)) {
+        return this.requestService.addConfirmation(id, url, confirmationType, result, {}).then(() => {
+          throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.USER_REJECTED_REQUEST);
+        });
       }
     }
-
-    // Address is validated in before step
-    const fromAddress = allowedAccounts.find(account => account.toLowerCase() === transaction.from.toLowerCase());
-    if (!fromAddress) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('You have rescinded allowance for this account in wallet'));
-    }
-    const pair = _uiKeyring.keyring.getPair(fromAddress);
-    if (!pair) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Unable to find account'));
-    }
-    const account = {
-      address: pair.address,
-      ...pair.meta
-    };
-
-    // Validate balance
-    const balance = new _bn.default((await web3.eth.getBalance(fromAddress)) || 0);
-    if (balance.lt(new _bn.default(estimateGas).add(new _bn.default(autoFormatNumber(transactionParams.value) || '0')))) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Insufficient balance'));
-    }
-    transaction.nonce = await web3.eth.getTransactionCount(fromAddress);
-    const hashPayload = this.transactionService.generateHashPayload(networkKey, transaction);
-    const isToContract = await (0, _parseTransaction.isContractAddress)(transaction.to || '', evmApi);
-    const parseData = isToContract ? transaction.data ? (await (0, _parseTransaction.parseContractInput)(transaction.data, transaction.to || '', evmNetwork)).result : '' : transaction.data || '';
+    const transactionValidated = result.payloadAfterValidated;
+    const networkKey = networkKey_ || '';
     const requestPayload = {
-      ...transaction,
-      estimateGas,
-      hashPayload,
-      isToContract,
-      parseData: parseData,
-      account: account,
-      canSign: true
+      ...transactionValidated,
+      errors: errors
     };
-    const eType = transaction.value ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.EVM_EXECUTE;
+    const eType = transactionValidated.value ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.EVM_EXECUTE;
     const transactionData = {
-      ...transaction
+      ...transactionValidated
     };
     const token = this.chainService.getNativeTokenInfo(networkKey);
     if (eType === _KoniTypes.ExtrinsicType.TRANSFER_BALANCE) {
@@ -1334,10 +1214,11 @@ class KoniState {
       chain: networkKey,
       url,
       data: transactionData,
+      errors: errors,
       extrinsicType: eType,
       chainType: _KoniTypes.ChainType.EVM,
       estimateFee: {
-        value: estimateGas,
+        value: transactionValidated.estimateGas,
         symbol: token.symbol,
         decimals: token.decimals || 18
       },

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

@@ -13,13 +13,12 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _RequestBytesSign = _interopRequireDefault(require("@subwallet/extension-base/background/RequestBytesSign"));
 var _RequestExtrinsicSign = _interopRequireDefault(require("@subwallet/extension-base/background/RequestExtrinsicSign"));
 var _constants = require("@subwallet/extension-base/constants");
+var _logicValidation = require("@subwallet/extension-base/core/logic-validation");
 var _defaults = require("@subwallet/extension-base/defaults");
 var _types2 = require("@subwallet/extension-base/services/chain-service/handler/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _constants2 = require("@subwallet/extension-base/services/setting-service/constants");
 var _utils2 = require("@subwallet/extension-base/utils");
-var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
-var _i18next = require("i18next");
 var _web = _interopRequireDefault(require("web3"));
 var _phishing = require("@polkadot/phishing");
 var _util = require("@polkadot/util");
@@ -134,33 +133,36 @@ class KoniTabs {
   }
 
   /// Clone from Polkadot.js
-  getSigningPair(address) {
-    const pair = _uiKeyring.default.getPair(address);
-    (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
-    return pair;
-  }
   async bytesSign(url, request) {
     const address = request.address;
-    const pair = this.getSigningPair(address);
-    const authInfo = await this.getAuthInfo(url);
-    if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[pair.address]) {
-      throw new Error('Account {{address}} not in allowed list'.replace('{{address}}', address));
-    }
+    const payloadValidate = {
+      address,
+      networkKey: '',
+      errors: [],
+      payloadAfterValidated: request
+    };
+    const {
+      pair
+    } = await (0, _logicValidation.generateValidationProcess)(this.#koniState, url, payloadValidate, [_logicValidation.validationAuthMiddleware]);
     return this.#koniState.sign(url, new _RequestBytesSign.default(request), {
       address,
-      ...pair.meta
+      ...(pair === null || pair === void 0 ? void 0 : pair.meta)
     });
   }
   async extrinsicSign(url, request) {
     const address = request.address;
-    const pair = this.getSigningPair(address);
-    const authInfo = await this.getAuthInfo(url);
-    if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[pair.address]) {
-      throw new Error('Account {{address}} not in allowed list'.replace('{{address}}', address));
-    }
+    const payloadValidate = {
+      address,
+      networkKey: '',
+      errors: [],
+      payloadAfterValidated: request
+    };
+    const {
+      pair
+    } = await (0, _logicValidation.generateValidationProcess)(this.#koniState, url, payloadValidate, [_logicValidation.validationAuthMiddleware]);
     return this.#koniState.sign(url, new _RequestExtrinsicSign.default(request), {
       address,
-      ...pair.meta
+      ...(pair === null || pair === void 0 ? void 0 : pair.meta)
     });
   }
   metadataProvide(url, request) {
@@ -795,8 +797,19 @@ class KoniTabs {
         params: params,
         id
       }, (error, result) => {
-        const err = (result === null || result === void 0 ? void 0 : result.error) || error;
+        let err = (result === null || result === void 0 ? void 0 : result.error) || error;
         if (err) {
+          let message = err.message.toLowerCase();
+          if (message.includes('method not found') || message.includes('not supported') || message.includes('is not available')) {
+            message = 'This method is not supported by SubWallet. Try again or contact support at agent@subwallet.app';
+          }
+          if (message.includes('network is disconnected')) {
+            message = 'Re-enable the network or change RPC on the extension and try again';
+          }
+          err = {
+            ...err,
+            message
+          };
           reject(err);
         } else {
           const rs = result === null || result === void 0 ? void 0 : result.result;
@@ -815,8 +828,7 @@ class KoniTabs {
       method,
       params
     } = _ref20;
-    const allowedAccounts = await this.getEvmCurrentAccount(url);
-    const signResult = await this.#koniState.evmSign(id, url, method, params, allowedAccounts);
+    const signResult = await this.#koniState.evmSign(id, url, method, params);
     if (signResult) {
       return signResult;
     } else {
@@ -828,17 +840,7 @@ class KoniTabs {
       params
     } = _ref21;
     const transactionParams = params[0];
-    const canUseAccount = transactionParams.from && this.canUseAccount(transactionParams.from, url);
-    const evmState = await this.getEvmState(url);
-    const networkKey = evmState.networkKey;
-    if (!canUseAccount) {
-      throw new Error((0, _i18next.t)('You have rescinded allowance for this account in wallet'));
-    }
-    if (!networkKey) {
-      throw new Error('Network unavailable. Please switch network or manually add network to wallet');
-    }
-    const allowedAccounts = await this.getEvmCurrentAccount(url);
-    const transactionHash = await this.#koniState.evmSendTransaction(id, url, networkKey, allowedAccounts, transactionParams);
+    const transactionHash = await this.#koniState.evmSendTransaction(id, url, transactionParams);
     if (!transactionHash) {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.USER_REJECTED_REQUEST);
     }

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.2.25-0'
+  version: '1.2.25-1'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -114,6 +114,7 @@ const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substra
 // eslint-disable-next-line @typescript-eslint/require-await
 exports.subscribeSubstrateBalance = subscribeSubstrateBalance;
 const subscribeWithSystemAccountPallet = async _ref => {
+  var _substrateApi$api$tx, _substrateApi$api$tx$;
   let {
     addresses,
     callback,
@@ -123,27 +124,34 @@ const subscribeWithSystemAccountPallet = async _ref => {
   } = _ref;
   const systemAccountKey = 'query_system_account';
   const poolMembersKey = 'query_nominationPools_poolMembers';
+  const isNominationPoolMigrated = !!((_substrateApi$api$tx = substrateApi.api.tx) !== null && _substrateApi$api$tx !== void 0 && (_substrateApi$api$tx$ = _substrateApi$api$tx.nominationPools) !== null && _substrateApi$api$tx$ !== void 0 && _substrateApi$api$tx$.migrateDelegation);
   const params = [{
     section: 'query',
     module: systemAccountKey.split('_')[1],
     method: systemAccountKey.split('_')[2],
     args: addresses
-  }, {
-    section: 'query',
-    module: poolMembersKey.split('_')[1],
-    method: poolMembersKey.split('_')[2],
-    args: addresses
   }];
+  if (!isNominationPoolMigrated) {
+    params.push({
+      section: 'query',
+      module: poolMembersKey.split('_')[1],
+      method: poolMembersKey.split('_')[2],
+      args: addresses
+    });
+  }
   const subscription = substrateApi.subscribeDataWithMulti(params, rs => {
     const balances = rs[systemAccountKey];
     const poolMemberInfos = rs[poolMembersKey];
     const items = balances.map((_balance, index) => {
       const balanceInfo = _balance;
-      const poolMemberInfo = poolMemberInfos[index];
-      const nominationPoolBalance = poolMemberInfo ? (0, _nominationpoolsPallet._getTotalStakeInNominationPool)(poolMemberInfo) : BigInt(0);
       const transferableBalance = (0, _systemPallet._getSystemPalletTransferable)(balanceInfo, (0, _utils2._getChainExistentialDeposit)(chainInfo), extrinsicType);
       const totalBalance = (0, _systemPallet._getSystemPalletTotalBalance)(balanceInfo);
-      const totalLockedFromTransfer = totalBalance - transferableBalance + nominationPoolBalance;
+      let totalLockedFromTransfer = totalBalance - transferableBalance;
+      if (!isNominationPoolMigrated) {
+        const poolMemberInfo = poolMemberInfos[index];
+        const nominationPoolBalance = poolMemberInfo ? (0, _nominationpoolsPallet._getTotalStakeInNominationPool)(poolMemberInfo) : BigInt(0);
+        totalLockedFromTransfer += nominationPoolBalance;
+      }
       return {
         address: addresses[index],
         tokenSlug: (0, _utils2._getChainNativeTokenSlug)(chainInfo),

package/cjs/services/chain-service/constants.js

@@ -143,7 +143,8 @@ const _EXPECTED_BLOCK_TIME = {
   manta_network: 12,
   enjin_relaychain: 6,
   availTuringTest: 20,
-  avail_mainnet: 20
+  avail_mainnet: 20,
+  dentnet: 3
 };
 exports._EXPECTED_BLOCK_TIME = _EXPECTED_BLOCK_TIME;
 const _PARACHAIN_INFLATION_DISTRIBUTION = {
@@ -243,6 +244,10 @@ const _KNOWN_CHAIN_INFLATION_PARAMS = {
     ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
     maxInflation: 0.05,
     minInflation: 0.01
+  },
+  dentnet: {
+    ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
+    falloff: 0.5
   }
 };
 

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

@@ -28,7 +28,7 @@ const filterChainInfoMap = (data, ignoredChains) => {
     return !info.bitcoinInfo && !ignoredChains.includes(slug);
   }));
 };
-const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet', 'core', 'satoshivm', 'satoshivm_testnet'];
+const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet', 'core', 'satoshivm', 'satoshivm_testnet', 'ton', 'ton_testnet'];
 const filterAssetInfoMap = (chainInfo, assets) => {
   return Object.fromEntries(Object.entries(assets).filter(_ref2 => {
     let [, info] = _ref2;
@@ -75,6 +75,7 @@ class ChainService {
   swapRefMapSubject = new _rxjs.Subject();
   assetLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.AssetLogoMap);
   chainLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.ChainLogoMap);
+  ledgerGenericAllowChainsSubject = new _rxjs.BehaviorSubject([]);
   assetMapPatch = JSON.stringify({});
   assetLogoPatch = JSON.stringify({});
 
@@ -97,6 +98,22 @@ class ChainService {
     this.evmChainHandler = new _EvmChainHandler.EvmChainHandler(this);
     this.logger = (0, _logger.logger)('chain-service');
   }
+  get value() {
+    const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
+    return {
+      get ledgerGenericAllowChains() {
+        return ledgerGenericAllowChains.value;
+      }
+    };
+  }
+  get observable() {
+    const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
+    return {
+      get ledgerGenericAllowChains() {
+        return ledgerGenericAllowChains.asObservable();
+      }
+    };
+  }
   subscribeSwapRefMap() {
     return this.swapRefMapSubject;
   }
@@ -624,6 +641,11 @@ class ChainService {
       }
     }
   }
+  handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains) {
+    this.ledgerGenericAllowChainsSubject.next(latestledgerGenericAllowChains);
+    this.eventService.emit('ledger.ready', true);
+    this.logger.log('Finished updating latest ledger generic allow chains');
+  }
   handleLatestData() {
     this.fetchLatestAssetData().then(_ref9 => {
       let [latestAssetInfo, latestAssetLogoMap] = _ref9;
@@ -641,6 +663,9 @@ class ChainService {
     this.fetchLatestPriceIdsData().then(latestPriceIds => {
       this.handleLatestPriceId(latestPriceIds);
     }).catch(console.error);
+    this.fetchLatestLedgerGenericAllowChains().then(latestledgerGenericAllowChains => {
+      this.handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains);
+    }).catch(console.error);
   }
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
@@ -898,6 +923,9 @@ class ChainService {
   async fetchLatestAssetRef() {
     return await Promise.all([(0, _utils2.fetchStaticData)('chain-assets/disabled-xcm-channels'), (0, _utils.fetchPatchData)('AssetRef.json')]);
   }
+  async fetchLatestLedgerGenericAllowChains() {
+    return (await (0, _utils2.fetchStaticData)('chains/ledger-generic-allow-chains')) || [];
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const defaultChainInfoMap = filterChainInfoMap(_chainList.ChainInfoMap, ignoredList);
@@ -1010,7 +1038,7 @@ class ChainService {
             deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
             deprecatedChains.push(storedSlug);
           } else {
-            var _storedChainInfo$bitc;
+            var _storedChainInfo$bitc, _storedChainInfo$tonI;
             mergedChainInfoMap[storedSlug] = {
               slug: storedSlug,
               name: storedChainInfo.name,
@@ -1019,6 +1047,7 @@ class ChainService {
               evmInfo: storedChainInfo.evmInfo,
               substrateInfo: storedChainInfo.substrateInfo,
               bitcoinInfo: (_storedChainInfo$bitc = storedChainInfo.bitcoinInfo) !== null && _storedChainInfo$bitc !== void 0 ? _storedChainInfo$bitc : null,
+              tonInfo: (_storedChainInfo$tonI = storedChainInfo.tonInfo) !== null && _storedChainInfo$tonI !== void 0 ? _storedChainInfo$tonI : null,
               isTestnet: storedChainInfo.isTestnet,
               chainStatus: storedChainInfo.chainStatus,
               icon: storedChainInfo.icon,
@@ -1234,6 +1263,7 @@ class ChainService {
       substrateInfo,
       evmInfo,
       bitcoinInfo: null,
+      tonInfo: null,
       isTestnet: false,
       chainStatus: _types._ChainStatus.ACTIVE,
       icon: '',

package/cjs/services/chain-service/utils/index.js

@@ -227,10 +227,10 @@ function _isEqualSmartContractAsset(asset1, asset2) {
   return false;
 }
 function _isPureEvmChain(chainInfo) {
-  return chainInfo.evmInfo !== null && chainInfo.substrateInfo === null;
+  return !!chainInfo.evmInfo && !chainInfo.substrateInfo;
 }
 function _isPureSubstrateChain(chainInfo) {
-  return chainInfo.evmInfo === null && chainInfo.substrateInfo !== null;
+  return !chainInfo.evmInfo && !!chainInfo.substrateInfo;
 }
 function _getOriginChainOfAsset(assetSlug) {
   if (assetSlug.startsWith(_types2._CUSTOM_PREFIX)) {

package/cjs/services/earning-service/constants/chains.js

@@ -8,7 +8,7 @@ exports._UPDATED_RUNTIME_STAKING_GROUP = exports._STAKING_CHAIN_GROUP = exports.
 // SPDX-License-Identifier: Apache-2.0
 
 const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet', 'vara_testnet'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet', 'vara_testnet', 'dentnet'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari', 'manta_network', 'polimec'],
   astar: ['astar', 'shiden', 'shibuya'],
   amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum', 'krest_network'],
@@ -25,7 +25,7 @@ const _STAKING_CHAIN_GROUP = {
   manta: ['manta_network']
 };
 exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
-const _UPDATED_RUNTIME_STAKING_GROUP = ['kusama', 'polkadot', 'westend', 'availTuringTest', 'avail_mainnet'];
+const _UPDATED_RUNTIME_STAKING_GROUP = ['kusama', 'polkadot', 'westend', 'availTuringTest', 'avail_mainnet', 'dentnet'];
 exports._UPDATED_RUNTIME_STAKING_GROUP = _UPDATED_RUNTIME_STAKING_GROUP;
 const MaxEraRewardPointsEras = 14;
 

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -308,7 +308,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const endEraForPoints = parseInt(activeEra) - 1;
     const startEraForPoints = Math.max(endEraForPoints - maxEraRewardPointsEras + 1, 0);
     let _eraStakersPromise;
-    if (_constants2._UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+    if (chainApi.api.query.staking.erasStakersOverview) {
       // todo: review all relaychains later
       _eraStakersPromise = chainApi.api.query.staking.erasStakersOverview.entries(parseInt(currentEra));
     } else {
@@ -325,8 +325,9 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const waitingValidatorLedger = {};
     if (_waitingValidatorLedger) {
       waitingValidatorList.forEach((validator, i) => {
-        const validatorLedger = _waitingValidatorLedger[i].toPrimitive();
-        waitingValidatorLedger[validator] = new _bignumber.default(validatorLedger.total).toFixed();
+        var _waitingValidatorLedg;
+        const validatorLedger = (_waitingValidatorLedg = _waitingValidatorLedger[i]) === null || _waitingValidatorLedg === void 0 ? void 0 : _waitingValidatorLedg.toPrimitive();
+        waitingValidatorLedger[validator] = new _bignumber.default((validatorLedger === null || validatorLedger === void 0 ? void 0 : validatorLedger.total) || 0).toFixed();
       });
     }
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;

package/cjs/services/earning-service/service.js

@@ -40,7 +40,7 @@ class EarningService {
   yieldPositionSubject = new _rxjs.BehaviorSubject({});
   yieldPositionListSubject = new _rxjs.BehaviorSubject([]); // virtual list of yieldPositionSubject with filter values
 
-  useOnlineCacheOnly = true;
+  useOnlineCacheOnly = false;
   constructor(state) {
     this.state = state;
     this.dbService = state.dbService;

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

@@ -35,6 +35,7 @@ class EventService extends _eventemitter.default {
     this.waitBuyTokenReady = this.generateWaitPromise('buy.tokens.ready');
     this.waitBuyServiceReady = this.generateWaitPromise('buy.services.ready');
     this.waitEarningReady = this.generateWaitPromise('earning.ready');
+    this.waitLedgerReady = this.generateWaitPromise('ledger.ready');
   }
   generateWaitPromise(eventType) {
     return new Promise(resolve => {

package/cjs/services/request-service/handler/EvmRequestHandler.js

@@ -29,7 +29,8 @@ class EvmRequestHandler {
     switchNetworkRequest: {},
     evmSignatureRequest: {},
     evmSendTransactionRequest: {},
-    evmWatchTransactionRequest: {}
+    evmWatchTransactionRequest: {},
+    errorConnectNetwork: {}
   });
   confirmationsPromiseMap = {};
   constructor(requestService) {