@subwallet/extension-base 1.1.38-1 → 1.1.40-0

package/cjs/services/chain-service/health-check/utils/provider.js

@@ -0,0 +1,186 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.timeoutMessage = exports.substrateHandleConnectChain = exports.handleSubstrateProvider = exports.handleEvmProvider = exports.failedMessage = exports.evmHandleConnectChain = void 0;
+var _EvmApi2 = require("@subwallet/extension-base/services/chain-service/handler/EvmApi");
+var _api2 = require("@polkadot/api");
+var _util = require("@polkadot/util");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const failedMessage = 'Connect failed';
+exports.failedMessage = failedMessage;
+const timeoutMessage = 'Connect timeout';
+exports.timeoutMessage = timeoutMessage;
+const substrateHandleConnectChain = async (chain, key, provider, hash) => {
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises,no-async-promise-executor
+  return new Promise(async resolve => {
+    console.log('start', chain, key, provider);
+    const _api = new _api2.ApiPromise({
+      provider: new _api2.WsProvider(provider)
+    });
+    let logFail = true;
+    const handlerOnFail = e => {
+      if (logFail) {
+        console.log('error', chain, key);
+        resolve([_api, (e === null || e === void 0 ? void 0 : e.message) || failedMessage]);
+      }
+      logFail = false;
+    };
+    const timeout = setTimeout(() => {
+      console.log('timeout', chain, key);
+      resolve([_api, timeoutMessage]);
+      logFail = false;
+      _api.disconnect().catch(console.error);
+      _api.off('disconnected', handlerOnFail);
+      _api.off('error', handlerOnFail);
+    }, 30 * 1000);
+    _api.on('disconnected', handlerOnFail);
+    _api.on('error', handlerOnFail);
+    const temp = await _api.isReady;
+    logFail = false;
+    const tempHash = temp.genesisHash.toHex();
+    if (hash && hash !== tempHash) {
+      resolve([_api, `Wrong genesisHash: current - ${hash}, onChain - ${tempHash}`]);
+    }
+    await _api.query.system.number();
+    _api.off('disconnected', handlerOnFail);
+    _api.off('error', handlerOnFail);
+    clearTimeout(timeout);
+    resolve([_api, '']);
+  });
+};
+exports.substrateHandleConnectChain = substrateHandleConnectChain;
+const evmHandleConnectChain = async (chain, key, provider, chainId) => {
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises,no-async-promise-executor
+  return new Promise(async resolve => {
+    console.log('start', chain, key, provider);
+    let api = null;
+    const _api = new _EvmApi2.EvmApi(chain, provider, {
+      providerName: key
+    });
+    let logFail = true;
+    const handlerOnFail = e => {
+      if (logFail) {
+        console.log('error', chain, key);
+        resolve([api, (e === null || e === void 0 ? void 0 : e.message) || failedMessage]);
+      }
+      logFail = false;
+    };
+    const timeout = setTimeout(() => {
+      console.log('timeout', chain, key);
+      resolve([api, timeoutMessage]);
+      logFail = false;
+      _api.destroy().catch(console.error);
+    }, 60 * 1000);
+    try {
+      api = await _api.isReady;
+    } catch (e) {
+      handlerOnFail(e);
+    }
+    logFail = false;
+    clearTimeout(timeout);
+    const tempId = await _api.api.eth.getChainId();
+    if (tempId !== chainId) {
+      resolve([api, `Wrong chain id: current - ${chainId}, onChain - ${tempId}`]);
+    }
+    resolve([api, '']);
+  });
+};
+exports.evmHandleConnectChain = evmHandleConnectChain;
+const handleSubstrateProvider = _ref => {
+  let {
+    awaitDisconnect,
+    chain,
+    genHash,
+    key,
+    onError,
+    onSuccess,
+    onTimeout,
+    provider
+  } = _ref;
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises,no-async-promise-executor
+  return new Promise(async resolve => {
+    try {
+      const timeHandler = () => {
+        onTimeout();
+        resolve();
+      };
+      const timeout = setTimeout(() => {
+        timeHandler();
+      }, 2 * 60 * 1000);
+      const [api, message] = await substrateHandleConnectChain(chain, key, provider, genHash);
+      const disconnectApi = async api => {
+        if (awaitDisconnect) {
+          await (api === null || api === void 0 ? void 0 : api.disconnect());
+        } else {
+          api === null || api === void 0 ? void 0 : api.disconnect().finally(_util.noop);
+        }
+      };
+      clearTimeout(timeout);
+      if (message) {
+        await onError(message);
+        await disconnectApi(api);
+        resolve();
+      }
+      await onSuccess(api);
+      await disconnectApi(api);
+      resolve();
+    } catch (e) {
+      await onError(e.message);
+      resolve();
+    }
+  });
+};
+exports.handleSubstrateProvider = handleSubstrateProvider;
+const handleEvmProvider = _ref2 => {
+  let {
+    awaitDisconnect,
+    chain,
+    chainId,
+    key,
+    onError,
+    onSuccess,
+    onTimeout,
+    provider
+  } = _ref2;
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises,no-async-promise-executor
+  return new Promise(async resolve => {
+    try {
+      const timeHandler = () => {
+        onTimeout();
+        resolve();
+      };
+      const timeout = setTimeout(() => {
+        timeHandler();
+      }, 2 * 60 * 1000);
+      const [_api, message] = await evmHandleConnectChain(chain, key, provider, chainId);
+      const disconnectApi = async _api => {
+        if (awaitDisconnect) {
+          await (_api === null || _api === void 0 ? void 0 : _api.destroy());
+        } else {
+          _api === null || _api === void 0 ? void 0 : _api.destroy().finally(_util.noop);
+        }
+      };
+      console.log('connected', chain, key, provider);
+      clearTimeout(timeout);
+      if (message) {
+        await onError(message);
+        await disconnectApi(_api);
+        resolve();
+      }
+
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const api = _api;
+      await onSuccess(api);
+      await disconnectApi(_api);
+      resolve();
+    } catch (e) {
+      await onError(e.message);
+      resolve();
+    }
+  });
+};
+exports.handleEvmProvider = handleEvmProvider;

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

