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

package/background/KoniTypes.d.ts

@@ -300,14 +300,16 @@ export interface CurrentAccountInfo {
     currentGenesisHash: string | null;
     allGenesisHash?: string;
 }
-export declare type LanguageType = 'en' | 'zh' | 'fr' | 'tr' | 'pl' | 'th' | 'ur';
+export declare type LanguageType = 'en' | 'zh' | 'fr' | 'tr' | 'pl' | 'th' | 'ur' | 'vi' | 'ja';
 export declare type LanguageOptionType = {
     text: string;
     value: LanguageType;
 };
 export declare type BrowserConfirmationType = 'extension' | 'popup' | 'window';
 export interface UiSettings {
+    language: LanguageType;
     browserConfirmationType: BrowserConfirmationType;
+    isShowZeroBalance: boolean;
     isShowBalance: boolean;
     accountAllLogo: string;
     theme: ThemeNames;
@@ -325,6 +327,12 @@ export declare type RequestChangeTimeAutoLock = {
 export declare type RequestChangeEnableChainPatrol = {
     enable: boolean;
 };
+export declare type RequestChangeShowZeroBalance = {
+    show: boolean;
+};
+export declare type RequestChangeLanguage = {
+    language: LanguageType;
+};
 export interface RandomTestRequest {
     start: number;
     end: number;
@@ -1578,13 +1586,15 @@ export interface KoniRequestSignatures {
     'pri(accounts.deleteContact)': [RequestDeleteContactAccount, boolean];
     'pri(settings.changeBalancesVisibility)': [null, boolean];
     'pri(settings.subscribe)': [null, UiSettings, UiSettings];
+    'pri(settings.getLogoMaps)': [null, AllLogoMap];
     'pri(settings.saveAccountAllLogo)': [string, boolean, UiSettings];
-    'pri(settings.saveTheme)': [ThemeNames, boolean, UiSettings];
-    'pri(settings.saveBrowserConfirmationType)': [BrowserConfirmationType, boolean, UiSettings];
+    'pri(settings.saveTheme)': [ThemeNames, boolean];
+    'pri(settings.saveBrowserConfirmationType)': [BrowserConfirmationType, boolean];
     'pri(settings.saveCamera)': [RequestCameraSettings, boolean];
     'pri(settings.saveAutoLockTime)': [RequestChangeTimeAutoLock, boolean];
     'pri(settings.saveEnableChainPatrol)': [RequestChangeEnableChainPatrol, boolean];
-    'pri(settings.getLogoMaps)': [null, AllLogoMap];
+    'pri(settings.saveLanguage)': [RequestChangeLanguage, boolean];
+    'pri(settings.saveShowZeroBalance)': [RequestChangeShowZeroBalance, boolean];
     'pri(transaction.history.getSubscription)': [null, TransactionHistoryItem[], TransactionHistoryItem[]];
     'pri(transfer.checkReferenceCount)': [RequestTransferCheckReferenceCount, boolean];
     'pri(transfer.checkSupporting)': [RequestTransferCheckSupporting, SupportTransferResponse];

package/cjs/constants/i18n.js

@@ -3,16 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.languageOptions = void 0;
+exports.languageOptions = exports.ENABLE_LANGUAGES = void 0;
 // Copyright 2019-2022 @polkadot/extension-ui authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const languageOptions = [{
   text: 'English',
   value: 'en'
+}, {
+  text: 'Tiếng Việt',
+  value: 'vi'
 }, {
   text: '汉语',
   value: 'zh'
+}, {
+  text: '日本語',
+  value: 'ja'
 }, {
   text: 'Français',
   value: 'fr'
@@ -29,4 +35,6 @@ const languageOptions = [{
   text: 'اردو',
   value: 'ur'
 }];
-exports.languageOptions = languageOptions;
+exports.languageOptions = languageOptions;
+const ENABLE_LANGUAGES = ['en', 'vi', 'zh'];
+exports.ENABLE_LANGUAGES = ENABLE_LANGUAGES;

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

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

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

@@ -82,7 +82,6 @@ class AcalaNftApi extends _nft.BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
-        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionIds = [];
@@ -118,7 +117,6 @@ class AcalaNftApi extends _nft.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/cjs/koni/api/nft/bit.country/index.js

@@ -9,6 +9,7 @@ var _config = require("@subwallet/extension-base/koni/api/nft/config");
 var _nft = require("@subwallet/extension-base/koni/api/nft/nft");
 var _utils = require("@subwallet/extension-base/utils");
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
+var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -24,9 +25,9 @@ class BitCountryNftApi extends _nft.BaseNftApi {
       return input;
     }
     if (!input.includes('ipfs://')) {
-      return _config.BIT_COUNTRY_SERVER + input;
+      return _config.BIT_COUNTRY_IPFS_SERVER + input;
     }
-    return _config.BIT_COUNTRY_SERVER + input.split('ipfs://')[1];
+    return _config.BIT_COUNTRY_IPFS_SERVER + input.split('ipfs://')[1];
   }
   async getNfts(addresses) {
     if (!this.substrateApi) {
@@ -55,7 +56,13 @@ class BitCountryNftApi extends _nft.BaseNftApi {
     if (!onChainMeta.metadata) {
       return null;
     }
-    return await (0, _crossFetch.default)(_config.BIT_COUNTRY_SERVER + onChainMeta.metadata).then(resp => resp.json());
+
+    // check if NFT is Land/Estate
+    if (onChainMeta.data.attributes['MetaverseId:']) {
+      return await (0, _crossFetch.default)(`${_config.BIT_COUNTRY_LAND_ESTATE_METADATA_API}/${assetId.classId}/${assetId.tokenId}/metadata.json`).then(resp => resp.json());
+    } else {
+      return await (0, _crossFetch.default)(_config.BIT_COUNTRY_IPFS_SERVER + onChainMeta.metadata).then(resp => resp.json());
+    }
   }
   async getCollectionDetails(collectionId) {
     if (!this.substrateApi) {
@@ -65,7 +72,41 @@ class BitCountryNftApi extends _nft.BaseNftApi {
     if (!metadataCollection.metadata) {
       return null;
     }
-    return await (0, _crossFetch.default)(_config.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 = _util.BN_ZERO;
+      try {
+        metaverseId = (0, _util.hexToBn)(hexMetaverseId);
+      } catch (e) {
+        console.warn('Error parsing metaverse id', e);
+      }
+      return {
+        name: `${category} #${collectionId}`,
+        metaverseId: metaverseId.toString()
+      };
+    } else {
+      return await (0, _crossFetch.default)(_config.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 {
@@ -80,7 +121,6 @@ class BitCountryNftApi extends _nft.BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
-        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionIds = [];
@@ -93,18 +133,10 @@ class BitCountryNftApi extends _nft.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,
@@ -116,7 +148,6 @@ class BitCountryNftApi extends _nft.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/cjs/koni/api/nft/config.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UNIQUE_SCAN_ENDPOINT = exports.UNIQUE_IPFS_GATEWAY = exports.TRANSFER_CHAIN_ID = exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN = exports.SUPPORTED_NFT_NETWORKS = exports.SINGULAR_V2_ENDPOINT = exports.SINGULAR_V2_COLLECTION_ENDPOINT = exports.SINGULAR_V1_ENDPOINT = exports.SINGULAR_V1_COLLECTION_ENDPOINT = exports.RMRK_PINATA_SERVER = exports.QUARTZ_SCAN_ENDPOINT = exports.PINATA_IPFS_GATEWAY = exports.NFT_STORAGE_GATEWAY = exports.KANARIA_EXTERNAL_SERVER = exports.KANARIA_ENDPOINT = exports.IPFS_TELOS_MIAMI = exports.IPFS_IO_GATEWAY = exports.IPFS_GATEWAY_CLOUD = exports.IPFS_FLEEK = exports.GATEWAY_IPFS_IO = exports.DWEB_LINK = exports.CLOUDFLARE_PINATA_SERVER = exports.CF_IPFS_GATEWAY = exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = exports.BIT_COUNTRY_SERVER = void 0;
+exports.UNIQUE_SCAN_ENDPOINT = exports.UNIQUE_IPFS_GATEWAY = exports.TRANSFER_CHAIN_ID = exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN = exports.SUPPORTED_NFT_NETWORKS = exports.SINGULAR_V2_ENDPOINT = exports.SINGULAR_V2_COLLECTION_ENDPOINT = exports.SINGULAR_V1_ENDPOINT = exports.SINGULAR_V1_COLLECTION_ENDPOINT = exports.RMRK_PINATA_SERVER = exports.QUARTZ_SCAN_ENDPOINT = exports.PINATA_IPFS_GATEWAY = exports.NFT_STORAGE_GATEWAY = exports.KANARIA_EXTERNAL_SERVER = exports.KANARIA_ENDPOINT = exports.IPFS_TELOS_MIAMI = exports.IPFS_IO_GATEWAY = exports.IPFS_GATEWAY_CLOUD = exports.IPFS_FLEEK = exports.GATEWAY_IPFS_IO = exports.DWEB_LINK = exports.CLOUDFLARE_PINATA_SERVER = exports.CF_IPFS_GATEWAY = exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = exports.BIT_COUNTRY_LAND_ESTATE_METADATA_API = exports.BIT_COUNTRY_IPFS_SERVER = void 0;
 exports.getRandomIpfsGateway = getRandomIpfsGateway;
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -25,8 +25,10 @@ const KANARIA_EXTERNAL_SERVER = 'https://kanaria.rmrk.app/catalogue/';
 exports.KANARIA_EXTERNAL_SERVER = KANARIA_EXTERNAL_SERVER;
 const CLOUDFLARE_PINATA_SERVER = 'https://cloudflare-ipfs.com/ipfs/';
 exports.CLOUDFLARE_PINATA_SERVER = CLOUDFLARE_PINATA_SERVER;
-const BIT_COUNTRY_SERVER = 'https://ipfs-cdn.bit.country/';
-exports.BIT_COUNTRY_SERVER = BIT_COUNTRY_SERVER;
+const BIT_COUNTRY_IPFS_SERVER = 'https://ipfs-cdn.bit.country/';
+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/';
 exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = BIT_COUNTRY_THUMBNAIL_RESOLVER;
 const CF_IPFS_GATEWAY = 'https://cf-ipfs.com/ipfs/';

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

@@ -92,7 +92,6 @@ class EvmNftApi extends _nft.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 = [];
@@ -147,10 +146,6 @@ class EvmNftApi extends _nft.BaseNftApi {
         originAsset: tokenInfo.slug
       };
       nftParams.updateCollection(this.chain, nftCollection);
-      Object.entries(nftOwnerMap).forEach(_ref => {
-        let [owner, nftIds] = _ref;
-        nftParams.cleanUpNfts(this.chain, owner, [smartContract], nftIds);
-      });
     }
   }
   async handleNfts(params) {

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

@@ -131,14 +131,13 @@ 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/cjs/koni/api/nft/karura_nft/index.js

@@ -90,7 +90,6 @@ class KaruraNftApi extends _nft.BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
-        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionIds = [];
@@ -124,7 +123,6 @@ class KaruraNftApi extends _nft.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/cjs/koni/api/nft/rmrk_nft/index.js

@@ -136,7 +136,6 @@ class RmrkNftApi extends _nft.BaseNftApi {
       const kusamaAddress = (0, _utils.reformatAddress)(address, 2);
       allNfts = await this.getAllByAccount(kusamaAddress);
       if (allNfts.length <= 0) {
-        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionInfoUrl = [];
@@ -244,9 +243,6 @@ class RmrkNftApi extends _nft.BaseNftApi {
         });
         params.updateCollection(this.chain, parsedCollection);
       });
-      const allCollectionIds = allCollections.map(item => item.collectionId);
-      const allNftIds = allNfts.map(nft => nft === null || nft === void 0 ? void 0 : nft.id);
-      params.cleanUpNfts(this.chain, address, allCollectionIds, allNftIds);
     } catch (e) {
       console.error(`${this.chain}`, e);
     }

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

@@ -93,7 +93,6 @@ class StatemineNftApi extends _nft.BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
-        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionIds = [];
@@ -124,7 +123,6 @@ class StatemineNftApi extends _nft.BaseNftApi {
         };
         params.updateCollection(this.chain, parsedCollection);
       }));
-      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error(`${this.chain}`, e);
     }

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

@@ -141,8 +141,6 @@ class UniqueNftApi extends _nft.BaseNftApi {
           }
         }
       }));
-      const collectionIds = [];
-      let allNftIds = [];
       await Promise.all(allCollectionId.map(async collectionId => {
         const collectionIdStr = collectionId.toString();
 
@@ -150,8 +148,6 @@ class UniqueNftApi extends _nft.BaseNftApi {
         const collection = (await this.substrateApi.api.query.nft.collectionById(collectionId)).toJSON();
         collectionMap[collectionIdStr] = collection;
         const nftIds = Object.entries(nftMap).filter(item => item[1] === collectionId).map(item => item[0]);
-        collectionIds.push(collectionIdStr);
-        allNftIds = allNftIds.concat(nftIds);
         const parsedCollection = {
           collectionId: collectionIdStr,
           chain: this.chain
@@ -181,7 +177,6 @@ class UniqueNftApi extends _nft.BaseNftApi {
           }
         }));
       }));
-      params.cleanUpNfts(this.chain, address, collectionIds, allNftIds);
     } catch (e) {
       console.error(`${this.chain}`, e);
     }

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

@@ -330,7 +330,6 @@ class WasmNftApi extends _nft.BaseNftApi {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       const balance = _balance.output ? balanceJson.ok || balanceJson.Ok : '0';
       if (parseInt(balance) === 0) {
-        nftParams.cleanUpNfts(this.chain, address, [smartContract], []);
         return;
       }
       const itemIndexes = [];
@@ -414,10 +413,6 @@ class WasmNftApi extends _nft.BaseNftApi {
         originAsset: tokenInfo.slug
       };
       nftParams.updateCollection(this.chain, nftCollection);
-      Object.entries(nftOwnerMap).forEach(_ref => {
-        let [owner, nftIds] = _ref;
-        nftParams.cleanUpNfts(this.chain, owner, [smartContract], nftIds);
-      });
     }
   }
   async fetchNfts(params) {

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

@@ -103,14 +103,14 @@ async function subscribeAmplitudeNominatorMetadata(chainInfo, address, substrate
     const nearestUnstakingAmount = Object.values(unstakingInfo)[0];
     const blockDuration = (_constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
 
-    const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber <= 0;
-    const remainingBlock = parseInt(nearestUnstakingBlock) - (currentBlockNumber + 1);
+    const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber < 0;
+    const remainingBlock = parseInt(nearestUnstakingBlock) - currentBlockNumber;
     const waitingTime = remainingBlock * blockDuration;
     unstakingList.push({
       chain: chainInfo.slug,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
       claimable: nearestUnstakingAmount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0,
+      waitingTime,
       validatorAddress: (delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.owner) || undefined
     });
   }
@@ -179,14 +179,14 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
     const nearestUnstakingAmount = Object.values(unstakingInfo)[0];
     const blockDuration = (_constants._STAKING_ERA_LENGTH_MAP[chain] || _constants._STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
 
-    const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber <= 0;
-    const remainingBlock = parseInt(nearestUnstakingBlock) - (currentBlockNumber + 1);
+    const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber < 0;
+    const remainingBlock = parseInt(nearestUnstakingBlock) - currentBlockNumber;
     const waitingTime = remainingBlock * blockDuration;
     unstakingList.push({
       chain,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
       claimable: nearestUnstakingAmount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0,
+      waitingTime,
       validatorAddress: (delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.owner) || undefined
     });
   }

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

@@ -127,14 +127,14 @@ async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi,
   const unlockingChunks = ledger.unbondingInfo.unlockingChunks;
   if (unlockingChunks.length > 0) {
     for (const unlockingChunk of unlockingChunks) {
-      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) <= 0;
-      const remainingEra = unlockingChunk.unlockEra - (parseInt(currentEra) + 1);
+      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) < 0;
+      const remainingEra = unlockingChunk.unlockEra - parseInt(currentEra);
       const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
       unstakingList.push({
         chain: chainInfo.slug,
         status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
         claimable: unlockingChunk.amount.toString(),
-        waitingTime: waitingTime > 0 ? waitingTime : 0
+        waitingTime
       });
     }
   }
@@ -215,14 +215,14 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
   const unlockingChunks = ledger.unbondingInfo.unlockingChunks;
   if (unlockingChunks.length > 0) {
     for (const unlockingChunk of unlockingChunks) {
-      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) <= 0;
-      const remainingEra = unlockingChunk.unlockEra - (parseInt(currentEra) + 1);
+      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) < 0;
+      const remainingEra = unlockingChunk.unlockEra - parseInt(currentEra);
       const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
       unstakingList.push({
         chain,
         status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
         claimable: unlockingChunk.amount.toString(),
-        waitingTime: waitingTime > 0 ? waitingTime : 0
+        waitingTime
       });
     }
   }

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

@@ -180,8 +180,8 @@ async function subscribeParaChainNominatorMetadata(chainInfo, address, substrate
       for (const scheduledRequest of delegationScheduledRequests) {
         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);
+          const isClaimable = scheduledRequest.whenExecutable - currentRound < 0;
+          const remainingEra = scheduledRequest.whenExecutable - currentRound;
           const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
           const claimable = Object.values(scheduledRequest.action)[0];
           unstakingMap[delegation.owner] = {
@@ -189,7 +189,7 @@ async function subscribeParaChainNominatorMetadata(chainInfo, address, substrate
             status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
             validatorAddress: delegation.owner,
             claimable: claimable.toString(),
-            waitingTime: waitingTime > 0 ? waitingTime : 0
+            waitingTime
           };
           hasUnstaking = true;
           break; // only handle 1 scheduledRequest per collator
@@ -272,7 +272,7 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
       for (const scheduledRequest of delegationScheduledRequests) {
         if ((0, _utils3.reformatAddress)(scheduledRequest.delegator, 0) === (0, _utils3.reformatAddress)(address, 0)) {
           // add network prefix
-          const isClaimable = scheduledRequest.whenExecutable - currentRound <= 0;
+          const isClaimable = scheduledRequest.whenExecutable - currentRound < 0;
           const remainingEra = scheduledRequest.whenExecutable - (currentRound + 1);
           const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
           const claimable = Object.values(scheduledRequest.action)[0];
@@ -281,7 +281,7 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
             status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
             validatorAddress: delegation.owner,
             claimable: claimable.toString(),
-            waitingTime: waitingTime > 0 ? waitingTime : 0
+            waitingTime: waitingTime
           };
           hasUnstaking = true;
           break; // only handle 1 scheduledRequest per collator

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

@@ -238,14 +238,14 @@ async function subscribeRelayChainNominatorMetadata(chainInfo, address, substrat
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
-    const isClaimable = unlockingChunk.era - parseInt(currentEra) <= 0;
-    const remainingEra = unlockingChunk.era - (parseInt(currentEra) + 1);
+    const isClaimable = unlockingChunk.era - parseInt(currentEra) < 0;
+    const remainingEra = unlockingChunk.era - parseInt(currentEra);
     const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
     unstakingList.push({
       chain,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
       claimable: unlockingChunk.value.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   return {
@@ -337,14 +337,14 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
-    const isClaimable = unlockingChunk.era - parseInt(currentEra) <= 0;
-    const remainingEra = unlockingChunk.era - (parseInt(currentEra) + 1);
+    const isClaimable = unlockingChunk.era - parseInt(currentEra) < 0;
+    const remainingEra = unlockingChunk.era - parseInt(currentEra);
     const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
     unstakingList.push({
       chain,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
       claimable: unlockingChunk.value.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   return {
@@ -395,14 +395,14 @@ async function subscribeRelayChainPoolMemberMetadata(chainInfo, address, substra
   const unstakings = [];
   Object.entries(poolMemberInfo.unbondingEras).forEach(_ref => {
     let [unlockingEra, amount] = _ref;
-    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) <= 0;
-    const remainingEra = parseInt(unlockingEra) - (parseInt(currentEra) + 1);
+    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) < 0;
+    const remainingEra = parseInt(unlockingEra) - parseInt(currentEra);
     const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
     unstakings.push({
       chain: chainInfo.slug,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
       claimable: amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   const bnActiveStake = new _util.BN(poolMemberInfo.points.toString());
@@ -473,14 +473,14 @@ async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi)
   const unstakings = [];
   Object.entries(poolMemberInfo.unbondingEras).forEach(_ref2 => {
     let [unlockingEra, amount] = _ref2;
-    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) <= 0;
-    const remainingEra = parseInt(unlockingEra) - (parseInt(currentEra) + 1);
+    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) < 0;
+    const remainingEra = parseInt(unlockingEra) - parseInt(currentEra);
     const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
     unstakings.push({
       chain: chainInfo.slug,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
       claimable: amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   const bnActiveStake = new _util.BN(poolMemberInfo.points.toString());
@@ -615,17 +615,27 @@ async function getRelayBondingExtrinsic(substrateApi, amount, targetValidators,
   const binaryAmount = new _util.BN(amount);
   let bondTx;
   let nominateTx;
+  const _params = chainApi.api.tx.staking.bond.toJSON();
+  const paramsCount = _params.args.length;
   const validatorParamList = targetValidators.map(validator => {
     return validator.address;
   });
   if (!nominatorMetadata) {
-    bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
+    if (paramsCount === 2) {
+      bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
+    } else {
+      bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
+    }
     nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
     return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
   }
   if (!nominatorMetadata.isBondedBefore) {
     // first time
-    bondTx = chainApi.api.tx.staking.bond(nominatorMetadata.address, binaryAmount, bondDest);
+    if (paramsCount === 2) {
+      bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
+    } else {
+      bondTx = chainApi.api.tx.staking.bond(nominatorMetadata.address, binaryAmount, bondDest);
+    }
     nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
     return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
   } else {

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

@@ -218,13 +218,7 @@ function getStakingAvailableActionsByNominator(nominatorMetadata, unclaimedRewar
   }
   if (nominatorMetadata.unstakings.length > 0) {
     result.push(StakingAction.CANCEL_UNSTAKE);
-    let hasClaimable = false;
-    for (const unstaking of nominatorMetadata.unstakings) {
-      if (unstaking.status === _KoniTypes.UnstakingStatus.CLAIMABLE) {
-        hasClaimable = true;
-        break;
-      }
-    }
+    const hasClaimable = nominatorMetadata.unstakings.some(unstaking => unstaking.status === _KoniTypes.UnstakingStatus.CLAIMABLE);
     if (hasClaimable) {
       result.push(StakingAction.WITHDRAW);
     }

package/cjs/koni/api/xcm/xTokens.js

@@ -25,6 +25,6 @@ function getCurrencyId(tokenInfo) {
 }
 function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = ['pioneer'].includes(originChainInfo.slug) ? _utils.FOUR_INSTRUCTIONS_WEIGHT : (0, _utils.getDestWeight)();
-  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala'].includes(originChainInfo.slug) ? 'V3' : undefined;
   return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, (0, _utils.getDestMultilocation)(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }