@subwallet/extension-base 1.1.31-beta.0 → 1.1.33-0

package/cjs/koni/api/nft/config.js

@@ -33,12 +33,8 @@ exports.BIT_COUNTRY_IPFS_SERVER = BIT_COUNTRY_IPFS_SERVER;
 const BIT_COUNTRY_LAND_ESTATE_METADATA_API = 'https://pioneer-api.bit.country/metadata/landTokenUriPioneer';
 exports.BIT_COUNTRY_LAND_ESTATE_METADATA_API = BIT_COUNTRY_LAND_ESTATE_METADATA_API;
 const BIT_COUNTRY_THUMBNAIL_RESOLVER = 'https://res.cloudinary.com/ddftctzph/image/upload/c_scale,q_100,w_250/production-ipfs/asset/';
-
-// XOrigin
 exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = BIT_COUNTRY_THUMBNAIL_RESOLVER;
 const CF_IPFS_GATEWAY = 'https://cf-ipfs.com/ipfs/';
-
-// XOrigin
 exports.CF_IPFS_GATEWAY = CF_IPFS_GATEWAY;
 const PINATA_IPFS_GATEWAY = 'https://gateway.pinata.cloud/ipfs/';
 exports.PINATA_IPFS_GATEWAY = PINATA_IPFS_GATEWAY;
@@ -51,22 +47,14 @@ const VARA_SCAN_ENDPOINT = 'https://nft-explorer.vara-network.io/graphql';
 // GATEWAY
 exports.VARA_SCAN_ENDPOINT = VARA_SCAN_ENDPOINT;
 const UNIQUE_IPFS_GATEWAY = 'https://ipfs.unique.network/ipfs/';
-
-// XOrigin
 exports.UNIQUE_IPFS_GATEWAY = UNIQUE_IPFS_GATEWAY;
 const NFT_STORAGE_GATEWAY = 'https://nftstorage.link/ipfs/';
 exports.NFT_STORAGE_GATEWAY = NFT_STORAGE_GATEWAY;
 const IPFS_W3S_LINK = 'https://w3s.link/ipfs/';
-
-// XOrigin
 exports.IPFS_W3S_LINK = IPFS_W3S_LINK;
 const GATEWAY_IPFS_IO = 'https://gateway.ipfs.io/ipfs/';
-
-// XOrigin
 exports.GATEWAY_IPFS_IO = GATEWAY_IPFS_IO;
 const IPFS_IO = 'https://ipfs.io/ipfs/';
-
-// XOrigin
 exports.IPFS_IO = IPFS_IO;
 const DWEB_LINK = 'https://dweb.link/ipfs/';
 exports.DWEB_LINK = DWEB_LINK;
@@ -134,8 +122,26 @@ exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = SUPPORTED_TRANSFER_SUBSTRATE_C
   SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME["pioneer"] = "pioneer";
 })(SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME || (exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = {}));
 const RANDOM_IPFS_GATEWAY_SETTING = [{
+  provider: CF_IPFS_GATEWAY,
+  weight: 4
+}, {
   provider: CLOUDFLARE_PINATA_SERVER,
   weight: 10
+}, {
+  provider: PINATA_IPFS_GATEWAY,
+  weight: 1 // Rate limit too low
+}, {
+  provider: DWEB_LINK,
+  weight: 5
+}, {
+  provider: GATEWAY_IPFS_IO,
+  weight: 5
+}, {
+  provider: IPFS_IO,
+  weight: 5
+}, {
+  provider: NFT_STORAGE_GATEWAY,
+  weight: 50
 }];
 if (isFirefox) {
   RANDOM_IPFS_GATEWAY_SETTING.push({
@@ -143,34 +149,18 @@ if (isFirefox) {
     weight: 5000
   });
 }
-if (!_utils.RuntimeInfo.protocol || !_utils.RuntimeInfo.protocol.startsWith('http') || _utils.RuntimeInfo.protocol.startsWith('https')) {
+if (!_utils.RuntimeInfo.protocol || _utils.RuntimeInfo.protocol && !_utils.RuntimeInfo.protocol.startsWith('http')) {
   RANDOM_IPFS_GATEWAY_SETTING.push({
     provider: IPFS_FLEEK,
     weight: 4
-  }, {
+  });
+  RANDOM_IPFS_GATEWAY_SETTING.push({
     provider: IPFS_GATEWAY_4EVERLAND,
     weight: 2
-  }, {
+  });
+  RANDOM_IPFS_GATEWAY_SETTING.push({
     provider: IPFS_W3S_LINK,
     weight: 1
-  }, {
-    provider: CF_IPFS_GATEWAY,
-    weight: 4
-  }, {
-    provider: PINATA_IPFS_GATEWAY,
-    weight: 1 // Rate limit too low
-  }, {
-    provider: NFT_STORAGE_GATEWAY,
-    weight: 50
-  }, {
-    provider: GATEWAY_IPFS_IO,
-    weight: 5
-  }, {
-    provider: DWEB_LINK,
-    weight: 5
-  }, {
-    provider: IPFS_IO,
-    weight: 5
   });
 }
 const RANDOM_IPFS_GATEWAY_TOTAL_WEIGHT = RANDOM_IPFS_GATEWAY_SETTING.reduce((value, item) => value + item.weight, 0);

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

@@ -9,7 +9,6 @@ var _acala_nft = require("@subwallet/extension-base/koni/api/nft/acala_nft");
 var _bit = require("@subwallet/extension-base/koni/api/nft/bit.country");
 var _evm_nft = require("@subwallet/extension-base/koni/api/nft/evm_nft");
 var _karura_nft = require("@subwallet/extension-base/koni/api/nft/karura_nft");
-var _ordinal_nft = _interopRequireDefault(require("@subwallet/extension-base/koni/api/nft/ordinal_nft"));
 var _rmrk_nft = require("@subwallet/extension-base/koni/api/nft/rmrk_nft");
 var _statemine_nft = _interopRequireDefault(require("@subwallet/extension-base/koni/api/nft/statemine_nft"));
 var _unique_nft = _interopRequireDefault(require("@subwallet/extension-base/koni/api/nft/unique_nft"));
@@ -51,9 +50,6 @@ function createWeb3NftApi(chain, evmApi, addresses) {
   const [, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
   return new _evm_nft.EvmNftApi(evmApi, evmAddresses, chain);
 }
-const createOrdinalApi = (chain, subscanChain, addresses) => {
-  return new _ordinal_nft.default(addresses, chain, subscanChain);
-};
 class NftHandler {
   // General settings
   chainInfoMap = {};
@@ -134,16 +130,6 @@ class NftHandler {
               }
             }
           }
-          if ((0, _utils._isSupportOrdinal)(chain)) {
-            var _chainInfo$extraInfo;
-            const subscanChain = (_chainInfo$extraInfo = chainInfo.extraInfo) === null || _chainInfo$extraInfo === void 0 ? void 0 : _chainInfo$extraInfo.subscanSlug;
-            if (subscanChain) {
-              const handler = createOrdinalApi(chain, subscanChain, substrateAddresses);
-              if (handler && !this.handlers.includes(handler)) {
-                this.handlers.push(handler);
-              }
-            }
-          }
         });
         this.needSetupApi = false;
       }

package/cjs/koni/api/nft/nft.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BaseNftApi = void 0;
+var _config = require("@subwallet/extension-base/koni/api/nft/config");
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -70,7 +71,27 @@ class BaseNftApi {
     return tokenId;
   }
   parseUrl(input) {
-    return (0, _utils.baseParseIPFSUrl)(input);
+    if (!input || input.length === 0) {
+      return undefined;
+    }
+    if ((0, _utils.isUrl)(input)) {
+      return input;
+    }
+    if ((0, _utils.isUrl)(input) || input.includes('https://') || input.includes('http')) {
+      return input;
+    }
+    if (input.startsWith('/ipfs/')) {
+      return (0, _config.getRandomIpfsGateway)() + input.split('/ipfs/')[1];
+    }
+    if (!input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
+      // just the IPFS hash
+      return (0, _config.getRandomIpfsGateway)() + input;
+    }
+    if (input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
+      // starts with ipfs://
+      return (0, _config.getRandomIpfsGateway)() + input.split('ipfs://')[1];
+    }
+    return (0, _config.getRandomIpfsGateway)() + input.split('ipfs://ipfs/')[1]; // starts with ipfs://ipfs/
   }
 
   // Subclass implements this function to parse data into prop result

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

@@ -15,9 +15,7 @@ exports.subscribeAmplitudeStakingMetadata = subscribeAmplitudeStakingMetadata;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
-var _utils2 = require("@subwallet/extension-base/services/earning-service/utils");
-var _types = require("@subwallet/extension-base/types");
-var _utils3 = require("@subwallet/extension-base/utils");
+var _utils2 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -26,13 +24,13 @@ var _utilCrypto = require("@polkadot/util-crypto");
 function subscribeAmplitudeStakingMetadata(chain, substrateApi, callback) {
   return substrateApi.api.query.parachainStaking.round(_round => {
     const roundObj = _round.toHuman();
-    const round = (0, _utils3.parseRawNumber)(roundObj.current);
+    const round = (0, _utils2.parseRawNumber)(roundObj.current);
     const maxDelegations = substrateApi.api.consts.parachainStaking.maxDelegationsPerRound.toString();
     const minDelegatorStake = substrateApi.api.consts.parachainStaking.minDelegatorStake.toString();
     const unstakingDelay = substrateApi.api.consts.parachainStaking.stakeDuration.toString();
     const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
     const blockPerRound = parseFloat(_blockPerRound);
-    const blockDuration = (_constants._STAKING_ERA_LENGTH_MAP[chain] || _constants._STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
+    const blockDuration = (_constants._STAKING_ERA_LENGTH_MAP[chain] || _constants._STAKING_ERA_LENGTH_MAP.default) / blockPerRound;
     const unstakingPeriod = blockDuration * parseInt(unstakingDelay);
     callback(chain, {
       chain,
@@ -50,7 +48,7 @@ function subscribeAmplitudeStakingMetadata(chain, substrateApi, callback) {
 async function getAmplitudeStakingMetadata(chain, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const _round = (await chainApi.api.query.parachainStaking.round()).toHuman();
-  const round = (0, _utils3.parseRawNumber)(_round.current);
+  const round = (0, _utils2.parseRawNumber)(_round.current);
   const maxDelegations = chainApi.api.consts.parachainStaking.maxDelegationsPerRound.toString();
   const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
   const unstakingDelay = chainApi.api.consts.parachainStaking.stakeDuration.toString();
@@ -74,48 +72,54 @@ async function subscribeAmplitudeNominatorMetadata(chainInfo, address, substrate
   const nominationList = [];
   const unstakingList = [];
   const minDelegatorStake = substrateApi.api.consts.parachainStaking.minDelegatorStake.toString();
+  const hasUnstakingInfo = unstakingInfo && Object.values(unstakingInfo).length > 0;
   let activeStake = '0';
   if (delegatorState) {
     // delegatorState can be null while unstaking all
-    const [identity] = await (0, _utils2.parseIdentity)(substrateApi, delegatorState.owner);
-    activeStake = delegatorState.amount.toString();
-    const bnActiveStake = new _util.BN(activeStake);
-    let delegationStatus = _types.EarningStatus.NOT_EARNING;
-    if (bnActiveStake.gt(_util.BN_ZERO) && bnActiveStake.gte(new _util.BN(minDelegatorStake))) {
-      delegationStatus = _types.EarningStatus.EARNING_REWARD;
-    }
-    nominationList.push({
-      status: delegationStatus,
-      chain: chainInfo.slug,
-      validatorAddress: delegatorState.owner,
-      activeStake: delegatorState.amount.toString(),
-      validatorMinStake: '0',
-      hasUnstaking: !!unstakingInfo && Object.values(unstakingInfo).length > 0,
-      validatorIdentity: identity
-    });
-  }
-  if (unstakingInfo && Object.values(unstakingInfo).length > 0) {
-    const _currentBlockInfo = await substrateApi.api.rpc.chain.getHeader();
-    const currentBlockInfo = _currentBlockInfo.toPrimitive();
-    const currentBlockNumber = currentBlockInfo.number;
-    const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
-    const blockPerRound = parseFloat(_blockPerRound);
-    const nearestUnstakingBlock = Object.keys(unstakingInfo)[0];
-    const nearestUnstakingAmount = Object.values(unstakingInfo)[0];
-    const blockDuration = (_constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
+    const identityPromises = delegatorState.map(delegate => (0, _utils.parseIdentity)(substrateApi, delegate.owner));
+    const identities = await Promise.all(identityPromises);
+    for (let i = 0; i < delegatorState.length; i++) {
+      const delegate = delegatorState[i];
+      const [identity] = identities[i];
+      activeStake = delegate.amount.toString();
+      const bnActiveStake = new _util.BN(activeStake);
+      let delegationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
+      if (bnActiveStake.gt(_util.BN_ZERO) && bnActiveStake.gte(new _util.BN(minDelegatorStake))) {
+        delegationStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
+      }
+      nominationList.push({
+        status: delegationStatus,
+        chain: chainInfo.slug,
+        validatorAddress: delegate.owner,
+        activeStake: delegate.amount.toString(),
+        validatorMinStake: '0',
+        hasUnstaking: hasUnstakingInfo,
+        validatorIdentity: identity
+      });
+      if (hasUnstakingInfo) {
+        const _currentBlockInfo = await substrateApi.api.rpc.chain.getHeader();
+        const currentBlockInfo = _currentBlockInfo.toPrimitive();
+        const currentBlockNumber = currentBlockInfo.number;
+        const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
+        const blockPerRound = parseFloat(_blockPerRound);
+        const nearestUnstakingBlock = Object.keys(unstakingInfo)[0];
+        const nearestUnstakingAmount = Object.values(unstakingInfo)[0];
+        const blockDuration = (_constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
 
-    const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber < 0;
-    const remainingBlock = parseInt(nearestUnstakingBlock) - currentBlockNumber;
-    const waitingTime = remainingBlock * blockDuration;
-    unstakingList.push({
-      chain: chainInfo.slug,
-      status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
-      claimable: nearestUnstakingAmount.toString(),
-      waitingTime,
-      validatorAddress: (delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.owner) || undefined
-    });
+        const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber < 0;
+        const remainingBlock = parseInt(nearestUnstakingBlock) - currentBlockNumber;
+        const waitingTime = remainingBlock * blockDuration;
+        unstakingList.push({
+          chain: chainInfo.slug,
+          status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
+          claimable: nearestUnstakingAmount.toString(),
+          waitingTime,
+          validatorAddress: (delegate === null || delegate === void 0 ? void 0 : delegate.owner) || undefined
+        });
+      }
+    }
   }
-  const stakingStatus = (0, _utils.getEarningStatusByNominations)(new _util.BN(activeStake), nominationList);
+  const stakingStatus = (0, _utils.getStakingStatusByNominations)(new _util.BN(activeStake), nominationList);
   return {
     chain: chainInfo.slug,
     type: _KoniTypes.StakingType.NOMINATED,
@@ -147,7 +151,7 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
       chain: chainInfo.slug,
       type: _KoniTypes.StakingType.NOMINATED,
       address,
-      status: _types.EarningStatus.NOT_STAKING,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       unstakings: []
@@ -156,12 +160,12 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
   let activeStake = '0';
   if (delegatorState) {
     // delegatorState can be null while unstaking all
-    const [identity] = await (0, _utils2.parseIdentity)(substrateApi, delegatorState.owner);
+    const [identity] = await (0, _utils.parseIdentity)(substrateApi, delegatorState.owner);
     activeStake = delegatorState.amount.toString();
     const bnActiveStake = new _util.BN(activeStake);
-    let delegationStatus = _types.EarningStatus.NOT_EARNING;
+    let delegationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
     if (bnActiveStake.gt(_util.BN_ZERO) && bnActiveStake.gte(new _util.BN(minDelegatorStake))) {
-      delegationStatus = _types.EarningStatus.EARNING_REWARD;
+      delegationStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
     }
     nominationList.push({
       status: delegationStatus,
@@ -188,7 +192,7 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
     const waitingTime = remainingBlock * blockDuration;
     unstakingList.push({
       chain,
-      status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
+      status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
       claimable: nearestUnstakingAmount.toString(),
       waitingTime,
       validatorAddress: (delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.owner) || undefined
@@ -197,7 +201,7 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
   if (nominationList.length === 0 && unstakingList.length === 0) {
     return;
   }
-  const stakingStatus = (0, _utils.getEarningStatusByNominations)(new _util.BN(activeStake), nominationList);
+  const stakingStatus = (0, _utils.getStakingStatusByNominations)(new _util.BN(activeStake), nominationList);
   return {
     chain,
     type: _KoniTypes.StakingType.NOMINATED,
@@ -210,33 +214,61 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
 }
 async function getAmplitudeCollatorsInfo(chain, substrateApi) {
   const chainApi = await substrateApi.isReady;
-  const [_allCollators, _inflationConfig] = await Promise.all([chainApi.api.query.parachainStaking.candidatePool.entries(), chainApi.api.query.parachainStaking.inflationConfig()]);
-  const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
-  const inflationConfig = _inflationConfig.toHuman();
-  const rawDelegatorReturn = inflationConfig.delegator.rewardRate.annual;
-  const delegatorReturn = parseFloat(rawDelegatorReturn.split('%')[0]);
-  const allCollators = [];
-  for (const _collator of _allCollators) {
-    const collatorInfo = _collator[1].toPrimitive();
-    const bnTotalStake = new _util.BN(collatorInfo.total);
-    const bnOwnStake = new _util.BN(collatorInfo.stake);
-    const bnOtherStake = bnTotalStake.sub(bnOwnStake);
-    allCollators.push({
-      address: collatorInfo.id,
-      totalStake: bnTotalStake.toString(),
-      ownStake: bnOwnStake.toString(),
-      otherStake: bnOtherStake.toString(),
-      nominatorCount: collatorInfo.delegators.length,
-      commission: 0,
-      expectedReturn: delegatorReturn,
-      blocked: false,
-      isVerified: false,
-      minBond: '0',
-      chain,
-      isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
-    });
+
+  // Noted: Krest do not have reward
+  if (_constants._STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
+    const _allCollators = await chainApi.api.query.parachainStaking.candidatePool.entries();
+    const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
+    const allCollators = [];
+    for (const _collator of _allCollators) {
+      const collatorInfo = _collator[1].toPrimitive();
+      const bnTotalStake = new _util.BN(collatorInfo.total);
+      const bnOwnStake = new _util.BN(collatorInfo.stake);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      allCollators.push({
+        address: collatorInfo.id,
+        totalStake: bnTotalStake.toString(),
+        ownStake: bnOwnStake.toString(),
+        otherStake: bnOtherStake.toString(),
+        nominatorCount: collatorInfo.delegators.length,
+        commission: 0,
+        blocked: false,
+        isVerified: false,
+        minBond: '0',
+        chain,
+        isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
+      });
+    }
+    return allCollators;
+  } else {
+    const [_allCollators, _inflationConfig] = await Promise.all([chainApi.api.query.parachainStaking.candidatePool.entries(), chainApi.api.query.parachainStaking.inflationConfig()]);
+    const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
+    const inflationConfig = _inflationConfig.toHuman();
+    const rawDelegatorReturn = inflationConfig.delegator.rewardRate.annual;
+    const delegatorReturn = parseFloat(rawDelegatorReturn.split('%')[0]);
+    const allCollators = [];
+    for (const _collator of _allCollators) {
+      const collatorInfo = _collator[1].toPrimitive();
+      const bnTotalStake = new _util.BN(collatorInfo.total);
+      const bnOwnStake = new _util.BN(collatorInfo.stake);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      allCollators.push({
+        address: collatorInfo.id,
+        totalStake: bnTotalStake.toString(),
+        ownStake: bnOwnStake.toString(),
+        otherStake: bnOtherStake.toString(),
+        nominatorCount: collatorInfo.delegators.length,
+        commission: 0,
+        expectedReturn: delegatorReturn,
+        blocked: false,
+        isVerified: false,
+        minBond: '0',
+        chain,
+        isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
+      });
+    }
+    return allCollators;
   }
-  return allCollators;
 }
 async function getAmplitudeBondingExtrinsic(substrateApi, amount, selectedValidatorInfo, nominatorMetadata) {
   const chainApi = await substrateApi.isReady;
@@ -247,7 +279,7 @@ async function getAmplitudeBondingExtrinsic(substrateApi, amount, selectedValida
   const {
     bondedValidators
   } = (0, _utils.getBondedValidators)(nominatorMetadata.nominations);
-  if (!bondedValidators.includes((0, _utils3.reformatAddress)(selectedValidatorInfo.address, 0))) {
+  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

@@ -17,7 +17,6 @@ exports.subscribeAstarStakingMetadata = subscribeAstarStakingMetadata;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
-var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _util = require("@polkadot/util");
@@ -116,7 +115,7 @@ async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi,
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new _util.BN(currentStake);
       if (bnCurrentStake.gt(_util.BN_ZERO)) {
-        const dappStakingStatus = bnCurrentStake.gt(_util.BN_ZERO) && bnCurrentStake.gte(new _util.BN(minDelegatorStake)) ? _types.EarningStatus.EARNING_REWARD : _types.EarningStatus.NOT_EARNING;
+        const dappStakingStatus = bnCurrentStake.gt(_util.BN_ZERO) && bnCurrentStake.gte(new _util.BN(minDelegatorStake)) ? _KoniTypes.StakingStatus.EARNING_REWARD : _KoniTypes.StakingStatus.NOT_EARNING;
         bnTotalActiveStake = bnTotalActiveStake.add(bnCurrentStake);
         const dappInfo = dAppInfoMap[dappAddress];
         nominationList.push({
@@ -140,7 +139,7 @@ async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi,
       const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
       unstakingList.push({
         chain: chainInfo.slug,
-        status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
+        status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
         claimable: unlockingChunk.amount.toString(),
         waitingTime
       });
@@ -151,13 +150,13 @@ async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi,
       chain: chainInfo.slug,
       type: _KoniTypes.StakingType.NOMINATED,
       address,
-      status: _types.EarningStatus.NOT_STAKING,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       unstakings: []
     };
   }
-  const stakingStatus = (0, _utils.getEarningStatusByNominations)(bnTotalActiveStake, nominationList);
+  const stakingStatus = (0, _utils.getStakingStatusByNominations)(bnTotalActiveStake, nominationList);
   return {
     chain: chainInfo.slug,
     type: _KoniTypes.StakingType.NOMINATED,
@@ -202,7 +201,7 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new _util.BN(currentStake);
       if (bnCurrentStake.gt(_util.BN_ZERO)) {
-        const dappStakingStatus = bnCurrentStake.gt(_util.BN_ZERO) && bnCurrentStake.gte(new _util.BN(minDelegatorStake)) ? _types.EarningStatus.EARNING_REWARD : _types.EarningStatus.NOT_EARNING;
+        const dappStakingStatus = bnCurrentStake.gt(_util.BN_ZERO) && bnCurrentStake.gte(new _util.BN(minDelegatorStake)) ? _KoniTypes.StakingStatus.EARNING_REWARD : _KoniTypes.StakingStatus.NOT_EARNING;
         bnTotalActiveStake = bnTotalActiveStake.add(bnCurrentStake);
         const dappInfo = dAppInfoMap[dappAddress];
         nominationList.push({
@@ -226,7 +225,7 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
       const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
       unstakingList.push({
         chain,
-        status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
+        status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
         claimable: unlockingChunk.amount.toString(),
         waitingTime
       });
@@ -237,13 +236,13 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
       chain: chainInfo.slug,
       type: _KoniTypes.StakingType.NOMINATED,
       address,
-      status: _types.EarningStatus.NOT_STAKING,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       unstakings: []
     };
   }
-  const stakingStatus = (0, _utils.getEarningStatusByNominations)(bnTotalActiveStake, nominationList);
+  const stakingStatus = (0, _utils.getStakingStatusByNominations)(bnTotalActiveStake, nominationList);
   return {
     chain,
     type: _KoniTypes.StakingType.NOMINATED,
@@ -370,13 +369,13 @@ async function getAstarClaimRewardExtrinsic(substrateApi, address) {
 function getAstarWithdrawable(nominatorMetadata) {
   const unstakingInfo = {
     chain: nominatorMetadata.chain,
-    status: _types.UnstakingStatus.CLAIMABLE,
+    status: _KoniTypes.UnstakingStatus.CLAIMABLE,
     claimable: '0',
     waitingTime: 0
   };
   let bnWithdrawable = _util.BN_ZERO;
   for (const unstaking of nominatorMetadata.unstakings) {
-    if (unstaking.status === _types.UnstakingStatus.CLAIMABLE) {
+    if (unstaking.status === _KoniTypes.UnstakingStatus.CLAIMABLE) {
       bnWithdrawable = bnWithdrawable.add(new _util.BN(unstaking.claimable));
     }
   }

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

@@ -20,16 +20,13 @@ var _amplitude = require("@subwallet/extension-base/koni/api/staking/bonding/amp
 var _astar = require("@subwallet/extension-base/koni/api/staking/bonding/astar");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/bonding/paraChain");
 var _relayChain = require("@subwallet/extension-base/koni/api/staking/bonding/relayChain");
-var _constants = require("@subwallet/extension-base/services/earning-service/constants");
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // all addresses must be converted to its chain format
 
 function validateUnbondingCondition(nominatorMetadata, amount, chain, chainStakingMetadata, selectedValidator) {
-  if (nominatorMetadata.type === _KoniTypes.StakingType.LIQUID_STAKING) {
-    return [];
-  }
   if (_constants._STAKING_CHAIN_GROUP.relay.includes(chain)) {
     return (0, _relayChain.validateRelayUnbondingCondition)(amount, chainStakingMetadata, nominatorMetadata);
   }
@@ -41,6 +38,8 @@ function validateBondingCondition(chainInfo, amount, selectedValidators, address
   }
   return (0, _paraChain.validateParaChainBondingCondition)(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata);
 }
+
+/** Deprecated */
 async function getChainStakingMetadata(chainInfo, substrateApi) {
   if (_constants._STAKING_CHAIN_GROUP.astar.includes(chainInfo.slug)) {
     return (0, _astar.getAstarStakingMetadata)(chainInfo.slug, substrateApi);