@@ -287,7 +287,21 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const currentEra = _era.toString();
     const allValidators = [];
     const validatorInfoList = [];
-    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data()]);
+    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data(), chainApi.api.query.staking.validators.entries()]);
+
+    // filter blocked validators
+    const validators = _validators;
+    const blockValidatorList = [];
+    for (const validator of validators) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      const validatorAddress = validator[0].toHuman()[0];
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      const validatorPrefs = validator[1].toHuman();
+      const isBlocked = validatorPrefs.blocked;
+      if (isBlocked) {
+        blockValidatorList.push(validatorAddress);
+      }
+    }
     const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
@@ -303,32 +317,34 @@ class RelayNativeStakingPoolHandler extends _base.default {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const rawValidatorStat = item[1].toHuman();
       const validatorAddress = rawValidatorInfo[1];
-      const rawTotalStake = rawValidatorStat.total;
-      const rawOwnStake = rawValidatorStat.own;
-      const bnTotalStake = new _util.BN(rawTotalStake.replaceAll(',', ''));
-      const bnOwnStake = new _util.BN(rawOwnStake.replaceAll(',', ''));
-      const otherStake = bnTotalStake.sub(bnOwnStake);
-      totalStakeMap[validatorAddress] = bnTotalStake;
-      let nominatorCount = 0;
-      if ('others' in rawValidatorStat) {
-        const others = rawValidatorStat.others;
-        nominatorCount = others.length;
+      if (!blockValidatorList.includes(validatorAddress)) {
+        const rawTotalStake = rawValidatorStat.total;
+        const rawOwnStake = rawValidatorStat.own;
+        const bnTotalStake = new _util.BN(rawTotalStake.replaceAll(',', ''));
+        const bnOwnStake = new _util.BN(rawOwnStake.replaceAll(',', ''));
+        const otherStake = bnTotalStake.sub(bnOwnStake);
+        totalStakeMap[validatorAddress] = bnTotalStake;
+        let nominatorCount = 0;
+        if ('others' in rawValidatorStat) {
+          const others = rawValidatorStat.others;
+          nominatorCount = others.length;
+        }
+        allValidators.push(validatorAddress);
+        validatorInfoList.push({
+          address: validatorAddress,
+          totalStake: bnTotalStake.toString(),
+          ownStake: bnOwnStake.toString(),
+          otherStake: otherStake.toString(),
+          nominatorCount,
+          // to be added later
+          commission: 0,
+          expectedReturn: 0,
+          blocked: false,
+          isVerified: false,
+          minBond,
+          isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded)
+        });
       }
-      allValidators.push(validatorAddress);
-      validatorInfoList.push({
-        address: validatorAddress,
-        totalStake: bnTotalStake.toString(),
-        ownStake: bnOwnStake.toString(),
-        otherStake: otherStake.toString(),
-        nominatorCount,
-        // to be added later
-        commission: 0,
-        expectedReturn: 0,
-        blocked: false,
-        isVerified: false,
-        minBond,
-        isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded)
-      });
     }
     const extraInfoMap = {};
     await Promise.all(allValidators.map(async address => {

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

@@ -134,13 +134,20 @@ class EarningService {
     this.eventService.onLazy((events, eventTypes) => {
       (async () => {
         const removedAddresses = [];
+        const removeChains = [];
         events.forEach(event => {
           if (event.type === 'account.remove') {
             removedAddresses.push(event.data[0]);
           }
+          if (event.type === 'chain.updateState') {
+            const chainState = this.state.getChainStateByKey(event.data[0]);
+            if (chainState && !(0, _utils._isChainEnabled)(chainState)) {
+              removeChains.push(event.data[0]);
+            }
+          }
         });
-        if (removedAddresses.length > 0) {
-          await this.removeYieldPositions(undefined, removedAddresses);
+        if (removeChains.length || removedAddresses.length) {
+          await this.removeYieldPositions(removeChains, removedAddresses);
         }
 
         // Account changed or chain changed (active or inactive)

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/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/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.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;

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";