@subwallet/extension-base 1.0.4-0 → 1.0.5-1

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

@@ -34,7 +34,7 @@ export function validatePoolBondingCondition(chainInfo, amount, selectedPool, ad
   if (nominatorMetadata) {
     const bnCurrentActiveStake = new BN(nominatorMetadata.activeStake);
     bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);
-    if (!bnCurrentActiveStake.gt(BN_ZERO)) {
+    if (nominatorMetadata.unstakings.length > 0) {
       errors.push(new TransactionError(StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
     }
   }
@@ -47,7 +47,7 @@ export function validateRelayBondingCondition(chainInfo, amount, selectedValidat
   const errors = [];
   let bnTotalStake = new BN(amount);
   const bnMinStake = new BN(chainStakingMetadata.minStake);
-  if (!nominatorMetadata) {
+  if (!nominatorMetadata || nominatorMetadata.status === StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
     }
@@ -145,7 +145,15 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
   const currentEra = _currentEra.toString();
   const bonded = _bonded.toHuman();
   if (!ledger) {
-    return;
+    return {
+      chain,
+      type: StakingType.NOMINATED,
+      status: StakingStatus.NOT_STAKING,
+      address: address,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   const activeStake = ledger.active.toString();
   const nominationList = [];
@@ -225,7 +233,16 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
   const poolMemberInfo = _poolMemberInfo.toPrimitive();
   const currentEra = _currentEra.toString();
   if (!poolMemberInfo) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: StakingType.POOLED,
+      address,
+      status: StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      // can only join 1 pool at a time
+      unstakings: []
+    };
   }
   let stakingStatus = StakingStatus.NOT_EARNING;
   const _poolMetadata = await chainApi.api.query.nominationPools.metadata(poolMemberInfo.poolId);

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
+import { getAstarWithdrawable } from '@subwallet/extension-base/koni/api/staking/bonding/astar';
 import { _KNOWN_CHAIN_INFLATION_PARAMS, _STAKING_CHAIN_GROUP, _SUBSTRATE_DEFAULT_INFLATION_PARAMS } from '@subwallet/extension-base/services/chain-service/constants';
 import { parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';
@@ -211,6 +212,9 @@ export function isActionFromValidator(stakingType, chain) {
 export function getWithdrawalInfo(nominatorMetadata) {
   const unstakings = nominatorMetadata.unstakings;
   let result;
+  if (_STAKING_CHAIN_GROUP.astar.includes(nominatorMetadata.chain)) {
+    return getAstarWithdrawable(nominatorMetadata);
+  }
   for (const unstaking of unstakings) {
     if (unstaking.status === UnstakingStatus.CLAIMABLE) {
       result = unstaking; // only get the first withdrawal

package/koni/api/staking/relayChain.js

@@ -154,7 +154,6 @@ export async function getNominationPoolReward(addresses, chainInfoMap, substrate
       }));
     }));
   } catch (e) {
-    console.error('Error fetching unclaimed reward for nomination pool', e);
     return rewardList;
   }
   return rewardList;

package/koni/api/staking/subsquidStaking.js

@@ -76,7 +76,6 @@ const getSubsquidStaking = async (accounts, chain, chainInfoMap) => {
     }));
     return result;
   } catch (e) {
-    console.error(`error getting ${chain} staking reward from subsquid`, e);
     return [];
   }
 };
@@ -94,7 +93,6 @@ export const getAllSubsquidStaking = async (accounts, chainInfoMap) => {
       rewardList = rewardList.concat(rewardItems);
     }));
   } catch (e) {
-    console.error('Error fetching staking reward from SubSquid', e);
     return rewardList;
   }
   return rewardList;

package/koni/api/tokens/wasm/index.js

@@ -23,7 +23,6 @@ export async function getPSP34TransferExtrinsic(networkKey, substrateApi, sender
       gasLimit
     }, recipientAddress, onChainOption, {});
   } catch (e) {
-    console.error('Error getting WASM NFT transfer extrinsic', e);
     return null;
   }
 }

package/koni/api/tokens/wasm/utils.js

@@ -9,7 +9,6 @@ const toContractAbiMessage = (contractPromise, message) => {
   if (!value) {
     const messages = contractPromise === null || contractPromise === void 0 ? void 0 : contractPromise.abi.messages.map(m => m.method).join(', ');
     const error = `"${message}" not found in metadata.spec.messages: [${messages}]`;
-    console.error(error);
     return {
       ok: false,
       error

package/koni/api/xcm/index.js

@@ -25,6 +25,5 @@ export const createXcmExtrinsic = async ({
   } else {
     extrinsic = getExtrinsicByXtokensPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
   }
-  console.log('XCM extrinsic: ', extrinsic.toHex());
   return extrinsic;
 };

package/koni/background/cron.js

@@ -93,7 +93,6 @@ export class KoniCron {
       if (!commonReload && !chainUpdated && !stakingSubmitted) {
         return;
       }
-      this.logger.log('ServiceInfo updated, Cron restarting...', eventTypes);
       const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
       if (!address) {
         return;
@@ -133,7 +132,6 @@ export class KoniCron {
     if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.address)) {
       return;
     }
-    this.logger.log('Starting cron jobs');
     if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
       this.resetNft(currentAccountInfo.address);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
@@ -162,48 +160,12 @@ export class KoniCron {
       this.serviceSubscription.unsubscribe();
       this.serviceSubscription = undefined;
     }
-    this.logger.log('Stopping cron jobs');
     this.removeAllCrons();
     this.status = 'stopped';
   };
   updateApiMapStatus = () => {
     this.state.chainService.updateApiMapStatus().catch(console.error);
-    // const apiMap = this.state.getApiMap();
-    // const networkMap = this.state.getChainStateMap();
-    //
-    // for (const [key, substrateApi] of Object.entries(apiMap.substrate)) {
-    //   let status: _ChainConnectionStatus = _ChainConnectionStatus.CONNECTING;
-    //
-    //   if (substrateApi.isApiConnected) {
-    //     status = _ChainConnectionStatus.CONNECTED;
-    //   }
-    //
-    //   if (!networkMap[key].connectionStatus) {
-    //     this.state.updateChainConnectionStatus(key, status);
-    //   } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== status) {
-    //     this.state.updateChainConnectionStatus(key, status);
-    //   }
-    // }
-    //
-    // for (const [key, evmApi] of Object.entries(apiMap.evm)) {
-    //   evmApi.api.eth.net.isListening()
-    //     .then(() => {
-    //       if (!networkMap[key].connectionStatus) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
-    //       } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTED) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
-    //       }
-    //     })
-    //     .catch(() => {
-    //       if (!networkMap[key].connectionStatus) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
-    //       } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTING) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
-    //       }
-    //     });
-    // }
   };
-
   recoverApiMap = () => {
     var _this$subscriptions;
     const apiMap = this.state.getApiMap();
@@ -224,7 +186,6 @@ export class KoniCron {
   };
   refreshNft = (address, apiMap, smartContractNfts, chainInfoMap) => {
     return () => {
-      console.debug('Refresh NFT state');
       this.subscriptions.subscribeNft(address, apiMap.substrate, apiMap.evm, smartContractNfts, chainInfoMap);
     };
   };
@@ -236,13 +197,11 @@ export class KoniCron {
   };
   refreshStakingReward = address => {
     return () => {
-      console.debug('Refresh staking reward state');
       this.subscriptions.subscribeStakingReward(address).catch(this.logger.error);
     };
   };
   refreshStakingRewardFastInterval = address => {
     return () => {
-      console.debug('Refresh staking reward data with fast interval');
       this.subscriptions.subscribeStakingRewardFastInterval(address).catch(this.logger.error);
     };
   };
@@ -254,20 +213,17 @@ export class KoniCron {
   };
   updateChainStakingMetadata = (chainInfoMap, chainStateMap, substrateApiMap) => {
     return () => {
-      console.debug('Fetching chain staking metadata');
       this.subscriptions.fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
     };
   };
   updateNominatorMetadata = (address, chainInfoMap, chainStateMap, substrateApiMap) => {
     return () => {
-      console.debug('Fetching nominator data for', address);
       this.subscriptions.fetchNominatorMetadata(address, chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
     };
   };
   async reloadNft() {
     const address = this.state.keyringService.currentAccount.address;
     const serviceInfo = this.state.getServiceInfo();
-    console.debug('Hard refresh NFT for', address);
     this.resetNft(address);
     this.removeCron('refreshNft');
     this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
@@ -276,7 +232,6 @@ export class KoniCron {
   }
   async reloadStaking() {
     const address = this.state.keyringService.currentAccount.address;
-    console.debug('Hard refresh staking meta for', address);
     this.resetStakingReward();
     this.removeCron('refreshStakingReward');
     this.removeCron('refreshPoolingStakingReward');

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

@@ -73,7 +73,9 @@ export default class KoniExtension {
     private saveTheme;
     private setCamera;
     private saveBrowserConfirmationType;
+    private setAutoLockTime;
     private subscribeSettings;
+    private setEnableChainPatrol;
     private subscribeAuthUrls;
     private _saveCurrentAccountAddress;
     private updateCurrentAccountAddress;
@@ -169,6 +171,7 @@ export default class KoniExtension {
     private keyringUnlock;
     private keyringLock;
     private keyringExportMnemonic;
+    private resetWallet;
     private signingApprovePasswordV2;
     private derivationCreateMultiple;
     private derivationCreateV3;

package/koni/background/handlers/Extension.js

@@ -7,7 +7,7 @@ import { isJsonPayload, SEED_DEFAULT_LENGTH, SEED_LENGTHS } from '@subwallet/ext
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { AccountExternalErrorCode, BasicTxErrorType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, StakingType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, DEFAULT_TIME_AUTO_LOCK } from '@subwallet/extension-base/constants';
+import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH } from '@subwallet/extension-base/constants';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
 import { checkReferenceCount, checkSupportTransfer, createTransferExtrinsic } from '@subwallet/extension-base/koni/api/dotsama/transfer';
@@ -20,6 +20,7 @@ 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 { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-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';
@@ -55,8 +56,20 @@ const ACCOUNT_ALL_JSON = {
 export default class KoniExtension {
   #lockTimeOut = undefined;
   #koniState;
+  #timeAutoLock = DEFAULT_AUTO_LOCK_TIME;
   constructor(state) {
     this.#koniState = state;
+    const updateTimeAutoLock = rs => {
+      this.#timeAutoLock = rs.timeAutoLock;
+      clearTimeout(this.#lockTimeOut);
+      this.#lockTimeOut = setTimeout(() => {
+        this.keyringLock();
+      }, this.#timeAutoLock * 60 * 1000);
+    };
+    this.#koniState.settingService.getSettings(updateTimeAutoLock);
+    this.#koniState.settingService.getSubject().subscribe({
+      next: updateTimeAutoLock
+    });
   }
 
   /// Clone from PolkadotJs
@@ -326,7 +339,6 @@ export default class KoniExtension {
   windowOpen(path) {
     const url = `${chrome.extension.getURL('index.html')}#${path}`;
     if (!ALLOWED_PATH.includes(path)) {
-      console.error('Not allowed to open the url:', url);
       return false;
     }
     withErrorLog(() => chrome.tabs.create({
@@ -712,7 +724,6 @@ export default class KoniExtension {
       assert(value, 'The source is not known');
       if (this.isAddressValidWithAuthType(address, value[url].accountAuthType)) {
         value[url].isAllowedMap[address] = connectValue;
-        console.log('Devbu: ', value);
         this.#koniState.setAuthorize(value, () => {
           callBack && callBack(value);
         });
@@ -725,7 +736,6 @@ export default class KoniExtension {
     this.#koniState.getAuthorize(value => {
       assert(value, 'The source is not known');
       value[id].isAllowed = connectValue;
-      console.log('Devbu: ', value);
       this.#koniState.setAuthorize(value);
     });
   }
@@ -733,7 +743,6 @@ export default class KoniExtension {
     this.#koniState.getAuthorize(value => {
       assert(value, 'The source is not known');
       value[id].isAllowedMap = values;
-      console.log('Devbu: ', value);
       this.#koniState.setAuthorize(value);
     });
   }
@@ -762,22 +771,18 @@ export default class KoniExtension {
       });
     });
   }
-  toggleBalancesVisibility(id, port) {
-    const cb = createSubscription(id, port);
-    this.#koniState.getSettings(value => {
-      const updateValue = {
-        ...value,
-        isShowBalance: !value.isShowBalance
-      };
-      this.#koniState.setSettings(updateValue, () => {
-        // eslint-disable-next-line node/no-callback-literal
-        cb(updateValue);
+  async toggleBalancesVisibility() {
+    return new Promise(resolve => {
+      this.#koniState.getSettings(value => {
+        const updateValue = {
+          ...value,
+          isShowBalance: !value.isShowBalance
+        };
+        this.#koniState.setSettings(updateValue, () => {
+          resolve(!value.isShowBalance);
+        });
       });
     });
-    port.onDisconnect.addListener(() => {
-      this.cancelSubscription(id);
-    });
-    return true;
   }
   saveAccountAllLogo(data, id, port) {
     const cb = createSubscription(id, port);
@@ -818,6 +823,12 @@ export default class KoniExtension {
     });
     return true;
   }
+  setAutoLockTime({
+    autoLockTime
+  }) {
+    this.#koniState.setAutoLockTime(autoLockTime);
+    return true;
+  }
   async subscribeSettings(id, port) {
     const cb = createSubscription(id, port);
     const balancesVisibilitySubscription = this.#koniState.subscribeSettingsSubject().subscribe({
@@ -831,6 +842,12 @@ export default class KoniExtension {
     });
     return await this.getSettings();
   }
+  setEnableChainPatrol({
+    enable
+  }) {
+    this.#koniState.setEnableChainPatrol(enable);
+    return true;
+  }
   async subscribeAuthUrls(id, port) {
     const cb = createSubscription(id, port);
     const authorizeUrlSubscription = this.#koniState.subscribeAuthorizeUrlSubject().subscribe({
@@ -894,11 +911,11 @@ export default class KoniExtension {
   }
   async updateAssetSetting(params) {
     try {
-      await this.#koniState.chainService.updateAssetSetting(params.tokenSlug, params.assetSetting);
+      await this.#koniState.chainService.updateAssetSetting(params.tokenSlug, params.assetSetting, params.autoEnableNativeToken);
       this.#koniState.eventService.emit('asset.updateState', params.tokenSlug);
       return true;
     } catch (e) {
-      console.error('Error updating asset setting', e);
+      console.error(e);
       return false;
     }
   }
@@ -1522,7 +1539,7 @@ export default class KoniExtension {
     try {
       return this.#koniState.refreshSubstrateApi(networkKey);
     } catch (e) {
-      console.error('error recovering substrate api', e);
+      console.error(e);
       return false;
     }
   }
@@ -1531,7 +1548,7 @@ export default class KoniExtension {
       await this.#koniState.upsertCustomToken(data);
       return true;
     } catch (e) {
-      console.error('Error insert/update custom token', e);
+      console.error(e);
       return false;
     }
   }
@@ -1593,26 +1610,39 @@ export default class KoniExtension {
             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);
+            console.warn(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);
+        const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
+        if (_isChainEvmCompatible(chainInfo)) {
+          const web3 = this.#koniState.chainService.getEvmApi(networkKey);
+          const transaction = {
+            value: 1,
+            to: address,
+            from: address
+          };
+          const gasPrice = await web3.api.eth.getGasPrice();
+          const gasLimit = await web3.api.eth.estimateGas(transaction);
+          estimatedFee = (gasLimit * parseInt(gasPrice)).toString();
+        } 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));
@@ -2147,7 +2177,6 @@ export default class KoniExtension {
   }
   async getNominationPoolOptions(chain) {
     const substrateApi = this.#koniState.getSubstrateApi(chain);
-    console.log('chain', chain);
     return await getNominationPoolsInfo(chain, substrateApi);
   }
   async submitBonding(inputData) {
@@ -2169,7 +2198,6 @@ export default class KoniExtension {
     }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await getBondingExtrinsic(chainInfo, amount, selectedValidators, substrateApi, address, nominatorMetadata);
-    console.log('Bonding extrinsic: ', chain, extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address,
       chain: chain,
@@ -2198,7 +2226,6 @@ export default class KoniExtension {
     }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await getUnbondingExtrinsic(nominatorMetadata, amount, chain, substrateApi, validatorAddress);
-    console.log('Unbonding extrinsic: ', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address: nominatorMetadata.address,
       chain: chain,
@@ -2219,7 +2246,6 @@ export default class KoniExtension {
     }
     const dotSamaApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await getWithdrawalExtrinsic(dotSamaApi, chain, nominatorMetadata, validatorAddress);
-    console.log('Stake withdrawal extrinsic: ', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address: nominatorMetadata.address,
       chain: chain,
@@ -2241,7 +2267,6 @@ export default class KoniExtension {
     }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await getClaimRewardExtrinsic(substrateApi, chain, address, stakingType, bondReward);
-    console.log('Staking claim reward extrinsic: ', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address,
       chain: chain,
@@ -2262,7 +2287,6 @@ export default class KoniExtension {
     }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await getCancelWithdrawalExtrinsic(substrateApi, chain, selectedUnstaking);
-    console.log('Cancel stake withdrawal extrinsic', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address,
       chain,
@@ -2291,7 +2315,6 @@ export default class KoniExtension {
     }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await getPoolingBondingExtrinsic(substrateApi, amount, selectedPool.id, nominatorMetadata);
-    console.log('Join nomination pool extrinsic', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address,
       chain,
@@ -2317,7 +2340,6 @@ export default class KoniExtension {
     }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await getPoolingUnbondingExtrinsic(substrateApi, amount, nominatorMetadata);
-    console.log('Nomination pool unbond extrinsic', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address: nominatorMetadata.address,
       chain,
@@ -2386,6 +2408,11 @@ export default class KoniExtension {
       chainType: ChainType.SUBSTRATE
     });
   }
+
+  /// Keyring state
+
+  // Subscribe keyring state
+
   keyringStateSubscribe(id, port) {
     const cb = createSubscription(id, port);
     const keyringStateSubject = this.#koniState.keyringService.keyringStateSubject;
@@ -2396,6 +2423,9 @@ export default class KoniExtension {
     });
     return this.#koniState.keyringService.keyringState;
   }
+
+  // Change master password
+
   keyringChangeMasterPassword({
     createNew,
     newPassword,
@@ -2431,6 +2461,9 @@ export default class KoniExtension {
       errors: []
     };
   }
+
+  // Migrate password
+
   keyringMigrateMasterPassword({
     address,
     password
@@ -2449,6 +2482,9 @@ export default class KoniExtension {
       errors: []
     };
   }
+
+  // Unlock wallet
+
   keyringUnlock({
     password
   }) {
@@ -2466,11 +2502,17 @@ export default class KoniExtension {
       errors: []
     };
   }
+
+  // Lock wallet
+
   keyringLock() {
     keyring.lockAll();
     this.#koniState.updateKeyringState();
     clearTimeout(this.#lockTimeOut);
   }
+
+  // Export mnemonic
+
   keyringExportMnemonic({
     address,
     password
@@ -2482,6 +2524,25 @@ export default class KoniExtension {
     };
   }
 
+  // Reset wallet
+
+  async resetWallet({
+    resetAll
+  }) {
+    try {
+      await this.#koniState.resetWallet(resetAll);
+      return {
+        errors: [],
+        status: true
+      };
+    } catch (e) {
+      return {
+        errors: [e.message],
+        status: false
+      };
+    }
+  }
+
   /// Signing external request
   signingApprovePasswordV2({
     id
@@ -2584,7 +2645,7 @@ export default class KoniExtension {
         this._addAddressToAuthList(address, isAllowed);
         result.push(childPair);
       } catch (e) {
-        console.log(`Fail to derive from ${parentAddress} with path ${item.suri}`, e);
+        console.log(e);
       }
     }
     if (result.length === 1) {
@@ -2828,7 +2889,7 @@ export default class KoniExtension {
     clearTimeout(this.#lockTimeOut);
     this.#lockTimeOut = setTimeout(() => {
       this.keyringLock();
-    }, DEFAULT_TIME_AUTO_LOCK);
+    }, this.#timeAutoLock * 60 * 1000);
     switch (type) {
       /// Clone from PolkadotJs
       case 'pri(accounts.create.external)':
@@ -2908,7 +2969,9 @@ export default class KoniExtension {
       case 'pri(authorize.toggle)':
         return this.toggleAuthorization2(request);
       case 'pri(settings.changeBalancesVisibility)':
-        return this.toggleBalancesVisibility(id, port);
+        return await this.toggleBalancesVisibility();
+
+      // Settings
       case 'pri(settings.subscribe)':
         return await this.subscribeSettings(id, port);
       case 'pri(settings.saveAccountAllLogo)':
@@ -2919,6 +2982,10 @@ export default class KoniExtension {
         return this.saveTheme(request, id, port);
       case 'pri(settings.saveBrowserConfirmationType)':
         return this.saveBrowserConfirmationType(request, id, port);
+      case 'pri(settings.saveAutoLockTime)':
+        return this.setAutoLockTime(request);
+      case 'pri(settings.saveEnableChainPatrol)':
+        return this.setEnableChainPatrol(request);
       case 'pri(price.getPrice)':
         return await this.getPrice();
       case 'pri(price.getSubscription)':
@@ -3154,6 +3221,8 @@ export default class KoniExtension {
         return this.keyringLock();
       case 'pri(keyring.export.mnemonic)':
         return this.keyringExportMnemonic(request);
+      case 'pri(keyring.reset)':
+        return await this.resetWallet(request);
 
       /// Signing external
       case 'pri(signing.approve.passwordV2)':