@subwallet/extension-base 1.1.11-2 → 1.1.13-0

package/background/types.d.ts

@@ -214,6 +214,7 @@ export interface RequestAccountEdit {
 }
 export interface RequestAccountForget {
     address: string;
+    lockAfter: boolean;
 }
 export interface RequestAccountShow {
     address: string;

package/cjs/koni/api/dotsama/crowdloan.js

@@ -123,7 +123,7 @@ async function subscribeCrowdloan(addresses, substrateApiMap, callback, chainInf
         }
         if (networkKey === _chainList.COMMON_CHAIN_SLUGS.ACALA) {
           const acalaAddresses = substrateAddresses.map(address => (0, _utils2.reformatAddress)(address, (0, _utils._getChainSubstrateAddressPrefix)(chainInfo), (0, _utils._isChainEvmCompatible)(chainInfo)));
-          unsubMap.acala = subscribeAcalaContributeInterval(acalaAddresses, polkadotFundsStatusMap[paraId], crowdloanCb);
+          unsubMap.acala = subscribeAcalaContributeInterval(acalaAddresses, _KoniTypes.CrowdloanParaState.COMPLETED, crowdloanCb);
         } else if (parentChain === _chainList.COMMON_CHAIN_SLUGS.POLKADOT && polkadotFundsStatusMap[paraId]) {
           unsubMap[networkKey] = getRPCCrowdloan(polkadotAPI, paraId, hexAddresses, polkadotFundsStatusMap[paraId], crowdloanCb);
         } else if (parentChain === _chainList.COMMON_CHAIN_SLUGS.KUSAMA && kusamaFundsStatusMap[paraId]) {

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

@@ -43,18 +43,24 @@ const handleTransferBalanceResult = _ref => {
   callback(response);
 };
 exports.handleTransferBalanceResult = handleTransferBalanceResult;
-async function getEVMTransactionObject(chainInfo, to, value, transferAll, evmApiMap) {
+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 _util.BN(value).add(new _util.BN(estimateFee).neg()) : value;
+  const estimateFee = new _util.BN(gasLimit).mul(new _util.BN(gasPrice));
+  transactionObject.value = transferAll ? new _util.BN(value).sub(estimateFee).toString() : value;
+  if (_constants.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()];
 }
 async function getERC20TransactionObject(assetAddress, chainInfo, from, to, value, transferAll, evmApiMap) {

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

@@ -1175,7 +1175,7 @@ class KoniExtension {
             address: _constants.ALL_ACCOUNT_KEY,
             currentGenesisHash: allGenesisHash || null,
             allGenesisHash
-          });
+          }, undefined, true);
         }
         changedAccount = true;
       }
@@ -1192,7 +1192,8 @@ class KoniExtension {
   }
   async accountsForgetOverride(_ref36) {
     let {
-      address
+      address,
+      lockAfter
     } = _ref36;
     _uiKeyring.keyring.forgetAccount(address);
     await new Promise(resolve => {
@@ -1224,6 +1225,9 @@ class KoniExtension {
       }, resolve);
     });
     await this.#koniState.disableMantaPay(address);
+    if (lockAfter) {
+      this.checkLockAfterMigrate();
+    }
     return true;
   }
   seedCreateV2(_ref37) {
@@ -1391,9 +1395,10 @@ class KoniExtension {
           _uiKeyring.keyring.restoreAccounts(file, password);
           this._addAddressesToAuthList(addressList, isAllowed);
         });
-        if (this.#alwaysLock) {
-          this.keyringLock();
-        }
+
+        // if (this.#alwaysLock) {
+        //   this.keyringLock();
+        // }
       } catch (error) {
         throw new Error(error.message);
       }
@@ -1563,7 +1568,7 @@ class KoniExtension {
         if ((0, _utils._isTokenEvmSmartContract)(tokenInfo) || (0, _utils._isLocalToken)(tokenInfo)) {
           [transaction, transferAmount.value] = await (0, _transfer3.getERC20TransactionObject)((0, _utils._getContractAddressOfToken)(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApiMap);
         } else {
-          [transaction, transferAmount.value] = await (0, _transfer3.getEVMTransactionObject)(chainInfo, to, txVal, !!transferAll, evmApiMap);
+          [transaction, transferAmount.value] = await (0, _transfer3.getEVMTransactionObject)(chainInfo, from, to, txVal, !!transferAll, evmApiMap);
         }
       } else if ((0, _utils._isMantaZkAsset)(tokenInfo)) {
         // TODO
@@ -2799,7 +2804,7 @@ class KoniExtension {
       };
     }
     this.#koniState.updateKeyringState();
-    if (this.#alwaysLock) {
+    if (this.#alwaysLock && !createNew) {
       this.keyringLock();
     }
     return {
@@ -2810,6 +2815,15 @@ class KoniExtension {
 
   // Migrate password
 
+  checkLockAfterMigrate() {
+    const pairs = _uiKeyring.keyring.getPairs();
+    const needMigrate = !!pairs.filter(acc => acc.address !== _constants.ALL_ACCOUNT_KEY && !acc.meta.isExternal && !acc.meta.isInjected).filter(acc => !acc.meta.isMasterPassword).length;
+    if (!needMigrate) {
+      if (this.#alwaysLock) {
+        this.keyringLock();
+      }
+    }
+  }
   keyringMigrateMasterPassword(_ref66) {
     let {
       address,
@@ -2817,6 +2831,7 @@ class KoniExtension {
     } = _ref66;
     try {
       _uiKeyring.keyring.migrateWithMasterPassword(address, password);
+      this.checkLockAfterMigrate();
     } catch (e) {
       console.error(e);
       return {

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

@@ -475,7 +475,7 @@ class KoniState {
   subscribeStakingReward() {
     return this.stakingRewardSubject;
   }
-  setCurrentAccount(data, callback) {
+  setCurrentAccount(data, callback, preventOneAccount) {
     const {
       address,
       currentGenesisHash
@@ -490,9 +490,13 @@ class KoniState {
       if (pairs.length > 1 || !pair) {
         result.allGenesisHash = currentGenesisHash || undefined;
       } else {
-        result.address = pair.address;
-        result.currentGenesisHash = pairGenesisHash || '';
-        result.allGenesisHash = pairGenesisHash || undefined;
+        if (!preventOneAccount) {
+          result.address = pair.address;
+          result.currentGenesisHash = pairGenesisHash || '';
+          result.allGenesisHash = pairGenesisHash || undefined;
+        } else {
+          result.allGenesisHash = currentGenesisHash || undefined;
+        }
       }
     }
     this.keyringService.setCurrentAccount(result);

package/cjs/packageInfo.js

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

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._STAKING_CHAIN_GROUP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._STAKING_CHAIN_GROUP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -237,9 +237,17 @@ const _XCM_TYPE = {
 };
 exports._XCM_TYPE = _XCM_TYPE;
 const _DEFAULT_ACTIVE_CHAINS = [..._chainList._DEFAULT_CHAINS];
+exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
+const EVM_PASS_CONNECT_STATUS = {
+  acala: ['acala_evm', 'karura_evm']
+};
+exports.EVM_PASS_CONNECT_STATUS = EVM_PASS_CONNECT_STATUS;
+const EVM_REFORMAT_DECIMALS = {
+  acala: ['acala_evm', 'karura_evm']
+};
 
 // TODO: review
-exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
+exports.EVM_REFORMAT_DECIMALS = EVM_REFORMAT_DECIMALS;
 const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
 const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
 exports._CHAIN_INFO_SRC = _CHAIN_INFO_SRC;

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.EvmApi = void 0;
 require("@polkadot/types-augment");
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _types = require("@subwallet/extension-base/services/chain-service/types");
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _rxjs = require("rxjs");
@@ -13,6 +14,7 @@ var _web = _interopRequireDefault(require("web3"));
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+const acalaEvmNetworks = _constants.EVM_PASS_CONNECT_STATUS.acala;
 class EvmApi {
   apiRetry = 0;
   isApiConnectedSubject = new _rxjs.BehaviorSubject(false);
@@ -75,11 +77,15 @@ 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() {
@@ -90,17 +96,23 @@ class EvmApi {
     const wsProvider = this.provider;
     wsProvider.connect && wsProvider.connect();
     this.updateConnectionStatus(_types._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(_types._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(_types._ChainConnectionStatus.DISCONNECTED);
-      console.warn(`Can not connect to ${this.chainSlug} (EVM) at ${this.apiUrl}`);
-    });
+    }
 
     // Interval to check connecting status
     this.intervalCheckApi = this.createIntervalCheckApi();

package/cjs/services/chain-service/handler/EvmChainHandler.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,6 +9,7 @@ var _types = require("@subwallet/chain-list/types");
 var _AbstractChainHandler = require("@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler");
 var _EvmApi2 = require("@subwallet/extension-base/services/chain-service/handler/EvmApi");
 var _helper = require("@subwallet/extension-base/services/chain-service/helper");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _logger = require("@polkadot/util/logger");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -134,7 +136,7 @@ class EvmChainHandler extends _AbstractChainHandler.AbstractChainHandler {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
         tokenContract.methods.symbol().call()]);
         name = _symbol;
-        decimals = _decimals;
+        decimals = new _bignumber.default(_decimals).toNumber();
         symbol = _symbol;
       }
       if (name === '' || symbol === '') {

package/cjs/services/migration-service/scripts/MigrateTokenDecimals.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateTokenDecimals extends _Base.default {
+  async run() {
+    const state = this.state;
+    return new Promise(resolve => {
+      const assetMap = state.getAssetRegistry();
+      for (const [slug, info] of Object.entries(assetMap)) {
+        if ((0, _utils._isCustomAsset)(slug)) {
+          state.chainService.upsertCustomToken({
+            ...info,
+            decimals: info.decimals ? parseInt(info.decimals.toString()) : info.decimals
+          });
+        }
+      }
+      resolve();
+    });
+  }
+}
+exports.default = MigrateTokenDecimals;

package/cjs/services/migration-service/scripts/index.js

@@ -15,6 +15,7 @@ var _MigrateImportedToken = _interopRequireDefault(require("./MigrateImportedTok
 var _MigrateLedgerAccount = _interopRequireDefault(require("./MigrateLedgerAccount"));
 var _MigrateNetworkSettings = _interopRequireDefault(require("./MigrateNetworkSettings"));
 var _MigrateSettings = _interopRequireDefault(require("./MigrateSettings"));
+var _MigrateTokenDecimals = _interopRequireDefault(require("./MigrateTokenDecimals"));
 var _MigrateTransactionHistory = _interopRequireDefault(require("./MigrateTransactionHistory"));
 var _MigrateWalletReference = _interopRequireDefault(require("./MigrateWalletReference"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -34,7 +35,8 @@ var _default = {
   '1.0.9-01': _MigrateLedgerAccount.default,
   '1.0.12-02': _MigrateEthProvider.default,
   '1.1.6-01': _MigrateWalletReference.default,
-  '1.1.7': _DeleteChain.default
+  '1.1.7': _DeleteChain.default,
+  '1.1.13-01': _MigrateTokenDecimals.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

package/cjs/services/setting-service/SettingService.js

@@ -18,7 +18,7 @@ class SettingService {
   passPhishingStore = new _PassPhishingStore.default();
   constructor() {
     let old = localStorage.getItem(_constants.LANGUAGE) || 'en';
-    this.settingsStore.getSubject().subscribe(_ref => {
+    const updateLanguage = _ref => {
       let {
         language
       } = _ref;
@@ -26,6 +26,10 @@ class SettingService {
         old = language;
         _i18n.default.changeLanguage(language).catch(console.error);
       }
+    };
+    this.getSettings(updateLanguage);
+    this.settingsStore.getSubject().subscribe({
+      next: updateLanguage
     });
   }
   getSubject() {

package/cjs/utils/environment.js

@@ -70,7 +70,7 @@ const getOS = () => {
   // @ts-ignore
   // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const platform = ((_window$navigator = window.navigator) === null || _window$navigator === void 0 ? void 0 : (_window$navigator$use = _window$navigator.userAgentData) === null || _window$navigator$use === void 0 ? void 0 : _window$navigator$use.platform) || window.navigator.platform;
-  const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'];
+  const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K', 'macOS'];
   const windowsPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE'];
   const iosPlatforms = ['iPhone', 'iPad', 'iPod'];
   let os = 'Unknown';

package/koni/api/dotsama/crowdloan.js

@@ -108,7 +108,7 @@ export async function subscribeCrowdloan(addresses, substrateApiMap, callback, c
         }
         if (networkKey === COMMON_CHAIN_SLUGS.ACALA) {
           const acalaAddresses = substrateAddresses.map(address => reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo), _isChainEvmCompatible(chainInfo)));
-          unsubMap.acala = subscribeAcalaContributeInterval(acalaAddresses, polkadotFundsStatusMap[paraId], crowdloanCb);
+          unsubMap.acala = subscribeAcalaContributeInterval(acalaAddresses, CrowdloanParaState.COMPLETED, crowdloanCb);
         } else if (parentChain === COMMON_CHAIN_SLUGS.POLKADOT && polkadotFundsStatusMap[paraId]) {
           unsubMap[networkKey] = getRPCCrowdloan(polkadotAPI, paraId, hexAddresses, polkadotFundsStatusMap[paraId], crowdloanCb);
         } else if (parentChain === COMMON_CHAIN_SLUGS.KUSAMA && kusamaFundsStatusMap[paraId]) {

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

@@ -171,6 +171,7 @@ export default class KoniExtension {
     private submitTuringCancelStakeCompound;
     private keyringStateSubscribe;
     private keyringChangeMasterPassword;
+    private checkLockAfterMigrate;
     private keyringMigrateMasterPassword;
     private keyringUnlock;
     private keyringLock;

package/koni/background/handlers/Extension.js

@@ -1131,7 +1131,7 @@ export default class KoniExtension {
             address: ALL_ACCOUNT_KEY,
             currentGenesisHash: allGenesisHash || null,
             allGenesisHash
-          });
+          }, undefined, true);
         }
         changedAccount = true;
       }
@@ -1147,7 +1147,8 @@ export default class KoniExtension {
     return addressDict;
   }
   async accountsForgetOverride({
-    address
+    address,
+    lockAfter
   }) {
     keyring.forgetAccount(address);
     await new Promise(resolve => {
@@ -1179,6 +1180,9 @@ export default class KoniExtension {
       }, resolve);
     });
     await this.#koniState.disableMantaPay(address);
+    if (lockAfter) {
+      this.checkLockAfterMigrate();
+    }
     return true;
   }
   seedCreateV2({
@@ -1338,9 +1342,10 @@ export default class KoniExtension {
           keyring.restoreAccounts(file, password);
           this._addAddressesToAuthList(addressList, isAllowed);
         });
-        if (this.#alwaysLock) {
-          this.keyringLock();
-        }
+
+        // if (this.#alwaysLock) {
+        //   this.keyringLock();
+        // }
       } catch (error) {
         throw new Error(error.message);
       }
@@ -1510,7 +1515,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
@@ -2724,7 +2729,7 @@ export default class KoniExtension {
       };
     }
     this.#koniState.updateKeyringState();
-    if (this.#alwaysLock) {
+    if (this.#alwaysLock && !createNew) {
       this.keyringLock();
     }
     return {
@@ -2735,12 +2740,22 @@ export default class KoniExtension {
 
   // Migrate password
 
+  checkLockAfterMigrate() {
+    const pairs = keyring.getPairs();
+    const needMigrate = !!pairs.filter(acc => acc.address !== ALL_ACCOUNT_KEY && !acc.meta.isExternal && !acc.meta.isInjected).filter(acc => !acc.meta.isMasterPassword).length;
+    if (!needMigrate) {
+      if (this.#alwaysLock) {
+        this.keyringLock();
+      }
+    }
+  }
   keyringMigrateMasterPassword({
     address,
     password
   }) {
     try {
       keyring.migrateWithMasterPassword(address, password);
+      this.checkLockAfterMigrate();
     } catch (e) {
       console.error(e);
       return {

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

@@ -128,7 +128,7 @@ export default class KoniState {
     removeAccountRef(address: string, callback: () => void): void;
     getStakingReward(update: (value: StakingRewardJson) => void): void;
     subscribeStakingReward(): Subject<StakingRewardJson>;
-    setCurrentAccount(data: CurrentAccountInfo, callback?: () => void): void;
+    setCurrentAccount(data: CurrentAccountInfo, callback?: () => void, preventOneAccount?: boolean): void;
     setAccountTie(address: string, genesisHash: string | null): boolean;
     switchEvmNetworkByUrl(shortenUrl: string, networkKey: string): Promise<void>;
     switchNetworkAccount(id: string, url: string, networkKey: string, changeAddress?: string): Promise<boolean>;

package/koni/background/handlers/State.js

@@ -463,7 +463,7 @@ export default class KoniState {
   subscribeStakingReward() {
     return this.stakingRewardSubject;
   }
-  setCurrentAccount(data, callback) {
+  setCurrentAccount(data, callback, preventOneAccount) {
     const {
       address,
       currentGenesisHash
@@ -478,9 +478,13 @@ export default class KoniState {
       if (pairs.length > 1 || !pair) {
         result.allGenesisHash = currentGenesisHash || undefined;
       } else {
-        result.address = pair.address;
-        result.currentGenesisHash = pairGenesisHash || '';
-        result.allGenesisHash = pairGenesisHash || undefined;
+        if (!preventOneAccount) {
+          result.address = pair.address;
+          result.currentGenesisHash = pairGenesisHash || '';
+          result.allGenesisHash = pairGenesisHash || undefined;
+        } else {
+          result.allGenesisHash = currentGenesisHash || undefined;
+        }
       }
     }
     this.keyringService.setCurrentAccount(result);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.11-2",
+  "version": "1.1.13-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -707,6 +707,11 @@
       "require": "./cjs/services/migration-service/scripts/MigrateSettings.js",
       "default": "./services/migration-service/scripts/MigrateSettings.js"
     },
+    "./services/migration-service/scripts/MigrateTokenDecimals": {
+      "types": "./services/migration-service/scripts/MigrateTokenDecimals.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateTokenDecimals.js",
+      "default": "./services/migration-service/scripts/MigrateTokenDecimals.js"
+    },
     "./services/migration-service/scripts/MigrateTransactionHistory": {
       "types": "./services/migration-service/scripts/MigrateTransactionHistory.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistory.js",
@@ -1221,11 +1226,11 @@
     "@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-2",
-    "@subwallet/extension-chains": "^1.1.11-2",
-    "@subwallet/extension-dapp": "^1.1.11-2",
-    "@subwallet/extension-inject": "^1.1.11-2",
+    "@subwallet/chain-list": "^0.2.14",
+    "@subwallet/extension-base": "^1.1.13-0",
+    "@subwallet/extension-chains": "^1.1.13-0",
+    "@subwallet/extension-dapp": "^1.1.13-0",
+    "@subwallet/extension-inject": "^1.1.13-0",
     "@subwallet/keyring": "^0.1.1",
     "@subwallet/ui-keyring": "^0.1.1",
     "@walletconnect/sign-client": "^2.8.4",

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-2'
+  version: '1.1.13-0'
 };

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/chain-service/handler/EvmChainHandler.js

@@ -5,6 +5,7 @@ import { _AssetType } from '@subwallet/chain-list/types';
 import { AbstractChainHandler } from '@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler';
 import { EvmApi } from '@subwallet/extension-base/services/chain-service/handler/EvmApi';
 import { _ERC20_ABI, _ERC721_ABI } from '@subwallet/extension-base/services/chain-service/helper';
+import BigN from 'bignumber.js';
 import { logger as createLogger } from '@polkadot/util/logger';
 export class EvmChainHandler extends AbstractChainHandler {
   evmApiMap = {};
@@ -127,7 +128,7 @@ export class EvmChainHandler extends AbstractChainHandler {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
         tokenContract.methods.symbol().call()]);
         name = _symbol;
-        decimals = _decimals;
+        decimals = new BigN(_decimals).toNumber();
         symbol = _symbol;
       }
       if (name === '' || symbol === '') {

package/services/migration-service/scripts/MigrateTokenDecimals.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateTokenDecimals extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/MigrateTokenDecimals.js

@@ -0,0 +1,22 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { _isCustomAsset } from '@subwallet/extension-base/services/chain-service/utils';
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateTokenDecimals extends BaseMigrationJob {
+  async run() {
+    const state = this.state;
+    return new Promise(resolve => {
+      const assetMap = state.getAssetRegistry();
+      for (const [slug, info] of Object.entries(assetMap)) {
+        if (_isCustomAsset(slug)) {
+          state.chainService.upsertCustomToken({
+            ...info,
+            decimals: info.decimals ? parseInt(info.decimals.toString()) : info.decimals
+          });
+        }
+      }
+      resolve();
+    });
+  }
+}

package/services/migration-service/scripts/index.js

@@ -11,6 +11,7 @@ import MigrateImportedToken from "./MigrateImportedToken.js";
 import MigrateLedgerAccount from "./MigrateLedgerAccount.js";
 import MigrateNetworkSettings from "./MigrateNetworkSettings.js";
 import MigrateSettings from "./MigrateSettings.js";
+import MigrateTokenDecimals from "./MigrateTokenDecimals.js";
 import MigrateTransactionHistory from "./MigrateTransactionHistory.js";
 import MigrateWalletReference from "./MigrateWalletReference.js";
 export const EVERYTIME = '__everytime__';
@@ -26,6 +27,7 @@ export default {
   '1.0.9-01': MigrateLedgerAccount,
   '1.0.12-02': MigrateEthProvider,
   '1.1.6-01': MigrateWalletReference,
-  '1.1.7': DeleteChain
+  '1.1.7': DeleteChain,
+  '1.1.13-01': MigrateTokenDecimals
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/setting-service/SettingService.js

@@ -11,13 +11,17 @@ export default class SettingService {
   passPhishingStore = new PassPhishingStore();
   constructor() {
     let old = localStorage.getItem(LANGUAGE) || 'en';
-    this.settingsStore.getSubject().subscribe(({
+    const updateLanguage = ({
       language
     }) => {
       if (language !== old) {
         old = language;
         i18n.changeLanguage(language).catch(console.error);
       }
+    };
+    this.getSettings(updateLanguage);
+    this.settingsStore.getSubject().subscribe({
+      next: updateLanguage
     });
   }
   getSubject() {

package/utils/environment.js

@@ -63,7 +63,7 @@ export const getOS = () => {
   // @ts-ignore
   // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const platform = ((_window$navigator = window.navigator) === null || _window$navigator === void 0 ? void 0 : (_window$navigator$use = _window$navigator.userAgentData) === null || _window$navigator$use === void 0 ? void 0 : _window$navigator$use.platform) || window.navigator.platform;
-  const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'];
+  const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K', 'macOS'];
   const windowsPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE'];
   const iosPlatforms = ['iPhone', 'iPad', 'iPod'];
   let os = 'Unknown';