@subwallet/extension-base 1.0.2-2 → 1.0.3-0

package/koni/background/handlers/Extension.js

@@ -6,30 +6,31 @@ 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 { 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, _isLocalToken, _isNativeToken, _isTokenEvmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
+import { reformatAddress } from '@subwallet/extension-base/utils';
+import { convertSubjectInfoToAddresses } from '@subwallet/extension-base/utils/address';
 import { createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPair } from '@subwallet/keyring';
 import { keyring } from '@subwallet/ui-keyring';
-import { accounts as accountsObservable } from '@subwallet/ui-keyring/observable/accounts';
 import BigN from 'bignumber.js';
 import { Transaction } from 'ethereumjs-tx';
 import { TypeRegistry } from '@polkadot/types';
-import { assert, BN, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
-import { base64Decode, isEthereumAddress, jsonDecrypt, keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
+import { assert, BN, BN_ZERO, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
+import { base64Decode, decodeAddress, isAddress, isEthereumAddress, jsonDecrypt, keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
 const ETH_DERIVE_DEFAULT = '/m/44\'/60\'/0\'/0/0';
 function getSuri(seed, type) {
   return type === 'ethereum' ? `${seed}${ETH_DERIVE_DEFAULT}` : seed;
@@ -163,7 +164,8 @@ export default class KoniExtension {
   // FIXME This looks very much like what we have in Tabs
   accountsSubscribe(id, port) {
     const cb = createSubscription(id, port);
-    const subscription = accountsObservable.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();
@@ -401,35 +403,37 @@ 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(() => {
-          const accountInfo = this.#koniState.keyringService.currentAccount;
-          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 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 = createSubscription(id, port);
@@ -445,21 +449,66 @@ export default class KoniExtension {
     });
     return id;
   }
-  saveRecentAccountId({
+  subscribeAddresses(id, port) {
+    const _cb = createSubscription(id, port);
+    const subscription = this.#koniState.keyringService.addressesSubject.subscribe(subjectInfo => {
+      const addresses = convertSubjectInfoToAddresses(subjectInfo);
+      _cb({
+        addresses: addresses
+      });
+    });
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    const subjectInfo = this.#koniState.keyringService.addresses;
+    return {
+      addresses: convertSubjectInfoToAddresses(subjectInfo)
+    };
+  }
+  saveRecentAccount({
     accountId
   }) {
-    return keyring.saveRecent(accountId);
+    if (isAddress(accountId)) {
+      const address = reformatAddress(accountId);
+      const account = keyring.getAccount(address);
+      const contact = keyring.getAddress(address);
+      return account || contact || {
+        ...keyring.saveRecent(accountId).json,
+        publicKey: decodeAddress(address)
+      };
+    } else {
+      throw Error('Invalid address');
+    }
   }
-  triggerAccountsSubscription() {
-    const accountsSubject = accountsObservable.subject;
-    accountsSubject.next(accountsSubject.getValue());
-    return true;
+  editContactAccount({
+    address,
+    meta
+  }) {
+    if (isAddress(address)) {
+      const _address = reformatAddress(address);
+      keyring.saveAddress(_address, meta);
+      return true;
+    } else {
+      throw Error('Invalid address');
+    }
+  }
+  deleteContactAccount({
+    address
+  }) {
+    if (isAddress(address)) {
+      const _address = reformatAddress(address);
+      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 = accountsObservable.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 => {
@@ -573,7 +622,7 @@ export default class KoniExtension {
     return true;
   }
   getNonReadonlyAccounts() {
-    const storedAccounts = accountsObservable.subject.getValue();
+    const storedAccounts = this.#koniState.keyringService.accounts;
     const transformedAccounts = transformAccounts(storedAccounts);
     return transformedAccounts.filter(a => !a.isReadOnly).map(a => a.address);
   }
@@ -806,8 +855,12 @@ export default class KoniExtension {
     } else {
       accountInfo.address = address;
       if (address !== ALL_ACCOUNT_KEY) {
-        const currentKeyPair = keyring.getAccount(address);
-        accountInfo.currentGenesisHash = (currentKeyPair === null || currentKeyPair === void 0 ? void 0 : currentKeyPair.meta.genesisHash) || ALL_GENESIS_HASH;
+        try {
+          const currentKeyPair = keyring.getPair(address);
+          accountInfo.currentGenesisHash = (currentKeyPair === null || currentKeyPair === void 0 ? void 0 : currentKeyPair.meta.genesisHash) || ALL_GENESIS_HASH;
+        } catch {
+          accountInfo.currentGenesisHash = ALL_GENESIS_HASH;
+        }
       } else {
         accountInfo.currentGenesisHash = accountInfo.allGenesisHash || ALL_GENESIS_HASH;
       }
@@ -817,18 +870,15 @@ export default class KoniExtension {
     });
   }
   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();
@@ -845,6 +895,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);
@@ -1272,6 +1323,14 @@ export default class KoniExtension {
     });
     return historySubject.getValue();
   }
+  addContact(to) {
+    const toAddress = reformatAddress(to);
+    const account = keyring.getAccount(toAddress);
+    const contact = keyring.getAddress(toAddress);
+    if (!account && (!contact || contact.meta.isRecent)) {
+      keyring.saveAddress(toAddress, {});
+    }
+  }
   validateTransfer(tokenSlug, from, to, value, transferAll) {
     const errors = [];
     const keypair = keyring.getPair(from);
@@ -1322,7 +1381,6 @@ 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';
@@ -1332,7 +1390,6 @@ export default class KoniExtension {
         [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);
@@ -1345,9 +1402,9 @@ export default class KoniExtension {
         to: to,
         substrateApi
       });
-      edAsWarning = true;
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
+    this.addContact(to);
     return this.#koniState.transactionService.handleTransaction({
       errors,
       warnings,
@@ -1360,7 +1417,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) {
@@ -1400,6 +1457,7 @@ export default class KoniExtension {
         substrateApi
       });
     }
+    this.addContact(to);
     return await this.#koniState.transactionService.handleTransaction({
       url: EXTENSION_REQUEST_URL,
       address: from,
@@ -1409,6 +1467,7 @@ export default class KoniExtension {
       extrinsicType: ExtrinsicType.TRANSFER_XCM,
       chainType: ChainType.SUBSTRATE,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
+      isTransferAll: inputData.transferAll,
       errors
     });
   }
@@ -1422,6 +1481,7 @@ export default class KoniExtension {
     const contractAddress = params.contractAddress;
     const tokenId = params.tokenId;
     const transaction = await getERC721Transaction(this.#koniState.getEvmApi(networkKey), contractAddress, senderAddress, recipientAddress, tokenId);
+    this.addContact(recipientAddress);
     return await this.#koniState.transactionService.handleTransaction({
       address: senderAddress,
       chain: networkKey,
@@ -1497,6 +1557,71 @@ export default class KoniExtension {
   }) {
     return await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
   }
+  async transferGetMaxTransferable({
+    address,
+    destChain,
+    isXcmTransfer,
+    networkKey,
+    token
+  }) {
+    const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
+    const tokenInfo = token ? this.#koniState.chainService.getAssetBySlug(token) : this.#koniState.chainService.getNativeTokenInfo(networkKey);
+    if (!_isNativeToken(tokenInfo)) {
+      return freeBalance;
+    } else {
+      const substrateApi = this.#koniState.chainService.getSubstrateApi(networkKey);
+      let estimatedFee;
+      let maxTransferable = new 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 BN(tokenInfo.minAmount || '0'));
+          const mockTx = await 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 createTransferExtrinsic({
+          from: address,
+          networkKey,
+          substrateApi,
+          to: address,
+          tokenInfo,
+          transferAll: true,
+          value: '0'
+        });
+        try {
+          var _paymentInfo$partialF2;
+          const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
+          estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF2 = paymentInfo.partialFee) === null || _paymentInfo$partialF2 === void 0 ? void 0 : _paymentInfo$partialF2.toString()) || '0';
+        } catch (e) {
+          estimatedFee = '0';
+          console.warn('Error estimating fee', e);
+        }
+      }
+      maxTransferable = maxTransferable.sub(new BN(estimatedFee));
+      return {
+        ...freeBalance,
+        value: maxTransferable.gt(BN_ZERO) ? maxTransferable.toString() || '0' : '0'
+      };
+    }
+  }
   async subscribeAddressFreeBalance({
     address,
     networkKey,
@@ -1543,6 +1668,7 @@ export default class KoniExtension {
     const networkKey = params === null || params === void 0 ? void 0 : params.networkKey;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const extrinsic = !isPSP34 ? getNftTransferExtrinsic(networkKey, apiProps, senderAddress, recipientAddress, params || {}) : await getPSP34TransferExtrinsic(networkKey, apiProps, senderAddress, recipientAddress, params || {});
+    this.addContact(recipientAddress);
     const rs = await this.#koniState.transactionService.handleTransaction({
       address: senderAddress,
       chain: networkKey,
@@ -1576,23 +1702,6 @@ export default class KoniExtension {
       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({
     address,
     genesisHash
@@ -2038,6 +2147,7 @@ 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) {
@@ -2048,12 +2158,15 @@ export default class KoniExtension {
       nominatorMetadata,
       selectedValidators
     } = inputData;
-    if (!amount || !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, selectedValidators, substrateApi, address, nominatorMetadata);
     console.log('Bonding extrinsic: ', chain, extrinsic.toHex());
@@ -2064,7 +2177,8 @@ export default class KoniExtension {
       data: inputData,
       extrinsicType: ExtrinsicType.STAKING_BOND,
       transaction: extrinsic,
-      url: EXTENSION_REQUEST_URL
+      url: EXTENSION_REQUEST_URL,
+      transferNativeAmount: amount
     });
   }
   async submitUnbonding(inputData) {
@@ -2074,12 +2188,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());
+    console.log('Unbonding extrinsic: ', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address: nominatorMetadata.address,
       chain: chain,
@@ -2153,7 +2272,7 @@ export default class KoniExtension {
       chainType: ChainType.SUBSTRATE
     });
   }
-  async submitPoolingBonding(inputData) {
+  async submitPoolBonding(inputData) {
     const {
       address,
       amount,
@@ -2161,8 +2280,15 @@ export default 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, 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());
@@ -2181,6 +2307,14 @@ 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());
@@ -2670,6 +2804,23 @@ 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);
+  }
+  async getLogoMap() {
+    const [chainLogoMap, assetLogoMap] = await Promise.all([this.#koniState.chainService.getChainLogoMap(), this.#koniState.chainService.getAssetLogoMap()]);
+    return {
+      chainLogoMap,
+      assetLogoMap
+    };
+  }
 
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
@@ -2688,8 +2839,6 @@ export default 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)':
@@ -2758,40 +2907,6 @@ export default 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)':
@@ -2841,6 +2956,65 @@ export default 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);
@@ -2884,6 +3058,8 @@ export default 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)':
@@ -2895,7 +3071,7 @@ export default 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)':
@@ -2953,7 +3129,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);
 
@@ -3002,6 +3178,10 @@ export default class KoniExtension {
       // Notification
       case 'pri(notifications.subscribe)':
         return this.subscribeNotifications(id, port);
+      case 'pri(cron.reload)':
+        return await this.reloadCron(request);
+      case 'pri(settings.getLogoMaps)':
+        return await this.getLogoMap();
 
       // Default
       default: