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

package/koni/background/handlers/Extension.js

@@ -6,19 +6,19 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { isJsonPayload, SEED_DEFAULT_LENGTH, SEED_LENGTHS } from '@subwallet/extension-base/background/handlers/Extension';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
-import { AccountExternalErrorCode, BasicTxErrorType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH } from '@subwallet/extension-base/constants';
+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 { 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';
 import { getNftTransferExtrinsic, isRecipientSelf } from '@subwallet/extension-base/koni/api/nft/transfer';
-import { getBondingExtrinsic, getCancelWithdrawalExtrinsic, getClaimRewardExtrinsic, getNominationPoolsInfo, getUnbondingExtrinsic, getValidatorsInfo, getWithdrawalExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding';
+import { getBondingExtrinsic, getCancelWithdrawalExtrinsic, getClaimRewardExtrinsic, getNominationPoolsInfo, getUnbondingExtrinsic, getValidatorsInfo, getWithdrawalExtrinsic, validateBondingCondition, validateUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding';
 import { getTuringCancelCompoundingExtrinsic, getTuringCompoundExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/paraChain';
-import { getPoolingBondingExtrinsic, getPoolingUnbondingExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
+import { getPoolingBondingExtrinsic, getPoolingUnbondingExtrinsic, validatePoolBondingCondition, validateRelayUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
 import { getERC20TransactionObject, getERC721Transaction, getEVMTransactionObject } from '@subwallet/extension-base/koni/api/tokens/evm/transfer';
 import { getPSP34TransferExtrinsic } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { createXcmExtrinsic } from '@subwallet/extension-base/koni/api/xcm';
-import { _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _getTokenMinAmount, _isAssetSmartContractNft, _isChainEvmCompatible, _isCustomAsset, _isNativeToken, _isTokenEvmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
+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 { createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
@@ -52,6 +52,7 @@ const ACCOUNT_ALL_JSON = {
   name: 'All'
 };
 export default class KoniExtension {
+  #lockTimeOut = undefined;
   #koniState;
   constructor(state) {
     this.#koniState = state;
@@ -400,36 +401,38 @@ export default class KoniExtension {
   }
   async accountsGetAllWithCurrentAddress(id, port) {
     const cb = createSubscription(id, port);
-    return await new Promise(resolve => {
-      const subscription = accountsObservable.subject.subscribe(storedAccounts => {
-        const transformedAccounts = transformAccounts(storedAccounts);
-        const accounts = transformedAccounts && transformedAccounts.length ? [{
-          ...ACCOUNT_ALL_JSON
-        }, ...transformedAccounts] : [];
-        const accountsWithCurrentAddress = {
-          accounts
-        };
-        setTimeout(() => {
-          this.#koniState.getCurrentAccount(accountInfo => {
-            if (accountInfo) {
-              accountsWithCurrentAddress.currentAddress = accountInfo.address;
-              if (accountInfo.address === ALL_ACCOUNT_KEY) {
-                accountsWithCurrentAddress.currentGenesisHash = accountInfo.currentGenesisHash;
-              } else {
-                const acc = accounts.find(a => a.address === accountInfo.address);
-                accountsWithCurrentAddress.currentGenesisHash = (acc === null || acc === void 0 ? void 0 : acc.genesisHash) || ALL_GENESIS_HASH;
-              }
-            }
-            resolve(accountsWithCurrentAddress);
-            cb(accountsWithCurrentAddress);
-          });
-        }, 300);
-      });
-      this.createUnsubscriptionHandle(id, subscription.unsubscribe);
-      port.onDisconnect.addListener(() => {
-        this.cancelSubscription(id);
-      });
+    const keyringService = this.#koniState.keyringService;
+    await this.#koniState.eventService.waitAccountReady;
+    const currentAccount = keyringService.currentAccount;
+    const accountsSubject = keyring.accounts.subject;
+    const transformedAccounts = transformAccounts(accountsSubject.value);
+    const responseData = {
+      accounts: transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [{
+        ...ACCOUNT_ALL_JSON
+      }, ...transformedAccounts] : [],
+      currentAddress: currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.address,
+      currentGenesisHash: currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.currentGenesisHash
+    };
+    const subscriptionAccounts = accountsSubject.subscribe(storedAccounts => {
+      const transformedAccounts = transformAccounts(storedAccounts);
+      responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [{
+        ...ACCOUNT_ALL_JSON
+      }, ...transformedAccounts] : [];
+      cb(responseData);
+    });
+    const subscriptionCurrentAccount = keyringService.currentAccountSubject.subscribe(currentAccountData => {
+      responseData.currentAddress = currentAccountData.address;
+      responseData.currentGenesisHash = currentAccountData.currentGenesisHash;
+      cb(responseData);
+    });
+    this.createUnsubscriptionHandle(id, () => {
+      subscriptionAccounts.unsubscribe();
+      subscriptionCurrentAccount.unsubscribe();
+    });
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
     });
+    return responseData;
   }
   accountsGetAll(id, port) {
     const cb = createSubscription(id, port);
@@ -450,11 +453,15 @@ export default class KoniExtension {
   }) {
     return keyring.saveRecent(accountId);
   }
-  triggerAccountsSubscription() {
-    const accountsSubject = accountsObservable.subject;
-    accountsSubject.next(accountsSubject.getValue());
-    return true;
-  }
+
+  // private triggerAccountsSubscription (): boolean {
+  //   const accountsSubject = accountsObservable.subject;
+  //
+  //   accountsSubject.next(accountsSubject.getValue());
+  //
+  //   return true;
+  // }
+
   _getAuthListV2() {
     return new Promise((resolve, reject) => {
       this.#koniState.getAuthorize(rs => {
@@ -796,40 +803,40 @@ export default class KoniExtension {
     return await this.#koniState.getAuthList();
   }
   _saveCurrentAccountAddress(address, callback) {
-    this.#koniState.getCurrentAccount(accountInfo => {
-      if (!accountInfo) {
-        accountInfo = {
-          address,
-          currentGenesisHash: ALL_GENESIS_HASH,
-          allGenesisHash: ALL_GENESIS_HASH || undefined
-        };
-      } else {
-        accountInfo.address = address;
-        if (address !== ALL_ACCOUNT_KEY) {
-          const currentKeyPair = keyring.getAccount(address);
+    let accountInfo = this.#koniState.keyringService.currentAccount;
+    if (!accountInfo) {
+      accountInfo = {
+        address,
+        currentGenesisHash: ALL_GENESIS_HASH,
+        allGenesisHash: ALL_GENESIS_HASH || undefined
+      };
+    } else {
+      accountInfo.address = address;
+      if (address !== ALL_ACCOUNT_KEY) {
+        try {
+          const currentKeyPair = keyring.getPair(address);
           accountInfo.currentGenesisHash = (currentKeyPair === null || currentKeyPair === void 0 ? void 0 : currentKeyPair.meta.genesisHash) || ALL_GENESIS_HASH;
-        } else {
-          accountInfo.currentGenesisHash = accountInfo.allGenesisHash || ALL_GENESIS_HASH;
+        } catch {
+          accountInfo.currentGenesisHash = ALL_GENESIS_HASH;
         }
+      } else {
+        accountInfo.currentGenesisHash = accountInfo.allGenesisHash || ALL_GENESIS_HASH;
       }
-      this.#koniState.setCurrentAccount(accountInfo, () => {
-        callback && callback(accountInfo);
-      });
+    }
+    this.#koniState.setCurrentAccount(accountInfo, () => {
+      callback && callback(accountInfo);
     });
   }
   updateCurrentAccountAddress(address) {
-    this._saveCurrentAccountAddress(address, () => {
-      this.triggerAccountsSubscription();
-    });
+    this._saveCurrentAccountAddress(address);
     return true;
   }
-  saveCurrentAccountAddress(data, id, port) {
-    const cb = createSubscription(id, port);
-    this._saveCurrentAccountAddress(data.address, cb);
-    port.onDisconnect.addListener(() => {
-      this.cancelSubscription(id);
+  async saveCurrentAccountAddress(data) {
+    return new Promise(resolve => {
+      this._saveCurrentAccountAddress(data.address, currentInfo => {
+        resolve(currentInfo);
+      });
     });
-    return true;
   }
   async getAssetSetting() {
     return this.#koniState.chainService.getAssetSettings();
@@ -846,6 +853,7 @@ export default class KoniExtension {
   async updateAssetSetting(params) {
     try {
       await this.#koniState.chainService.updateAssetSetting(params.tokenSlug, params.assetSetting);
+      this.#koniState.eventService.emit('asset.updateState', params.tokenSlug);
       return true;
     } catch (e) {
       console.error('Error updating asset setting', e);
@@ -969,16 +977,10 @@ export default class KoniExtension {
         throw Error('Require password to set up master password');
       } else {
         keyring.changeMasterPassword(password);
-        this.#koniState.setKeyringState({
-          hasMasterPassword: true,
-          isLocked: false,
-          isReady: true
-        });
+        this.#koniState.updateKeyringState();
       }
     }
-    const currentAccount = await new Promise(resolve => {
-      this.#koniState.getCurrentAccount(resolve);
-    });
+    const currentAccount = this.#koniState.keyringService.currentAccount;
     const allGenesisHash = (currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.allGenesisHash) || undefined;
     types === null || types === void 0 ? void 0 : types.forEach(type => {
       const suri = getSuri(_suri, type);
@@ -1038,19 +1040,13 @@ export default class KoniExtension {
       });
     });
 
-    // Remove history
-    await this.#koniState.historyService.removeHistoryByAddress(address);
-
     // Set current account to all account
     await new Promise(resolve => {
-      this.#koniState.getCurrentAccount(({
-        allGenesisHash
-      }) => {
-        this.#koniState.setCurrentAccount({
-          currentGenesisHash: allGenesisHash || null,
-          address: ALL_ACCOUNT_KEY
-        }, resolve);
-      });
+      const currentAccountInfo = this.#koniState.keyringService.currentAccount;
+      this.#koniState.setCurrentAccount({
+        currentGenesisHash: (currentAccountInfo === null || currentAccountInfo === void 0 ? void 0 : currentAccountInfo.allGenesisHash) || null,
+        address: ALL_ACCOUNT_KEY
+      }, resolve);
     });
     return true;
   }
@@ -1301,7 +1297,7 @@ export default class KoniExtension {
     if (!tokenInfo) {
       errors.push(new TransactionError(BasicTxErrorType.INVALID_PARAMS, 'Not found token from registry'));
     }
-    if (isEthereumAddress(from) && isEthereumAddress(to) && !_isNativeToken(tokenInfo) && !_isTokenEvmSmartContract(tokenInfo)) {
+    if (isEthereumAddress(from) && isEthereumAddress(to) && _isTokenEvmSmartContract(tokenInfo) && _getContractAddressOfToken(tokenInfo).length === 0) {
       errors.push(new TransactionError(BasicTxErrorType.INVALID_PARAMS, 'Not found ERC20 address for this token'));
     }
     return [errors, keypair, transferValue, tokenInfo];
@@ -1335,17 +1331,15 @@ export default class KoniExtension {
 
     // Get native token amount
     const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
-    let edAsWarning = false;
     if (isEthereumAddress(from) && isEthereumAddress(to)) {
       chainType = ChainType.EVM;
       const txVal = transferAll ? freeBalance.value : value || '0';
 
       // Estimate with EVM API
-      if (_isTokenEvmSmartContract(tokenInfo)) {
+      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);
-        edAsWarning = true;
       }
     } else {
       const substrateApi = this.#koniState.getSubstrateApi(networkKey);
@@ -1358,7 +1352,6 @@ export default class KoniExtension {
         to: to,
         substrateApi
       });
-      edAsWarning = true;
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     return this.#koniState.transactionService.handleTransaction({
@@ -1373,7 +1366,7 @@ export default class KoniExtension {
       extrinsicType: isTransferNativeToken ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.TRANSFER_TOKEN,
       ignoreWarnings: transferAll,
       isTransferAll: transferAll,
-      edAsWarning: edAsWarning
+      edAsWarning: isTransferNativeToken
     });
   }
   validateCrossChainTransfer(destinationNetworkKey, sendingTokenSlug, sender, sendingValue) {
@@ -1740,9 +1733,7 @@ export default class KoniExtension {
         resolve();
       });
     }
-    const currentAccount = await new Promise(resolve => {
-      this.#koniState.getCurrentAccount(resolve);
-    });
+    const currentAccount = this.#koniState.keyringService.currentAccount;
     const allGenesisHash = (currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.allGenesisHash) || undefined;
     if (addresses.length <= 1) {
       this.#koniState.setCurrentAccount({
@@ -2053,31 +2044,38 @@ 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) {
     const {
+      address,
       amount,
       chain,
       nominatorMetadata,
       selectedValidators
     } = inputData;
-    if (!amount || !nominatorMetadata || !selectedValidators) {
-      // Todo: Check and return error here
-
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INVALID_PARAMS)]);
-    }
     const chainInfo = this.#koniState.getChainInfo(chain);
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, StakingType.NOMINATED);
+    if (!chainStakingMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const bondingValidation = validateBondingCondition(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata);
+    if (!amount || !selectedValidators || bondingValidation.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(bondingValidation);
+    }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
-    const extrinsic = await getBondingExtrinsic(chainInfo, amount, nominatorMetadata, selectedValidators, substrateApi);
+    const extrinsic = await getBondingExtrinsic(chainInfo, amount, selectedValidators, substrateApi, address, nominatorMetadata);
+    console.log('Bonding extrinsic: ', chain, extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
-      address: nominatorMetadata.address,
+      address,
       chain: chain,
       chainType: ChainType.SUBSTRATE,
       data: inputData,
       extrinsicType: ExtrinsicType.STAKING_BOND,
       transaction: extrinsic,
-      url: EXTENSION_REQUEST_URL
+      url: EXTENSION_REQUEST_URL,
+      transferNativeAmount: amount
     });
   }
   async submitUnbonding(inputData) {
@@ -2087,11 +2085,17 @@ export default class KoniExtension {
       nominatorMetadata,
       validatorAddress
     } = inputData;
-    if (!amount || !nominatorMetadata) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INVALID_PARAMS)]);
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, StakingType.NOMINATED);
+    if (!chainStakingMetadata || !nominatorMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const unbondingValidation = validateUnbondingCondition(nominatorMetadata, amount, chain, chainStakingMetadata, validatorAddress);
+    if (!amount || unbondingValidation.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(unbondingValidation);
     }
     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,
@@ -2112,6 +2116,7 @@ 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,
@@ -2133,6 +2138,7 @@ 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,
@@ -2153,6 +2159,7 @@ 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,
@@ -2162,7 +2169,7 @@ export default class KoniExtension {
       chainType: ChainType.SUBSTRATE
     });
   }
-  async submitPoolingBonding(inputData) {
+  async submitPoolBonding(inputData) {
     const {
       address,
       amount,
@@ -2170,8 +2177,18 @@ export default class KoniExtension {
       nominatorMetadata,
       selectedPool
     } = inputData;
+    const chainInfo = this.#koniState.getChainInfo(chain);
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, StakingType.NOMINATED);
+    if (!chainStakingMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const bondingValidation = validatePoolBondingCondition(chainInfo, amount, selectedPool, address, chainStakingMetadata, nominatorMetadata);
+    if (!amount || bondingValidation.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(bondingValidation);
+    }
     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,
@@ -2187,8 +2204,17 @@ export default class KoniExtension {
       chain,
       nominatorMetadata
     } = inputData;
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, StakingType.NOMINATED);
+    if (!chainStakingMetadata || !nominatorMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const unbondingValidation = validateRelayUnbondingCondition(amount, chainStakingMetadata, nominatorMetadata);
+    if (!amount || unbondingValidation.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(unbondingValidation);
+    }
     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,
@@ -2259,12 +2285,13 @@ export default class KoniExtension {
   }
   keyringStateSubscribe(id, port) {
     const cb = createSubscription(id, port);
-    const subscription = this.#koniState.subscribeKeyringState().subscribe(value => cb(value));
+    const keyringStateSubject = this.#koniState.keyringService.keyringStateSubject;
+    const subscription = keyringStateSubject.subscribe(value => cb(value));
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return this.#koniState.getKeyringState();
+    return this.#koniState.keyringService.keyringState;
   }
   keyringChangeMasterPassword({
     createNew,
@@ -2295,11 +2322,7 @@ export default class KoniExtension {
         status: false
       };
     }
-    this.#koniState.setKeyringState({
-      hasMasterPassword: true,
-      isLocked: false,
-      isReady: true
-    });
+    this.#koniState.updateKeyringState();
     return {
       status: true,
       errors: []
@@ -2334,11 +2357,7 @@ export default class KoniExtension {
         status: false
       };
     }
-    this.#koniState.setKeyringState({
-      isReady: true,
-      hasMasterPassword: true,
-      isLocked: false
-    });
+    this.#koniState.updateKeyringState();
     return {
       status: true,
       errors: []
@@ -2346,11 +2365,8 @@ export default class KoniExtension {
   }
   keyringLock() {
     keyring.lockAll();
-    this.#koniState.setKeyringState({
-      isReady: true,
-      hasMasterPassword: true,
-      isLocked: true
-    });
+    this.#koniState.updateKeyringState();
+    clearTimeout(this.#lockTimeOut);
   }
   keyringExportMnemonic({
     address,
@@ -2393,6 +2409,7 @@ export default class KoniExtension {
       payload
     } = request;
     const registry = new TypeRegistry();
+    let isEvm = false;
     if (isJsonPayload(payload)) {
       // Get the metadata for the genesisHash
       const currentMetadata = this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash);
@@ -2402,11 +2419,16 @@ export default class KoniExtension {
       if (currentMetadata) {
         registry.register(currentMetadata === null || currentMetadata === void 0 ? void 0 : currentMetadata.types);
       }
+      const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
+      if (chainInfo) {
+        isEvm = _isChainEvmCompatible(chainInfo);
+      }
     }
     const result = request.sign(registry, pair);
     resolve({
       id,
-      ...result
+      // In case evm chain, must be cut 2 character after 0x
+      signature: isEvm ? `0x${result.signature.slice(4)}` : result.signature
     });
     return true;
   }
@@ -2679,10 +2701,24 @@ export default class KoniExtension {
     });
     return notificationSubject.value;
   }
+  async reloadCron({
+    data
+  }) {
+    if (data === 'nft') {
+      return await this.#koniState.reloadNft();
+    } else if (data === 'staking') {
+      return await this.#koniState.reloadStaking();
+    }
+    return Promise.resolve(false);
+  }
 
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
+    clearTimeout(this.#lockTimeOut);
+    this.#lockTimeOut = setTimeout(() => {
+      this.keyringLock();
+    }, DEFAULT_TIME_AUTO_LOCK);
     switch (type) {
       /// Clone from PolkadotJs
       case 'pri(accounts.create.external)':
@@ -2791,10 +2827,8 @@ export default class KoniExtension {
         return this.accountsGetAll(id, port);
       case 'pri(accounts.saveRecent)':
         return this.saveRecentAccountId(request);
-      case 'pri(accounts.triggerSubscription)':
-        return this.triggerAccountsSubscription();
       case 'pri(currentAccount.saveAddress)':
-        return this.saveCurrentAccountAddress(request, id, port);
+        return await this.saveCurrentAccountAddress(request);
       case 'pri(accounts.updateCurrentAddress)':
         return this.updateCurrentAccountAddress(request);
       case 'pri(settings.changeBalancesVisibility)':
@@ -2958,7 +2992,7 @@ export default class KoniExtension {
       case 'pri(staking.submitTuringCancelCompound)':
         return await this.submitTuringCancelStakeCompound(request);
       case 'pri(bonding.nominationPool.submitBonding)':
-        return await this.submitPoolingBonding(request);
+        return await this.submitPoolBonding(request);
       case 'pri(bonding.nominationPool.submitUnbonding)':
         return await this.submitPoolingUnbonding(request);
 
@@ -3007,6 +3041,8 @@ export default class KoniExtension {
       // Notification
       case 'pri(notifications.subscribe)':
         return this.subscribeNotifications(id, port);
+      case 'pri(cron.reload)':
+        return await this.reloadCron(request);
 
       // Default
       default: