@subwallet/extension-base 1.0.2-2 → 1.0.2-3

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

@@ -24,11 +24,12 @@ var _wasm = require("@subwallet/extension-base/koni/api/tokens/wasm");
 var _xcm = require("@subwallet/extension-base/koni/api/xcm");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _constants2 = require("@subwallet/extension-base/services/request-service/constants");
+var _utils2 = require("@subwallet/extension-base/utils");
+var _address2 = require("@subwallet/extension-base/utils/address");
 var _eth = require("@subwallet/extension-base/utils/eth");
 var _parseTransaction2 = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _keyring = require("@subwallet/keyring");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethereumjsTx = require("ethereumjs-tx");
 var _types = require("@polkadot/types");
@@ -181,7 +182,8 @@ class KoniExtension {
   // FIXME This looks very much like what we have in Tabs
   accountsSubscribe(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
-    const subscription = _accounts.accounts.subject.subscribe(accounts => cb(transformAccounts(accounts)));
+    const accountSubject = this.#koniState.keyringService.accountSubject;
+    const subscription = accountSubject.subscribe(accounts => cb(transformAccounts(accounts)));
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
       subscription.unsubscribe();
@@ -430,35 +432,37 @@ 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(() => {
-          const accountInfo = this.#koniState.keyringService.currentAccount;
-          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 transformedAccounts = transformAccounts(keyringService.accounts);
+    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 = keyringService.accountSubject.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);
@@ -474,22 +478,69 @@ class KoniExtension {
     });
     return id;
   }
-  saveRecentAccountId(_ref21) {
+  subscribeAddresses(id, port) {
+    const _cb = (0, _subscriptions.createSubscription)(id, port);
+    const subscription = this.#koniState.keyringService.addressesSubject.subscribe(subjectInfo => {
+      const addresses = (0, _address2.convertSubjectInfoToAddresses)(subjectInfo);
+      _cb({
+        addresses: addresses
+      });
+    });
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    const subjectInfo = this.#koniState.keyringService.addresses;
+    return {
+      addresses: (0, _address2.convertSubjectInfoToAddresses)(subjectInfo)
+    };
+  }
+  saveRecentAccount(_ref21) {
     let {
       accountId
     } = _ref21;
-    return _uiKeyring.keyring.saveRecent(accountId);
+    if ((0, _utilCrypto.isAddress)(accountId)) {
+      const address = (0, _utils2.reformatAddress)(accountId);
+      const account = _uiKeyring.keyring.getAccount(address);
+      const contact = _uiKeyring.keyring.getAddress(address);
+      return account || contact || {
+        ..._uiKeyring.keyring.saveRecent(accountId).json,
+        publicKey: (0, _utilCrypto.decodeAddress)(address)
+      };
+    } else {
+      throw Error('Invalid address');
+    }
   }
