@subwallet/extension-base 1.0.1 → 1.0.2-1

package/background/KoniTypes.d.ts

@@ -103,7 +103,6 @@ export interface StakingItem {
     nativeToken: string;
     unit?: string;
     state: APIItemState;
-    rewardInfo?: StakingRewardItem;
 }
 export interface StakingJson {
     reset?: boolean;
@@ -379,14 +378,14 @@ export interface AmountData extends BasicTokenInfo {
 }
 export interface XCMTransactionAdditionalInfo {
     destinationChain: string;
-    fee: AmountData;
+    fee?: AmountData;
 }
 export interface NFTTransactionAdditionalInfo {
     collectionName: string;
 }
 export declare type TransactionAdditionalInfo<T extends ExtrinsicType> = T extends ExtrinsicType.TRANSFER_XCM ? XCMTransactionAdditionalInfo : T extends ExtrinsicType.SEND_NFT ? NFTTransactionAdditionalInfo : undefined;
 export interface TransactionHistoryItem<ET extends ExtrinsicType = ExtrinsicType.TRANSFER_BALANCE> {
-    origin?: string;
+    origin?: 'app' | 'migration' | 'subsquid';
     callhash?: string;
     signature?: string;
     chain: string;
@@ -1057,6 +1056,7 @@ export interface NominationInfo {
     activeStake: string;
     hasUnstaking?: boolean;
     validatorMinStake?: string;
+    status: StakingStatus;
 }
 export interface PalletNominationPoolsBondedPoolInner {
     points: number;
@@ -1086,9 +1086,15 @@ export interface UnstakingInfo {
     waitingTime: number;
     validatorAddress?: string;
 }
+export declare enum StakingStatus {
+    EARNING_REWARD = "EARNING_REWARD",
+    PARTIALLY_EARNING = "PARTIALLY_EARNING",
+    NOT_EARNING = "NOT_EARNING"
+}
 export interface NominatorMetadata {
     chain: string;
     type: StakingType;
+    status: StakingStatus;
     address: string;
     activeStake: string;
     nominations: NominationInfo[];
@@ -1138,6 +1144,7 @@ export interface BondingSubmitParams extends BaseRequestSign {
     type: StakingType;
     nominatorMetadata?: NominatorMetadata;
     amount: string;
+    address: string;
     selectedValidators: ValidatorInfo[];
     lockPeriod?: number;
 }

package/background/KoniTypes.js

@@ -204,6 +204,12 @@ export let UnstakingStatus;
   UnstakingStatus["CLAIMABLE"] = "CLAIMABLE";
   UnstakingStatus["UNLOCKING"] = "UNLOCKING";
 })(UnstakingStatus || (UnstakingStatus = {}));
+export let StakingStatus;
+(function (StakingStatus) {
+  StakingStatus["EARNING_REWARD"] = "EARNING_REWARD";
+  StakingStatus["PARTIALLY_EARNING"] = "PARTIALLY_EARNING";
+  StakingStatus["NOT_EARNING"] = "NOT_EARNING";
+})(StakingStatus || (StakingStatus = {}));
 export let ChainEditStandard;
 
 // ChainService

package/cjs/background/KoniTypes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UnstakingStatus = exports.TransferTxErrorType = exports.TransactionDirection = exports.ThemeNames = exports.StakingType = exports.StakingTxErrorType = exports.RMRK_VER = exports.ProviderErrorType = exports.NotificationType = exports.NETWORK_STATUS = exports.NETWORK_ERROR = exports.ExtrinsicType = exports.ExtrinsicStatus = exports.ExternalRequestPromiseStatus = exports.EvmProviderErrorType = exports.CrowdloanParaState = exports.ContractType = exports.ChainType = exports.ChainEditStandard = exports.BasicTxWarningCode = exports.BasicTxErrorType = exports.BalanceErrorType = exports.AccountExternalErrorCode = exports.APIItemState = void 0;
+exports.UnstakingStatus = exports.TransferTxErrorType = exports.TransactionDirection = exports.ThemeNames = exports.StakingType = exports.StakingTxErrorType = exports.StakingStatus = exports.RMRK_VER = exports.ProviderErrorType = exports.NotificationType = exports.NETWORK_STATUS = exports.NETWORK_ERROR = exports.ExtrinsicType = exports.ExtrinsicStatus = exports.ExternalRequestPromiseStatus = exports.EvmProviderErrorType = exports.CrowdloanParaState = exports.ContractType = exports.ChainType = exports.ChainEditStandard = exports.BasicTxWarningCode = exports.BasicTxErrorType = exports.BalanceErrorType = exports.AccountExternalErrorCode = exports.APIItemState = void 0;
 // Copyright 2019-2022 @polkadot/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 /// Request Auth
@@ -211,6 +211,13 @@ exports.UnstakingStatus = UnstakingStatus;
   UnstakingStatus["CLAIMABLE"] = "CLAIMABLE";
   UnstakingStatus["UNLOCKING"] = "UNLOCKING";
 })(UnstakingStatus || (exports.UnstakingStatus = UnstakingStatus = {}));
