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

package/cjs/utils/index.js

@@ -36,12 +36,9 @@ var _exportNames = {
   getDomainFromUrl: true,
   waitTimeout: true,
   stripUrl: true,
-  baseParseIPFSUrl: true,
-  swParseIPFSUrl: true,
   wait: true,
   canDerive: true
 };
-exports.baseParseIPFSUrl = void 0;
 Object.defineProperty(exports, "canDerive", {
   enumerable: true,
   get: function () {
@@ -70,13 +67,12 @@ exports.parseRawNumber = parseRawNumber;
 exports.reformatAddress = reformatAddress;
 exports.stripUrl = void 0;
 exports.sumBN = sumBN;
-exports.toUnit = exports.swParseIPFSUrl = void 0;
+exports.toUnit = void 0;
 exports.utf16ToString = utf16ToString;
 exports.wait = wait;
 exports.waitTimeout = waitTimeout;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
-var _config = require("@subwallet/extension-base/koni/api/nft/config");
 var _environment = require("@subwallet/extension-base/utils/environment");
 var _i18next = require("i18next");
 var _util = require("@polkadot/util");
@@ -118,18 +114,6 @@ Object.keys(_environment2).forEach(function (key) {
     }
   });
 });
-var _number = require("./number");
-Object.keys(_number).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _number[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _number[key];
-    }
-  });
-});
 var _lazy = require("./lazy");
 Object.keys(_lazy).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -142,18 +126,6 @@ Object.keys(_lazy).forEach(function (key) {
     }
   });
 });
-var _promise = require("./promise");
-Object.keys(_promise).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _promise[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _promise[key];
-    }
-  });
-});
 var _registry = require("./registry");
 Object.keys(_registry).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -178,18 +150,6 @@ Object.keys(_translate).forEach(function (key) {
     }
   });
 });
-var _object = require("./object");
-Object.keys(_object).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _object[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _object[key];
-    }
-  });
-});
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -490,54 +450,6 @@ const stripUrl = url => {
   return parts[2];
 };
 exports.stripUrl = stripUrl;
-const baseParseIPFSUrl = input => {
-  if (!input || input.length === 0) {
-    return undefined;
-  }
-  if (isUrl(input)) {
-    return input;
-  }
-  if (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/
-};
-exports.baseParseIPFSUrl = baseParseIPFSUrl;
-const swParseIPFSUrl = input => {
-  if (!input || input.length === 0) {
-    return undefined;
-  }
-  if (isUrl(input)) {
-    return input;
-  }
-  if (isUrl(input) || input.includes('https://') || input.includes('http')) {
-    return input;
-  }
-  if (input.startsWith('/ipfs/')) {
-    return _config.SUBWALLET_IPFS + input.split('/ipfs/')[1];
-  }
-  if (!input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
-    // just the IPFS hash
-    return _config.SUBWALLET_IPFS + input;
-  }
-  if (input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
-    // starts with ipfs://
-    return _config.SUBWALLET_IPFS + input.split('ipfs://')[1];
-  }
-  return _config.SUBWALLET_IPFS + input.split('ipfs://ipfs/')[1]; // starts with ipfs://ipfs/
-};
-exports.swParseIPFSUrl = swParseIPFSUrl;
 function wait(milliseconds) {
   return new Promise(resolve => {
     setTimeout(() => {

package/cjs/utils/number.js

@@ -105,9 +105,7 @@ const toBNString = (input, decimal) => {
   return raw.multipliedBy(BN_TEN.pow(decimal)).toFixed();
 };
 exports.toBNString = toBNString;
-const formatNumber = function (input, decimal) {
-  let formatter = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : balanceFormatter;
-  let metadata = arguments.length > 3 ? arguments[3] : undefined;
+const formatNumber = (input, decimal, formatter, metadata) => {
   const raw = new _bignumber.default(input).dividedBy(BN_TEN.pow(decimal)).toFixed();
   return formatter(raw, metadata);
 };

package/constants/index.d.ts

@@ -1,5 +1,3 @@
-export declare const BASE_SECOND_INTERVAL = 1000;
-export declare const BASE_MINUTE_INTERVAL: number;
 export declare const CRON_REFRESH_PRICE_INTERVAL = 30000;
 export declare const CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = 60000;
 export declare const CRON_AUTO_RECOVER_WEB3_INTERVAL = 90000;
@@ -8,7 +6,7 @@ export declare const ASTAR_REFRESH_BALANCE_INTERVAL = 60000;
 export declare const SUB_TOKEN_REFRESH_BALANCE_INTERVAL = 60000;
 export declare const CRON_REFRESH_NFT_INTERVAL = 7200000;
 export declare const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
-export declare const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 90000;
+export declare const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 300000;
 export declare const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export declare const CRON_GET_API_MAP_STATUS = 10000;
 export declare const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
@@ -16,7 +14,6 @@ export declare const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export declare const CRON_RECOVER_HISTORY_INTERVAL = 30000;
 export declare const CRON_SYNC_MANTA_PAY = 300000;
 export declare const MANTA_PAY_BALANCE_INTERVAL = 30000;
-export declare const CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL: number;
 export declare const ALL_ACCOUNT_KEY = "ALL";
 export declare const ALL_NETWORK_KEY = "all";
 export declare const ALL_GENESIS_HASH: null;
@@ -25,7 +22,5 @@ export declare const IGNORE_QR_SIGNER: string[];
 export declare const XCM_MIN_AMOUNT_RATIO = 1.2;
 export declare const GAS_PRICE_RATIO: number;
 export declare const NETWORK_MULTI_GAS_FEE: string[];
-export declare const ORDINAL_COLLECTION = "__Ordinal__";
-export declare const ORDINAL_METHODS: string[];
 export * from './staking';
 export * from './storage';

package/constants/index.js

@@ -1,8 +1,6 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export const BASE_SECOND_INTERVAL = 1000;
-export const BASE_MINUTE_INTERVAL = 60 * BASE_SECOND_INTERVAL;
 export const CRON_REFRESH_PRICE_INTERVAL = 30000;
 export const CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = 60000;
 export const CRON_AUTO_RECOVER_WEB3_INTERVAL = 90000;
@@ -11,7 +9,7 @@ export const ASTAR_REFRESH_BALANCE_INTERVAL = 60000;
 export const SUB_TOKEN_REFRESH_BALANCE_INTERVAL = 60000;
 export const CRON_REFRESH_NFT_INTERVAL = 7200000;
 export const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
-export const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 90000;
+export const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 300000;
 export const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export const CRON_GET_API_MAP_STATUS = 10000;
 export const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
@@ -19,7 +17,6 @@ export const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export const CRON_RECOVER_HISTORY_INTERVAL = 30000;
 export const CRON_SYNC_MANTA_PAY = 300000;
 export const MANTA_PAY_BALANCE_INTERVAL = 30000;
-export const CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL = 15 * BASE_MINUTE_INTERVAL;
 export const ALL_ACCOUNT_KEY = 'ALL';
 export const ALL_NETWORK_KEY = 'all';
 export const ALL_GENESIS_HASH = null;
@@ -28,7 +25,5 @@ export const IGNORE_QR_SIGNER = [];
 export const XCM_MIN_AMOUNT_RATIO = 1.2;
 export const GAS_PRICE_RATIO = 1 + 2 / 100;
 export const NETWORK_MULTI_GAS_FEE = ['*'];
-export const ORDINAL_COLLECTION = '__Ordinal__';
-export const ORDINAL_METHODS = ['drc-20', 'pol-20'];
 export * from "./staking.js";
 export * from "./storage.js";

package/koni/api/nft/config.js

@@ -15,11 +15,7 @@ export const CLOUDFLARE_PINATA_SERVER = 'https://cloudflare-ipfs.com/ipfs/';
 export const BIT_COUNTRY_IPFS_SERVER = 'https://ipfs-cdn.bit.country/';
 export const BIT_COUNTRY_LAND_ESTATE_METADATA_API = 'https://pioneer-api.bit.country/metadata/landTokenUriPioneer';
 export const BIT_COUNTRY_THUMBNAIL_RESOLVER = 'https://res.cloudinary.com/ddftctzph/image/upload/c_scale,q_100,w_250/production-ipfs/asset/';
-
-// XOrigin
 export const CF_IPFS_GATEWAY = 'https://cf-ipfs.com/ipfs/';
-
-// XOrigin
 export const PINATA_IPFS_GATEWAY = 'https://gateway.pinata.cloud/ipfs/';
 export const UNIQUE_SCAN_ENDPOINT = 'https://explorer-api.unique.network/v1/graphql';
 export const QUARTZ_SCAN_ENDPOINT = 'https://hasura-quartz.unique.network/v1/graphql';
@@ -28,18 +24,10 @@ export const VARA_SCAN_ENDPOINT = 'https://nft-explorer.vara-network.io/graphql'
 // GATEWAY
 
 export const UNIQUE_IPFS_GATEWAY = 'https://ipfs.unique.network/ipfs/';
-
-// XOrigin
 export const NFT_STORAGE_GATEWAY = 'https://nftstorage.link/ipfs/';
 export const IPFS_W3S_LINK = 'https://w3s.link/ipfs/';
-
-// XOrigin
 export const GATEWAY_IPFS_IO = 'https://gateway.ipfs.io/ipfs/';
-
-// XOrigin
 export const IPFS_IO = 'https://ipfs.io/ipfs/';
-
-// XOrigin
 export const DWEB_LINK = 'https://dweb.link/ipfs/';
 export const IPFS_GATEWAY_4EVERLAND = 'https://4everland.io/ipfs/';
 export const IPFS_FLEEK = 'https://ipfs.fleek.co/ipfs/';
@@ -95,8 +83,26 @@ export let SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME;
   SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME["pioneer"] = "pioneer";
 })(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({
@@ -104,34 +110,18 @@ if (isFirefox) {
     weight: 5000
   });
 }
-if (!RuntimeInfo.protocol || !RuntimeInfo.protocol.startsWith('http') || RuntimeInfo.protocol.startsWith('https')) {
+if (!RuntimeInfo.protocol || RuntimeInfo.protocol && !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/koni/api/nft/index.js

@@ -5,14 +5,13 @@ import { AcalaNftApi } from '@subwallet/extension-base/koni/api/nft/acala_nft';
 import { BitCountryNftApi } from '@subwallet/extension-base/koni/api/nft/bit.country';
 import { EvmNftApi } from '@subwallet/extension-base/koni/api/nft/evm_nft';
 import { KaruraNftApi } from '@subwallet/extension-base/koni/api/nft/karura_nft';
-import OrdinalNftApi from '@subwallet/extension-base/koni/api/nft/ordinal_nft';
 import { RmrkNftApi } from '@subwallet/extension-base/koni/api/nft/rmrk_nft';
 import StatemineNftApi from '@subwallet/extension-base/koni/api/nft/statemine_nft';
 import UniqueNftApi from '@subwallet/extension-base/koni/api/nft/unique_nft';
 import { VaraNftApi } from '@subwallet/extension-base/koni/api/nft/vara_nft';
 import { WasmNftApi } from '@subwallet/extension-base/koni/api/nft/wasm_nft';
 import { _NFT_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft, _isSupportOrdinal } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses } from '@subwallet/extension-base/utils';
 import StatemintNftApi from "./statemint_nft/index.js";
 function createSubstrateNftApi(chain, substrateApi, addresses) {
@@ -44,9 +43,6 @@ function createWeb3NftApi(chain, evmApi, addresses) {
   const [, evmAddresses] = categoryAddresses(addresses);
   return new EvmNftApi(evmApi, evmAddresses, chain);
 }
-const createOrdinalApi = (chain, subscanChain, addresses) => {
-  return new OrdinalNftApi(addresses, chain, subscanChain);
-};
 export class NftHandler {
   // General settings
   chainInfoMap = {};
@@ -126,16 +122,6 @@ export class NftHandler {
               }
             }
           }
-          if (_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/koni/api/nft/nft.js

@@ -1,7 +1,8 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { baseParseIPFSUrl } from '@subwallet/extension-base/utils';
+import { getRandomIpfsGateway } from '@subwallet/extension-base/koni/api/nft/config';
+import { isUrl } from '@subwallet/extension-base/utils';
 export class BaseNftApi {
   chain = '';
   substrateApi = null;
@@ -64,7 +65,27 @@ export class BaseNftApi {
     return tokenId;
   }
   parseUrl(input) {
-    return baseParseIPFSUrl(input);
+    if (!input || input.length === 0) {
+      return undefined;
+    }
+    if (isUrl(input)) {
+      return input;
+    }
+    if (isUrl(input) || input.includes('https://') || input.includes('http')) {
+      return input;
+    }
+    if (input.startsWith('/ipfs/')) {
+      return getRandomIpfsGateway() + input.split('/ipfs/')[1];
+    }
+    if (!input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
+      // just the IPFS hash
+      return getRandomIpfsGateway() + input;
+    }
+    if (input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
+      // starts with ipfs://
+      return getRandomIpfsGateway() + input.split('ipfs://')[1];
+    }
+    return getRandomIpfsGateway() + input.split('ipfs://ipfs/')[1]; // starts with ipfs://ipfs/
   }
 
   // Subclass implements this function to parse data into prop result

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

@@ -1,11 +1,9 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { StakingType } from '@subwallet/extension-base/background/KoniTypes';
-import { getBondedValidators, getEarningStatusByNominations, isUnstakeAll } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
+import { getBondedValidators, getStakingStatusByNominations, isUnstakeAll, parseIdentity } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
-import { parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
-import { EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -66,9 +64,9 @@ export async function subscribeAmplitudeNominatorMetadata(chainInfo, address, su
     const [identity] = await parseIdentity(substrateApi, delegatorState.owner);
     activeStake = delegatorState.amount.toString();
     const bnActiveStake = new BN(activeStake);
-    let delegationStatus = EarningStatus.NOT_EARNING;
+    let delegationStatus = StakingStatus.NOT_EARNING;
     if (bnActiveStake.gt(BN_ZERO) && bnActiveStake.gte(new BN(minDelegatorStake))) {
-      delegationStatus = EarningStatus.EARNING_REWARD;
+      delegationStatus = StakingStatus.EARNING_REWARD;
     }
     nominationList.push({
       status: delegationStatus,
@@ -101,7 +99,7 @@ export async function subscribeAmplitudeNominatorMetadata(chainInfo, address, su
       validatorAddress: (delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.owner) || undefined
     });
   }
-  const stakingStatus = getEarningStatusByNominations(new BN(activeStake), nominationList);
+  const stakingStatus = getStakingStatusByNominations(new BN(activeStake), nominationList);
   return {
     chain: chainInfo.slug,
     type: StakingType.NOMINATED,
@@ -133,7 +131,7 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
       chain: chainInfo.slug,
       type: StakingType.NOMINATED,
       address,
-      status: EarningStatus.NOT_STAKING,
+      status: StakingStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       unstakings: []
@@ -145,9 +143,9 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
     const [identity] = await parseIdentity(substrateApi, delegatorState.owner);
     activeStake = delegatorState.amount.toString();
     const bnActiveStake = new BN(activeStake);
-    let delegationStatus = EarningStatus.NOT_EARNING;
+    let delegationStatus = StakingStatus.NOT_EARNING;
     if (bnActiveStake.gt(BN_ZERO) && bnActiveStake.gte(new BN(minDelegatorStake))) {
-      delegationStatus = EarningStatus.EARNING_REWARD;
+      delegationStatus = StakingStatus.EARNING_REWARD;
     }
     nominationList.push({
       status: delegationStatus,
@@ -183,7 +181,7 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
   if (nominationList.length === 0 && unstakingList.length === 0) {
     return;
   }
-  const stakingStatus = getEarningStatusByNominations(new BN(activeStake), nominationList);
+  const stakingStatus = getStakingStatusByNominations(new BN(activeStake), nominationList);
   return {
     chain,
     type: StakingType.NOMINATED,

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

@@ -1,10 +1,9 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { StakingType } from '@subwallet/extension-base/background/KoniTypes';
-import { getEarningStatusByNominations } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
+import { getStakingStatusByNominations } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
-import { EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { isUrl, parseRawNumber } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
 import { BN, BN_ZERO } from '@polkadot/util';
@@ -100,7 +99,7 @@ export async function subscribeAstarNominatorMetadata(chainInfo, address, substr
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new BN(currentStake);
       if (bnCurrentStake.gt(BN_ZERO)) {
-        const dappStakingStatus = bnCurrentStake.gt(BN_ZERO) && bnCurrentStake.gte(new BN(minDelegatorStake)) ? EarningStatus.EARNING_REWARD : EarningStatus.NOT_EARNING;
+        const dappStakingStatus = bnCurrentStake.gt(BN_ZERO) && bnCurrentStake.gte(new BN(minDelegatorStake)) ? StakingStatus.EARNING_REWARD : StakingStatus.NOT_EARNING;
         bnTotalActiveStake = bnTotalActiveStake.add(bnCurrentStake);
         const dappInfo = dAppInfoMap[dappAddress];
         nominationList.push({
@@ -135,13 +134,13 @@ export async function subscribeAstarNominatorMetadata(chainInfo, address, substr
       chain: chainInfo.slug,
       type: StakingType.NOMINATED,
       address,
-      status: EarningStatus.NOT_STAKING,
+      status: StakingStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       unstakings: []
     };
   }
-  const stakingStatus = getEarningStatusByNominations(bnTotalActiveStake, nominationList);
+  const stakingStatus = getStakingStatusByNominations(bnTotalActiveStake, nominationList);
   return {
     chain: chainInfo.slug,
     type: StakingType.NOMINATED,
@@ -186,7 +185,7 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new BN(currentStake);
       if (bnCurrentStake.gt(BN_ZERO)) {
-        const dappStakingStatus = bnCurrentStake.gt(BN_ZERO) && bnCurrentStake.gte(new BN(minDelegatorStake)) ? EarningStatus.EARNING_REWARD : EarningStatus.NOT_EARNING;
+        const dappStakingStatus = bnCurrentStake.gt(BN_ZERO) && bnCurrentStake.gte(new BN(minDelegatorStake)) ? StakingStatus.EARNING_REWARD : StakingStatus.NOT_EARNING;
         bnTotalActiveStake = bnTotalActiveStake.add(bnCurrentStake);
         const dappInfo = dAppInfoMap[dappAddress];
         nominationList.push({
@@ -221,13 +220,13 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
       chain: chainInfo.slug,
       type: StakingType.NOMINATED,
       address,
-      status: EarningStatus.NOT_STAKING,
+      status: StakingStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       unstakings: []
     };
   }
-  const stakingStatus = getEarningStatusByNominations(bnTotalActiveStake, nominationList);
+  const stakingStatus = getStakingStatusByNominations(bnTotalActiveStake, nominationList);
   return {
     chain,
     type: StakingType.NOMINATED,

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

@@ -4,13 +4,14 @@ import { ChainStakingMetadata, NominatorMetadata, StakingType, UnstakingInfo, Va
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 export declare function validateUnbondingCondition(nominatorMetadata: NominatorMetadata, amount: string, chain: string, chainStakingMetadata: ChainStakingMetadata, selectedValidator?: string): TransactionError[];
 export declare function validateBondingCondition(chainInfo: _ChainInfo, amount: string, selectedValidators: ValidatorInfo[], address: string, chainStakingMetadata: ChainStakingMetadata, nominatorMetadata?: NominatorMetadata): TransactionError[];
+/** Deprecated */
 export declare function getChainStakingMetadata(chainInfo: _ChainInfo, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 /**
  * Deprecated
  * */
 export declare function getNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getValidatorsInfo(networkKey: string, substrateApi: _SubstrateApi, decimals: number, chainStakingMetadata: ChainStakingMetadata): Promise<ValidatorInfo[]>;
-export declare function getNominationPoolsInfo(chain: string, substrateApi: _SubstrateApi): Promise<import("../../../../types").NominationPoolInfo[]>;
+export declare function getNominationPoolsInfo(chain: string, substrateApi: _SubstrateApi): Promise<import("@subwallet/extension-base/background/KoniTypes").NominationPoolInfo[]>;
 export declare function getBondingExtrinsic(chainInfo: _ChainInfo, amount: string, selectedValidators: ValidatorInfo[], substrateApi: _SubstrateApi, address: string, nominatorMetadata?: NominatorMetadata): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getUnbondingExtrinsic(nominatorMetadata: NominatorMetadata, amount: string, chain: string, substrateApi: _SubstrateApi, selectedValidator?: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getWithdrawalExtrinsic(substrateApi: _SubstrateApi, chain: string, nominatorMetadata: NominatorMetadata, validatorAddress?: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;

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

@@ -6,14 +6,10 @@ import { getAmplitudeBondingExtrinsic, getAmplitudeClaimRewardExtrinsic, getAmpl
 import { getAstarBondingExtrinsic, getAstarClaimRewardExtrinsic, getAstarDappsInfo, getAstarNominatorMetadata, getAstarStakingMetadata, getAstarUnbondingExtrinsic, getAstarWithdrawalExtrinsic, subscribeAstarStakingMetadata } from '@subwallet/extension-base/koni/api/staking/bonding/astar';
 import { getParaBondingExtrinsic, getParaCancelWithdrawalExtrinsic, getParachainCollatorsInfo, getParaChainNominatorMetadata, getParaChainStakingMetadata, getParaUnbondingExtrinsic, getParaWithdrawalExtrinsic, subscribeParaChainStakingMetadata, validateParaChainBondingCondition, validateParaChainUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding/paraChain';
 import { getPoolingClaimRewardExtrinsic, getPoolingWithdrawalExtrinsic, getRelayBondingExtrinsic, getRelayCancelWithdrawalExtrinsic, getRelayChainNominatorMetadata, getRelayChainStakingMetadata, getRelayPoolsInfo, getRelayUnbondingExtrinsic, getRelayValidatorsInfo, getRelayWithdrawalExtrinsic, subscribeRelayChainStakingMetadata, validateRelayBondingCondition, validateRelayUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
-import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
-
+import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 // all addresses must be converted to its chain format
 
 export function validateUnbondingCondition(nominatorMetadata, amount, chain, chainStakingMetadata, selectedValidator) {
-  if (nominatorMetadata.type === StakingType.LIQUID_STAKING) {
-    return [];
-  }
   if (_STAKING_CHAIN_GROUP.relay.includes(chain)) {
     return validateRelayUnbondingCondition(amount, chainStakingMetadata, nominatorMetadata);
   }
@@ -25,6 +21,8 @@ export function validateBondingCondition(chainInfo, amount, selectedValidators,
   }
   return validateParaChainBondingCondition(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata);
 }
+
+/** Deprecated */
 export async function getChainStakingMetadata(chainInfo, substrateApi) {
   if (_STAKING_CHAIN_GROUP.astar.includes(chainInfo.slug)) {
     return getAstarStakingMetadata(chainInfo.slug, substrateApi);