@subwallet/extension-base 1.1.33-beta.0 → 1.1.34-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,10 +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 _constants2 = require("@subwallet/extension-base/services/earning-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
@@ -27,7 +24,7 @@ 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();
@@ -51,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();
@@ -79,16 +76,16 @@ async function subscribeAmplitudeNominatorMetadata(chainInfo, address, substrate
   let activeStake = '0';
   if (delegatorState) {
     // delegatorState can be null while unstaking all
-    const identityPromises = delegatorState.map(delegate => (0, _utils2.parseIdentity)(substrateApi, delegate.owner));
+    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 = _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,
@@ -114,7 +111,7 @@ async function subscribeAmplitudeNominatorMetadata(chainInfo, address, substrate
         const waitingTime = remainingBlock * blockDuration;
         unstakingList.push({
           chain: chainInfo.slug,
-          status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
+          status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
           claimable: unstakingAmount.toString(),
           waitingTime,
           validatorAddress: undefined
@@ -122,7 +119,7 @@ async function subscribeAmplitudeNominatorMetadata(chainInfo, address, substrate
       }
     }
   }
-  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,
@@ -154,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: []
@@ -163,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,
@@ -195,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
@@ -204,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,
@@ -219,7 +216,7 @@ async function getAmplitudeCollatorsInfo(chain, substrateApi) {
   const chainApi = await substrateApi.isReady;
 
   // Noted: Krest do not have reward
-  if (_constants2._STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
+  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 = [];
@@ -282,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);
   }

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

@@ -21,9 +21,7 @@ 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/chain-service/utils");
-var _utils3 = require("@subwallet/extension-base/services/earning-service/utils");
-var _types = require("@subwallet/extension-base/types");
-var _utils4 = require("@subwallet/extension-base/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -33,7 +31,7 @@ function validateParaChainUnbondingCondition(amount, nominatorMetadata, chainSta
   const errors = [];
   let targetNomination;
   for (const nomination of nominatorMetadata.nominations) {
-    if ((0, _utils4.isSameAddress)(nomination.validatorAddress, selectedCollator)) {
+    if ((0, _utils3.isSameAddress)(nomination.validatorAddress, selectedCollator)) {
       targetNomination = nomination;
       break;
     }
@@ -66,7 +64,7 @@ function validateParaChainBondingCondition(chainInfo, amount, selectedCollators,
   const minStakeErrorMessage = (0, _utils.getMinStakeErrorMessage)(chainInfo, bnMinStake);
   const maxValidatorErrorMessage = (0, _utils.getMaxValidatorErrorMessage)(chainInfo, chainStakingMetadata.maxValidatorPerNominator);
   const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(chainInfo.slug, nominatorMetadata === null || nominatorMetadata === void 0 ? void 0 : nominatorMetadata.type, true);
-  if (!nominatorMetadata || nominatorMetadata.status === _types.EarningStatus.NOT_STAKING) {
+  if (!nominatorMetadata || nominatorMetadata.status === _KoniTypes.StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
     }
@@ -75,7 +73,7 @@ function validateParaChainBondingCondition(chainInfo, amount, selectedCollators,
   const {
     bondedValidators
   } = (0, _utils.getBondedValidators)(nominatorMetadata.nominations);
-  const parsedSelectedCollatorAddress = (0, _utils4.reformatAddress)(selectedCollator.address, 0);
+  const parsedSelectedCollatorAddress = (0, _utils3.reformatAddress)(selectedCollator.address, 0);
   if (!bondedValidators.includes(parsedSelectedCollatorAddress)) {
     // new delegation
     if (!bnTotalStake.gte(bnMinStake)) {
@@ -89,7 +87,7 @@ function validateParaChainBondingCondition(chainInfo, amount, selectedCollators,
     let currentDelegationAmount = '0';
     let hasUnstaking = false;
     for (const delegation of nominatorMetadata.nominations) {
-      if ((0, _utils4.reformatAddress)(delegation.validatorAddress, 0) === parsedSelectedCollatorAddress) {
+      if ((0, _utils3.reformatAddress)(delegation.validatorAddress, 0) === parsedSelectedCollatorAddress) {
         currentDelegationAmount = delegation.activeStake;
         hasUnstaking = !!delegation.hasUnstaking && delegation.hasUnstaking;
         break;
@@ -109,7 +107,7 @@ function subscribeParaChainStakingMetadata(chain, substrateApi, callback) {
   return substrateApi.api.query.parachainStaking.round(_round => {
     var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$con3, _substrateApi$api$con4, _substrateApi$api$con5, _substrateApi$api$con6;
     const roundObj = _round.toHuman();
-    const round = (0, _utils4.parseRawNumber)(roundObj.current);
+    const round = (0, _utils3.parseRawNumber)(roundObj.current);
     const maxDelegations = (_substrateApi$api$con = substrateApi.api.consts) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.parachainStaking) === null || _substrateApi$api$con2 === void 0 ? void 0 : (_substrateApi$api$con3 = _substrateApi$api$con2.maxDelegationsPerDelegator) === null || _substrateApi$api$con3 === void 0 ? void 0 : _substrateApi$api$con3.toString();
     const unstakingDelay = substrateApi.api.consts.parachainStaking.delegationBondLessDelay.toString();
     const unstakingPeriod = parseInt(unstakingDelay) * (_constants._STAKING_ERA_LENGTH_MAP[chain] || _constants._STAKING_ERA_LENGTH_MAP.default);
@@ -131,7 +129,7 @@ async function getParaChainStakingMetadata(chain, substrateApi) {
   var _chainApi$api$consts$, _chainApi$api$consts$2;
   const chainApi = await substrateApi.isReady;
   const _round = (await chainApi.api.query.parachainStaking.round()).toHuman();
-  const round = (0, _utils4.parseRawNumber)(_round.current);
+  const round = (0, _utils3.parseRawNumber)(_round.current);
   const maxDelegations = chainApi.api.consts.parachainStaking.maxDelegationsPerDelegator.toString();
   const unstakingDelay = chainApi.api.consts.parachainStaking.delegationBondLessDelay.toString();
   const minDelegatorStake = (_chainApi$api$consts$ = chainApi.api.consts.parachainStaking) === null || _chainApi$api$consts$ === void 0 ? void 0 : (_chainApi$api$consts$2 = _chainApi$api$consts$.minDelegatorStk) === null || _chainApi$api$consts$2 === void 0 ? void 0 : _chainApi$api$consts$2.toString();
@@ -152,7 +150,7 @@ async function getParaChainStakingMetadata(chain, substrateApi) {
   }
 
   const inflationConfig = _inflation.toHuman();
-  const inflation = (0, _utils.getParaCurrentInflation)((0, _utils4.parseRawNumber)(totalStake.toString()), inflationConfig);
+  const inflation = (0, _utils.getParaCurrentInflation)((0, _utils3.parseRawNumber)(totalStake.toString()), inflationConfig);
   const unstakingPeriod = parseInt(unstakingDelay) * _constants._STAKING_ERA_LENGTH_MAP[chain];
   return {
     chain,
@@ -175,17 +173,17 @@ async function subscribeParaChainNominatorMetadata(chainInfo, address, substrate
   const roundInfo = _roundInfo.toPrimitive();
   const currentRound = roundInfo.current;
   await Promise.all(delegatorState.delegations.map(async delegation => {
-    const [_delegationScheduledRequests, [identity], _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils3.parseIdentity)(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
+    const [_delegationScheduledRequests, [identity], _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils.parseIdentity)(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
     const collatorInfo = _collatorInfo.toPrimitive();
     const minDelegation = collatorInfo === null || collatorInfo === void 0 ? void 0 : collatorInfo.lowestTopDelegationAmount.toString();
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
     let hasUnstaking = false;
-    let delegationStatus = _types.EarningStatus.NOT_EARNING;
+    let delegationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
 
     // parse unstaking info
     if (delegationScheduledRequests) {
       for (const scheduledRequest of delegationScheduledRequests) {
-        if ((0, _utils4.reformatAddress)(scheduledRequest.delegator, 0) === (0, _utils4.reformatAddress)(address, 0)) {
+        if ((0, _utils3.reformatAddress)(scheduledRequest.delegator, 0) === (0, _utils3.reformatAddress)(address, 0)) {
           // add network prefix
           const isClaimable = scheduledRequest.whenExecutable - currentRound < 0;
           const remainingEra = scheduledRequest.whenExecutable - currentRound;
@@ -193,7 +191,7 @@ async function subscribeParaChainNominatorMetadata(chainInfo, address, substrate
           const claimable = Object.values(scheduledRequest.action)[0];
           unstakingMap[delegation.owner] = {
             chain: chainInfo.slug,
-            status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
+            status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
             validatorAddress: delegation.owner,
             claimable: claimable.toString(),
             waitingTime
@@ -208,7 +206,7 @@ async function subscribeParaChainNominatorMetadata(chainInfo, address, substrate
     const bnUnstakeBalance = unstakingMap[delegation.owner] ? new _util.BN(unstakingMap[delegation.owner].claimable) : _util.BN_ZERO;
     const bnActiveStake = bnStake.sub(bnUnstakeBalance);
     if (bnActiveStake.gt(_util.BN_ZERO) && bnActiveStake.gte(new _util.BN(minDelegation))) {
-      delegationStatus = _types.EarningStatus.EARNING_REWARD;
+      delegationStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
     }
     bnTotalActiveStake = bnTotalActiveStake.add(bnActiveStake);
     nominationList.push({
@@ -229,7 +227,7 @@ async function subscribeParaChainNominatorMetadata(chainInfo, address, substrate
   //   nomination.validatorMinStake = collatorInfo.lowestTopDelegationAmount.toString();
   // }));
 
-  const stakingStatus = (0, _utils.getEarningStatusByNominations)(bnTotalActiveStake, nominationList);
+  const stakingStatus = (0, _utils.getStakingStatusByNominations)(bnTotalActiveStake, nominationList);
   return {
     chain: chainInfo.slug,
     type: _KoniTypes.StakingType.NOMINATED,
@@ -259,7 +257,7 @@ async function getParaChainNominatorMetadata(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: []
@@ -267,19 +265,19 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
   }
   let bnTotalActiveStake = _util.BN_ZERO;
   await Promise.all(delegatorState.delegations.map(async delegation => {
-    const [_delegationScheduledRequests, [identity], _roundInfo, _collatorInfo] = await Promise.all([chainApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils3.parseIdentity)(substrateApi, delegation.owner), chainApi.api.query.parachainStaking.round(), chainApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
+    const [_delegationScheduledRequests, [identity], _roundInfo, _collatorInfo] = await Promise.all([chainApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils.parseIdentity)(substrateApi, delegation.owner), chainApi.api.query.parachainStaking.round(), chainApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
     const rawCollatorInfo = _collatorInfo.toHuman();
     const minDelegation = (rawCollatorInfo === null || rawCollatorInfo === void 0 ? void 0 : rawCollatorInfo.lowestTopDelegationAmount).replaceAll(',', '');
     const roundInfo = _roundInfo.toPrimitive();
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
     const currentRound = roundInfo.current;
     let hasUnstaking = false;
-    let delegationStatus = _types.EarningStatus.NOT_EARNING;
+    let delegationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
 
     // parse unstaking info
     if (delegationScheduledRequests) {
       for (const scheduledRequest of delegationScheduledRequests) {
-        if ((0, _utils4.reformatAddress)(scheduledRequest.delegator, 0) === (0, _utils4.reformatAddress)(address, 0)) {
+        if ((0, _utils3.reformatAddress)(scheduledRequest.delegator, 0) === (0, _utils3.reformatAddress)(address, 0)) {
           // add network prefix
           const isClaimable = scheduledRequest.whenExecutable - currentRound < 0;
           const remainingEra = scheduledRequest.whenExecutable - (currentRound + 1);
@@ -287,7 +285,7 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
           const claimable = Object.values(scheduledRequest.action)[0];
           unstakingMap[delegation.owner] = {
             chain,
-            status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
+            status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
             validatorAddress: delegation.owner,
             claimable: claimable.toString(),
             waitingTime: waitingTime
@@ -302,7 +300,7 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
     const bnUnstakeBalance = unstakingMap[delegation.owner] ? new _util.BN(unstakingMap[delegation.owner].claimable) : _util.BN_ZERO;
     const bnActiveStake = bnStake.sub(bnUnstakeBalance);
     if (bnActiveStake.gt(_util.BN_ZERO) && bnActiveStake.gte(new _util.BN(minDelegation))) {
-      delegationStatus = _types.EarningStatus.EARNING_REWARD;
+      delegationStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
     }
     bnTotalActiveStake = bnTotalActiveStake.add(bnActiveStake);
     nominationList.push({
@@ -319,7 +317,7 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
     const collatorInfo = _collatorInfo.toPrimitive();
     nomination.validatorMinStake = collatorInfo.lowestTopDelegationAmount.toString();
   }));
-  const stakingStatus = (0, _utils.getEarningStatusByNominations)(bnTotalActiveStake, nominationList);
+  const stakingStatus = (0, _utils.getStakingStatusByNominations)(bnTotalActiveStake, nominationList);
   return {
     chain,
     type: _KoniTypes.StakingType.NOMINATED,
@@ -362,7 +360,7 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
   }
   const extraInfoMap = {};
   await Promise.all(allCollators.map(async collator => {
-    const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (0, _utils3.parseIdentity)(apiProps, collator.address)]);
+    const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (0, _utils.parseIdentity)(apiProps, collator.address)]);
     const rawInfo = _info.toHuman();
     const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
     extraInfoMap[collator.address] = {
@@ -390,7 +388,7 @@ async function getParaBondingExtrinsic(chainInfo, substrateApi, amount, selected
     bondedValidators,
     nominationCount
   } = (0, _utils.getBondedValidators)(nominatorMetadata.nominations);
-  const parsedSelectedCollatorAddress = (0, _utils4.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 {