+let StakingStatus;
+exports.StakingStatus = StakingStatus;
+(function (StakingStatus) {
+  StakingStatus["EARNING_REWARD"] = "EARNING_REWARD";
+  StakingStatus["PARTIALLY_EARNING"] = "PARTIALLY_EARNING";
+  StakingStatus["NOT_EARNING"] = "NOT_EARNING";
+})(StakingStatus || (exports.StakingStatus = StakingStatus = {}));
 let ChainEditStandard; // ChainService
 // for custom network
 exports.ChainEditStandard = ChainEditStandard;

package/cjs/constants/index.js

@@ -27,9 +27,10 @@ var _exportNames = {
   ALL_NETWORK_KEY: true,
   ALL_GENESIS_HASH: true,
   IGNORE_GET_SUBSTRATE_FEATURES_LIST: true,
-  IGNORE_QR_SIGNER: true
+  IGNORE_QR_SIGNER: true,
+  DEFAULT_TIME_AUTO_LOCK: true
 };
-exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.SUBSCRIBE_BALANCE_FAST_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.DOTSAMA_MAX_CONTINUE_RETRY = exports.DOTSAMA_AUTO_CONNECT_MS = exports.DOTSAMA_API_TIMEOUT = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_STAKING_DATA = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = exports.ACALA_REFRESH_BALANCE_INTERVAL = void 0;
+exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.SUBSCRIBE_BALANCE_FAST_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.DOTSAMA_MAX_CONTINUE_RETRY = exports.DOTSAMA_AUTO_CONNECT_MS = exports.DOTSAMA_API_TIMEOUT = exports.DEFAULT_TIME_AUTO_LOCK = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_STAKING_DATA = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = exports.ACALA_REFRESH_BALANCE_INTERVAL = void 0;
 var _staking = require("./staking");
 Object.keys(_staking).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -92,4 +93,6 @@ exports.ALL_GENESIS_HASH = ALL_GENESIS_HASH;
 const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = IGNORE_GET_SUBSTRATE_FEATURES_LIST;
 const IGNORE_QR_SIGNER = [];
-exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;
+exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;
+const DEFAULT_TIME_AUTO_LOCK = 15 * 60 * 1000;
+exports.DEFAULT_TIME_AUTO_LOCK = DEFAULT_TIME_AUTO_LOCK;

package/cjs/koni/api/dotsama/balance.js

@@ -35,6 +35,17 @@ function subscribeBalance(addresses, chainInfoMap, substrateApiMap, evmApiMap, c
       return subscribeEVMBalance(chainSlug, useAddresses, evmApiMap, callback, nativeTokenInfo);
     }
     if (!useAddresses || useAddresses.length === 0 || _constants2._PURE_EVM_CHAINS.indexOf(chainSlug) > -1) {
+      const fungibleTokensByChain = _handlers.state.chainService.getFungibleTokensByChain(chainSlug, true);
+      const now = new Date().getTime();
+      Object.values(fungibleTokensByChain).map(token => {
+        return {
+          tokenSlug: token.slug,
+          free: '0',
+          locked: '0',
+          state: _KoniTypes.APIItemState.READY,
+          timestamp: now
+        };
+      }).forEach(callback);
       return undefined;
     }
     const networkAPI = await substrateApiMap[chainSlug].isReady;

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

@@ -64,6 +64,7 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
     const identity = (0, _utils.parseIdentity)(identityInfo);
     activeStake = delegatorState.amount.toString();
     nominationList.push({
+      status: _KoniTypes.StakingStatus.NOT_EARNING,
       chain,
       validatorAddress: delegatorState.owner,
       activeStake: delegatorState.amount.toString(),
@@ -134,13 +135,16 @@ async function getAmplitudeCollatorsInfo(chain, substrateApi) {
   }
   return allCollators;
 }
-async function getAmplitudeBondingExtrinsic(nominatorMetadata, substrateApi, amount, selectedValidatorInfo) {
+async function getAmplitudeBondingExtrinsic(substrateApi, amount, selectedValidatorInfo, nominatorMetadata) {
   const chainApi = await substrateApi.isReady;
   const binaryAmount = new _util.BN(amount);
+  if (!nominatorMetadata) {
+    return chainApi.api.tx.parachainStaking.joinDelegators(selectedValidatorInfo.address, binaryAmount);
+  }
   const {
     bondedValidators
   } = (0, _utils.getBondedValidators)(nominatorMetadata.nominations);
-  if (!bondedValidators.includes(selectedValidatorInfo.address)) {
+  if (!bondedValidators.includes((0, _utils2.reformatAddress)(selectedValidatorInfo.address, 0))) {
     return chainApi.api.tx.parachainStaking.joinDelegators(selectedValidatorInfo.address, binaryAmount);
   } else {
     const _params = chainApi.api.tx.parachainStaking.delegatorStakeMore.toJSON();

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

@@ -5,26 +5,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getAstarBondingExtrinsic = getAstarBondingExtrinsic;
-exports.getAstarBondingTxInfo = getAstarBondingTxInfo;
 exports.getAstarClaimRewardExtrinsic = getAstarClaimRewardExtrinsic;
-exports.getAstarClaimRewardTxInfo = getAstarClaimRewardTxInfo;
 exports.getAstarDappsInfo = getAstarDappsInfo;
 exports.getAstarNominatorMetadata = getAstarNominatorMetadata;
 exports.getAstarStakingMetadata = getAstarStakingMetadata;
 exports.getAstarUnbondingExtrinsic = getAstarUnbondingExtrinsic;
-exports.getAstarUnbondingTxInfo = getAstarUnbondingTxInfo;
 exports.getAstarWithdrawalExtrinsic = getAstarWithdrawalExtrinsic;
-exports.getAstarWithdrawalTxInfo = getAstarWithdrawalTxInfo;
-exports.handleAstarBondingTxInfo = handleAstarBondingTxInfo;
-exports.handleAstarClaimRewardTxInfo = handleAstarClaimRewardTxInfo;
-exports.handleAstarUnbondingTxInfo = handleAstarUnbondingTxInfo;
-exports.handleAstarUnlockingInfo = handleAstarUnlockingInfo;
-exports.handleAstarWithdrawalTxInfo = handleAstarWithdrawalTxInfo;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _balance = require("@subwallet/extension-base/koni/api/dotsama/balance");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
-var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils2 = require("@subwallet/extension-base/utils");
+var _utils = require("@subwallet/extension-base/utils");
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -103,6 +92,8 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
         bnTotalActiveStake = bnTotalActiveStake.add(bnCurrentStake);
         const dappInfo = dAppInfoMap[dappAddress];
         nominationList.push({
+          status: _KoniTypes.StakingStatus.NOT_EARNING,
+          // TODO
           chain,
           validatorAddress: dappAddress,
           activeStake: currentStake,
@@ -137,14 +128,16 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
     address: address,
     activeStake: bnTotalActiveStake.toString(),
     nominations: nominationList,
-    unstakings: unstakingList
+    unstakings: unstakingList,
+    status: _KoniTypes.StakingStatus.NOT_EARNING // TODO
   };
 }
+
 async function getAstarDappsInfo(networkKey, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const rawMaxStakerPerContract = chainApi.api.consts.dappsStaking.maxNumberOfStakersPerContract.toHuman();
   const allDappsInfo = [];
-  const maxStakerPerContract = (0, _utils2.parseRawNumber)(rawMaxStakerPerContract);
+  const maxStakerPerContract = (0, _utils.parseRawNumber)(rawMaxStakerPerContract);
   const allDappsReq = new Promise(function (resolve) {
     (0, _crossFetch.default)(`https://api.astar.network/api/v1/${networkKey}/dapps-staking/dapps`, {
       method: 'GET'
@@ -153,27 +146,32 @@ async function getAstarDappsInfo(networkKey, substrateApi) {
     }).catch(console.error);
   });
   const [_era, _allDapps] = await Promise.all([chainApi.api.query.dappsStaking.currentEra(), allDappsReq]);
-  const era = (0, _utils2.parseRawNumber)(_era.toHuman());
+  const era = (0, _utils.parseRawNumber)(_era.toHuman());
   const allDapps = _allDapps;
   await Promise.all(allDapps.map(async dapp => {
     const dappName = dapp.name;
     const dappAddress = dapp.address;
-    const dappIcon = (0, _utils2.isUrl)(dapp.iconUrl) ? dapp.iconUrl : undefined;
-    const _contractInfo = await chainApi.api.query.dappsStaking.contractEraStake({
+    const dappIcon = (0, _utils.isUrl)(dapp.iconUrl) ? dapp.iconUrl : undefined;
+    const contractParam = (0, _utilCrypto.isEthereumAddress)(dappAddress) ? {
       Evm: dappAddress
-    }, era);
-    const contractInfo = _contractInfo.toHuman();
-    let totalStake = 0;
+    } : {
+      Wasm: dappAddress
+    };
+    const _contractInfo = await chainApi.api.query.dappsStaking.contractEraStake(contractParam, era);
+    const contractInfo = _contractInfo.toPrimitive();
+    let totalStake = '0';
     let stakerCount = 0;
     if (contractInfo !== null) {
-      totalStake = (0, _utils2.parseRawNumber)(contractInfo.total);
-      stakerCount = (0, _utils2.parseRawNumber)(contractInfo.numberOfStakers);
+      var _contractInfo$total;
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+      totalStake = contractInfo === null || contractInfo === void 0 ? void 0 : (_contractInfo$total = contractInfo.total) === null || _contractInfo$total === void 0 ? void 0 : _contractInfo$total.toString();
+      stakerCount = contractInfo.numberOfStakers;
     }
     allDappsInfo.push({
       commission: 0,
       expectedReturn: 0,
       address: dappAddress,
-      totalStake: totalStake.toString(),
+      totalStake: totalStake,
       ownStake: '0',
       otherStake: totalStake.toString(),
       nominatorCount: stakerCount,
@@ -188,175 +186,34 @@ async function getAstarDappsInfo(networkKey, substrateApi) {
   }));
   return allDappsInfo;
 }
-async function getAstarBondingTxInfo(chainInfo, substrateApi, stakerAddress, amount, dappInfo) {
-  const apiPromise = await substrateApi.isReady;
-  const {
-    decimals
-  } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-  const parsedAmount = amount * 10 ** decimals;
-  const binaryAmount = new _util.BN(parsedAmount.toString());
-  const extrinsic = apiPromise.api.tx.dappsStaking.bondAndStake({
-    Evm: dappInfo.address
-  }, binaryAmount);
-  return extrinsic.paymentInfo(stakerAddress);
-}
-async function handleAstarBondingTxInfo(chainInfo, amount, networkKey, stakerAddress, dappInfo, substrateApiMap, evmApiMap) {
-  const {
-    decimals,
-    symbol
-  } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-  try {
-    const [txInfo, balance] = await Promise.all([getAstarBondingTxInfo(chainInfo, substrateApiMap[networkKey], stakerAddress, amount, dappInfo), (0, _balance.getFreeBalance)(networkKey, stakerAddress, substrateApiMap, evmApiMap)]);
-    const feeString = (0, _utils2.parseNumberToDisplay)(txInfo.partialFee, decimals) + ` ${symbol}`;
-    const rawFee = (0, _utils2.parseRawNumber)(txInfo.partialFee.toString());
-    const binaryBalance = new _util.BN(balance);
-    const sumAmount = txInfo.partialFee.addn(amount);
-    const balanceError = sumAmount.gt(binaryBalance);
-    return {
-      rawFee,
-      fee: feeString,
-      balanceError
-    };
-  } catch (e) {
-    return {
-      fee: `0.0000 ${symbol}`,
-      balanceError: false
-    };
-  }
-}
 async function getAstarBondingExtrinsic(substrateApi, amount, dappInfo) {
   const chainApi = await substrateApi.isReady;
   const binaryAmount = new _util.BN(amount);
-  return chainApi.api.tx.dappsStaking.bondAndStake({
+  const dappParam = (0, _utilCrypto.isEthereumAddress)(dappInfo.address) ? {
     Evm: dappInfo.address
-  }, binaryAmount);
-}
-async function getAstarUnbondingTxInfo(chainInfo, substrateApi, stakerAddress, amount, dappAddress) {
-  const apiPromise = await substrateApi.isReady;
-  const {
-    decimals
-  } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-  const parsedAmount = amount * 10 ** decimals;
-  const binaryAmount = new _util.BN(parsedAmount.toString());
-  const extrinsic = apiPromise.api.tx.dappsStaking.unbondAndUnstake({
-    Evm: dappAddress
-  }, binaryAmount);
-  return extrinsic.paymentInfo(stakerAddress);
-}
-async function handleAstarUnbondingTxInfo(chainInfo, amount, networkKey, stakerAddress, dappAddress, substrateApiMap, evmApiMap) {
-  const {
-    decimals,
-    symbol
-  } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-  try {
-    const [txInfo, balance] = await Promise.all([getAstarUnbondingTxInfo(chainInfo, substrateApiMap[networkKey], stakerAddress, amount, dappAddress), (0, _balance.getFreeBalance)(networkKey, stakerAddress, substrateApiMap, evmApiMap)]);
-    const feeString = (0, _utils2.parseNumberToDisplay)(txInfo.partialFee, decimals) + ` ${symbol}`;
-    const rawFee = (0, _utils2.parseRawNumber)(txInfo.partialFee.toString());
-    const binaryBalance = new _util.BN(balance);
-    const balanceError = txInfo.partialFee.gt(binaryBalance);
-    return {
-      rawFee,
-      fee: feeString,
-      balanceError
-    };
-  } catch (e) {
-    return {
-      fee: `0.0000 ${symbol}`,
-      balanceError: false
-    };
-  }
+  } : {
+    Wasm: dappInfo.address
+  };
+  return chainApi.api.tx.dappsStaking.bondAndStake(dappParam, binaryAmount);
 }
 async function getAstarUnbondingExtrinsic(substrateApi, amount, dappAddress) {
   const apiPromise = await substrateApi.isReady;
   const binaryAmount = new _util.BN(amount);
-  return apiPromise.api.tx.dappsStaking.unbondAndUnstake({
+  const dappParam = (0, _utilCrypto.isEthereumAddress)(dappAddress) ? {
     Evm: dappAddress
-  }, binaryAmount);
-}
-async function getAstarUnlockingInfo(substrateApi, address, networkKey) {
-  const chainApi = await substrateApi.isReady;
-  const [_stakingInfo, _era] = await Promise.all([chainApi.api.query.dappsStaking.ledger(address), chainApi.api.query.dappsStaking.currentEra()]);
-  const currentEra = (0, _utils2.parseRawNumber)(_era.toHuman());
-  const stakingInfo = _stakingInfo.toHuman();
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-  const unlockingChunks = stakingInfo.unbondingInfo.unlockingChunks;
-  let nextWithdrawalEra = -1;
-  let nextWithdrawalAmount = 0;
-  let redeemable = 0;
-  for (const chunk of unlockingChunks) {
-    const unlockEra = (0, _utils2.parseRawNumber)(chunk.unlockEra);
-    const amount = (0, _utils2.parseRawNumber)(chunk.amount);
-
-    // Find next withdrawal
-    if (nextWithdrawalEra === -1) {
-      nextWithdrawalEra = unlockEra;
-      nextWithdrawalAmount = amount;
-    } else if (unlockEra <= nextWithdrawalEra) {
-      nextWithdrawalEra = unlockEra;
-      nextWithdrawalAmount += amount;
-    }
-
-    // Find redeemable
-    if (unlockEra - currentEra <= 0) {
-      redeemable += amount;
-    }
-  }
-  const nextWithdrawal = (nextWithdrawalEra - currentEra) * _constants._STAKING_ERA_LENGTH_MAP[networkKey];
-  return {
-    nextWithdrawal,
-    nextWithdrawalAmount,
-    redeemable
-  };
-}
-async function handleAstarUnlockingInfo(substrateApi, chainInfo, networkKey, address, type) {
-  const {
-    nextWithdrawal,
-    nextWithdrawalAmount,
-    redeemable
-  } = await getAstarUnlockingInfo(substrateApi, address, networkKey);
-  const {
-    decimals
-  } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-  const parsedRedeemable = redeemable / 10 ** decimals;
-  const parsedNextWithdrawalAmount = nextWithdrawalAmount / 10 ** decimals;
-  return {
-    address,
-    type,
-    chain: networkKey,
-    nextWithdrawal: nextWithdrawal,
-    redeemable: parsedRedeemable,
-    nextWithdrawalAmount: parsedNextWithdrawalAmount
-  };
-}
-async function getAstarWithdrawalTxInfo(substrateApi, address) {
-  const apiPromise = await substrateApi.isReady;
-  const extrinsic = apiPromise.api.tx.dappsStaking.withdrawUnbonded();
-  return extrinsic.paymentInfo(address);
-}
-async function handleAstarWithdrawalTxInfo(networkKey, chainInfo, substrateApiMap, evmApiMap, address) {
-  const [txInfo, balance] = await Promise.all([getAstarWithdrawalTxInfo(substrateApiMap[networkKey], address), (0, _balance.getFreeBalance)(networkKey, address, substrateApiMap, evmApiMap)]);
-  const {
-    decimals,
-    symbol
-  } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-  const feeString = (0, _utils2.parseNumberToDisplay)(txInfo.partialFee, decimals) + ` ${symbol}`;
-  const rawFee = (0, _utils2.parseRawNumber)(txInfo.partialFee.toString());
-  const binaryBalance = new _util.BN(balance);
-  const balanceError = txInfo.partialFee.gt(binaryBalance);
-  return {
-    rawFee,
-    fee: feeString,
-    balanceError
+  } : {
+    Wasm: dappAddress
   };
+  return apiPromise.api.tx.dappsStaking.unbondAndUnstake(dappParam, binaryAmount);
 }
 async function getAstarWithdrawalExtrinsic(substrateApi) {
   const chainApi = await substrateApi.isReady;
   return chainApi.api.tx.dappsStaking.withdrawUnbonded();
 }
-async function getAstarClaimRewardTxInfo(substrateApi, address) {
+async function getAstarClaimRewardExtrinsic(substrateApi, address) {
   const apiPromise = await substrateApi.isReady;
   const [_stakedDapps, _currentEra] = await Promise.all([apiPromise.api.query.dappsStaking.generalStakerInfo.entries(address), apiPromise.api.query.dappsStaking.currentEra()]);
-  const currentEra = (0, _utils2.parseRawNumber)(_currentEra.toHuman());
+  const currentEra = (0, _utils.parseRawNumber)(_currentEra.toHuman());
   const transactions = [];
   for (const item of _stakedDapps) {
     const data = item[0].toHuman();
@@ -365,6 +222,7 @@ async function getAstarClaimRewardTxInfo(substrateApi, address) {
     const stakes = stakeData.stakes;
     const dappAddress = stakedDapp.Evm.toLowerCase();
     let numberOfUnclaimedEra = 0;
+    const maxTx = 50;
     for (let i = 0; i < stakes.length; i++) {
       var _stakes;
       const {
@@ -372,84 +230,23 @@ async function getAstarClaimRewardTxInfo(substrateApi, address) {
         staked
       } = stakes[i];
       const bnStaked = new _util.BN(staked.replaceAll(',', ''));
-      const parsedEra = (0, _utils2.parseRawNumber)(era);
+      const parsedEra = (0, _utils.parseRawNumber)(era);
       if (bnStaked.eq(new _util.BN(0))) {
         continue;
       }
       const nextEraData = (_stakes = stakes[i + 1]) !== null && _stakes !== void 0 ? _stakes : null;
-      const nextEra = nextEraData && (0, _utils2.parseRawNumber)(nextEraData.era);
+      const nextEra = nextEraData && (0, _utils.parseRawNumber)(nextEraData.era);
       const isLastEra = i === stakes.length - 1;
       const eraToClaim = isLastEra ? currentEra - parsedEra : nextEra - parsedEra;
       numberOfUnclaimedEra += eraToClaim;
     }
-    for (let i = 0; i < numberOfUnclaimedEra; i++) {
-      const tx = apiPromise.api.tx.dappsStaking.claimStaker({
-        Evm: dappAddress
-      });
-      transactions.push(tx);
-    }
-  }
-  console.log('no of tx: ', transactions.length);
-  const extrinsic = apiPromise.api.tx.utility.batch(transactions);
-  return extrinsic.paymentInfo(address);
-}
-async function handleAstarClaimRewardTxInfo(address, networkKey, chainInfo, substrateApiMap, evmApiMap) {
-  const {
-    decimals,
-    symbol
-  } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-  try {
-    const [txInfo, balance] = await Promise.all([getAstarClaimRewardTxInfo(substrateApiMap[networkKey], address), (0, _balance.getFreeBalance)(networkKey, address, substrateApiMap, evmApiMap)]);
-    const feeString = (0, _utils2.parseNumberToDisplay)(txInfo.partialFee, decimals) + ` ${symbol}`;
-    const rawFee = (0, _utils2.parseRawNumber)(txInfo.partialFee.toString());
-    const binaryBalance = new _util.BN(balance);
-    const balanceError = txInfo.partialFee.gt(binaryBalance);
-    return {
-      rawFee,
-      fee: feeString,
-      balanceError
-    };
-  } catch (e) {
-    return {
-      fee: `0.0000 ${symbol}`,
-      balanceError: false
+    const dappParam = (0, _utilCrypto.isEthereumAddress)(dappAddress) ? {
+      Evm: dappAddress
+    } : {
+      Wasm: dappAddress
     };
-  }
-}
-async function getAstarClaimRewardExtrinsic(substrateApi, address) {
-  const apiPromise = await substrateApi.isReady;
-  const [_stakedDapps, _currentEra] = await Promise.all([apiPromise.api.query.dappsStaking.generalStakerInfo.entries(address), apiPromise.api.query.dappsStaking.currentEra()]);
-  const currentEra = (0, _utils2.parseRawNumber)(_currentEra.toHuman());
-  const transactions = [];
-  for (const item of _stakedDapps) {
-    const data = item[0].toHuman();
-    const stakedDapp = data[1];
-    const stakeData = item[1].toHuman();
-    const stakes = stakeData.stakes;
-    const dappAddress = stakedDapp.Evm.toLowerCase();
-    let numberOfUnclaimedEra = 0;
-    const maxTx = 50;
-    for (let i = 0; i < stakes.length; i++) {
-      var _stakes2;
-      const {
-        era,
-        staked
-      } = stakes[i];
-      const bnStaked = new _util.BN(staked.replaceAll(',', ''));
-      const parsedEra = (0, _utils2.parseRawNumber)(era);
-      if (bnStaked.eq(new _util.BN(0))) {
-        continue;
-      }
-      const nextEraData = (_stakes2 = stakes[i + 1]) !== null && _stakes2 !== void 0 ? _stakes2 : null;
-      const nextEra = nextEraData && (0, _utils2.parseRawNumber)(nextEraData.era);
-      const isLastEra = i === stakes.length - 1;
-      const eraToClaim = isLastEra ? currentEra - parsedEra : nextEra - parsedEra;
-      numberOfUnclaimedEra += eraToClaim;
-    }
     for (let i = 0; i < Math.min(numberOfUnclaimedEra, maxTx); i++) {
-      const tx = apiPromise.api.tx.dappsStaking.claimStaker({
-        Evm: dappAddress
-      });
+      const tx = apiPromise.api.tx.dappsStaking.claimStaker(dappParam);
       transactions.push(tx);
     }
   }

package/cjs/koni/api/staking/bonding/index.js

@@ -56,15 +56,15 @@ async function getValidatorsInfo(networkKey, substrateApi, decimals, chainStakin
 async function getNominationPoolsInfo(chain, substrateApi) {
   return (0, _relayChain.getRelayPoolsInfo)(chain, substrateApi);
 }
-async function getBondingExtrinsic(chainInfo, amount, nominatorMetadata, selectedValidators, substrateApi) {
+async function getBondingExtrinsic(chainInfo, amount, selectedValidators, substrateApi, address, nominatorMetadata) {
   if (_constants._STAKING_CHAIN_GROUP.para.includes(chainInfo.slug)) {
-    return (0, _paraChain.getParaBondingExtrinsic)(nominatorMetadata, chainInfo, substrateApi, amount, selectedValidators[0]); // only select 1 validator at a time
+    return (0, _paraChain.getParaBondingExtrinsic)(chainInfo, substrateApi, amount, selectedValidators[0], nominatorMetadata); // only select 1 validator at a time
   } else if (_constants._STAKING_CHAIN_GROUP.astar.includes(chainInfo.slug)) {
     return (0, _astar.getAstarBondingExtrinsic)(substrateApi, amount, selectedValidators[0]);
   } else if (_constants._STAKING_CHAIN_GROUP.amplitude.includes(chainInfo.slug)) {
-    return (0, _amplitude.getAmplitudeBondingExtrinsic)(nominatorMetadata, substrateApi, amount, selectedValidators[0]);
+    return (0, _amplitude.getAmplitudeBondingExtrinsic)(substrateApi, amount, selectedValidators[0], nominatorMetadata);
   }
-  return (0, _relayChain.getRelayBondingExtrinsic)(substrateApi, amount, selectedValidators, nominatorMetadata, chainInfo);
+  return (0, _relayChain.getRelayBondingExtrinsic)(substrateApi, amount, selectedValidators, chainInfo, address, nominatorMetadata);
 }
 async function getUnbondingExtrinsic(nominatorMetadata, amount, chain, substrateApi, selectedValidator) {
   if (_constants._STAKING_CHAIN_GROUP.para.includes(chain)) {

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

@@ -111,6 +111,7 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
     bnTotalActiveStake = bnTotalActiveStake.add(bnActiveStake);
     nominationList.push({
       chain,
+      status: _KoniTypes.StakingStatus.NOT_EARNING,
       validatorAddress: delegation.owner,
       validatorIdentity: identity,
       activeStake: bnActiveStake.toString(),
@@ -133,15 +134,16 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
 }
 async function getParachainCollatorsInfo(chain, substrateApi) {
   const apiProps = await substrateApi.isReady;
-  const allValidators = [];
+  const allCollators = [];
   const [_allCollators, _collatorCommission] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission()]);
   const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
   const rawCollatorCommission = _collatorCommission.toHuman();
   const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
   for (const collator of _allCollators) {
-    const collatorAddress = collator[0].toPrimitive();
+    const _collatorAddress = collator[0].toHuman();
+    const collatorAddress = _collatorAddress[0];
     const collatorInfo = collator[1].toPrimitive();
-    allValidators.push({
+    allCollators.push({
       commission: 0,
       expectedReturn: 0,
       address: collatorAddress,
@@ -157,9 +159,9 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
     });
   }
   const extraInfoMap = {};
-  await Promise.all(allValidators.map(async validator => {
+  await Promise.all(allCollators.map(async collator => {
     var _apiProps$api$query, _apiProps$api$query$i;
-    const [_info, _identity] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(validator.address), (_apiProps$api$query = apiProps.api.query) === null || _apiProps$api$query === void 0 ? void 0 : (_apiProps$api$query$i = _apiProps$api$query.identity) === null || _apiProps$api$query$i === void 0 ? void 0 : _apiProps$api$query$i.identityOf(validator.address) // some chains might not have identity pallet
+    const [_info, _identity] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (_apiProps$api$query = apiProps.api.query) === null || _apiProps$api$query === void 0 ? void 0 : (_apiProps$api$query$i = _apiProps$api$query.identity) === null || _apiProps$api$query$i === void 0 ? void 0 : _apiProps$api$query$i.identityOf(collator.address) // some chains might not have identity pallet
     ]);
     const rawInfo = _info.toHuman();
     const rawIdentity = _identity ? _identity.toHuman() : null;
@@ -175,7 +177,7 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
       isReasonable = rawIdentity.judgements.length > 0;
       identity = (0, _utils.parseIdentity)(rawIdentity);
     }
-    extraInfoMap[validator.address] = {
+    extraInfoMap[collator.address] = {
       identity,
       isVerified: isReasonable,
       bond: bond.toString(),
@@ -184,7 +186,7 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
       active
     };
   }));
-  for (const validator of allValidators) {
+  for (const validator of allCollators) {
     validator.minBond = extraInfoMap[validator.address].minDelegation.toString();
     validator.ownStake = extraInfoMap[validator.address].bond.toString();
     validator.blocked = !extraInfoMap[validator.address].active;
@@ -195,16 +197,20 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
     validator.nominatorCount = extraInfoMap[validator.address].delegationCount;
     validator.commission = collatorCommission;
   }
-  return allValidators;
+  return allCollators;
 }
-async function getParaBondingExtrinsic(nominatorMetadata, chainInfo, substrateApi, amount, selectedCollatorInfo) {
+async function getParaBondingExtrinsic(chainInfo, substrateApi, amount, selectedCollatorInfo, nominatorMetadata) {
   const apiPromise = await substrateApi.isReady;
   const binaryAmount = new _util.BN(amount);
+  if (!nominatorMetadata) {
+    return apiPromise.api.tx.parachainStaking.delegate(selectedCollatorInfo.address, binaryAmount, new _util.BN(selectedCollatorInfo.nominatorCount), 0);
+  }
   const {
     bondedValidators,
     nominationCount
   } = (0, _utils.getBondedValidators)(nominatorMetadata.nominations);
-  if (!bondedValidators.includes((0, _utils3.reformatAddress)(selectedCollatorInfo.address, 0))) {
+  const parsedSelectedCollatorAddress = (0, _utils3.reformatAddress)(selectedCollatorInfo.address, 0);
+  if (!bondedValidators.includes(parsedSelectedCollatorAddress)) {
     return apiPromise.api.tx.parachainStaking.delegate(selectedCollatorInfo.address, binaryAmount, new _util.BN(selectedCollatorInfo.nominatorCount), nominationCount);
   } else {
     return apiPromise.api.tx.parachainStaking.delegatorBondMore(selectedCollatorInfo.address, binaryAmount);