@subwallet/extension-base 1.0.2-1b → 1.0.2-3

package/koni/background/handlers/Extension.js

@@ -20,16 +20,17 @@ import { getPSP34TransferExtrinsic } from '@subwallet/extension-base/koni/api/to
 import { createXcmExtrinsic } from '@subwallet/extension-base/koni/api/xcm';
 import { _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _getTokenMinAmount, _isAssetSmartContractNft, _isChainEvmCompatible, _isCustomAsset, _isLocalToken, _isNativeToken, _isTokenEvmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
+import { reformatAddress } from '@subwallet/extension-base/utils';
+import { convertSubjectInfoToAddresses } from '@subwallet/extension-base/utils/address';
 import { createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPair } from '@subwallet/keyring';
 import { keyring } from '@subwallet/ui-keyring';
-import { accounts as accountsObservable } from '@subwallet/ui-keyring/observable/accounts';
 import BigN from 'bignumber.js';
 import { Transaction } from 'ethereumjs-tx';
 import { TypeRegistry } from '@polkadot/types';
-import { assert, BN, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
-import { base64Decode, isEthereumAddress, jsonDecrypt, keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
+import { assert, BN, BN_ZERO, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
+import { base64Decode, decodeAddress, isAddress, isEthereumAddress, jsonDecrypt, keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
 const ETH_DERIVE_DEFAULT = '/m/44\'/60\'/0\'/0/0';
 function getSuri(seed, type) {
   return type === 'ethereum' ? `${seed}${ETH_DERIVE_DEFAULT}` : seed;
@@ -163,7 +164,8 @@ export default class KoniExtension {
   // FIXME This looks very much like what we have in Tabs
   accountsSubscribe(id, port) {
     const cb = createSubscription(id, port);
-    const subscription = accountsObservable.subject.subscribe(accounts => cb(transformAccounts(accounts)));
+    const accountSubject = this.#koniState.keyringService.accountSubject;
+    const subscription = accountSubject.subscribe(accounts => cb(transformAccounts(accounts)));
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
       subscription.unsubscribe();
@@ -404,8 +406,7 @@ export default class KoniExtension {
     const keyringService = this.#koniState.keyringService;
     await this.#koniState.eventService.waitAccountReady;
     const currentAccount = keyringService.currentAccount;
-    const accountsSubject = keyring.accounts.subject;
-    const transformedAccounts = transformAccounts(accountsSubject.value);
+    const transformedAccounts = transformAccounts(keyringService.accounts);
     const responseData = {
       accounts: transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [{
         ...ACCOUNT_ALL_JSON
@@ -413,7 +414,7 @@ export default class KoniExtension {
       currentAddress: currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.address,
       currentGenesisHash: currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.currentGenesisHash
     };
-    const subscriptionAccounts = accountsSubject.subscribe(storedAccounts => {
+    const subscriptionAccounts = keyringService.accountSubject.subscribe(storedAccounts => {
       const transformedAccounts = transformAccounts(storedAccounts);
       responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [{
         ...ACCOUNT_ALL_JSON
@@ -448,25 +449,66 @@ export default class KoniExtension {
     });
     return id;
   }
-  saveRecentAccountId({
+  subscribeAddresses(id, port) {
+    const _cb = createSubscription(id, port);
+    const subscription = this.#koniState.keyringService.addressesSubject.subscribe(subjectInfo => {
+      const addresses = convertSubjectInfoToAddresses(subjectInfo);
+      _cb({
+        addresses: addresses
+      });
+    });
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    const subjectInfo = this.#koniState.keyringService.addresses;
+    return {
+      addresses: convertSubjectInfoToAddresses(subjectInfo)
+    };
+  }
+  saveRecentAccount({
     accountId
   }) {
-    return keyring.saveRecent(accountId);
+    if (isAddress(accountId)) {
+      const address = reformatAddress(accountId);
+      const account = keyring.getAccount(address);
+      const contact = keyring.getAddress(address);
+      return account || contact || {
+        ...keyring.saveRecent(accountId).json,
+        publicKey: decodeAddress(address)
+      };
+    } else {
+      throw Error('Invalid address');
+    }
+  }
+  editContactAccount({
+    address,
+    meta
+  }) {
+    if (isAddress(address)) {
+      const _address = reformatAddress(address);
+      keyring.saveAddress(_address, meta);
+      return true;
+    } else {
+      throw Error('Invalid address');
+    }
+  }
+  deleteContactAccount({
+    address
+  }) {
+    if (isAddress(address)) {
+      const _address = reformatAddress(address);
+      keyring.forgetAddress(_address);
+      return true;
+    } else {
+      throw Error('Invalid address');
+    }
   }
-
-  // private triggerAccountsSubscription (): boolean {
-  //   const accountsSubject = accountsObservable.subject;
-  //
-  //   accountsSubject.next(accountsSubject.getValue());
-  //
-  //   return true;
-  // }
-
   _getAuthListV2() {
+    const keyringService = this.#koniState.keyringService;
     return new Promise((resolve, reject) => {
       this.#koniState.getAuthorize(rs => {
-        const accounts = accountsObservable.subject.getValue();
-        const addressList = Object.keys(accounts);
+        const addressList = Object.keys(keyringService.accounts);
         const urlList = Object.keys(rs);
         if (Object.keys(rs[urlList[0]].isAllowedMap).toString() !== addressList.toString()) {
           urlList.forEach(url => {
@@ -580,7 +622,7 @@ export default class KoniExtension {
     return true;
   }
   getNonReadonlyAccounts() {
-    const storedAccounts = accountsObservable.subject.getValue();
+    const storedAccounts = this.#koniState.keyringService.accounts;
     const transformedAccounts = transformAccounts(storedAccounts);
     return transformedAccounts.filter(a => !a.isReadOnly).map(a => a.address);
   }
@@ -1281,6 +1323,14 @@ export default class KoniExtension {
     });
     return historySubject.getValue();
   }
+  addContact(to) {
+    const toAddress = reformatAddress(to);
+    const account = keyring.getAccount(toAddress);
+    const contact = keyring.getAddress(toAddress);
+    if (!account && (!contact || contact.meta.isRecent)) {
+      keyring.saveAddress(toAddress, {});
+    }
+  }
   validateTransfer(tokenSlug, from, to, value, transferAll) {
     const errors = [];
     const keypair = keyring.getPair(from);
@@ -1354,6 +1404,7 @@ export default class KoniExtension {
       });
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
+    this.addContact(to);
     return this.#koniState.transactionService.handleTransaction({
       errors,
       warnings,
@@ -1406,6 +1457,7 @@ export default class KoniExtension {
         substrateApi
       });
     }
+    this.addContact(to);
     return await this.#koniState.transactionService.handleTransaction({
       url: EXTENSION_REQUEST_URL,
       address: from,
@@ -1415,6 +1467,7 @@ export default class KoniExtension {
       extrinsicType: ExtrinsicType.TRANSFER_XCM,
       chainType: ChainType.SUBSTRATE,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
+      isTransferAll: inputData.transferAll,
       errors
     });
   }
@@ -1428,6 +1481,7 @@ export default class KoniExtension {
     const contractAddress = params.contractAddress;
     const tokenId = params.tokenId;
     const transaction = await getERC721Transaction(this.#koniState.getEvmApi(networkKey), contractAddress, senderAddress, recipientAddress, tokenId);
+    this.addContact(recipientAddress);
     return await this.#koniState.transactionService.handleTransaction({
       address: senderAddress,
       chain: networkKey,
@@ -1503,6 +1557,71 @@ export default class KoniExtension {
   }) {
     return await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
   }
+  async transferGetMaxTransferable({
+    address,
+    destChain,
+    isXcmTransfer,
+    networkKey,
+    token
+  }) {
+    const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
+    const tokenInfo = token ? this.#koniState.chainService.getAssetBySlug(token) : this.#koniState.chainService.getNativeTokenInfo(networkKey);
+    if (!_isNativeToken(tokenInfo)) {
+      return freeBalance;
+    } else {
+      const substrateApi = this.#koniState.chainService.getSubstrateApi(networkKey);
+      let estimatedFee;
+      let maxTransferable = new BN(freeBalance.value);
+      if (isXcmTransfer) {
+        const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
+        const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, tokenInfo.slug);
+        if (!destinationTokenInfo) {
+          estimatedFee = '0';
+        } else {
+          maxTransferable = maxTransferable.sub(new BN(tokenInfo.minAmount || '0'));
+          const mockTx = await createXcmExtrinsic({
+            chainInfoMap,
+            destinationTokenInfo,
+            originTokenInfo: tokenInfo,
+            recipient: address,
+            sendingValue: '0',
+            substrateApi
+          });
+          try {
+            var _paymentInfo$partialF;
+            const paymentInfo = await mockTx.paymentInfo(address);
+            estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0';
+          } catch (e) {
+            estimatedFee = '0';
+            console.warn('Error estimating fee', e);
+          }
+        }
+      } else {
+        const [mockTx] = await createTransferExtrinsic({
+          from: address,
+          networkKey,
+          substrateApi,
+          to: address,
+          tokenInfo,
+          transferAll: true,
+          value: '0'
+        });
+        try {
+          var _paymentInfo$partialF2;
+          const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
+          estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF2 = paymentInfo.partialFee) === null || _paymentInfo$partialF2 === void 0 ? void 0 : _paymentInfo$partialF2.toString()) || '0';
+        } catch (e) {
+          estimatedFee = '0';
+          console.warn('Error estimating fee', e);
+        }
+      }
+      maxTransferable = maxTransferable.sub(new BN(estimatedFee));
+      return {
+        ...freeBalance,
+        value: maxTransferable.gt(BN_ZERO) ? maxTransferable.toString() || '0' : '0'
+      };
+    }
+  }
   async subscribeAddressFreeBalance({
     address,
     networkKey,
@@ -1549,6 +1668,7 @@ export default class KoniExtension {
     const networkKey = params === null || params === void 0 ? void 0 : params.networkKey;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const extrinsic = !isPSP34 ? getNftTransferExtrinsic(networkKey, apiProps, senderAddress, recipientAddress, params || {}) : await getPSP34TransferExtrinsic(networkKey, apiProps, senderAddress, recipientAddress, params || {});
+    this.addContact(recipientAddress);
     const rs = await this.#koniState.transactionService.handleTransaction({
       address: senderAddress,
       chain: networkKey,
@@ -1582,23 +1702,6 @@ export default class KoniExtension {
       meta: pair.meta
     };
   }
-
-  // private async isInWalletAccount (address?: string) {
-  //   return new Promise((resolve) => {
-  //     if (address) {
-  //       accountsObservable.subject.subscribe((storedAccounts: SubjectInfo): void => {
-  //         if (storedAccounts[address]) {
-  //           resolve(true);
-  //         }
-  //
-  //         resolve(false);
-  //       });
-  //     } else {
-  //       resolve(false);
-  //     }
-  //   });
-  // }
-
   accountsTie2({
     address,
     genesisHash
@@ -2729,8 +2832,6 @@ export default class KoniExtension {
         return this.accountsCreateSuri(request);
       case 'pri(accounts.changePassword)':
         return this.accountsChangePassword(request);
-      case 'pri(accounts.edit)':
-        return this.accountsEdit(request);
       case 'pri(accounts.export)':
         return this.accountsExport(request);
       case 'pri(accounts.show)':
@@ -2799,38 +2900,6 @@ export default class KoniExtension {
         return this.getAuthListV2();
       case 'pri(authorize.toggle)':
         return this.toggleAuthorization2(request);
-      case 'pri(accounts.create.suriV2)':
-        return await this.accountsCreateSuriV2(request);
-      case 'pri(accounts.forget)':
-        return await this.accountsForgetOverride(request);
-      case 'pri(accounts.create.externalV2)':
-        return await this.accountsCreateExternalV2(request);
-      case 'pri(accounts.create.hardwareV2)':
-        return await this.accountsCreateHardwareV2(request);
-      case 'pri(accounts.create.hardwareMultiple)':
-        return await this.accountsCreateHardwareMultiple(request);
-      case 'pri(accounts.create.withSecret)':
-        return await this.accountsCreateWithSecret(request);
-      case 'pri(seed.createV2)':
-        return this.seedCreateV2(request);
-      case 'pri(seed.validateV2)':
-        return this.seedValidateV2(request);
-      case 'pri(privateKey.validateV2)':
-        return this.metamaskPrivateKeyValidateV2(request);
-      case 'pri(accounts.exportPrivateKey)':
-        return this.accountExportPrivateKey(request);
-      case 'pri(accounts.checkPublicAndSecretKey)':
-        return this.checkPublicAndSecretKey(request);
-      case 'pri(accounts.subscribeWithCurrentAddress)':
-        return await this.accountsGetAllWithCurrentAddress(id, port);
-      case 'pri(accounts.subscribeAccountsInputAddress)':
-        return this.accountsGetAll(id, port);
-      case 'pri(accounts.saveRecent)':
-        return this.saveRecentAccountId(request);
-      case 'pri(currentAccount.saveAddress)':
-        return await this.saveCurrentAccountAddress(request);
-      case 'pri(accounts.updateCurrentAddress)':
-        return this.updateCurrentAccountAddress(request);
       case 'pri(settings.changeBalancesVisibility)':
         return this.toggleBalancesVisibility(id, port);
       case 'pri(settings.subscribe)':
@@ -2880,6 +2949,65 @@ export default class KoniExtension {
       case 'pri(transaction.history.getSubscription)':
         return await this.subscribeHistory(id, port);
 
+      /// Account management
+      // Add account
+      case 'pri(accounts.create.suriV2)':
+        return await this.accountsCreateSuriV2(request);
+      case 'pri(accounts.create.externalV2)':
+        return await this.accountsCreateExternalV2(request);
+      case 'pri(accounts.create.hardwareV2)':
+        return await this.accountsCreateHardwareV2(request);
+      case 'pri(accounts.create.hardwareMultiple)':
+        return await this.accountsCreateHardwareMultiple(request);
+      case 'pri(accounts.create.withSecret)':
+        return await this.accountsCreateWithSecret(request);
+      case 'pri(seed.createV2)':
+        return this.seedCreateV2(request);
+
+      // Remove account
+      case 'pri(accounts.forget)':
+        return await this.accountsForgetOverride(request);
+
+      // Validate account
+      case 'pri(seed.validateV2)':
+        return this.seedValidateV2(request);
+      case 'pri(privateKey.validateV2)':
+        return this.metamaskPrivateKeyValidateV2(request);
+      case 'pri(accounts.checkPublicAndSecretKey)':
+        return this.checkPublicAndSecretKey(request);
+
+      // Export account
+      case 'pri(accounts.exportPrivateKey)':
+        return this.accountExportPrivateKey(request);
+
+      // Subscribe account
+      case 'pri(accounts.subscribeWithCurrentAddress)':
+        return await this.accountsGetAllWithCurrentAddress(id, port);
+      case 'pri(accounts.subscribeAccountsInputAddress)':
+        return this.accountsGetAll(id, port);
+
+      // Save current account
+      case 'pri(currentAccount.saveAddress)':
+        return await this.saveCurrentAccountAddress(request);
+      case 'pri(accounts.updateCurrentAddress)':
+        return this.updateCurrentAccountAddress(request);
+
+      // Edit account
+      case 'pri(accounts.edit)':
+        return this.accountsEdit(request);
+
+      // Save contact address
+      case 'pri(accounts.saveRecent)':
+        return this.saveRecentAccount(request);
+      case 'pri(accounts.editContact)':
+        return this.editContactAccount(request);
+      case 'pri(accounts.deleteContact)':
+        return this.deleteContactAccount(request);
+
+      // Subscribe address
+      case 'pri(accounts.subscribeAddresses)':
+        return this.subscribeAddresses(id, port);
+
       // ChainService
       case 'pri(chainService.subscribeChainInfoMap)':
         return this.subscribeChainInfoMap(id, port);
@@ -2923,6 +3051,8 @@ export default class KoniExtension {
         return await this.transferCheckSupporting(request);
       case 'pri(transfer.getExistentialDeposit)':
         return this.transferGetExistentialDeposit(request);
+      case 'pri(transfer.getMaxTransferable)':
+        return this.transferGetMaxTransferable(request);
       case 'pri(freeBalance.get)':
         return this.getAddressFreeBalance(request);
       case 'pri(freeBalance.subscribe)':
@@ -2934,7 +3064,7 @@ export default class KoniExtension {
       case 'pri(accounts.get.meta)':
         return this.getAccountMeta(request);
 
-      // Send NFT
+      /// Send NFT
       case 'pri(evmNft.submitTransaction)':
         return this.evmNftSubmitTransaction(request);
       case 'pri(substrateNft.submitTransaction)':

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

@@ -109,7 +109,7 @@ export default class KoniState {
     resetNft(newAddress: string): void;
     updateNftData(network: string, nftData: NftItem, address: string, callback?: (nftData: NftItem) => void): void;
     deleteNftCollection(chain: string, collectionId: string): Promise<void>;
-    cleanUpNfts(chain: string, owner: string, collectionId: string, nftIds: string[]): void;
+    cleanUpNfts(chain: string, owner: string, collectionId: string[], nftIds: string[], ownNothing?: boolean): void;
     getNft(): Promise<NftJson | undefined>;
     subscribeNft(): Subject<NftJson>;
     resetStakingReward(): void;

package/koni/background/handlers/State.js

@@ -27,7 +27,6 @@ import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { decodePair } from '@subwallet/keyring/pair/decode';
 import { keyring } from '@subwallet/ui-keyring';
-import { accounts } from '@subwallet/ui-keyring/observable/accounts';
 import SimpleKeyring from 'eth-simple-keyring';
 import { Subject } from 'rxjs';
 import { assert, BN, hexStripPrefix, hexToU8a, isHex, logger as createLogger, u8aToHex } from '@polkadot/util';
@@ -84,10 +83,10 @@ export default class KoniState {
     this.notificationService = new NotificationService();
     this.chainService = new ChainService(this.dbService, this.eventService);
     this.settingService = new SettingService();
-    this.requestService = new RequestService(this.chainService, this.settingService);
+    this.requestService = new RequestService(this.chainService, this.settingService, this.keyringService);
     this.priceService = new PriceService(this.dbService, this.eventService, this.chainService);
     this.balanceService = new BalanceService(this.chainService);
-    this.historyService = new HistoryService(this.dbService, this.chainService, this.eventService);
+    this.historyService = new HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService);
     this.transactionService = new TransactionService(this.chainService, this.eventService, this.requestService, this.balanceService, this.historyService, this.notificationService, this.dbService);
     this.migrationService = new MigrationService(this);
     this.subscription = new KoniSubscription(this, this.dbService);
@@ -252,7 +251,7 @@ export default class KoniState {
     return this.requestService.getAuthList();
   }
   getAddressList(value = false) {
-    const addressList = Object.keys(accounts.subject.value);
+    const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -356,8 +355,8 @@ export default class KoniState {
   deleteNftCollection(chain, collectionId) {
     return this.dbService.deleteNftCollection(chain, collectionId);
   }
-  cleanUpNfts(chain, owner, collectionId, nftIds) {
-    this.dbService.cleanUpNft(chain, owner, collectionId, nftIds).catch(e => this.logger.warn(e));
+  cleanUpNfts(chain, owner, collectionId, nftIds, ownNothing) {
+    this.dbService.cleanUpNft(chain, owner, collectionId, nftIds, ownNothing).catch(e => this.logger.warn(e));
   }
   async getNft() {
     const addresses = this.getDecodedAddresses();
@@ -530,7 +529,11 @@ export default class KoniState {
       isApproved
     }) => {
       if (isApproved) {
-        await this.upsertChainInfo(networkData);
+        if (networkData.mode === 'insert') {
+          await this.upsertChainInfo(networkData);
+        } else {
+          // TODO: update existed network (need more discussion)
+        }
         return null;
       } else {
         throw new EvmProviderError(EvmProviderErrorType.USER_REJECTED_REQUEST);
@@ -987,7 +990,10 @@ export default class KoniState {
     if (!chainId) {
       return [undefined, undefined];
     }
-    const rs = Object.entries(this.chainService.getChainInfoMap()).find(([networkKey, chainInfo]) => _getEvmChainId(chainInfo) === chainId);
+    const rs = Object.entries(this.chainService.getChainInfoMap()).find(([networkKey, chainInfo]) => {
+      var _chainInfo$evmInfo;
+      return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId) === chainId;
+    });
     if (rs) {
       return rs;
     } else {
@@ -1221,17 +1227,23 @@ export default class KoniState {
       account: account,
       canSign: true
     };
+    const eType = transaction.value ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.EVM_EXECUTE;
+    const transactionData = {
+      ...transaction
+    };
+    if (eType === ExtrinsicType.TRANSFER_BALANCE) {
+      // @ts-ignore
+      transactionData.tokenSlug = this.chainService.getNativeTokenInfo(networkKey).slug;
+    }
 
-    // Todo: Convert this to handle transaction
+    // Custom handle this instead of general handler transaction
     const transactionEmitter = await this.transactionService.addTransaction({
       transaction: requestPayload,
       address: requestPayload.from,
       chain: networkKey,
       url,
-      data: {
-        ...transaction
-      },
-      extrinsicType: transaction.value ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.EVM_EXECUTE,
+      data: transactionData,
+      extrinsicType: eType,
       chainType: ChainType.EVM
     });
 
@@ -1356,7 +1368,7 @@ export default class KoniState {
         var _currentAssetSettings;
         const chain = SUBSCAN_CHAIN_MAP_REVERSE[network];
         const chainInfo = chain ? chainMap[chain] : null;
-        const balanceIsEmpty = (!balance || balance === '0') && !locked && locked === '0' && (!bonded || bonded === '0');
+        const balanceIsEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
 
         // Cancel if chain is not supported or is testnet or balance is 0
         if (!chainInfo || chainInfo.isTestnet || balanceIsEmpty) {

package/koni/background/handlers/Tabs.js

@@ -13,7 +13,6 @@ import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
 import { _generateCustomProviderKey } from '@subwallet/extension-base/services/chain-service/utils';
 import { canDerive } from '@subwallet/extension-base/utils';
 import keyring from '@subwallet/ui-keyring';
-import { accounts as accountsObservable } from '@subwallet/ui-keyring/observable/accounts';
 import Web3 from 'web3';
 import { checkIfDenied } from '@polkadot/phishing';
 import { assert, isNumber } from '@polkadot/util';
@@ -182,13 +181,13 @@ export default class KoniTabs {
     anyType
   }) {
     const authInfo = await this.getAuthInfo(url);
-    return transformAccountsV2(accountsObservable.subject.getValue(), anyType, authInfo, accountAuthType);
+    return transformAccountsV2(this.#koniState.keyringService.accounts, anyType, authInfo, accountAuthType);
   }
   accountsSubscribeV2(url, {
     accountAuthType
   }, id, port) {
     const cb = createSubscription(id, port);
-    const subscription = accountsObservable.subject.subscribe(accounts => {
+    const subscription = this.#koniState.keyringService.accountSubject.subscribe(accounts => {
       this.getAuthInfo(url).then(authInfo => {
         cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
       }).catch(console.error);
@@ -213,7 +212,7 @@ export default class KoniTabs {
   async getEvmCurrentAccount(url, getAll = false) {
     return await new Promise(resolve => {
       this.getAuthInfo(url).then(authInfo => {
-        const allAccounts = accountsObservable.subject.getValue();
+        const allAccounts = this.#koniState.keyringService.accounts;
         const accountList = transformAccountsV2(allAccounts, false, authInfo, 'evm').map(a => a.address);
         let accounts = [];
         const address = this.#koniState.keyringService.currentAccount.address;
@@ -250,8 +249,8 @@ export default class KoniTabs {
         slug
       } = currentEvmNetwork;
       const evmApi = this.#koniState.getEvmApi(slug);
-      const web3 = evmApi.api;
-      if (web3.currentProvider instanceof Web3.providers.WebsocketProvider) {
+      const web3 = evmApi === null || evmApi === void 0 ? void 0 : evmApi.api;
+      if ((web3 === null || web3 === void 0 ? void 0 : web3.currentProvider) instanceof Web3.providers.WebsocketProvider) {
         if (!web3.currentProvider.connected) {
           console.log(`[Web3] ${slug} is disconnected, trying to connect...`);
           this.#koniState.refreshWeb3Api(slug);
@@ -336,12 +335,16 @@ export default class KoniTabs {
       contractAddress: input.options.address,
       originChain: chain
     });
-    if (validate.isExist) {
-      throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
-    } else if (validate.contractError) {
+
+    // Below code is comment because we will handle exited token in the ui-view
+    // if (validate.isExist) {
+    //   throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
+    // } else
+    if (validate.contractError) {
       throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Contract address is invalid');
     }
     const tokenInfo = {
+      slug: validate === null || validate === void 0 ? void 0 : validate.existedSlug,
       type: tokenType,
       name: validate.name,
       contractAddress: input.options.address,
@@ -364,16 +367,38 @@ export default class KoniTabs {
       } = input[0];
       if (chainId) {
         const chainIdNum = parseInt(chainId, 16);
-        const [networkKey] = this.#koniState.findNetworkKeyByChainId(chainIdNum);
-        if (networkKey) {
+        const [existedNetworkSlug, existedChainInfo] = this.#koniState.findNetworkKeyByChainId(chainIdNum);
+        if (existedNetworkSlug && existedChainInfo && existedChainInfo !== null && existedChainInfo !== void 0 && existedChainInfo.evmInfo) {
+          const evmInfo = existedChainInfo.evmInfo;
+          const substrateInfo = existedChainInfo.substrateInfo;
+          const chainState = this.#koniState.getChainStateByKey(existedNetworkSlug);
+          await this.#koniState.addNetworkConfirm(id, url, {
+            mode: 'update',
+            chainSpec: {
+              evmChainId: evmInfo.evmChainId,
+              decimals: evmInfo.decimals,
+              existentialDeposit: evmInfo.existentialDeposit,
+              genesisHash: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.genesisHash) || '',
+              paraId: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.paraId) || null,
+              addressPrefix: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.addressPrefix) || 0
+            },
+            chainEditInfo: {
+              blockExplorer: blockExplorerUrls === null || blockExplorerUrls === void 0 ? void 0 : blockExplorerUrls[0],
+              slug: existedNetworkSlug,
+              currentProvider: chainState.currentProvider,
+              providers: existedChainInfo.providers,
+              symbol: evmInfo.symbol,
+              chainType: 'EVM',
+              name: existedChainInfo.name
+            }
+          });
           return await this.switchEvmChain(id, url, {
             method: 'wallet_switchEthereumChain',
             params: [{
               chainId
             }]
           });
-        }
-        if (rpcUrls && chainName) {
+        } else if (rpcUrls && chainName) {
           const filteredUrls = rpcUrls.filter(targetString => {
             let url;
             try {
@@ -414,6 +439,8 @@ export default class KoniTabs {
               name: chainInfo.name
             }
           });
+        } else {
+          throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
         }
       }
     }
@@ -668,9 +695,8 @@ export default class KoniTabs {
       if (e.code) {
         throw e;
       } else {
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, e.message);
+        console.error(e);
+        throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, e === null || e === void 0 ? void 0 : e.toString());
       }
     }
   }