@subwallet/extension-base 1.1.2-0 → 1.1.2-1

package/cjs/koni/background/handlers/State.js

@@ -620,51 +620,11 @@ class KoniState {
   setSettings(settings, callback) {
     this.settingService.setSettings(settings, callback);
   }
-  setTheme(theme, callback) {
+  updateSetting(key, value) {
     this.settingService.getSettings(settings => {
       const newSettings = {
         ...settings,
-        theme
-      };
-      this.settingService.setSettings(newSettings, () => {
-        callback && callback(newSettings);
-      });
-    });
-  }
-  setBrowserConfirmationType(browserConfirmationType, callback) {
-    this.settingService.getSettings(settings => {
-      const newSettings = {
-        ...settings,
-        browserConfirmationType
-      };
-      this.settingService.setSettings(newSettings, () => {
-        callback && callback(newSettings);
-      });
-    });
-  }
-  setCamera(value) {
-    this.settingService.getSettings(settings => {
-      const newSettings = {
-        ...settings,
-        camera: value
-      };
-      this.settingService.setSettings(newSettings);
-    });
-  }
-  setAutoLockTime(value) {
-    this.settingService.getSettings(settings => {
-      const newSettings = {
-        ...settings,
-        timeAutoLock: value
-      };
-      this.settingService.setSettings(newSettings);
-    });
-  }
-  setEnableChainPatrol(value) {
-    this.settingService.getSettings(settings => {
-      const newSettings = {
-        ...settings,
-        enableChainPatrol: value
+        [key]: value
       };
       this.settingService.setSettings(newSettings);
     });
@@ -1561,10 +1521,13 @@ class KoniState {
     });
   }
   async reloadNft() {
+    const currentAddress = this.keyringService.currentAccount.address;
+    await this.dbService.removeNftsByAddress(currentAddress);
     return await this.cron.reloadNft();
   }
   async reloadStaking() {
-    return await this.cron.reloadStaking();
+    await this.subscription.reloadStaking();
+    return true;
   }
   async approvePassPhishingPage(_url) {
     return new Promise(resolve => {

package/cjs/koni/background/subscription.js

@@ -1,24 +1,19 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.KoniSubscription = void 0;
-var _constants = require("@subwallet/extension-base/constants");
 var _balance = require("@subwallet/extension-base/koni/api/dotsama/balance");
 var _crowdloan = require("@subwallet/extension-base/koni/api/dotsama/crowdloan");
 var _staking = require("@subwallet/extension-base/koni/api/staking");
 var _bonding = require("@subwallet/extension-base/koni/api/staking/bonding");
-var _relayChain = require("@subwallet/extension-base/koni/api/staking/bonding/relayChain");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/paraChain");
 var _handlers = require("@subwallet/extension-base/koni/background/handlers");
-var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/services/event-service/types");
-var _axios = _interopRequireDefault(require("axios"));
+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
 // SPDX-License-Identifier: Apache-2.0
 
@@ -198,8 +193,6 @@ class KoniSubscription {
       return _this.state.updateNftData(...arguments);
     }, function () {
       return _this.state.setNftCollection(...arguments);
-    }, function () {
-      return _this.state.cleanUpNfts(...arguments);
     }).catch(this.logger.log);
   }
   async subscribeStakingReward(address) {
@@ -250,86 +243,11 @@ class KoniSubscription {
     };
     await Promise.all([(0, _staking.getPoolingStakingRewardData)(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap(), updateState), (0, _paraChain.getAmplitudeUnclaimedStakingReward)(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks, updateState)]);
   }
-  async fetchingStakingFromApi() {
-    try {
-      const response = await _axios.default.get('https://staking-data.subwallet.app/api/staking/get');
-      if (response.status === 200) {
-        return response.data;
-      }
-    } catch (e) {
-      this.logger.error(e);
-    }
-    return {};
-  }
-  async fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap) {
-    const filteredChainInfoMap = {};
-    Object.values(chainInfoMap).forEach(chainInfo => {
-      const chainState = chainStateMap[chainInfo.slug];
-      if (chainState !== null && chainState !== void 0 && chainState.active && (0, _utils._isChainSupportSubstrateStaking)(chainInfo)) {
-        filteredChainInfoMap[chainInfo.slug] = chainInfo;
-      }
-    });
-    if (Object.values(filteredChainInfoMap).length === 0) {
-      return;
-    }
-    const timeout = new Promise(resolve => {
-      const id = setTimeout(() => {
-        clearTimeout(id);
-        resolve(null);
-      }, 3000);
-    });
-
-    // Fetch data from helper API
-    const _dataFromApi = await Promise.race([this.fetchingStakingFromApi(), timeout]);
-    const dataFromApi = _dataFromApi;
-    await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
-      // Use fetch API data if available
-      if (dataFromApi && dataFromApi[chainInfo.slug]) {
-        this.state.updateChainStakingMetadata(dataFromApi[chainInfo.slug], {
-          expectedReturn: dataFromApi[chainInfo.slug].expectedReturn,
-          inflation: dataFromApi[chainInfo.slug].inflation,
-          nominatorCount: dataFromApi[chainInfo.slug].nominatorCount
-        });
-      } else {
-        const chainStakingMetadata = await (0, _bonding.getChainStakingMetadata)(chainInfo, substrateApiMap[chainInfo.slug]);
-        this.state.updateChainStakingMetadata(chainStakingMetadata, {
-          expectedReturn: chainStakingMetadata.expectedReturn,
-          inflation: chainStakingMetadata.inflation,
-          nominatorCount: chainStakingMetadata.nominatorCount
-        });
-      }
-    }));
-  }
-  async fetchNominatorMetadata(currentAddress, chainInfoMap, chainStateMap, substrateApiMap) {
-    const filteredChainInfoMap = {};
-    Object.values(chainInfoMap).forEach(chainInfo => {
-      const chainState = chainStateMap[chainInfo.slug];
-      if (chainState !== null && chainState !== void 0 && chainState.active && (0, _utils._isChainSupportSubstrateStaking)(chainInfo)) {
-        filteredChainInfoMap[chainInfo.slug] = chainInfo;
-      }
-    });
-    let addresses = [currentAddress];
-    if (currentAddress === _constants.ALL_ACCOUNT_KEY) {
-      addresses = await this.state.getStakingOwnersByChains(Object.keys(filteredChainInfoMap));
-    }
-    await Promise.all(addresses.map(async address => {
-      const isEvmAddress = (0, _utilCrypto.isEthereumAddress)(address);
-      await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
-        if (isEvmAddress && !(0, _utils._isChainEvmCompatible)(chainInfo)) {
-          return;
-        }
-        if ((0, _utils._isSubstrateRelayChain)(chainInfo) && _constants2._STAKING_CHAIN_GROUP.nominationPool.includes(chainInfo.slug)) {
-          const poolMemberMetadata = await (0, _relayChain.getRelayChainPoolMemberMetadata)(chainInfo, address, substrateApiMap[chainInfo.slug]);
-          if (poolMemberMetadata) {
-            this.state.updateStakingNominatorMetadata(poolMemberMetadata);
-          }
-        }
-        const nominatorMetadata = await (0, _bonding.getNominatorMetadata)(chainInfo, address, substrateApiMap[chainInfo.slug]);
-        if (nominatorMetadata) {
-          this.state.updateStakingNominatorMetadata(nominatorMetadata);
-        }
-      }));
-    }));
+  async reloadStaking() {
+    var _this$state$keyringSe2;
+    const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.address;
+    this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
+    await (0, _utils2.waitTimeout)(1800);
   }
 }
 exports.KoniSubscription = KoniSubscription;

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.2-0'
+  version: '1.1.2-1'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/constants.js

@@ -37,7 +37,7 @@ const _BALANCE_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
-  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main'],
+  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum'],
   statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'] // perhaps there are some runtime updates
 };
@@ -63,7 +63,7 @@ const _STAKING_CHAIN_GROUP = {
   relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari'],
   astar: ['astar', 'shiden', 'shibuya'],
-  amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine'],
+  amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum'],
   // amplitude and kilt only share some common logic
   kilt: ['kilt', 'kilt_peregrine'],
   nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph'],
@@ -97,6 +97,7 @@ const _STAKING_ERA_LENGTH_MAP = {
   calamari_test: 6,
   amplitude: 2,
   amplitude_test: 2,
+  pendulum: 2,
   kilt: 2,
   kilt_peregrine: 2
 };
@@ -201,7 +202,8 @@ const _TRANSFER_CHAIN_GROUP = {
   statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
-  avail: ['kate']
+  avail: ['kate'],
+  pendulum: ['pendulum']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
 const _BALANCE_PARSING_CHAIN_GROUP = {
@@ -234,7 +236,7 @@ const _DEFAULT_ACTIVE_CHAINS = [..._chainList._DEFAULT_CHAINS];
 
 // TODO: review
 exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
-const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni/dev/issue-15' : 'master';
+const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
 const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
 exports._CHAIN_INFO_SRC = _CHAIN_INFO_SRC;
 const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;

package/cjs/services/setting-service/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_THEME = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = exports.DEFAULT_CHAIN_PATROL_ENABLE = exports.DEFAULT_AUTO_LOCK_TIME = void 0;
+exports.DEFAULT_THEME = exports.DEFAULT_SHOW_ZERO_BALANCE = exports.DEFAULT_SHOW_BALANCE = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = exports.DEFAULT_LANGUAGE = exports.DEFAULT_CHAIN_PATROL_ENABLE = exports.DEFAULT_CAMERA_ENABLE = exports.DEFAULT_AUTO_LOCK_TIME = exports.DEFAULT_ALL_LOGO = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -16,14 +16,24 @@ const DEFAULT_AUTO_LOCK_TIME = 15;
 exports.DEFAULT_AUTO_LOCK_TIME = DEFAULT_AUTO_LOCK_TIME;
 const DEFAULT_CHAIN_PATROL_ENABLE = false;
 exports.DEFAULT_CHAIN_PATROL_ENABLE = DEFAULT_CHAIN_PATROL_ENABLE;
+const DEFAULT_LANGUAGE = 'en';
+exports.DEFAULT_LANGUAGE = DEFAULT_LANGUAGE;
+const DEFAULT_SHOW_ZERO_BALANCE = true;
+exports.DEFAULT_SHOW_ZERO_BALANCE = DEFAULT_SHOW_ZERO_BALANCE;
+const DEFAULT_SHOW_BALANCE = false;
+exports.DEFAULT_SHOW_BALANCE = DEFAULT_SHOW_BALANCE;
+const DEFAULT_ALL_LOGO = '';
+exports.DEFAULT_ALL_LOGO = DEFAULT_ALL_LOGO;
+const DEFAULT_CAMERA_ENABLE = false;
+exports.DEFAULT_CAMERA_ENABLE = DEFAULT_CAMERA_ENABLE;
 const DEFAULT_SETTING = {
-  // language: 'en',
+  language: DEFAULT_LANGUAGE,
   browserConfirmationType: DEFAULT_NOTIFICATION_TYPE,
-  // isShowZeroBalance: true,
-  isShowBalance: false,
-  accountAllLogo: '',
+  isShowZeroBalance: DEFAULT_SHOW_ZERO_BALANCE,
+  isShowBalance: DEFAULT_SHOW_BALANCE,
+  accountAllLogo: DEFAULT_ALL_LOGO,
   theme: DEFAULT_THEME,
-  camera: false,
+  camera: DEFAULT_CAMERA_ENABLE,
   timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
   enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE
 };

package/cjs/services/storage-service/DatabaseService.js

@@ -178,6 +178,9 @@ class DatabaseService {
   removeNfts(chain, address, collectionId, nftIds) {
     return this.stores.nft.removeNfts(chain, address, collectionId, nftIds);
   }
+  removeNftsByAddress(address) {
+    return this.stores.nft.removeNftsByAddress([address]);
+  }
 
   // Chain
   async updateChainStore(item) {

package/cjs/services/storage-service/db-stores/Nft.js

@@ -55,6 +55,9 @@ class NftStore extends _BaseStoreWithAddressAndChain.default {
       collectionId
     }).filter(item => nftIds.includes(item.id || '')).delete();
   }
+  removeNftsByAddress(addresses) {
+    return this.table.where('address').anyOfIgnoreCase(addresses).delete();
+  }
 
   // reformatCollectionIds (items: INft[]) {
   //   return items.map((item) => {

package/cjs/services/storage-service/db-stores/NominatorMetadata.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _BaseStoreWithAddressAndChain = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/BaseStoreWithAddressAndChain"));
 var _dexie = require("dexie");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -12,7 +13,7 @@ var _dexie = require("dexie");
 
 class NominatorMetadataStore extends _BaseStoreWithAddressAndChain.default {
   async getAll() {
-    return this.table.toArray();
+    return this.table.filter(item => item.status !== _KoniTypes.StakingStatus.NOT_STAKING).toArray();
   }
   subscribeByAddresses(addresses) {
     return (0, _dexie.liveQuery)(() => this.getByAddress(addresses));
@@ -21,7 +22,7 @@ class NominatorMetadataStore extends _BaseStoreWithAddressAndChain.default {
     return (0, _dexie.liveQuery)(() => this.getAll());
   }
   getByAddress(addresses) {
-    return this.table.where('address').anyOfIgnoreCase(addresses).toArray();
+    return this.table.where('address').anyOfIgnoreCase(addresses).and(item => item.status !== _KoniTypes.StakingStatus.NOT_STAKING).toArray();
   }
   async removeByAddress(address) {
     return this.table.where('address').anyOfIgnoreCase(address).delete();

package/cjs/utils/index.js

@@ -109,6 +109,18 @@ Object.keys(_lazy).forEach(function (key) {
     }
   });
 });
+var _translate = require("./translate");
+Object.keys(_translate).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _translate[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _translate[key];
+    }
+  });
+});
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 

package/cjs/utils/translate.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.detectTranslate = void 0;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const detectTranslate = message => message;
+exports.detectTranslate = detectTranslate;

package/constants/i18n.d.ts

@@ -1,2 +1,3 @@
-import { LanguageOptionType } from '@subwallet/extension-base/background/KoniTypes';
+import { LanguageOptionType, LanguageType } from '@subwallet/extension-base/background/KoniTypes';
 export declare const languageOptions: LanguageOptionType[];
+export declare const ENABLE_LANGUAGES: LanguageType[];

package/constants/i18n.js

@@ -4,9 +4,15 @@
 export const languageOptions = [{
   text: 'English',
   value: 'en'
+}, {
+  text: 'Tiếng Việt',
+  value: 'vi'
 }, {
   text: '汉语',
   value: 'zh'
+}, {
+  text: '日本語',
+  value: 'ja'
 }, {
   text: 'Français',
   value: 'fr'
@@ -22,4 +28,5 @@ export const languageOptions = [{
 }, {
   text: 'اردو',
   value: 'ur'
-}];
+}];
+export const ENABLE_LANGUAGES = ['en', 'vi', 'zh'];

package/koni/api/dotsama/transfer.js

@@ -140,6 +140,12 @@ export const createTransferExtrinsic = async ({
     } else if (value) {
       transfer = api.tx.tokens.transfer(to, _getTokenOnChainInfo(tokenInfo) || _getTokenOnChainAssetId(tokenInfo), new BN(value));
     }
+  } else if (_TRANSFER_CHAIN_GROUP.pendulum.includes(networkKey) && isTxTokensSupported) {
+    if (transferAll) {
+      transfer = api.tx.tokens.transferAll(to, _getTokenOnChainInfo(tokenInfo), false);
+    } else if (value) {
+      transfer = api.tx.tokens.transfer(to, _getTokenOnChainInfo(tokenInfo), new BN(value));
+    }
   } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey)
   // && isTxEqBalancesSupported
   ) {

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

@@ -75,7 +75,6 @@ export class AcalaNftApi extends BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
-        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionIds = [];
@@ -111,7 +110,6 @@ export class AcalaNftApi extends BaseNftApi {
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
       }));
-      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error(`${this.chain}`, e);
     }

package/koni/api/nft/bit.country/index.d.ts

@@ -6,6 +6,7 @@ export declare class BitCountryNftApi extends BaseNftApi {
     private getNfts;
     private getTokenDetails;
     private getCollectionDetails;
+    private parseMetadata;
     fetchNfts(params: HandleNftParams): Promise<number>;
     handleNft(address: string, params: HandleNftParams): Promise<void>;
     handleNfts(params: HandleNftParams): Promise<void>;

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

@@ -1,10 +1,11 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { BIT_COUNTRY_SERVER } from '@subwallet/extension-base/koni/api/nft/config';
+import { BIT_COUNTRY_IPFS_SERVER, BIT_COUNTRY_LAND_ESTATE_METADATA_API } from '@subwallet/extension-base/koni/api/nft/config';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
+import { BN_ZERO, hexToBn } from '@polkadot/util';
 export class BitCountryNftApi extends BaseNftApi {
   constructor(api, addresses, chain) {
     super(chain, api, addresses);
@@ -17,9 +18,9 @@ export class BitCountryNftApi extends BaseNftApi {
       return input;
     }
     if (!input.includes('ipfs://')) {
-      return BIT_COUNTRY_SERVER + input;
+      return BIT_COUNTRY_IPFS_SERVER + input;
     }
-    return BIT_COUNTRY_SERVER + input.split('ipfs://')[1];
+    return BIT_COUNTRY_IPFS_SERVER + input.split('ipfs://')[1];
   }
   async getNfts(addresses) {
     if (!this.substrateApi) {
@@ -48,7 +49,13 @@ export class BitCountryNftApi extends BaseNftApi {
     if (!onChainMeta.metadata) {
       return null;
     }
-    return await fetch(BIT_COUNTRY_SERVER + onChainMeta.metadata).then(resp => resp.json());
+
+    // check if NFT is Land/Estate
+    if (onChainMeta.data.attributes['MetaverseId:']) {
+      return await fetch(`${BIT_COUNTRY_LAND_ESTATE_METADATA_API}/${assetId.classId}/${assetId.tokenId}/metadata.json`).then(resp => resp.json());
+    } else {
+      return await fetch(BIT_COUNTRY_IPFS_SERVER + onChainMeta.metadata).then(resp => resp.json());
+    }
   }
   async getCollectionDetails(collectionId) {
     if (!this.substrateApi) {
@@ -58,7 +65,41 @@ export class BitCountryNftApi extends BaseNftApi {
     if (!metadataCollection.metadata) {
       return null;
     }
-    return await fetch(BIT_COUNTRY_SERVER + metadataCollection.metadata).then(resp => resp.json());
+    if (metadataCollection.data.attributes['MetaverseId:']) {
+      const category = metadataCollection.data.attributes['Category:'];
+      const hexMetaverseId = metadataCollection.data.attributes['MetaverseId:'];
+      let metaverseId = BN_ZERO;
+      try {
+        metaverseId = hexToBn(hexMetaverseId);
+      } catch (e) {
+        console.warn('Error parsing metaverse id', e);
+      }
+      return {
+        name: `${category} #${collectionId}`,
+        metaverseId: metaverseId.toString()
+      };
+    } else {
+      return await fetch(BIT_COUNTRY_IPFS_SERVER + metadataCollection.metadata).then(resp => resp.json());
+    }
+  }
+  parseMetadata(data) {
+    const traitList = data !== null && data !== void 0 && data.traits ? data.traits : data === null || data === void 0 ? void 0 : data.attributes;
+    const propertiesMap = {};
+    if (traitList) {
+      traitList.forEach(traitMap => {
+        propertiesMap[traitMap.trait_type] = {
+          value: traitMap.value
+        };
+      });
+    }
+    return {
+      name: data === null || data === void 0 ? void 0 : data.name,
+      image: data !== null && data !== void 0 && data.image_url ? this.parseUrl(data.image_url) : this.parseUrl(data === null || data === void 0 ? void 0 : data.image),
+      description: data === null || data === void 0 ? void 0 : data.description,
+      properties: propertiesMap,
+      externalUrl: data === null || data === void 0 ? void 0 : data.external_url,
+      chain: this.chain
+    };
   }
   async fetchNfts(params) {
     try {
@@ -73,7 +114,6 @@ export class BitCountryNftApi extends BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
-        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionIds = [];
@@ -86,18 +126,10 @@ export class BitCountryNftApi extends BaseNftApi {
         }
         nftIds.push(parsedTokenId);
         const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetails(parsedClassId)]);
-        const parsedNft = {
-          id: parsedTokenId,
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-          name: tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.name,
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
-          description: tokenInfo && tokenInfo.description ? tokenInfo.description : collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.description,
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-          image: tokenInfo && tokenInfo.image_url ? this.parseUrl(tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.image_url) : this.parseUrl(collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.image_url),
-          collectionId: parsedClassId,
-          chain: this.chain,
-          owner: address
-        };
+        const parsedNft = this.parseMetadata(tokenInfo);
+        parsedNft.collectionId = parsedClassId;
+        parsedNft.id = parsedTokenId;
+        parsedNft.owner = address;
         const parsedCollection = {
           collectionId: parsedClassId,
           chain: this.chain,
@@ -109,7 +141,6 @@ export class BitCountryNftApi extends BaseNftApi {
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
       }));
-      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error(`${this.chain}`, e);
     }

package/koni/api/nft/config.d.ts

@@ -6,7 +6,8 @@ export declare const SINGULAR_V1_COLLECTION_ENDPOINT = "https://singular.rmrk.ap
 export declare const SINGULAR_V2_COLLECTION_ENDPOINT = "https://singular.app/api/rmrk2/collection/";
 export declare const KANARIA_EXTERNAL_SERVER = "https://kanaria.rmrk.app/catalogue/";
 export declare const CLOUDFLARE_PINATA_SERVER = "https://cloudflare-ipfs.com/ipfs/";
-export declare const BIT_COUNTRY_SERVER = "https://ipfs-cdn.bit.country/";
+export declare const BIT_COUNTRY_IPFS_SERVER = "https://ipfs-cdn.bit.country/";
+export declare const BIT_COUNTRY_LAND_ESTATE_METADATA_API = "https://pioneer-api.bit.country/metadata/landTokenUriPioneer";
 export declare const BIT_COUNTRY_THUMBNAIL_RESOLVER = "https://res.cloudinary.com/ddftctzph/image/upload/c_scale,q_100,w_250/production-ipfs/asset/";
 export declare const CF_IPFS_GATEWAY = "https://cf-ipfs.com/ipfs/";
 export declare const PINATA_IPFS_GATEWAY = "https://gateway.pinata.cloud/ipfs/";

package/koni/api/nft/config.js

@@ -10,7 +10,8 @@ export const SINGULAR_V1_COLLECTION_ENDPOINT = 'https://singular.rmrk.app/api/rm
 export const SINGULAR_V2_COLLECTION_ENDPOINT = 'https://singular.app/api/rmrk2/collection/';
 export const KANARIA_EXTERNAL_SERVER = 'https://kanaria.rmrk.app/catalogue/';
 export const CLOUDFLARE_PINATA_SERVER = 'https://cloudflare-ipfs.com/ipfs/';
-export const BIT_COUNTRY_SERVER = 'https://ipfs-cdn.bit.country/';
+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/';
 export const CF_IPFS_GATEWAY = 'https://cf-ipfs.com/ipfs/';
 export const PINATA_IPFS_GATEWAY = 'https://gateway.pinata.cloud/ipfs/';

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

@@ -85,7 +85,6 @@ export class EvmNftApi extends BaseNftApi {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const balance = await contract.methods.balanceOf(address).call();
       if (Number(balance) === 0) {
-        nftParams.cleanUpNfts(this.chain, address, [smartContract], []);
         return;
       }
       const itemIndexes = [];
@@ -140,9 +139,6 @@ export class EvmNftApi extends BaseNftApi {
         originAsset: tokenInfo.slug
       };
       nftParams.updateCollection(this.chain, nftCollection);
-      Object.entries(nftOwnerMap).forEach(([owner, nftIds]) => {
-        nftParams.cleanUpNfts(this.chain, owner, [smartContract], nftIds);
-      });
     }
   }
   async handleNfts(params) {

package/koni/api/nft/index.d.ts

@@ -17,5 +17,5 @@ export declare class NftHandler {
     setAddresses(addresses: string[]): void;
     private setupNftContracts;
     private setupApi;
-    handleNfts(nftContracts: _ChainAsset[], updateItem: (chain: string, data: NftItem, owner: string) => void, updateCollection: (chain: string, data: NftCollection) => void, cleanUpNfts: (chain: string, owner: string, collectionId: string[], nftIds: string[], ownNothing?: boolean) => void): Promise<void>;
+    handleNfts(nftContracts: _ChainAsset[], updateItem: (chain: string, data: NftItem, owner: string) => void, updateCollection: (chain: string, data: NftCollection) => void): Promise<void>;
 }

package/koni/api/nft/index.js

@@ -123,14 +123,13 @@ export class NftHandler {
       console.error(e);
     }
   }
-  async handleNfts(nftContracts, updateItem, updateCollection, cleanUpNfts) {
+  async handleNfts(nftContracts, updateItem, updateCollection) {
     this.setupApi();
     this.setupNftContracts(nftContracts);
     await Promise.all(this.handlers.map(async handler => {
       await handler.fetchNfts({
         updateItem,
-        updateCollection,
-        cleanUpNfts
+        updateCollection
       });
     }));
   }

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

@@ -82,7 +82,6 @@ export class KaruraNftApi extends BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
-        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionIds = [];
@@ -116,7 +115,6 @@ export class KaruraNftApi extends BaseNftApi {
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
       }));
-      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error(`${this.chain}`, e);
     }

package/koni/api/nft/nft.d.ts

@@ -3,7 +3,6 @@ import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain
 export interface HandleNftParams {
     updateItem: (chain: string, data: NftItem, owner: string) => void;
     updateCollection: (chain: string, data: NftCollection) => void;
-    cleanUpNfts: (chain: string, owner: string, collectionId: string[], nftIds: string[], ownNothing?: boolean) => void;
 }
 export declare abstract class BaseNftApi {
     chain: string;