@subwallet/extension-base 1.1.11-1 → 1.1.12-1

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

@@ -34,6 +34,7 @@ var _util = require("@polkadot/util");
 
 class TransactionService {
   transactionSubject = new _rxjs.BehaviorSubject({});
+  watchTransactionSubscribes = {};
   get transactions() {
     return this.transactionSubject.getValue();
   }
@@ -716,6 +717,7 @@ class TransactionService {
       payload.from = address;
     }
     const isExternal = !!account.isExternal;
+    const isInjected = !!account.isInjected;
 
     // generate hashPayload for EVM transaction
     payload.hashPayload = this.generateHashPayload(chain, payload);
@@ -736,73 +738,140 @@ class TransactionService {
       warnings: [],
       extrinsicHash: id
     };
-    this.requestService.addConfirmation(id, url || _constants3.EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async _ref7 => {
-      let {
-        isApproved,
-        payload
-      } = _ref7;
-      if (isApproved) {
-        let signedTransaction;
-        if (!payload) {
-          throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.UNAUTHORIZED, (0, _i18next.t)('Failed to sign'));
-        }
-        const web3Api = this.chainService.getEvmApi(chain).api;
-        if (!isExternal) {
-          signedTransaction = payload;
-        } else {
-          const signed = (0, _mergeTransactionAndSignature.mergeTransactionAndSignature)(txObject, payload);
-          const recover = web3Api.eth.accounts.recoverTransaction(signed);
-          if (recover.toLowerCase() !== account.address.toLowerCase()) {
-            throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.UNAUTHORIZED, (0, _i18next.t)('Wrong signature. Please sign with the account you use in dApp'));
+    if (isInjected) {
+      this.requestService.addConfirmation(id, url || _constants3.EXTENSION_REQUEST_URL, 'evmWatchTransactionRequest', payload, {}).then(async _ref7 => {
+        let {
+          isApproved,
+          payload
+        } = _ref7;
+        if (isApproved) {
+          if (!payload) {
+            throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.UNAUTHORIZED, 'Bad signature');
           }
-          signedTransaction = signed;
-        }
+          const web3Api = this.chainService.getEvmApi(chain).api;
 
-        // Emit signed event
-        emitter.emit('signed', eventData);
+          // Emit signed event
+          emitter.emit('signed', eventData);
+          eventData.nonce = txObject.nonce;
+          eventData.startBlock = (await web3Api.eth.getBlockNumber()) - 3;
+          // Add start info
+          emitter.emit('send', eventData); // This event is needed after sending transaction with queue
 
-        // Send transaction
-        this.handleTransactionTimeout(emitter, eventData);
-
-        // Add start info
-        eventData.nonce = txObject.nonce;
-        eventData.startBlock = await web3Api.eth.getBlockNumber();
-        emitter.emit('send', eventData); // This event is needed after sending transaction with queue
-        signedTransaction && web3Api.eth.sendSignedTransaction(signedTransaction).once('transactionHash', hash => {
-          eventData.extrinsicHash = hash;
+          const txHash = payload;
+          eventData.extrinsicHash = txHash;
           emitter.emit('extrinsicHash', eventData);
-        }).once('receipt', rs => {
-          eventData.extrinsicHash = rs.transactionHash;
-          eventData.blockHash = rs.blockHash;
-          eventData.blockNumber = rs.blockNumber;
-          emitter.emit('success', eventData);
-        }).once('error', e => {
-          eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.SEND_TRANSACTION_FAILED, (0, _i18next.t)(e.message)));
+          this.watchTransactionSubscribes[id] = new Promise((resolve, reject) => {
+            // eslint-disable-next-line prefer-const
+            let subscribe;
+            const onComplete = () => {
+              var _subscribe, _subscribe$unsubscrib, _subscribe$unsubscrib2;
+              (_subscribe = subscribe) === null || _subscribe === void 0 ? void 0 : (_subscribe$unsubscrib = _subscribe.unsubscribe) === null || _subscribe$unsubscrib === void 0 ? void 0 : (_subscribe$unsubscrib2 = _subscribe$unsubscrib.call(_subscribe)) === null || _subscribe$unsubscrib2 === void 0 ? void 0 : _subscribe$unsubscrib2.then(console.debug).catch(console.debug);
+              delete this.watchTransactionSubscribes[id];
+            };
+            const onSuccess = rs => {
+              if (rs) {
+                eventData.extrinsicHash = rs.transactionHash;
+                eventData.blockHash = rs.blockHash;
+                eventData.blockNumber = rs.blockNumber;
+                emitter.emit('success', eventData);
+                onComplete();
+                resolve();
+              }
+            };
+            const onError = error => {
+              if (error) {
+                // TODO: Change type and message
+                eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNABLE_TO_SEND, error.message));
+                emitter.emit('error', eventData);
+                onComplete();
+                reject(error);
+              }
+            };
+            const onCheck = () => {
+              web3Api.eth.getTransactionReceipt(txHash).then(onSuccess).catch(onError);
+            };
+            subscribe = web3Api.eth.subscribe('newBlockHeaders', onCheck);
+          });
+        } else {
+          this.removeTransaction(id);
+          eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.USER_REJECT_REQUEST));
           emitter.emit('error', eventData);
-        }).catch(e => {
-          eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNABLE_TO_SEND, (0, _i18next.t)(e.message)));
+        }
+      }).catch(e => {
+        this.removeTransaction(id);
+        // TODO: Change type
+        eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNABLE_TO_SIGN, e.message));
+        emitter.emit('error', eventData);
+      });
+    } else {
+      this.requestService.addConfirmation(id, url || _constants3.EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async _ref8 => {
+        let {
+          isApproved,
+          payload
+        } = _ref8;
+        if (isApproved) {
+          let signedTransaction;
+          if (!payload) {
+            throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.UNAUTHORIZED, (0, _i18next.t)('Failed to sign'));
+          }
+          const web3Api = this.chainService.getEvmApi(chain).api;
+          if (!isExternal) {
+            signedTransaction = payload;
+          } else {
+            const signed = (0, _mergeTransactionAndSignature.mergeTransactionAndSignature)(txObject, payload);
+            const recover = web3Api.eth.accounts.recoverTransaction(signed);
+            if (recover.toLowerCase() !== account.address.toLowerCase()) {
+              throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.UNAUTHORIZED, (0, _i18next.t)('Wrong signature. Please sign with the account you use in dApp'));
+            }
+            signedTransaction = signed;
+          }
+
+          // Emit signed event
+          emitter.emit('signed', eventData);
+
+          // Send transaction
+          this.handleTransactionTimeout(emitter, eventData);
+
+          // Add start info
+          eventData.nonce = txObject.nonce;
+          eventData.startBlock = await web3Api.eth.getBlockNumber();
+          emitter.emit('send', eventData); // This event is needed after sending transaction with queue
+          signedTransaction && web3Api.eth.sendSignedTransaction(signedTransaction).once('transactionHash', hash => {
+            eventData.extrinsicHash = hash;
+            emitter.emit('extrinsicHash', eventData);
+          }).once('receipt', rs => {
+            eventData.extrinsicHash = rs.transactionHash;
+            eventData.blockHash = rs.blockHash;
+            eventData.blockNumber = rs.blockNumber;
+            emitter.emit('success', eventData);
+          }).once('error', e => {
+            eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.SEND_TRANSACTION_FAILED, (0, _i18next.t)(e.message)));
+            emitter.emit('error', eventData);
+          }).catch(e => {
+            eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNABLE_TO_SEND, (0, _i18next.t)(e.message)));
+            emitter.emit('error', eventData);
+          });
+        } else {
+          this.removeTransaction(id);
+          eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.USER_REJECT_REQUEST));
           emitter.emit('error', eventData);
-        });
-      } else {
+        }
+      }).catch(e => {
         this.removeTransaction(id);
-        eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.USER_REJECT_REQUEST));
+        eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNABLE_TO_SIGN, (0, _i18next.t)(e.message)));
         emitter.emit('error', eventData);
-      }
-    }).catch(e => {
-      this.removeTransaction(id);
-      eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNABLE_TO_SIGN, (0, _i18next.t)(e.message)));
-      emitter.emit('error', eventData);
-    });
+      });
+    }
     return emitter;
   }
-  signAndSendSubstrateTransaction(_ref8) {
+  signAndSendSubstrateTransaction(_ref9) {
     let {
       address,
       chain,
       id,
       transaction,
       url
-    } = _ref8;
+    } = _ref9;
     const emitter = new _eventemitter.default();
     const eventData = {
       id,
@@ -848,20 +917,20 @@ class TransactionService {
           eventData.extrinsicHash = txState.txHash.toHex();
           eventData.eventLogs = txState.events;
           // TODO: push block hash and block number into eventData
-          txState.events.filter(_ref9 => {
+          txState.events.filter(_ref10 => {
             let {
               event: {
                 section
               }
-            } = _ref9;
+            } = _ref10;
             return section === 'system';
-          }).forEach(_ref10 => {
+          }).forEach(_ref11 => {
             let {
               event: {
                 method,
                 data: [error]
               }
-            } = _ref10;
+            } = _ref11;
             if (method === 'ExtrinsicFailed') {
               eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.SEND_TRANSACTION_FAILED, error.toString()));
               emitter.emit('error', eventData);

package/cjs/utils/lazy.js

@@ -20,6 +20,7 @@ function removeLazy(key) {
 function addLazy(key, callback) {
   let lazyTime = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 300;
   let maxLazyTime = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 3000;
+  let fireOnFirst = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
   const existed = lazyMap[key];
   const now = new Date().getTime();
   if (existed) {
@@ -42,11 +43,24 @@ function addLazy(key, callback) {
       }, lazyTime);
     }
   } else {
-    // Fire callback immediately in the first time
-    callback();
-    lazyMap[key] = {
-      callback,
-      lastFire: now
-    };
+    if (fireOnFirst) {
+      // Fire callback immediately in the first time
+      callback();
+      lazyMap[key] = {
+        callback,
+        lastFire: now
+      };
+    } else {
+      lazyMap[key] = {
+        callback,
+        lastFire: now
+      };
+      lazyMap[key].timeout = setTimeout(() => {
+        // This will be fire in the last call of lazy thread
+        callback();
+        lazyMap[key].lastFire = new Date().getTime();
+        removeLazy(key);
+      }, lazyTime);
+    }
   }
 }

package/koni/api/staking/bonding/utils.js

@@ -6,6 +6,7 @@ import { getAstarWithdrawable } from '@subwallet/extension-base/koni/api/staking
 import { _KNOWN_CHAIN_INFLATION_PARAMS, _STAKING_CHAIN_GROUP, _SUBSTRATE_DEFAULT_INFLATION_PARAMS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainNativeTokenBasicInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { detectTranslate, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { t } from 'i18next';
 import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';
 export let PalletParachainStakingRequestType;
@@ -254,7 +255,7 @@ export function getValidatorLabel(chain) {
 }
 export const getMinStakeErrorMessage = (chainInfo, bnMinStake) => {
   const tokenInfo = _getChainNativeTokenBasicInfo(chainInfo);
-  const number = bnMinStake.div(new BN(10).pow(new BN(tokenInfo.decimals))).toString();
+  const number = formatNumber(bnMinStake.toString(), tokenInfo.decimals || 0, balanceFormatter);
   return t('Insufficient stake. Please stake at least {{number}} {{tokenSymbol}} to get rewards', {
     replace: {
       tokenSymbol: tokenInfo.symbol,

package/koni/api/tokens/evm/transfer.d.ts

@@ -11,7 +11,7 @@ interface HandleTransferBalanceResultProps {
     updateState?: (promise: Partial<ExternalRequestPromise>) => void;
 }
 export declare const handleTransferBalanceResult: ({ callback, changeValue, networkKey, receipt, response, updateState }: HandleTransferBalanceResultProps) => void;
-export declare function getEVMTransactionObject(chainInfo: _ChainInfo, to: string, value: string, transferAll: boolean, evmApiMap: Record<string, _EvmApi>): Promise<[TransactionConfig, string]>;
+export declare function getEVMTransactionObject(chainInfo: _ChainInfo, from: string, to: string, value: string, transferAll: boolean, evmApiMap: Record<string, _EvmApi>): Promise<[TransactionConfig, string]>;
 export declare function getERC20TransactionObject(assetAddress: string, chainInfo: _ChainInfo, from: string, to: string, value: string, transferAll: boolean, evmApiMap: Record<string, _EvmApi>): Promise<[TransactionConfig, string]>;
 export declare function getERC721Transaction(web3Api: _EvmApi, contractAddress: string, senderAddress: string, recipientAddress: string, tokenId: string): Promise<TransactionConfig>;
 export {};

package/koni/api/tokens/evm/transfer.js

@@ -3,7 +3,7 @@
 
 import { ExternalRequestPromiseStatus } from '@subwallet/extension-base/background/KoniTypes';
 import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
-import { _BALANCE_PARSING_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
+import { _BALANCE_PARSING_CHAIN_GROUP, EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ERC721_ABI } from '@subwallet/extension-base/services/chain-service/helper';
 import { BN, hexToBn } from '@polkadot/util';
 export const handleTransferBalanceResult = ({
@@ -32,18 +32,24 @@ export const handleTransferBalanceResult = ({
   });
   callback(response);
 };
-export async function getEVMTransactionObject(chainInfo, to, value, transferAll, evmApiMap) {
+export async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, evmApiMap) {
   const networkKey = chainInfo.slug;
   const web3Api = evmApiMap[networkKey];
   const gasPrice = await web3Api.api.eth.getGasPrice();
   const transactionObject = {
     gasPrice: gasPrice,
-    to: to
+    to: to,
+    value: value,
+    from: from
   };
   const gasLimit = await web3Api.api.eth.estimateGas(transactionObject);
   transactionObject.gas = gasLimit;
-  const estimateFee = parseInt(gasPrice) * gasLimit;
-  transactionObject.value = transferAll ? new BN(value).add(new BN(estimateFee).neg()) : value;
+  const estimateFee = new BN(gasLimit).mul(new BN(gasPrice));
+  transactionObject.value = transferAll ? new BN(value).sub(estimateFee).toString() : value;
+  if (EVM_REFORMAT_DECIMALS.acala.includes(networkKey)) {
+    const numberReplace = 18 - 12;
+    transactionObject.value = transactionObject.value.substring(0, transactionObject.value.length - 6) + new Array(numberReplace).fill('0').join('');
+  }
   return [transactionObject, transactionObject.value.toString()];
 }
 export async function getERC20TransactionObject(assetAddress, chainInfo, from, to, value, transferAll, evmApiMap) {

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

@@ -210,5 +210,7 @@ export default class KoniExtension {
     private findRawMetadata;
     private resolveDomainByAddress;
     private resolveAddressByDomain;
+    private addInjects;
+    private removeInjects;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }

package/koni/background/handlers/Extension.js

@@ -1510,7 +1510,7 @@ export default class KoniExtension {
         if (_isTokenEvmSmartContract(tokenInfo) || _isLocalToken(tokenInfo)) {
           [transaction, transferAmount.value] = await getERC20TransactionObject(_getContractAddressOfToken(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApiMap);
         } else {
-          [transaction, transferAmount.value] = await getEVMTransactionObject(chainInfo, to, txVal, !!transferAll, evmApiMap);
+          [transaction, transferAmount.value] = await getEVMTransactionObject(chainInfo, from, to, txVal, !!transferAll, evmApiMap);
         }
       } else if (_isMantaZkAsset(tokenInfo)) {
         // TODO
@@ -2700,15 +2700,19 @@ export default class KoniExtension {
       if (createNew) {
         const pairs = keyring.getPairs();
         for (const pair of pairs) {
-          const meta = {
-            ...pair.meta,
-            isMasterPassword: false
-          };
-          if (!meta.originGenesisHash) {
-            meta.genesisHash = '';
+          if (pair.meta.isInjected) {
+            // Empty
+          } else {
+            const meta = {
+              ...pair.meta,
+              isMasterPassword: false
+            };
+            if (!meta.originGenesisHash) {
+              meta.genesisHash = '';
+            }
+            pair.setMeta(meta);
+            keyring.saveAccountMeta(pair, pair.meta);
           }
-          pair.setMeta(meta);
-          keyring.saveAccountMeta(pair, pair.meta);
         }
       }
       keyring.changeMasterPassword(newPassword, oldPassword);
@@ -2810,7 +2814,7 @@ export default class KoniExtension {
     }
   }
 
-  /// Signing external request
+  /// Signing substrate request
   signingApprovePasswordV2({
     id
   }) {
@@ -3473,6 +3477,16 @@ export default class KoniExtension {
     return await resolveAzeroAddressToDomain(request.address, request.chain, chainApi.api);
   }
 
+  /// Inject account
+  addInjects(request) {
+    this.#koniState.keyringService.addInjectAccounts(request.accounts);
+    return true;
+  }
+  removeInjects(request) {
+    this.#koniState.keyringService.removeInjectAccounts(request.addresses);
+    return true;
+  }
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -3625,7 +3639,7 @@ export default class KoniExtension {
       case 'pri(transaction.history.getSubscription)':
         return await this.subscribeHistory(id, port);
 
-      /// Account management
+      /* Account management */
       // Add account
       case 'pri(accounts.create.suriV2)':
         return await this.accountsCreateSuriV2(request);
@@ -3688,6 +3702,14 @@ export default class KoniExtension {
       case 'pri(accounts.resolveAddressToDomain)':
         return await this.resolveAddressByDomain(request);
 
+      // Inject account
+      case 'pri(accounts.inject.add)':
+        return this.addInjects(request);
+      case 'pri(accounts.inject.remove)':
+        return this.removeInjects(request);
+
+      /* Account management */
+
       // ChainService
       case 'pri(chainService.subscribeChainInfoMap)':
         return this.subscribeChainInfoMap(id, port);

package/koni/background/handlers/State.js

@@ -1539,7 +1539,7 @@ export default class KoniState {
     });
   }
   async resetWallet(resetAll) {
-    this.keyringService.resetWallet(resetAll);
+    await this.keyringService.resetWallet(resetAll);
     this.requestService.resetWallet();
     this.transactionService.resetWallet();
     await this.dbService.resetWallet(resetAll);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.11-1",
+  "version": "1.1.12-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1221,13 +1221,13 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.13",
-    "@subwallet/extension-base": "^1.1.11-1",
-    "@subwallet/extension-chains": "^1.1.11-1",
-    "@subwallet/extension-dapp": "^1.1.11-1",
-    "@subwallet/extension-inject": "^1.1.11-1",
-    "@subwallet/keyring": "^0.0.10",
-    "@subwallet/ui-keyring": "^0.0.10",
+    "@subwallet/chain-list": "^0.2.14",
+    "@subwallet/extension-base": "^1.1.12-1",
+    "@subwallet/extension-chains": "^1.1.12-1",
+    "@subwallet/extension-dapp": "^1.1.12-1",
+    "@subwallet/extension-inject": "^1.1.12-1",
+    "@subwallet/keyring": "^0.1.1",
+    "@subwallet/ui-keyring": "^0.1.1",
     "@walletconnect/sign-client": "^2.8.4",
     "@walletconnect/types": "^2.8.4",
     "@walletconnect/utils": "^2.8.4",
@@ -1256,6 +1256,8 @@
     "web3": "^1.10.0",
     "web3-core": "^1.10.0",
     "web3-core-helpers": "^1.10.0",
+    "web3-core-subscriptions": "1.10.0",
+    "web3-eth": "1.10.0",
     "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.11-1'
+  version: '1.1.12-1'
 };

package/page/SubWalleEvmProvider.d.ts

@@ -16,7 +16,7 @@ export declare class SubWalletEvmProvider extends SafeEventEmitter implements Ev
     get connected(): boolean;
     isConnected(): boolean;
     protected subscribeExtensionEvents(): void;
-    enable(): Promise<unknown>;
+    enable(): Promise<string[]>;
     on(eventName: string | symbol, listener: (...args: any[]) => void): this;
     once(eventName: string | symbol, listener: (...args: any[]) => void): this;
     request<T>({ method, params }: RequestArguments): Promise<T>;

package/services/chain-service/constants.d.ts

@@ -85,6 +85,12 @@ export declare const _XCM_TYPE: {
     PR: string;
 };
 export declare const _DEFAULT_ACTIVE_CHAINS: string[];
+export declare const EVM_PASS_CONNECT_STATUS: {
+    acala: string[];
+};
+export declare const EVM_REFORMAT_DECIMALS: {
+    acala: string[];
+};
 export declare const _CHAIN_INFO_SRC: string;
 export declare const _CHAIN_ASSET_SRC: string;
 export declare const _ASSET_REF_SRC: string;

package/services/chain-service/constants.js

@@ -216,6 +216,12 @@ export const _XCM_TYPE = {
 };
 
 export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS];
+export const EVM_PASS_CONNECT_STATUS = {
+  acala: ['acala_evm', 'karura_evm']
+};
+export const EVM_REFORMAT_DECIMALS = {
+  acala: ['acala_evm', 'karura_evm']
+};
 
 // TODO: review
 const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';

package/services/chain-service/handler/EvmApi.js

@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import '@polkadot/types-augment';
+import { EVM_PASS_CONNECT_STATUS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { BehaviorSubject } from 'rxjs';
 import Web3 from 'web3';
+const acalaEvmNetworks = EVM_PASS_CONNECT_STATUS.acala;
 export class EvmApi {
   apiRetry = 0;
   isApiConnectedSubject = new BehaviorSubject(false);
@@ -67,11 +69,15 @@ export class EvmApi {
   createIntervalCheckApi() {
     this.clearIntervalCheckApi();
     return setInterval(() => {
-      this.api.eth.net.isListening().then(() => {
+      if (!acalaEvmNetworks.includes(this.chainSlug)) {
+        this.api.eth.net.isListening().then(() => {
+          this.onConnect();
+        }).catch(() => {
+          this.onDisconnect();
+        });
+      } else {
         this.onConnect();
-      }).catch(() => {
-        this.onDisconnect();
-      });
+      }
     }, 10000);
   }
   clearIntervalCheckApi() {
@@ -82,17 +88,23 @@ export class EvmApi {
     const wsProvider = this.provider;
     wsProvider.connect && wsProvider.connect();
     this.updateConnectionStatus(_ChainConnectionStatus.CONNECTING);
+
     // Check if api is ready
-    this.api.eth.net.isListening().then(() => {
+    if (!acalaEvmNetworks.includes(this.chainSlug)) {
+      this.api.eth.net.isListening().then(() => {
+        this.isApiReadyOnce = true;
+        this.onConnect();
+      }).catch(error => {
+        this.isApiReadyOnce = false;
+        this.isApiReady = false;
+        this.isReadyHandler.reject(error);
+        this.updateConnectionStatus(_ChainConnectionStatus.DISCONNECTED);
+        console.warn(`Can not connect to ${this.chainSlug} (EVM) at ${this.apiUrl}`);
+      });
+    } else {
       this.isApiReadyOnce = true;
       this.onConnect();
-    }).catch(error => {
-      this.isApiReadyOnce = false;
-      this.isApiReady = false;
-      this.isReadyHandler.reject(error);
-      this.updateConnectionStatus(_ChainConnectionStatus.DISCONNECTED);
-      console.warn(`Can not connect to ${this.chainSlug} (EVM) at ${this.apiUrl}`);
-    });
+    }
 
     // Interval to check connecting status
     this.intervalCheckApi = this.createIntervalCheckApi();

package/services/keyring-service/index.d.ts

@@ -1,5 +1,6 @@
 import { CurrentAccountInfo, KeyringState } from '@subwallet/extension-base/background/KoniTypes';
 import { EventService } from '@subwallet/extension-base/services/event-service';
+import { InjectedAccountWithMeta } from '@subwallet/extension-inject/types';
 import { SubjectInfo } from '@subwallet/ui-keyring/observable/types';
 import { BehaviorSubject } from 'rxjs';
 export declare class KeyringService {
@@ -19,5 +20,7 @@ export declare class KeyringService {
     get currentAccount(): CurrentAccountInfo;
     setCurrentAccount(currentAccountData: CurrentAccountInfo): void;
     lock(): void;
-    resetWallet(resetAll: boolean): void;
+    addInjectAccounts(accounts: InjectedAccountWithMeta[]): void;
+    removeInjectAccounts(addresses: string[]): void;
+    resetWallet(resetAll: boolean): Promise<void>;
 }

package/services/keyring-service/index.js

@@ -5,6 +5,7 @@ import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { CurrentAccountStore } from '@subwallet/extension-base/stores';
 import { keyring } from '@subwallet/ui-keyring';
 import { BehaviorSubject } from 'rxjs';
+import { stringShorten } from '@polkadot/util';
 export class KeyringService {
   currentAccountStore = new CurrentAccountStore();
   currentAccountSubject = new BehaviorSubject({
@@ -91,8 +92,39 @@ export class KeyringService {
     keyring.lockAll();
     this.updateKeyringState();
   }
-  resetWallet(resetAll) {
+
+  /* Inject */
+
+  addInjectAccounts(accounts) {
+    keyring.addInjects(accounts.map(account => {
+      const name = account.meta.name || stringShorten(account.address);
+
+      // TODO: Add if need
+      // name = name.concat(' (', account.meta.source, ')');
+
+      return {
+        ...account,
+        meta: {
+          ...account.meta,
+          name: name
+        }
+      };
+    }));
+  }
+  removeInjectAccounts(addresses) {
+    keyring.removeInjects(addresses);
+  }
+
+  /* Inject */
+
+  /* Reset */
+  async resetWallet(resetAll) {
     keyring.resetWallet(resetAll);
+    await new Promise(resolve => {
+      setTimeout(() => {
+        resolve();
+      }, 500);
+    });
     this.updateKeyringState();
     this.currentAccountSubject.next({
       address: ALL_ACCOUNT_KEY,