-  triggerAccountsSubscription() {
-    const accountsSubject = _accounts.accounts.subject;
-    accountsSubject.next(accountsSubject.getValue());
-    return true;
+  editContactAccount(_ref22) {
+    let {
+      address,
+      meta
+    } = _ref22;
+    if ((0, _utilCrypto.isAddress)(address)) {
+      const _address = (0, _utils2.reformatAddress)(address);
+      _uiKeyring.keyring.saveAddress(_address, meta);
+      return true;
+    } else {
+      throw Error('Invalid address');
+    }
+  }
+  deleteContactAccount(_ref23) {
+    let {
+      address
+    } = _ref23;
+    if ((0, _utilCrypto.isAddress)(address)) {
+      const _address = (0, _utils2.reformatAddress)(address);
+      _uiKeyring.keyring.forgetAddress(_address);
+      return true;
+    } else {
+      throw Error('Invalid address');
+    }
   }
   _getAuthListV2() {
+    const keyringService = this.#koniState.keyringService;
     return new Promise((resolve, reject) => {
       this.#koniState.getAuthorize(rs => {
-        const accounts = _accounts.accounts.subject.getValue();
-        const addressList = Object.keys(accounts);
+        const addressList = Object.keys(keyringService.accounts);
         const urlList = Object.keys(rs);
         if (Object.keys(rs[urlList[0]].isAllowedMap).toString() !== addressList.toString()) {
           urlList.forEach(url => {
@@ -525,11 +576,11 @@ class KoniExtension {
       list: authList
     };
   }
-  authorizeApproveV2(_ref22) {
+  authorizeApproveV2(_ref24) {
     let {
       accounts,
       id
-    } = _ref22;
+    } = _ref24;
     const queued = this.#koniState.getAuthRequestV2(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -541,10 +592,10 @@ class KoniExtension {
     });
     return true;
   }
-  authorizeRejectV2(_ref23) {
+  authorizeRejectV2(_ref25) {
     let {
       id
-    } = _ref23;
+    } = _ref25;
     const queued = this.#koniState.getAuthRequestV2(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -553,10 +604,10 @@ class KoniExtension {
     reject(new Error('Rejected'));
     return true;
   }
-  authorizeCancelV2(_ref24) {
+  authorizeCancelV2(_ref26) {
     let {
       id
-    } = _ref24;
+    } = _ref26;
     const queued = this.#koniState.getAuthRequestV2(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -606,7 +657,7 @@ class KoniExtension {
     return true;
   }
   getNonReadonlyAccounts() {
-    const storedAccounts = _accounts.accounts.subject.getValue();
+    const storedAccounts = this.#koniState.keyringService.accounts;
     const transformedAccounts = transformAccounts(storedAccounts);
     return transformedAccounts.filter(a => !a.isReadOnly).map(a => a.address);
   }
@@ -788,10 +839,10 @@ class KoniExtension {
     });
     return true;
   }
-  setCamera(_ref25) {
+  setCamera(_ref27) {
     let {
       camera
-    } = _ref25;
+    } = _ref27;
     this.#koniState.setCamera(camera);
     return true;
   }
@@ -840,8 +891,12 @@ class KoniExtension {
     } else {
       accountInfo.address = address;
       if (address !== _constants.ALL_ACCOUNT_KEY) {
-        const currentKeyPair = _uiKeyring.keyring.getAccount(address);
-        accountInfo.currentGenesisHash = (currentKeyPair === null || currentKeyPair === void 0 ? void 0 : currentKeyPair.meta.genesisHash) || _constants.ALL_GENESIS_HASH;
+        try {
+          const currentKeyPair = _uiKeyring.keyring.getPair(address);
+          accountInfo.currentGenesisHash = (currentKeyPair === null || currentKeyPair === void 0 ? void 0 : currentKeyPair.meta.genesisHash) || _constants.ALL_GENESIS_HASH;
+        } catch {
+          accountInfo.currentGenesisHash = _constants.ALL_GENESIS_HASH;
+        }
       } else {
         accountInfo.currentGenesisHash = accountInfo.allGenesisHash || _constants.ALL_GENESIS_HASH;
       }
@@ -851,18 +906,15 @@ class KoniExtension {
     });
   }
   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();
@@ -879,6 +931,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);
@@ -986,7 +1039,7 @@ class KoniExtension {
       }
     });
   }
-  async accountsCreateSuriV2(_ref26) {
+  async accountsCreateSuriV2(_ref28) {
     let {
       genesisHash,
       isAllowed,
@@ -994,7 +1047,7 @@ class KoniExtension {
       password,
       suri: _suri,
       types
-    } = _ref26;
+    } = _ref28;
     const addressDict = {};
     let changedAccount = false;
     const hasMasterPassword = _uiKeyring.keyring.keyring.hasMasterPassword;
@@ -1042,10 +1095,10 @@ class KoniExtension {
     });
     return addressDict;
   }
-  async accountsForgetOverride(_ref27) {
+  async accountsForgetOverride(_ref29) {
     let {
       address
-    } = _ref27;
+    } = _ref29;
     _uiKeyring.keyring.forgetAccount(address);
     await new Promise(resolve => {
       this.#koniState.removeAccountRef(address, () => {
@@ -1077,12 +1130,12 @@ class KoniExtension {
     });
     return true;
   }
-  seedCreateV2(_ref28) {
+  seedCreateV2(_ref30) {
     let {
       length = _Extension.SEED_DEFAULT_LENGTH,
       seed: _seed,
       types
-    } = _ref28;
+    } = _ref30;
     const seed = _seed || (0, _utilCrypto.mnemonicGenerate)(length);
     const rs = {
       seed: seed,
@@ -1093,11 +1146,11 @@ class KoniExtension {
     });
     return rs;
   }
-  seedValidateV2(_ref29) {
+  seedValidateV2(_ref31) {
     let {
       suri,
       types
-    } = _ref29;
+    } = _ref31;
     const {
       phrase
     } = (0, _utilCrypto.keyExtractSuri)(suri);
@@ -1117,11 +1170,11 @@ class KoniExtension {
     });
     return rs;
   }
-  _checkValidatePrivateKey(_ref30) {
+  _checkValidatePrivateKey(_ref32) {
     let {
       suri,
       types
-    } = _ref30;
+    } = _ref32;
     let autoAddPrefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const {
       phrase
@@ -1144,11 +1197,11 @@ class KoniExtension {
     }
     return rs;
   }
-  metamaskPrivateKeyValidateV2(_ref31) {
+  metamaskPrivateKeyValidateV2(_ref33) {
     let {
       suri,
       types
-    } = _ref31;
+    } = _ref33;
     const isValidSuri = suri.startsWith('0x');
     if (isValidSuri) {
       return this._checkValidatePrivateKey({
@@ -1173,14 +1226,14 @@ class KoniExtension {
       throw new Error(`"${suri}" is not a valid derivation path`);
     }
   }
-  derivationCreateV2(_ref32) {
+  derivationCreateV2(_ref34) {
     let {
       genesisHash,
       isAllowed,
       name,
       parentAddress,
       suri
-    } = _ref32;
+    } = _ref34;
     const childPair = this.deriveV2(parentAddress, suri, {
       genesisHash,
       name,
@@ -1194,14 +1247,14 @@ class KoniExtension {
     });
     return true;
   }
-  jsonRestoreV2(_ref33) {
+  jsonRestoreV2(_ref35) {
     let {
       address,
       file,
       isAllowed,
       password,
       withMasterPassword
-    } = _ref33;
+    } = _ref35;
     const isPasswordValidated = this.validatePassword(file, password);
     if (isPasswordValidated) {
       try {
@@ -1216,13 +1269,13 @@ class KoniExtension {
       throw new Error('Unable to decode using the supplied passphrase');
     }
   }
-  batchRestoreV2(_ref34) {
+  batchRestoreV2(_ref36) {
     let {
       accountsInfo,
       file,
       isAllowed,
       password
-    } = _ref34;
+    } = _ref36;
     const addressList = accountsInfo.map(acc => acc.address);
     const isPasswordValidated = this.validatedAccountsPassword(file, password);
     if (isPasswordValidated) {
@@ -1316,6 +1369,14 @@ class KoniExtension {
     });
     return historySubject.getValue();
   }
+  addContact(to) {
+    const toAddress = (0, _utils2.reformatAddress)(to);
+    const account = _uiKeyring.keyring.getAccount(toAddress);
+    const contact = _uiKeyring.keyring.getAddress(toAddress);
+    if (!account && (!contact || contact.meta.isRecent)) {
+      _uiKeyring.keyring.saveAddress(toAddress, {});
+    }
+  }
   validateTransfer(tokenSlug, from, to, value, transferAll) {
     const errors = [];
     const keypair = _uiKeyring.keyring.getPair(from);
@@ -1366,7 +1427,6 @@ 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';
@@ -1376,7 +1436,6 @@ class KoniExtension {
         [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);
@@ -1389,9 +1448,9 @@ class KoniExtension {
         to: to,
         substrateApi
       });
-      edAsWarning = true;
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
+    this.addContact(to);
     return this.#koniState.transactionService.handleTransaction({
       errors,
       warnings,
@@ -1404,7 +1463,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) {
@@ -1444,6 +1503,7 @@ class KoniExtension {
         substrateApi
       });
     }
+    this.addContact(to);
     return await this.#koniState.transactionService.handleTransaction({
       url: _constants2.EXTENSION_REQUEST_URL,
       address: from,
@@ -1453,6 +1513,7 @@ class KoniExtension {
       extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
       chainType: _KoniTypes.ChainType.SUBSTRATE,
       transferNativeAmount: (0, _utils._isNativeToken)(originTokenInfo) ? value : '0',
+      isTransferAll: inputData.transferAll,
       errors
     });
   }
@@ -1466,6 +1527,7 @@ class KoniExtension {
     const contractAddress = params.contractAddress;
     const tokenId = params.tokenId;
     const transaction = await (0, _transfer3.getERC721Transaction)(this.#koniState.getEvmApi(networkKey), contractAddress, senderAddress, recipientAddress, tokenId);
+    this.addContact(recipientAddress);
     return await this.#koniState.transactionService.handleTransaction({
       address: senderAddress,
       chain: networkKey,
@@ -1493,11 +1555,11 @@ class KoniExtension {
   async enableChain(networkKey) {
     return await this.#koniState.enableChain(networkKey);
   }
-  async validateNetwork(_ref35) {
+  async validateNetwork(_ref37) {
     let {
       existedChainSlug,
       provider
-    } = _ref35;
+    } = _ref37;
     return await this.#koniState.validateCustomChain(provider, existedChainSlug);
   }
   resetDefaultNetwork() {
@@ -1535,20 +1597,86 @@ class KoniExtension {
   async validateCustomAsset(data) {
     return await this.#koniState.validateCustomAsset(data);
   }
-  async getAddressFreeBalance(_ref36) {
+  async getAddressFreeBalance(_ref38) {
     let {
       address,
       networkKey,
       token
-    } = _ref36;
+    } = _ref38;
     return await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
   }
-  async subscribeAddressFreeBalance(_ref37, id, port) {
+  async transferGetMaxTransferable(_ref39) {
     let {
       address,
+      destChain,
+      isXcmTransfer,
       networkKey,
       token
-    } = _ref37;
+    } = _ref39;
+    const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
+    const tokenInfo = token ? this.#koniState.chainService.getAssetBySlug(token) : this.#koniState.chainService.getNativeTokenInfo(networkKey);
+    if (!(0, _utils._isNativeToken)(tokenInfo)) {
+      return freeBalance;
+    } else {
+      const substrateApi = this.#koniState.chainService.getSubstrateApi(networkKey);
+      let estimatedFee;
+      let maxTransferable = new _util.BN(freeBalance.value);
+      if (isXcmTransfer) {
+        const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
+        const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, tokenInfo.slug);
+        if (!destinationTokenInfo) {
+          estimatedFee = '0';
+        } else {
+          maxTransferable = maxTransferable.sub(new _util.BN(tokenInfo.minAmount || '0'));
+          const mockTx = await (0, _xcm.createXcmExtrinsic)({
+            chainInfoMap,
+            destinationTokenInfo,
+            originTokenInfo: tokenInfo,
+            recipient: address,
+            sendingValue: '0',
+            substrateApi
+          });
+          try {
+            var _paymentInfo$partialF;
+            const paymentInfo = await mockTx.paymentInfo(address);
+            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);
+          }
+        }
+      } else {
+        const [mockTx] = await (0, _transfer.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 _util.BN(estimatedFee));
+      return {
+        ...freeBalance,
+        value: maxTransferable.gt(_util.BN_ZERO) ? maxTransferable.toString() || '0' : '0'
+      };
+    }
+  }
+  async subscribeAddressFreeBalance(_ref40, id, port) {
+    let {
+      address,
+      networkKey,
+      token
+    } = _ref40;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const [unsub, currentFreeBalance] = await this.#koniState.balanceService.subscribeTokenFreeBalance(address, networkKey, token, cb);
     this.createUnsubscriptionHandle(id, unsub);
@@ -1557,26 +1685,26 @@ class KoniExtension {
     });
     return currentFreeBalance;
   }
-  async transferCheckReferenceCount(_ref38) {
+  async transferCheckReferenceCount(_ref41) {
     let {
       address,
       networkKey
-    } = _ref38;
+    } = _ref41;
     // 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(_ref39) {
+  async transferCheckSupporting(_ref42) {
     let {
       networkKey,
       tokenSlug
-    } = _ref39;
+    } = _ref42;
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     return await (0, _transfer.checkSupportTransfer)(networkKey, tokenInfo, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
   }
-  transferGetExistentialDeposit(_ref40) {
+  transferGetExistentialDeposit(_ref43) {
     let {
       tokenSlug
-    } = _ref40;
+    } = _ref43;
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     return (0, _utils._getTokenMinAmount)(tokenInfo);
   }
@@ -1593,6 +1721,7 @@ class KoniExtension {
     const networkKey = params === null || params === void 0 ? void 0 : params.networkKey;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const extrinsic = !isPSP34 ? (0, _transfer2.getNftTransferExtrinsic)(networkKey, apiProps, senderAddress, recipientAddress, params || {}) : await (0, _wasm.getPSP34TransferExtrinsic)(networkKey, apiProps, senderAddress, recipientAddress, params || {});
+    this.addContact(recipientAddress);
     const rs = await this.#koniState.transactionService.handleTransaction({
       address: senderAddress,
       chain: networkKey,
@@ -1617,41 +1746,24 @@ class KoniExtension {
     }
     return true;
   }
-  getAccountMeta(_ref41) {
+  getAccountMeta(_ref44) {
     let {
       address
-    } = _ref41;
+    } = _ref44;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, 'Unable to find pair');
     return {
       meta: pair.meta
     };
   }
-
-  // private async isInWalletAccount (address?: string) {
-  //   return new Promise((resolve) => {
-  //     if (address) {
-  //       accountsObservable.subject.subscribe((storedAccounts: SubjectInfo): void => {
-  //         if (storedAccounts[address]) {
-  //           resolve(true);
-  //         }
-  //
-  //         resolve(false);
-  //       });
-  //     } else {
-  //       resolve(false);
-  //     }
-  //   });
-  // }
-
-  accountsTie2(_ref42) {
+  accountsTie2(_ref45) {
     let {
       address,
       genesisHash
-    } = _ref42;
+    } = _ref45;
     return this.#koniState.setAccountTie(address, genesisHash);
   }
-  async accountsCreateExternalV2(_ref43) {
+  async accountsCreateExternalV2(_ref46) {
     let {
       address,
       genesisHash,
@@ -1659,7 +1771,7 @@ class KoniExtension {
       isEthereum,
       isReadOnly,
       name
-    } = _ref43;
+    } = _ref46;
     try {
       let result;
       try {
@@ -1718,7 +1830,7 @@ class KoniExtension {
       }];
     }
   }
-  async accountsCreateHardwareV2(_ref44) {
+  async accountsCreateHardwareV2(_ref47) {
     let {
       accountIndex,
       address,
@@ -1727,7 +1839,7 @@ class KoniExtension {
       hardwareType,
       isAllowed,
       name
-    } = _ref44;
+    } = _ref47;
     const key = _uiKeyring.keyring.addHardware(address, hardwareType, {
       accountIndex,
       addressOffset,
@@ -1750,10 +1862,10 @@ class KoniExtension {
     });
     return true;
   }
-  async accountsCreateHardwareMultiple(_ref45) {
+  async accountsCreateHardwareMultiple(_ref48) {
     let {
       accounts
-    } = _ref45;
+    } = _ref48;
     const addresses = [];
     if (!accounts.length) {
       throw new Error('No accounts to import');
@@ -1804,14 +1916,14 @@ class KoniExtension {
     });
     return true;
   }
-  async accountsCreateWithSecret(_ref46) {
+  async accountsCreateWithSecret(_ref49) {
     let {
       isAllow,
       isEthereum,
       name,
       publicKey,
       secretKey
-    } = _ref46;
+    } = _ref49;
     try {
       let keyringPair = null;
       if (isEthereum) {
@@ -1954,30 +2066,30 @@ class KoniExtension {
 
   // Parse transaction
 
-  parseSubstrateTransaction(_ref47) {
+  parseSubstrateTransaction(_ref50) {
     let {
       data,
       networkKey
-    } = _ref47;
+    } = _ref50;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const apiPromise = apiProps.api;
     return (0, _parseTransaction.parseSubstrateTransaction)(data, apiPromise);
   }
-  async parseEVMRLP(_ref48) {
+  async parseEVMRLP(_ref51) {
     let {
       data
-    } = _ref48;
+    } = _ref51;
     return await (0, _parseTransaction2.parseEvmRlp)(data, this.#koniState.getChainInfoMap(), this.#koniState.getEvmApiMap());
   }
 
   // Sign
 
-  qrSignSubstrate(_ref49) {
+  qrSignSubstrate(_ref52) {
     let {
       address,
       data,
       networkKey
-    } = _ref49;
+    } = _ref52;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, 'Unable to find pair');
     if (pair.isLocked) {
@@ -1994,13 +2106,13 @@ class KoniExtension {
       signature: signed
     };
   }
-  async qrSignEVM(_ref50) {
+  async qrSignEVM(_ref53) {
     let {
       address,
       chainId,
       message,
       type
-    } = _ref50;
+    } = _ref53;
     let signed;
     const network = this.getNetworkJsonByChainId(chainId);
     if (!network) {
@@ -2081,11 +2193,11 @@ class KoniExtension {
     });
     return this.#koniState.getNominatorMetadata();
   }
-  async getBondingOptions(_ref51) {
+  async getBondingOptions(_ref54) {
     let {
       chain,
       type
-    } = _ref51;
+    } = _ref54;
     const apiProps = this.#koniState.getSubstrateApi(chain);
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, type);
@@ -2099,6 +2211,7 @@ 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) {
@@ -2109,12 +2222,15 @@ class KoniExtension {
       nominatorMetadata,
       selectedValidators
     } = inputData;
-    if (!amount || !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, selectedValidators, substrateApi, address, nominatorMetadata);
     console.log('Bonding extrinsic: ', chain, extrinsic.toHex());
@@ -2125,7 +2241,8 @@ class KoniExtension {
       data: inputData,
       extrinsicType: _KoniTypes.ExtrinsicType.STAKING_BOND,
       transaction: extrinsic,
-      url: _constants2.EXTENSION_REQUEST_URL
+      url: _constants2.EXTENSION_REQUEST_URL,
+      transferNativeAmount: amount
     });
   }
   async submitUnbonding(inputData) {
@@ -2135,12 +2252,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());
+    console.log('Unbonding extrinsic: ', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address: nominatorMetadata.address,
       chain: chain,
@@ -2214,7 +2336,7 @@ class KoniExtension {
       chainType: _KoniTypes.ChainType.SUBSTRATE
     });
   }
-  async submitPoolingBonding(inputData) {
+  async submitPoolBonding(inputData) {
     const {
       address,
       amount,
@@ -2222,8 +2344,15 @@ class KoniExtension {
       nominatorMetadata,
       selectedPool
     } = inputData;
-
-    // TODO: can't stake when unstake all
+    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());
@@ -2242,6 +2371,14 @@ 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());
@@ -2256,12 +2393,12 @@ class KoniExtension {
   }
 
   // EVM Transaction
-  async parseContractInput(_ref52) {
+  async parseContractInput(_ref55) {
     let {
       chainId,
       contract,
       data
-    } = _ref52;
+    } = _ref55;
     const network = this.getNetworkJsonByChainId(chainId);
     return await (0, _parseTransaction2.parseContractInput)(data, contract, network);
   }
@@ -2324,12 +2461,12 @@ class KoniExtension {
     });
     return this.#koniState.keyringService.keyringState;
   }
-  keyringChangeMasterPassword(_ref53) {
+  keyringChangeMasterPassword(_ref56) {
     let {
       createNew,
       newPassword,
       oldPassword
-    } = _ref53;
+    } = _ref56;
     try {
       // Remove isMasterPassword meta if createNew
       if (createNew) {
@@ -2360,11 +2497,11 @@ class KoniExtension {
       errors: []
     };
   }
-  keyringMigrateMasterPassword(_ref54) {
+  keyringMigrateMasterPassword(_ref57) {
     let {
       address,
       password
-    } = _ref54;
+    } = _ref57;
     try {
       _uiKeyring.keyring.migrateWithMasterPassword(address, password);
     } catch (e) {
@@ -2379,10 +2516,10 @@ class KoniExtension {
       errors: []
     };
   }
-  keyringUnlock(_ref55) {
+  keyringUnlock(_ref58) {
     let {
       password
-    } = _ref55;
+    } = _ref58;
     try {
       _uiKeyring.keyring.unlockKeyring(password);
     } catch (e) {
@@ -2402,11 +2539,11 @@ class KoniExtension {
     this.#koniState.updateKeyringState();
     clearTimeout(this.#lockTimeOut);
   }
-  keyringExportMnemonic(_ref56) {
+  keyringExportMnemonic(_ref59) {
     let {
       address,
       password
-    } = _ref56;
+    } = _ref59;
     const pair = _uiKeyring.keyring.getPair(address);
     const result = pair.exportMnemonic(password);
     return {
@@ -2415,10 +2552,10 @@ class KoniExtension {
   }
 
   /// Signing external request
-  signingApprovePasswordV2(_ref57) {
+  signingApprovePasswordV2(_ref60) {
     let {
       id
-    } = _ref57;
+    } = _ref60;
     const queued = this.#koniState.getSignRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -2471,22 +2608,22 @@ class KoniExtension {
 
   /// Derive account
 
-  derivationCreateMultiple(_ref58) {
+  derivationCreateMultiple(_ref61) {
     let {
       isAllowed,
       items,
       parentAddress
-    } = _ref58;
+    } = _ref61;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
       _uiKeyring.keyring.unlockPair(parentPair.address);
     }
-    const createChild = _ref59 => {
+    const createChild = _ref62 => {
       let {
         name,
         suri
-      } = _ref59;
+      } = _ref62;
       const meta = {
         name: name,
         parentAddress
@@ -2532,10 +2669,10 @@ class KoniExtension {
     }
     return true;
   }
-  derivationCreateV3(_ref60) {
+  derivationCreateV3(_ref63) {
     let {
       address: parentAddress
-    } = _ref60;
+    } = _ref63;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2567,11 +2704,11 @@ class KoniExtension {
     });
     return true;
   }
-  validateDerivePath(_ref61) {
+  validateDerivePath(_ref64) {
     let {
       parentAddress,
       suri
-    } = _ref61;
+    } = _ref64;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2604,12 +2741,12 @@ class KoniExtension {
       suri: meta.suri
     };
   }
-  getListDeriveAccounts(_ref62) {
+  getListDeriveAccounts(_ref65) {
     let {
       limit,
       page,
       parentAddress
-    } = _ref62;
+    } = _ref65;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2700,10 +2837,10 @@ class KoniExtension {
   getSupportedSmartContractTypes() {
     return this.#koniState.getSupportedSmartContractTypes();
   }
-  getTransaction(_ref63) {
+  getTransaction(_ref66) {
     let {
       id
-    } = _ref63;
+    } = _ref66;
     const {
       transaction,
       ...transactionResult
@@ -2713,8 +2850,8 @@ class KoniExtension {
   subscribeTransactions(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     function convertRs(rs) {
-      return Object.fromEntries(Object.entries(rs).map(_ref64 => {
-        let [key, value] = _ref64;
+      return Object.fromEntries(Object.entries(rs).map(_ref67 => {
+        let [key, value] = _ref67;
         const {
           transaction,
           ...transactionResult
@@ -2744,6 +2881,17 @@ class KoniExtension {
     });
     return notificationSubject.value;
   }
+  async reloadCron(_ref68) {
+    let {
+      data
+    } = _ref68;
+    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
@@ -2762,8 +2910,6 @@ class KoniExtension {
         return this.accountsCreateSuri(request);
       case 'pri(accounts.changePassword)':
         return this.accountsChangePassword(request);
-      case 'pri(accounts.edit)':
-        return this.accountsEdit(request);
       case 'pri(accounts.export)':
         return this.accountsExport(request);
       case 'pri(accounts.show)':
@@ -2832,40 +2978,6 @@ class KoniExtension {
         return this.getAuthListV2();
       case 'pri(authorize.toggle)':
         return this.toggleAuthorization2(request);
-      case 'pri(accounts.create.suriV2)':
-        return await this.accountsCreateSuriV2(request);
-      case 'pri(accounts.forget)':
-        return await this.accountsForgetOverride(request);
-      case 'pri(accounts.create.externalV2)':
-        return await this.accountsCreateExternalV2(request);
-      case 'pri(accounts.create.hardwareV2)':
-        return await this.accountsCreateHardwareV2(request);
-      case 'pri(accounts.create.hardwareMultiple)':
-        return await this.accountsCreateHardwareMultiple(request);
-      case 'pri(accounts.create.withSecret)':
-        return await this.accountsCreateWithSecret(request);
-      case 'pri(seed.createV2)':
-        return this.seedCreateV2(request);
-      case 'pri(seed.validateV2)':
-        return this.seedValidateV2(request);
-      case 'pri(privateKey.validateV2)':
-        return this.metamaskPrivateKeyValidateV2(request);
-      case 'pri(accounts.exportPrivateKey)':
-        return this.accountExportPrivateKey(request);
-      case 'pri(accounts.checkPublicAndSecretKey)':
-        return this.checkPublicAndSecretKey(request);
-      case 'pri(accounts.subscribeWithCurrentAddress)':
-        return await this.accountsGetAllWithCurrentAddress(id, port);
-      case 'pri(accounts.subscribeAccountsInputAddress)':
-        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);
-      case 'pri(accounts.updateCurrentAddress)':
-        return this.updateCurrentAccountAddress(request);
       case 'pri(settings.changeBalancesVisibility)':
         return this.toggleBalancesVisibility(id, port);
       case 'pri(settings.subscribe)':
@@ -2915,6 +3027,65 @@ class KoniExtension {
       case 'pri(transaction.history.getSubscription)':
         return await this.subscribeHistory(id, port);
 
+      /// Account management
+      // Add account
+      case 'pri(accounts.create.suriV2)':
+        return await this.accountsCreateSuriV2(request);
+      case 'pri(accounts.create.externalV2)':
+        return await this.accountsCreateExternalV2(request);
+      case 'pri(accounts.create.hardwareV2)':
+        return await this.accountsCreateHardwareV2(request);
+      case 'pri(accounts.create.hardwareMultiple)':
+        return await this.accountsCreateHardwareMultiple(request);
+      case 'pri(accounts.create.withSecret)':
+        return await this.accountsCreateWithSecret(request);
+      case 'pri(seed.createV2)':
+        return this.seedCreateV2(request);
+
+      // Remove account
+      case 'pri(accounts.forget)':
+        return await this.accountsForgetOverride(request);
+
+      // Validate account
+      case 'pri(seed.validateV2)':
+        return this.seedValidateV2(request);
+      case 'pri(privateKey.validateV2)':
+        return this.metamaskPrivateKeyValidateV2(request);
+      case 'pri(accounts.checkPublicAndSecretKey)':
+        return this.checkPublicAndSecretKey(request);
+
+      // Export account
+      case 'pri(accounts.exportPrivateKey)':
+        return this.accountExportPrivateKey(request);
+
+      // Subscribe account
+      case 'pri(accounts.subscribeWithCurrentAddress)':
+        return await this.accountsGetAllWithCurrentAddress(id, port);
+      case 'pri(accounts.subscribeAccountsInputAddress)':
+        return this.accountsGetAll(id, port);
+
+      // Save current account
+      case 'pri(currentAccount.saveAddress)':
+        return await this.saveCurrentAccountAddress(request);
+      case 'pri(accounts.updateCurrentAddress)':
+        return this.updateCurrentAccountAddress(request);
+
+      // Edit account
+      case 'pri(accounts.edit)':
+        return this.accountsEdit(request);
+
+      // Save contact address
+      case 'pri(accounts.saveRecent)':
+        return this.saveRecentAccount(request);
+      case 'pri(accounts.editContact)':
+        return this.editContactAccount(request);
+      case 'pri(accounts.deleteContact)':
+        return this.deleteContactAccount(request);
+
+      // Subscribe address
+      case 'pri(accounts.subscribeAddresses)':
+        return this.subscribeAddresses(id, port);
+
       // ChainService
       case 'pri(chainService.subscribeChainInfoMap)':
         return this.subscribeChainInfoMap(id, port);
@@ -2958,6 +3129,8 @@ class KoniExtension {
         return await this.transferCheckSupporting(request);
       case 'pri(transfer.getExistentialDeposit)':
         return this.transferGetExistentialDeposit(request);
+      case 'pri(transfer.getMaxTransferable)':
+        return this.transferGetMaxTransferable(request);
       case 'pri(freeBalance.get)':
         return this.getAddressFreeBalance(request);
       case 'pri(freeBalance.subscribe)':
@@ -2969,7 +3142,7 @@ class KoniExtension {
       case 'pri(accounts.get.meta)':
         return this.getAccountMeta(request);
 
-      // Send NFT
+      /// Send NFT
       case 'pri(evmNft.submitTransaction)':
         return this.evmNftSubmitTransaction(request);
       case 'pri(substrateNft.submitTransaction)':
@@ -3027,7 +3200,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);
 
@@ -3076,6 +3249,8 @@ class KoniExtension {
       // Notification
       case 'pri(notifications.subscribe)':
         return this.subscribeNotifications(id, port);
+      case 'pri(cron.reload)':
+        return await this.reloadCron(request);
 
       // Default
       default: