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

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

@@ -62,6 +62,7 @@ const ACCOUNT_ALL_JSON = {
   name: 'All'
 };
 class KoniExtension {
+  #lockTimeOut = undefined;
   #koniState;
   constructor(state) {
     this.#koniState = state;
@@ -429,36 +430,38 @@ class KoniExtension {
   }
   async accountsGetAllWithCurrentAddress(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
-    return await new Promise(resolve => {
-      const subscription = _accounts.accounts.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 === _constants.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) || _constants.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 = _uiKeyring.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 = (0, _subscriptions.createSubscription)(id, port);
@@ -480,11 +483,15 @@ class KoniExtension {
     } = _ref21;
     return _uiKeyring.keyring.saveRecent(accountId);
   }
-  triggerAccountsSubscription() {
-    const accountsSubject = _accounts.accounts.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 => {
@@ -830,40 +837,40 @@ class KoniExtension {
     return await this.#koniState.getAuthList();
   }
   _saveCurrentAccountAddress(address, callback) {
-    this.#koniState.getCurrentAccount(accountInfo => {
-      if (!accountInfo) {
-        accountInfo = {
-          address,
-          currentGenesisHash: _constants.ALL_GENESIS_HASH,
-          allGenesisHash: _constants.ALL_GENESIS_HASH || undefined
-        };
-      } else {
-        accountInfo.address = address;
-        if (address !== _constants.ALL_ACCOUNT_KEY) {
-          const currentKeyPair = _uiKeyring.keyring.getAccount(address);
+    let accountInfo = this.#koniState.keyringService.currentAccount;
+    if (!accountInfo) {
+      accountInfo = {
+        address,
+        currentGenesisHash: _constants.ALL_GENESIS_HASH,
+        allGenesisHash: _constants.ALL_GENESIS_HASH || undefined
+      };
+    } else {
+      accountInfo.address = address;
+      if (address !== _constants.ALL_ACCOUNT_KEY) {
+        try {
+          const currentKeyPair = _uiKeyring.keyring.getPair(address);
           accountInfo.currentGenesisHash = (currentKeyPair === null || currentKeyPair === void 0 ? void 0 : currentKeyPair.meta.genesisHash) || _constants.ALL_GENESIS_HASH;
-        } else {
-          accountInfo.currentGenesisHash = accountInfo.allGenesisHash || _constants.ALL_GENESIS_HASH;
+        } catch {
+          accountInfo.currentGenesisHash = _constants.ALL_GENESIS_HASH;
         }
+      } else {
+        accountInfo.currentGenesisHash = accountInfo.allGenesisHash || _constants.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 = (0, _subscriptions.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();
@@ -880,6 +887,7 @@ 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);
@@ -1004,16 +1012,10 @@ class KoniExtension {
         throw Error('Require password to set up master password');
       } else {
         _uiKeyring.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);
@@ -1074,29 +1076,22 @@ class KoniExtension {
       });
     });
 
-    // Remove history
-    await this.#koniState.historyService.removeHistoryByAddress(address);
-
     // Set current account to all account
     await new Promise(resolve => {
-      this.#koniState.getCurrentAccount(_ref28 => {
-        let {
-          allGenesisHash
-        } = _ref28;
-        this.#koniState.setCurrentAccount({
-          currentGenesisHash: allGenesisHash || null,
-          address: _constants.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: _constants.ALL_ACCOUNT_KEY
+      }, resolve);
     });
     return true;
   }
-  seedCreateV2(_ref29) {
+  seedCreateV2(_ref28) {
     let {
       length = _Extension.SEED_DEFAULT_LENGTH,
       seed: _seed,
       types
-    } = _ref29;
+    } = _ref28;
     const seed = _seed || (0, _utilCrypto.mnemonicGenerate)(length);
     const rs = {
       seed: seed,
@@ -1107,11 +1102,11 @@ class KoniExtension {
     });
     return rs;
   }
-  seedValidateV2(_ref30) {
+  seedValidateV2(_ref29) {
     let {
       suri,
       types
-    } = _ref30;
+    } = _ref29;
     const {
       phrase
     } = (0, _utilCrypto.keyExtractSuri)(suri);
@@ -1131,11 +1126,11 @@ class KoniExtension {
     });
     return rs;
   }
-  _checkValidatePrivateKey(_ref31) {
+  _checkValidatePrivateKey(_ref30) {
     let {
       suri,
       types
-    } = _ref31;
+    } = _ref30;
     let autoAddPrefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const {
       phrase
@@ -1158,11 +1153,11 @@ class KoniExtension {
     }
     return rs;
   }
-  metamaskPrivateKeyValidateV2(_ref32) {
+  metamaskPrivateKeyValidateV2(_ref31) {
     let {
       suri,
       types
-    } = _ref32;
+    } = _ref31;
     const isValidSuri = suri.startsWith('0x');
     if (isValidSuri) {
       return this._checkValidatePrivateKey({
@@ -1187,14 +1182,14 @@ class KoniExtension {
       throw new Error(`"${suri}" is not a valid derivation path`);
     }
   }
-  derivationCreateV2(_ref33) {
+  derivationCreateV2(_ref32) {
     let {
       genesisHash,
       isAllowed,
       name,
       parentAddress,
       suri
-    } = _ref33;
+    } = _ref32;
     const childPair = this.deriveV2(parentAddress, suri, {
       genesisHash,
       name,
@@ -1208,14 +1203,14 @@ class KoniExtension {
     });
     return true;
   }
-  jsonRestoreV2(_ref34) {
+  jsonRestoreV2(_ref33) {
     let {
       address,
       file,
       isAllowed,
       password,
       withMasterPassword
-    } = _ref34;
+    } = _ref33;
     const isPasswordValidated = this.validatePassword(file, password);
     if (isPasswordValidated) {
       try {
@@ -1230,13 +1225,13 @@ class KoniExtension {
       throw new Error('Unable to decode using the supplied passphrase');
     }
   }
-  batchRestoreV2(_ref35) {
+  batchRestoreV2(_ref34) {
     let {
       accountsInfo,
       file,
       isAllowed,
       password
-    } = _ref35;
+    } = _ref34;
     const addressList = accountsInfo.map(acc => acc.address);
     const isPasswordValidated = this.validatedAccountsPassword(file, password);
     if (isPasswordValidated) {
@@ -1346,7 +1341,7 @@ class KoniExtension {
     if (!tokenInfo) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, 'Not found token from registry'));
     }
-    if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && !(0, _utils._isNativeToken)(tokenInfo) && !(0, _utils._isTokenEvmSmartContract)(tokenInfo)) {
+    if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils._isTokenEvmSmartContract)(tokenInfo) && (0, _utils._getContractAddressOfToken)(tokenInfo).length === 0) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, 'Not found ERC20 address for this token'));
     }
     return [errors, keypair, transferValue, tokenInfo];
@@ -1380,17 +1375,15 @@ class KoniExtension {
 
     // Get native token amount
     const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
-    let edAsWarning = false;
     if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to)) {
       chainType = _KoniTypes.ChainType.EVM;
       const txVal = transferAll ? freeBalance.value : value || '0';
 
       // Estimate with EVM API
-      if ((0, _utils._isTokenEvmSmartContract)(tokenInfo)) {
+      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);
-        edAsWarning = true;
       }
     } else {
       const substrateApi = this.#koniState.getSubstrateApi(networkKey);
@@ -1403,7 +1396,6 @@ class KoniExtension {
         to: to,
         substrateApi
       });
-      edAsWarning = true;
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     return this.#koniState.transactionService.handleTransaction({
@@ -1418,7 +1410,7 @@ class KoniExtension {
       extrinsicType: isTransferNativeToken ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.TRANSFER_TOKEN,
       ignoreWarnings: transferAll,
       isTransferAll: transferAll,
-      edAsWarning: edAsWarning
+      edAsWarning: isTransferNativeToken
     });
   }
   validateCrossChainTransfer(destinationNetworkKey, sendingTokenSlug, sender, sendingValue) {
@@ -1507,11 +1499,11 @@ class KoniExtension {
   async enableChain(networkKey) {
     return await this.#koniState.enableChain(networkKey);
   }
-  async validateNetwork(_ref36) {
+  async validateNetwork(_ref35) {
     let {
       existedChainSlug,
       provider
-    } = _ref36;
+    } = _ref35;
     return await this.#koniState.validateCustomChain(provider, existedChainSlug);
   }
   resetDefaultNetwork() {
@@ -1549,20 +1541,20 @@ class KoniExtension {
   async validateCustomAsset(data) {
     return await this.#koniState.validateCustomAsset(data);
   }
-  async getAddressFreeBalance(_ref37) {
+  async getAddressFreeBalance(_ref36) {
     let {
       address,
       networkKey,
       token
-    } = _ref37;
+    } = _ref36;
     return await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
   }
-  async subscribeAddressFreeBalance(_ref38, id, port) {
+  async subscribeAddressFreeBalance(_ref37, id, port) {
     let {
       address,
       networkKey,
       token
-    } = _ref38;
+    } = _ref37;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const [unsub, currentFreeBalance] = await this.#koniState.balanceService.subscribeTokenFreeBalance(address, networkKey, token, cb);
     this.createUnsubscriptionHandle(id, unsub);
@@ -1571,26 +1563,26 @@ class KoniExtension {
     });
     return currentFreeBalance;
   }
-  async transferCheckReferenceCount(_ref39) {
+  async transferCheckReferenceCount(_ref38) {
     let {
       address,
       networkKey
-    } = _ref39;
+    } = _ref38;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return
     return await (0, _transfer.checkReferenceCount)(networkKey, address, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
   }
-  async transferCheckSupporting(_ref40) {
+  async transferCheckSupporting(_ref39) {
     let {
       networkKey,
       tokenSlug
-    } = _ref40;
+    } = _ref39;
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     return await (0, _transfer.checkSupportTransfer)(networkKey, tokenInfo, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
   }
-  transferGetExistentialDeposit(_ref41) {
+  transferGetExistentialDeposit(_ref40) {
     let {
       tokenSlug
-    } = _ref41;
+    } = _ref40;
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     return (0, _utils._getTokenMinAmount)(tokenInfo);
   }
@@ -1631,10 +1623,10 @@ class KoniExtension {
     }
     return true;
   }
-  getAccountMeta(_ref42) {
+  getAccountMeta(_ref41) {
     let {
       address
-    } = _ref42;
+    } = _ref41;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, 'Unable to find pair');
     return {
@@ -1658,14 +1650,14 @@ class KoniExtension {
   //   });
   // }
 
-  accountsTie2(_ref43) {
+  accountsTie2(_ref42) {
     let {
       address,
       genesisHash
-    } = _ref43;
+    } = _ref42;
     return this.#koniState.setAccountTie(address, genesisHash);
   }
-  async accountsCreateExternalV2(_ref44) {
+  async accountsCreateExternalV2(_ref43) {
     let {
       address,
       genesisHash,
@@ -1673,7 +1665,7 @@ class KoniExtension {
       isEthereum,
       isReadOnly,
       name
-    } = _ref44;
+    } = _ref43;
     try {
       let result;
       try {
@@ -1732,7 +1724,7 @@ class KoniExtension {
       }];
     }
   }
-  async accountsCreateHardwareV2(_ref45) {
+  async accountsCreateHardwareV2(_ref44) {
     let {
       accountIndex,
       address,
@@ -1741,7 +1733,7 @@ class KoniExtension {
       hardwareType,
       isAllowed,
       name
-    } = _ref45;
+    } = _ref44;
     const key = _uiKeyring.keyring.addHardware(address, hardwareType, {
       accountIndex,
       addressOffset,
@@ -1764,10 +1756,10 @@ class KoniExtension {
     });
     return true;
   }
-  async accountsCreateHardwareMultiple(_ref46) {
+  async accountsCreateHardwareMultiple(_ref45) {
     let {
       accounts
-    } = _ref46;
+    } = _ref45;
     const addresses = [];
     if (!accounts.length) {
       throw new Error('No accounts to import');
@@ -1796,9 +1788,7 @@ 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({
@@ -1820,14 +1810,14 @@ class KoniExtension {
     });
     return true;
   }
-  async accountsCreateWithSecret(_ref47) {
+  async accountsCreateWithSecret(_ref46) {
     let {
       isAllow,
       isEthereum,
       name,
       publicKey,
       secretKey
-    } = _ref47;
+    } = _ref46;
     try {
       let keyringPair = null;
       if (isEthereum) {
@@ -1970,30 +1960,30 @@ class KoniExtension {
 
   // Parse transaction
 
-  parseSubstrateTransaction(_ref48) {
+  parseSubstrateTransaction(_ref47) {
     let {
       data,
       networkKey
-    } = _ref48;
+    } = _ref47;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const apiPromise = apiProps.api;
     return (0, _parseTransaction.parseSubstrateTransaction)(data, apiPromise);
   }
-  async parseEVMRLP(_ref49) {
+  async parseEVMRLP(_ref48) {
     let {
       data
-    } = _ref49;
+    } = _ref48;
     return await (0, _parseTransaction2.parseEvmRlp)(data, this.#koniState.getChainInfoMap(), this.#koniState.getEvmApiMap());
   }
 
   // Sign
 
-  qrSignSubstrate(_ref50) {
+  qrSignSubstrate(_ref49) {
     let {
       address,
       data,
       networkKey
-    } = _ref50;
+    } = _ref49;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, 'Unable to find pair');
     if (pair.isLocked) {
@@ -2010,13 +2000,13 @@ class KoniExtension {
       signature: signed
     };
   }
-  async qrSignEVM(_ref51) {
+  async qrSignEVM(_ref50) {
     let {
       address,
       chainId,
       message,
       type
-    } = _ref51;
+    } = _ref50;
     let signed;
     const network = this.getNetworkJsonByChainId(chainId);
     if (!network) {
@@ -2097,11 +2087,11 @@ class KoniExtension {
     });
     return this.#koniState.getNominatorMetadata();
   }
-  async getBondingOptions(_ref52) {
+  async getBondingOptions(_ref51) {
     let {
       chain,
       type
-    } = _ref52;
+    } = _ref51;
     const apiProps = this.#koniState.getSubstrateApi(chain);
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, type);
@@ -2115,31 +2105,38 @@ class KoniExtension {
   }
   async getNominationPoolOptions(chain) {
     const substrateApi = this.#koniState.getSubstrateApi(chain);
+    console.log('chain', chain);
     return await (0, _bonding.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.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS)]);
-    }
     const chainInfo = this.#koniState.getChainInfo(chain);
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, _KoniTypes.StakingType.NOMINATED);
+    if (!chainStakingMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const bondingValidation = (0, _bonding.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 (0, _bonding.getBondingExtrinsic)(chainInfo, amount, nominatorMetadata, selectedValidators, substrateApi);
+    const extrinsic = await (0, _bonding.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: _KoniTypes.ChainType.SUBSTRATE,
       data: inputData,
       extrinsicType: _KoniTypes.ExtrinsicType.STAKING_BOND,
       transaction: extrinsic,
-      url: _constants2.EXTENSION_REQUEST_URL
+      url: _constants2.EXTENSION_REQUEST_URL,
+      transferNativeAmount: amount
     });
   }
   async submitUnbonding(inputData) {
@@ -2149,11 +2146,17 @@ class KoniExtension {
       nominatorMetadata,
       validatorAddress
     } = inputData;
-    if (!amount || !nominatorMetadata) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS)]);
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, _KoniTypes.StakingType.NOMINATED);
+    if (!chainStakingMetadata || !nominatorMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const unbondingValidation = (0, _bonding.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 (0, _bonding.getUnbondingExtrinsic)(nominatorMetadata, amount, chain, substrateApi, validatorAddress);
+    console.log('Unbonding extrinsic: ', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address: nominatorMetadata.address,
       chain: chain,
@@ -2174,6 +2177,7 @@ class KoniExtension {
     }
     const dotSamaApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await (0, _bonding.getWithdrawalExtrinsic)(dotSamaApi, chain, nominatorMetadata, validatorAddress);
+    console.log('Stake withdrawal extrinsic: ', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address: nominatorMetadata.address,
       chain: chain,
@@ -2195,6 +2199,7 @@ class KoniExtension {
     }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await (0, _bonding.getClaimRewardExtrinsic)(substrateApi, chain, address, stakingType, bondReward);
+    console.log('Staking claim reward extrinsic: ', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address,
       chain: chain,
@@ -2215,6 +2220,7 @@ class KoniExtension {
     }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await (0, _bonding.getCancelWithdrawalExtrinsic)(substrateApi, chain, selectedUnstaking);
+    console.log('Cancel stake withdrawal extrinsic', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address,
       chain,
@@ -2224,7 +2230,7 @@ class KoniExtension {
       chainType: _KoniTypes.ChainType.SUBSTRATE
     });
   }
-  async submitPoolingBonding(inputData) {
+  async submitPoolBonding(inputData) {
     const {
       address,
       amount,
@@ -2232,8 +2238,18 @@ class KoniExtension {
       nominatorMetadata,
       selectedPool
     } = inputData;
+    const chainInfo = this.#koniState.getChainInfo(chain);
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, _KoniTypes.StakingType.NOMINATED);
+    if (!chainStakingMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const bondingValidation = (0, _relayChain.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 (0, _relayChain.getPoolingBondingExtrinsic)(substrateApi, amount, selectedPool.id, nominatorMetadata);
+    console.log('Join nomination pool extrinsic', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address,
       chain,
@@ -2249,8 +2265,17 @@ class KoniExtension {
       chain,
       nominatorMetadata
     } = inputData;
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, _KoniTypes.StakingType.NOMINATED);
+    if (!chainStakingMetadata || !nominatorMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const unbondingValidation = (0, _relayChain.validateRelayUnbondingCondition)(amount, chainStakingMetadata, nominatorMetadata);
+    if (!amount || unbondingValidation.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(unbondingValidation);
+    }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await (0, _relayChain.getPoolingUnbondingExtrinsic)(substrateApi, amount, nominatorMetadata);
+    console.log('Nomination pool unbond extrinsic', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address: nominatorMetadata.address,
       chain,
@@ -2262,12 +2287,12 @@ class KoniExtension {
   }
 
   // EVM Transaction
-  async parseContractInput(_ref53) {
+  async parseContractInput(_ref52) {
     let {
       chainId,
       contract,
       data
-    } = _ref53;
+    } = _ref52;
     const network = this.getNetworkJsonByChainId(chainId);
     return await (0, _parseTransaction2.parseContractInput)(data, contract, network);
   }
@@ -2322,19 +2347,20 @@ class KoniExtension {
   }
   keyringStateSubscribe(id, port) {
     const cb = (0, _subscriptions.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(_ref54) {
+  keyringChangeMasterPassword(_ref53) {
     let {
       createNew,
       newPassword,
       oldPassword
-    } = _ref54;
+    } = _ref53;
     try {
       // Remove isMasterPassword meta if createNew
       if (createNew) {
@@ -2359,21 +2385,17 @@ class KoniExtension {
         status: false
       };
     }
-    this.#koniState.setKeyringState({
-      hasMasterPassword: true,
-      isLocked: false,
-      isReady: true
-    });
+    this.#koniState.updateKeyringState();
     return {
       status: true,
       errors: []
     };
   }
-  keyringMigrateMasterPassword(_ref55) {
+  keyringMigrateMasterPassword(_ref54) {
     let {
       address,
       password
-    } = _ref55;
+    } = _ref54;
     try {
       _uiKeyring.keyring.migrateWithMasterPassword(address, password);
     } catch (e) {
@@ -2388,10 +2410,10 @@ class KoniExtension {
       errors: []
     };
   }
-  keyringUnlock(_ref56) {
+  keyringUnlock(_ref55) {
     let {
       password
-    } = _ref56;
+    } = _ref55;
     try {
       _uiKeyring.keyring.unlockKeyring(password);
     } catch (e) {
@@ -2400,11 +2422,7 @@ class KoniExtension {
         status: false
       };
     }
-    this.#koniState.setKeyringState({
-      isReady: true,
-      hasMasterPassword: true,
-      isLocked: false
-    });
+    this.#koniState.updateKeyringState();
     return {
       status: true,
       errors: []
@@ -2412,17 +2430,14 @@ class KoniExtension {
   }
   keyringLock() {
     _uiKeyring.keyring.lockAll();
-    this.#koniState.setKeyringState({
-      isReady: true,
-      hasMasterPassword: true,
-      isLocked: true
-    });
+    this.#koniState.updateKeyringState();
+    clearTimeout(this.#lockTimeOut);
   }
-  keyringExportMnemonic(_ref57) {
+  keyringExportMnemonic(_ref56) {
     let {
       address,
       password
-    } = _ref57;
+    } = _ref56;
     const pair = _uiKeyring.keyring.getPair(address);
     const result = pair.exportMnemonic(password);
     return {
@@ -2431,10 +2446,10 @@ class KoniExtension {
   }
 
   /// Signing external request
-  signingApprovePasswordV2(_ref58) {
+  signingApprovePasswordV2(_ref57) {
     let {
       id
-    } = _ref58;
+    } = _ref57;
     const queued = this.#koniState.getSignRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -2461,6 +2476,7 @@ class KoniExtension {
       payload
     } = request;
     const registry = new _types.TypeRegistry();
+    let isEvm = false;
     if ((0, _Extension.isJsonPayload)(payload)) {
       // Get the metadata for the genesisHash
       const currentMetadata = this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash);
@@ -2470,33 +2486,38 @@ 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 = (0, _utils._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;
   }
 
   /// Derive account
 
-  derivationCreateMultiple(_ref59) {
+  derivationCreateMultiple(_ref58) {
     let {
       isAllowed,
       items,
       parentAddress
-    } = _ref59;
+    } = _ref58;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
       _uiKeyring.keyring.unlockPair(parentPair.address);
     }
-    const createChild = _ref60 => {
+    const createChild = _ref59 => {
       let {
         name,
         suri
-      } = _ref60;
+      } = _ref59;
       const meta = {
         name: name,
         parentAddress
@@ -2542,10 +2563,10 @@ class KoniExtension {
     }
     return true;
   }
-  derivationCreateV3(_ref61) {
+  derivationCreateV3(_ref60) {
     let {
       address: parentAddress
-    } = _ref61;
+    } = _ref60;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2577,11 +2598,11 @@ class KoniExtension {
     });
     return true;
   }
-  validateDerivePath(_ref62) {
+  validateDerivePath(_ref61) {
     let {
       parentAddress,
       suri
-    } = _ref62;
+    } = _ref61;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2614,12 +2635,12 @@ class KoniExtension {
       suri: meta.suri
     };
   }
-  getListDeriveAccounts(_ref63) {
+  getListDeriveAccounts(_ref62) {
     let {
       limit,
       page,
       parentAddress
-    } = _ref63;
+    } = _ref62;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2710,10 +2731,10 @@ class KoniExtension {
   getSupportedSmartContractTypes() {
     return this.#koniState.getSupportedSmartContractTypes();
   }
-  getTransaction(_ref64) {
+  getTransaction(_ref63) {
     let {
       id
-    } = _ref64;
+    } = _ref63;
     const {
       transaction,
       ...transactionResult
@@ -2723,8 +2744,8 @@ class KoniExtension {
   subscribeTransactions(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     function convertRs(rs) {
-      return Object.fromEntries(Object.entries(rs).map(_ref65 => {
-        let [key, value] = _ref65;
+      return Object.fromEntries(Object.entries(rs).map(_ref64 => {
+        let [key, value] = _ref64;
         const {
           transaction,
           ...transactionResult
@@ -2754,10 +2775,25 @@ class KoniExtension {
     });
     return notificationSubject.value;
   }
+  async reloadCron(_ref65) {
+    let {
+      data
+    } = _ref65;
+    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();
+    }, _constants.DEFAULT_TIME_AUTO_LOCK);
     switch (type) {
       /// Clone from PolkadotJs
       case 'pri(accounts.create.external)':
@@ -2866,10 +2902,8 @@ 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)':
@@ -3033,7 +3067,7 @@ 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);
 
@@ -3082,6 +3116,8 @@ class KoniExtension {
       // Notification
       case 'pri(notifications.subscribe)':
         return this.subscribeNotifications(id, port);
+      case 'pri(cron.reload)':
+        return await this.reloadCron(request);
 
       // Default
       default: