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

package/cjs/services/transaction-service/index.js

@@ -12,6 +12,7 @@ var _TransactionWarning = require("@subwallet/extension-base/background/warnings
 var _constants = require("@subwallet/extension-base/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _constants2 = require("@subwallet/extension-base/services/request-service/constants");
+var _constants3 = require("@subwallet/extension-base/services/transaction-service/constants");
 var _eventParser = require("@subwallet/extension-base/services/transaction-service/event-parser");
 var _helpers = require("@subwallet/extension-base/services/transaction-service/helpers");
 var _utils2 = require("@subwallet/extension-base/services/transaction-service/utils");
@@ -276,7 +277,7 @@ class TransactionService {
   getTransactionLink(id) {
     const transaction = this.getTransaction(id);
     const chainInfo = this.chainService.getChainInfoByKey(transaction.chain);
-    return (0, _utils2.getTransactionLink)(chainInfo, transaction.extrinsicHash);
+    return (0, _utils2.getExplorerLink)(chainInfo, transaction.extrinsicHash, 'tx');
   }
   transactionToHistories(id, eventLogs) {
     const transaction = this.getTransaction(id);
@@ -463,7 +464,7 @@ class TransactionService {
     let {
       id
     } = _ref;
-    console.log(`Transaction "${id}" is signed`);
+    console.debug(`Transaction "${id}" is signed`);
   }
   onSend(_ref2) {
     let {
@@ -476,23 +477,25 @@ class TransactionService {
 
     // Create Input History Transaction History
     this.historyService.insertHistories(this.transactionToHistories(id)).catch(console.error);
-    console.log(`Transaction "${id}" is sent`);
+    console.debug(`Transaction "${id}" is sent`);
   }
   onHasTransactionHash(_ref3) {
     let {
+      blockHash,
       extrinsicHash,
       id
     } = _ref3;
     // Write processing transaction history
     const updateData = {
       extrinsicHash,
-      status: _KoniTypes.ExtrinsicStatus.PROCESSING
+      status: _KoniTypes.ExtrinsicStatus.PROCESSING,
+      blockHash: blockHash || ''
     };
     this.updateTransaction(id, updateData);
 
     // In this case transaction id is the same as extrinsic hash and will change after below update
     this.historyService.updateHistoryByExtrinsicHash(id, updateData).catch(console.error);
-    console.log(`Transaction "${id}" is submitted with hash ${extrinsicHash || ''}`);
+    console.debug(`Transaction "${id}" is submitted with hash ${extrinsicHash || ''}`);
   }
   handlePostProcessing(id) {
     // must be done after success/failure to make sure the transaction is finalized
@@ -530,7 +533,6 @@ class TransactionService {
     this.updateTransaction(id, {
       status: _KoniTypes.ExtrinsicStatus.SUCCESS
     });
-    console.log('Transaction completed', id, transaction.extrinsicHash);
 
     // Write success transaction history
     this.historyService.updateHistories(transaction.chain, transaction.extrinsicHash, {
@@ -563,7 +565,6 @@ class TransactionService {
         status: nextStatus,
         errors
       });
-      console.log('Transaction failed', id, transaction.extrinsicHash);
 
       // Write failed transaction history
       this.historyService.updateHistories(transaction.chain, transaction.extrinsicHash, {
@@ -582,8 +583,6 @@ class TransactionService {
       });
     }
     this.eventService.emit('transaction.failed', transaction);
-    // Log transaction errors
-    console.error(errors);
   }
   generateHashPayload(chain, transaction) {
     const chainInfo = this.chainService.getChainInfoByKey(chain);
@@ -694,6 +693,7 @@ class TransactionService {
         emitter.emit('signed', eventData);
 
         // Send transaction
+        this.handleTransactionTimeout(emitter, eventData);
         emitter.emit('send', eventData); // This event is needed after sending transaction with queue
         signedTransaction && web3Api.eth.sendSignedTransaction(signedTransaction).once('transactionHash', hash => {
           eventData.extrinsicHash = hash;
@@ -749,7 +749,9 @@ class TransactionService {
       emitter.emit('signed', eventData);
 
       // Send transaction
+      this.handleTransactionTimeout(emitter, eventData);
       emitter.emit('send', eventData); // This event is needed after sending transaction with queue
+
       rs.send(txState => {
         // handle events, logs, history
         if (!txState || !txState.status) {
@@ -759,6 +761,7 @@ class TransactionService {
           eventData.eventLogs = txState.events;
           if (!eventData.extrinsicHash || eventData.extrinsicHash === '') {
             eventData.extrinsicHash = txState.txHash.toHex();
+            eventData.blockHash = txState.status.asInBlock.toHex();
             emitter.emit('extrinsicHash', eventData);
           }
         }
@@ -798,5 +801,24 @@ class TransactionService {
     });
     return emitter;
   }
+  handleTransactionTimeout(emitter, eventData) {
+    const timeout = setTimeout(() => {
+      const transaction = this.getTransaction(eventData.id);
+      if (transaction.status !== _KoniTypes.ExtrinsicStatus.SUCCESS && transaction.status !== _KoniTypes.ExtrinsicStatus.FAIL) {
+        eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.TIMEOUT, 'Transaction timeout'));
+        emitter.emit('error', eventData);
+        clearTimeout(timeout);
+      }
+    }, _constants3.TRANSACTION_TIMEOUT);
+    emitter.once('success', () => {
+      clearTimeout(timeout);
+    });
+    emitter.once('error', () => {
+      clearTimeout(timeout);
+    });
+  }
+  resetWallet() {
+    this.transactionSubject.next({});
+  }
 }
 exports.default = TransactionService;

package/cjs/services/transaction-service/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTransactionLink = getTransactionLink;
+exports.getExplorerLink = getExplorerLink;
 exports.parseTransactionData = parseTransactionData;
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -14,19 +14,30 @@ function parseTransactionData(data) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return data;
 }
-function getTransactionLink(chainInfo, extrinsicHash) {
-  if (extrinsicHash.startsWith('0x')) {
-    const explorerLink = (0, _utils._getBlockExplorerFromChain)(chainInfo);
-    if ((0, _utils._isPureEvmChain)(chainInfo)) {
-      if (explorerLink) {
-        return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}tx/${extrinsicHash}`;
-      }
-    } else {
-      const explorerLink = (0, _utils._getBlockExplorerFromChain)(chainInfo);
-      if (explorerLink) {
-        return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}extrinsic/${extrinsicHash}`;
-      }
-    }
+function getBlockExplorerAccountRoute(explorerLink) {
+  if (explorerLink.includes('explorer.subspace.network')) {
+    return 'accounts';
+  }
+  if (explorerLink.includes('subscan.io')) {
+    return 'account';
+  }
+  return 'address';
+}
+function getBlockExplorerTxRoute(chainInfo) {
+  if ((0, _utils._isPureEvmChain)(chainInfo)) {
+    return 'tx';
+  }
+  return 'extrinsic';
+}
+function getExplorerLink(chainInfo, value, type) {
+  const explorerLink = (0, _utils._getBlockExplorerFromChain)(chainInfo);
+  if (explorerLink && type === 'account') {
+    const route = getBlockExplorerAccountRoute(explorerLink);
+    return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
+  }
+  if (explorerLink && value.startsWith('0x')) {
+    const route = getBlockExplorerTxRoute(chainInfo);
+    return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
   }
   return undefined;
 }

package/constants/index.d.ts

@@ -11,10 +11,10 @@ export declare const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export declare const CRON_GET_API_MAP_STATUS = 10000;
 export declare const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
 export declare const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
+export declare const CRON_RECOVER_HISTORY_INTERVAL = 30000;
 export declare const ALL_ACCOUNT_KEY = "ALL";
 export declare const ALL_NETWORK_KEY = "all";
 export declare const ALL_GENESIS_HASH: null;
 export declare const IGNORE_GET_SUBSTRATE_FEATURES_LIST: string[];
 export declare const IGNORE_QR_SIGNER: string[];
-export declare const DEFAULT_TIME_AUTO_LOCK: number;
 export * from './staking';

package/constants/index.js

@@ -14,10 +14,10 @@ export const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export const CRON_GET_API_MAP_STATUS = 10000;
 export const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
 export const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
+export const CRON_RECOVER_HISTORY_INTERVAL = 30000;
 export const ALL_ACCOUNT_KEY = 'ALL';
 export const ALL_NETWORK_KEY = 'all';
 export const ALL_GENESIS_HASH = null;
 export const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 export const IGNORE_QR_SIGNER = [];
-export const DEFAULT_TIME_AUTO_LOCK = 15 * 60 * 1000;
 export * from "./staking.js";

package/koni/api/coingecko.js

@@ -7,9 +7,6 @@ export const getTokenPrice = async (priceIds, currency = 'usd') => {
     // const inverseMap: Record<string, string> = {};
     const idStr = priceIds.join(',');
     const res = await axios.get(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency}&per_page=1000&ids=${idStr}`);
-    if (res.status !== 200) {
-      console.warn('Failed to get token price');
-    }
     const responseData = res.data;
     const priceMap = {};
     const price24hMap = {};
@@ -31,7 +28,7 @@ export const getTokenPrice = async (priceIds, currency = 'usd') => {
       price24hMap
     };
   } catch (err) {
-    console.error('Failed to get token price', err);
+    console.error(err);
     throw err;
   }
 };

package/koni/api/dotsama/balance.js

@@ -109,11 +109,13 @@ async function subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI
       }
     }
     balances.forEach(balance => {
-      var _balance$data, _balance$data$free, _balance$data2, _balance$data2$reserv, _balance$data3, _balance$data3$miscFr, _balance$data4, _balance$data4$feeFro;
+      var _balance$data, _balance$data$free, _balance$data2, _balance$data2$reserv, _balance$data3, _balance$data3$miscFr, _balance$data4, _balance$data4$frozen, _balance$data5, _balance$data5$feeFro;
       total = total.add(((_balance$data = balance.data) === null || _balance$data === void 0 ? void 0 : (_balance$data$free = _balance$data.free) === null || _balance$data$free === void 0 ? void 0 : _balance$data$free.toBn()) || new BN(0)); // reserved is seperated
       reserved = reserved.add(((_balance$data2 = balance.data) === null || _balance$data2 === void 0 ? void 0 : (_balance$data2$reserv = _balance$data2.reserved) === null || _balance$data2$reserv === void 0 ? void 0 : _balance$data2$reserv.toBn()) || new BN(0));
-      miscFrozen = miscFrozen.add(((_balance$data3 = balance.data) === null || _balance$data3 === void 0 ? void 0 : (_balance$data3$miscFr = _balance$data3.miscFrozen) === null || _balance$data3$miscFr === void 0 ? void 0 : _balance$data3$miscFr.toBn()) || new BN(0));
-      feeFrozen = feeFrozen.add(((_balance$data4 = balance.data) === null || _balance$data4 === void 0 ? void 0 : (_balance$data4$feeFro = _balance$data4.feeFrozen) === null || _balance$data4$feeFro === void 0 ? void 0 : _balance$data4$feeFro.toBn()) || new BN(0));
+      // @ts-ignore
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      miscFrozen = miscFrozen.add(((_balance$data3 = balance.data) === null || _balance$data3 === void 0 ? void 0 : (_balance$data3$miscFr = _balance$data3.miscFrozen) === null || _balance$data3$miscFr === void 0 ? void 0 : _balance$data3$miscFr.toBn()) || (balance === null || balance === void 0 ? void 0 : (_balance$data4 = balance.data) === null || _balance$data4 === void 0 ? void 0 : (_balance$data4$frozen = _balance$data4.frozen) === null || _balance$data4$frozen === void 0 ? void 0 : _balance$data4$frozen.toBn()) || new BN(0)); // TODO: update frozen
+      feeFrozen = feeFrozen.add(((_balance$data5 = balance.data) === null || _balance$data5 === void 0 ? void 0 : (_balance$data5$feeFro = _balance$data5.feeFrozen) === null || _balance$data5$feeFro === void 0 ? void 0 : _balance$data5$feeFro.toBn()) || new BN(0));
     });
     let locked = reserved.add(miscFrozen);
     total = total.add(reserved); // total = free + reserved
@@ -159,7 +161,7 @@ function subscribeERC20Interval(addresses, chain, evmApiMap, callBack) {
           state: APIItemState.READY
         });
       } catch (err) {
-        console.log('There is a problem fetching ' + tokenInfo.slug + ' token balance', err);
+        console.log(tokenInfo.slug, err);
       }
     });
   };
@@ -197,7 +199,7 @@ function subscribePSP22Balance(addresses, chain, api, callBack) {
           state: APIItemState.READY
         });
       } catch (err) {
-        console.warn('Problem fetching ' + tokenInfo.slug + ' PSP-22 token balance', err); // TODO: error createType
+        console.warn(tokenInfo.slug, err); // TODO: error createType
       }
     });
   };

package/koni/api/dotsama/crowdloan.js

@@ -37,10 +37,6 @@ export const subscribeAcalaContributeInterval = (polkadotAddresses, paraState, c
       let contribute = new BN(0);
       resList.forEach(res => {
         var _res$data$data, _res$data$data$acala, _res$data$data$acala$;
-        if (res.status !== 200) {
-          console.warn('Failed to get Acala, Karura crowdloan contribute');
-        }
-
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
         contribute = contribute.add(new BN(((_res$data$data = res.data.data) === null || _res$data$data === void 0 ? void 0 : (_res$data$data$acala = _res$data$data.acala) === null || _res$data$data$acala === void 0 ? void 0 : (_res$data$data$acala$ = _res$data$data$acala[0]) === null || _res$data$data$acala$ === void 0 ? void 0 : _res$data$data$acala$.totalDOTLocked) || '0'));
       });

package/koni/api/dotsama/transfer.js

@@ -94,7 +94,6 @@ export const createTransferExtrinsic = async ({
   transferAll,
   value
 }) => {
-  var _transfer;
   const api = substrateApi.api;
 
   // @ts-ignore
@@ -142,8 +141,5 @@ export const createTransferExtrinsic = async ({
       transfer = api.tx.balances.transfer(to, new BN(value));
     }
   }
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-  console.log('transfer extrinsic: ', (_transfer = transfer) === null || _transfer === void 0 ? void 0 : _transfer.toHex());
   return [transfer, transferAmount || value];
 };

package/koni/api/nft/acala_nft/index.js

@@ -113,7 +113,7 @@ export class AcalaNftApi extends BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch acala nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/bit.country/index.js

@@ -111,7 +111,7 @@ export class BitCountryNftApi extends BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch bit.country nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/evm_nft/index.js

@@ -106,7 +106,6 @@ export class EvmNftApi extends BaseNftApi {
               const resp = await fetch(detailUrl);
               const itemDetail = resp && resp.ok && (await resp.json());
               if (!itemDetail) {
-                console.warn((resp === null || resp === void 0 ? void 0 : resp.statusText) || `Cannot fetch NFT id [${nftId}] from Web3.`);
                 return;
               }
               const parsedItem = this.parseMetadata(itemDetail);
@@ -123,13 +122,13 @@ export class EvmNftApi extends BaseNftApi {
                 ownItem = true;
               }
             } catch (e) {
-              console.error(`error parsing item for ${this.chain} nft`, e);
+              console.error(`${this.chain}`, e);
             }
           }
         }));
         nftOwnerMap[address] = nftIds;
       } catch (e) {
-        console.error('EVM NFT error', e);
+        console.error(`${this.chain}`, e);
       }
     }));
     if (ownItem) {

package/koni/api/nft/index.js

@@ -118,10 +118,9 @@ export class NftHandler {
           }
         });
         this.needSetupApi = false;
-        // console.log(`${this.handlers.length} nft handlers connected`, this.handlers);
       }
     } catch (e) {
-      console.error('error setting up nft handlers', e);
+      console.error(e);
     }
   }
   async handleNfts(nftContracts, updateItem, updateCollection, cleanUpNfts) {

package/koni/api/nft/karura_nft/index.js

@@ -118,7 +118,7 @@ export class KaruraNftApi extends BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch karura nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/quartz_nft/index.js

@@ -181,7 +181,7 @@ export default class QuartzNftApi extends BaseNftApi {
         }
       }));
     } catch (e) {
-      console.error('Failed to fetch quartz nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/rmrk_nft/index.js

@@ -193,7 +193,6 @@ export class RmrkNftApi extends BaseNftApi {
             return {};
           }
         } catch (e) {
-          console.error('error fetching collection info', url);
           return {};
         }
       }));
@@ -220,7 +219,7 @@ export class RmrkNftApi extends BaseNftApi {
             };
           }
         } catch (e) {
-          console.error('error parsing JSON for RMRK ', item.url, e);
+          console.error(item.url, e);
         }
       }));
       allCollections.forEach(item => {
@@ -245,7 +244,7 @@ export class RmrkNftApi extends BaseNftApi {
       const allNftIds = allNfts.map(nft => nft === null || nft === void 0 ? void 0 : nft.id);
       params.cleanUpNfts(this.chain, address, allCollectionIds, allNftIds);
     } catch (e) {
-      console.error('Failed to fetch rmrk nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/statemine_nft/index.js

@@ -119,7 +119,7 @@ export default class StatemineNftApi extends BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch statemine nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/transfer.js

@@ -12,7 +12,7 @@ export function acalaGetExtrinsic(substrateApi, senderAddress, recipientAddress,
     const collectionId = params.collectionId;
     return substrateApi.api.tx.nft.transfer(recipientAddress, [collectionId, itemId]);
   } catch (e) {
-    console.error('error handling acala transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -25,7 +25,7 @@ export function rmrkGetExtrinsic(substrateApi, senderAddress, recipientAddress,
     const parsedRemark = remark.concat(recipientAddress.replace(/\\s/g, ''));
     return substrateApi.api.tx.system.remark(parsedRemark);
   } catch (e) {
-    console.error('error handling rmrk transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -37,7 +37,7 @@ export function uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress
       Substrate: recipientAddress
     }, collectionId, itemId, 1);
   } catch (e) {
-    console.error('error handling unique transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -49,7 +49,7 @@ export function quartzGetExtrinsic(substrateApi, senderAddress, recipientAddress
       Substrate: recipientAddress
     }, collectionId, itemId, 1);
   } catch (e) {
-    console.error('error handling quartz transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -59,7 +59,7 @@ export function statemineGetExtrinsic(substrateApi, senderAddress, recipientAddr
     const collectionId = params.collectionId;
     return substrateApi.api.tx.uniques.transfer(collectionId, itemId, recipientAddress);
   } catch (e) {
-    console.error('error handling statemine transfer nft', e);
+    console.error(e);
     return null;
   }
 }

package/koni/api/nft/unique_nft/index.js

@@ -175,7 +175,7 @@ export default class UniqueNftApi extends BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, allNftIds);
     } catch (e) {
-      console.error('Failed to fetch unique nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/unique_nft/uniqueNftV2.js

@@ -46,7 +46,6 @@ export class UniqueNftApiV2 extends BaseNftApi {
         const nfts = await this.getNftByAccount(address);
         allNfts = allNfts.concat(nfts);
       }));
-      console.log('allNfts', allNfts);
     } catch (e) {
       console.error(`Failed to fetch ${this.chain} nft`, e);
     }

package/koni/api/nft/wasm_nft/index.js

@@ -216,7 +216,6 @@ export class WasmNftApi extends BaseNftApi {
         }
       }
       if (!itemDetail) {
-        console.warn(`Cannot fetch NFT metadata [${tokenId}] from PSP-34 contract.`);
         return nftItem;
       }
       nftItem.name = itemDetail.name;
@@ -298,7 +297,7 @@ export class WasmNftApi extends BaseNftApi {
 
         nftOwnerMap[address] = nftIds;
       } catch (e) {
-        console.error(`error parsing item for ${this.chain} nft`, e);
+        console.error(`${this.chain}`, e);
       }
     }));
     if (isFeatured) {

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

@@ -42,9 +42,16 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
   const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
   const delegatorState = _delegatorState.toPrimitive();
   const unstakingInfo = _unstakingInfo.toPrimitive();
-  console.log('unstakingInfo ampe', unstakingInfo, !!unstakingInfo);
   if (!delegatorState && !unstakingInfo) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: StakingType.NOMINATED,
+      address,
+      status: StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   let activeStake = '0';
   if (delegatorState) {

package/koni/api/staking/bonding/astar.d.ts

@@ -1,5 +1,5 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
-import { ChainStakingMetadata, NominatorMetadata, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainStakingMetadata, NominatorMetadata, UnstakingInfo, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 export declare function getAstarStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function getAstarNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
@@ -8,3 +8,4 @@ export declare function getAstarBondingExtrinsic(substrateApi: _SubstrateApi, am
 export declare function getAstarUnbondingExtrinsic(substrateApi: _SubstrateApi, amount: string, dappAddress: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getAstarWithdrawalExtrinsic(substrateApi: _SubstrateApi): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getAstarClaimRewardExtrinsic(substrateApi: _SubstrateApi, address: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
+export declare function getAstarWithdrawable(nominatorMetadata: NominatorMetadata): UnstakingInfo;

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

@@ -96,20 +96,28 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
 
   const unlockingChunks = ledger.unbondingInfo.unlockingChunks;
   if (unlockingChunks.length > 0) {
-    const nearestUnstaking = unlockingChunks[0]; // only handle 1 unstaking request at a time, might need to change
-
-    const isClaimable = nearestUnstaking.unlockEra - parseInt(currentEra) <= 0;
-    const remainingEra = nearestUnstaking.unlockEra - (parseInt(currentEra) + 1);
-    const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chain];
-    unstakingList.push({
-      chain,
-      status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
-      claimable: nearestUnstaking.amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
-    });
+    for (const unlockingChunk of unlockingChunks) {
+      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) <= 0;
+      const remainingEra = unlockingChunk.unlockEra - (parseInt(currentEra) + 1);
+      const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chain];
+      unstakingList.push({
+        chain,
+        status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
+        claimable: unlockingChunk.amount.toString(),
+        waitingTime: waitingTime > 0 ? waitingTime : 0
+      });
+    }
   }
   if (nominationList.length === 0 && unstakingList.length === 0) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: StakingType.NOMINATED,
+      address,
+      status: StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   const stakingStatus = getStakingStatusByNominations(bnTotalActiveStake, nominationList);
   return {
@@ -239,6 +247,21 @@ export async function getAstarClaimRewardExtrinsic(substrateApi, address) {
       transactions.push(tx);
     }
   }
-  console.log('no of astar claim reward tx: ', transactions.length);
   return apiPromise.api.tx.utility.batch(transactions);
+}
+export function getAstarWithdrawable(nominatorMetadata) {
+  const unstakingInfo = {
+    chain: nominatorMetadata.chain,
+    status: UnstakingStatus.CLAIMABLE,
+    claimable: '0',
+    waitingTime: 0
+  };
+  let bnWithdrawable = BN_ZERO;
+  for (const unstaking of nominatorMetadata.unstakings) {
+    if (unstaking.status === UnstakingStatus.CLAIMABLE) {
+      bnWithdrawable = bnWithdrawable.add(new BN(unstaking.claimable));
+    }
+  }
+  unstakingInfo.claimable = bnWithdrawable.toString();
+  return unstakingInfo;
 }

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

@@ -42,7 +42,7 @@ export function validateParaChainBondingCondition(chainInfo, amount, selectedCol
   const bnChainMinStake = new BN(chainStakingMetadata.minStake || '0');
   const bnCollatorMinStake = new BN(selectedCollator.minBond || '0');
   const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
-  if (!nominatorMetadata) {
+  if (!nominatorMetadata || nominatorMetadata.status === StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
     }
@@ -130,7 +130,15 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
   const _delegatorState = await chainApi.api.query.parachainStaking.delegatorState(address);
   const delegatorState = _delegatorState.toPrimitive();
   if (!delegatorState) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: StakingType.NOMINATED,
+      address,
+      status: StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   let bnTotalActiveStake = BN_ZERO;
   await Promise.all(delegatorState.delegations.map(async delegation => {