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

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;

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

@@ -129,7 +129,6 @@ export class RmrkNftApi extends BaseNftApi {
       const kusamaAddress = reformatAddress(address, 2);
       allNfts = await this.getAllByAccount(kusamaAddress);
       if (allNfts.length <= 0) {
-        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionInfoUrl = [];
@@ -237,9 +236,6 @@ export class RmrkNftApi extends 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/koni/api/nft/statemine_nft/index.js

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

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

@@ -133,8 +133,6 @@ export default class UniqueNftApi extends BaseNftApi {
           }
         }
       }));
-      const collectionIds = [];
-      let allNftIds = [];
       await Promise.all(allCollectionId.map(async collectionId => {
         const collectionIdStr = collectionId.toString();
 
@@ -142,8 +140,6 @@ export default class UniqueNftApi extends 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
@@ -173,7 +169,6 @@ export default class UniqueNftApi extends BaseNftApi {
           }
         }));
       }));
-      params.cleanUpNfts(this.chain, address, collectionIds, allNftIds);
     } catch (e) {
       console.error(`${this.chain}`, e);
     }

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

@@ -324,7 +324,6 @@ export class WasmNftApi extends 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 = [];
@@ -408,9 +407,6 @@ export class WasmNftApi extends BaseNftApi {
         originAsset: tokenInfo.slug
       };
       nftParams.updateCollection(this.chain, nftCollection);
-      Object.entries(nftOwnerMap).forEach(([owner, nftIds]) => {
-        nftParams.cleanUpNfts(this.chain, owner, [smartContract], nftIds);
-      });
     }
   }
   async fetchNfts(params) {

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

@@ -89,14 +89,14 @@ export async function subscribeAmplitudeNominatorMetadata(chainInfo, address, su
     const nearestUnstakingAmount = Object.values(unstakingInfo)[0];
     const blockDuration = (_STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _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 ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: nearestUnstakingAmount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0,
+      waitingTime,
       validatorAddress: (delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.owner) || undefined
     });
   }
@@ -165,14 +165,14 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
     const nearestUnstakingAmount = Object.values(unstakingInfo)[0];
     const blockDuration = (_STAKING_ERA_LENGTH_MAP[chain] || _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 ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: nearestUnstakingAmount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0,
+      waitingTime,
       validatorAddress: (delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.owner) || undefined
     });
   }

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

@@ -111,14 +111,14 @@ export async function subscribeAstarNominatorMetadata(chainInfo, address, substr
   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 * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
       unstakingList.push({
         chain: chainInfo.slug,
         status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
         claimable: unlockingChunk.amount.toString(),
-        waitingTime: waitingTime > 0 ? waitingTime : 0
+        waitingTime
       });
     }
   }
@@ -199,14 +199,14 @@ export 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 * _STAKING_ERA_LENGTH_MAP[chain];
       unstakingList.push({
         chain,
         status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
         claimable: unlockingChunk.amount.toString(),
-        waitingTime: waitingTime > 0 ? waitingTime : 0
+        waitingTime
       });
     }
   }

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

@@ -162,8 +162,8 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
       for (const scheduledRequest of delegationScheduledRequests) {
         if (reformatAddress(scheduledRequest.delegator, 0) === 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 * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
           const claimable = Object.values(scheduledRequest.action)[0];
           unstakingMap[delegation.owner] = {
@@ -171,7 +171,7 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
             status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
             validatorAddress: delegation.owner,
             claimable: claimable.toString(),
-            waitingTime: waitingTime > 0 ? waitingTime : 0
+            waitingTime
           };
           hasUnstaking = true;
           break; // only handle 1 scheduledRequest per collator
@@ -254,7 +254,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
       for (const scheduledRequest of delegationScheduledRequests) {
         if (reformatAddress(scheduledRequest.delegator, 0) === 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 * _STAKING_ERA_LENGTH_MAP[chain];
           const claimable = Object.values(scheduledRequest.action)[0];
@@ -263,7 +263,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
             status: isClaimable ? UnstakingStatus.CLAIMABLE : 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/koni/api/staking/bonding/relayChain.js

@@ -214,14 +214,14 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
     }
   }
   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 * _STAKING_ERA_LENGTH_MAP[chain];
     unstakingList.push({
       chain,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: unlockingChunk.value.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   return {
@@ -313,14 +313,14 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
     }
   }
   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 * _STAKING_ERA_LENGTH_MAP[chain];
     unstakingList.push({
       chain,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: unlockingChunk.value.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   return {
@@ -370,14 +370,14 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
   };
   const unstakings = [];
   Object.entries(poolMemberInfo.unbondingEras).forEach(([unlockingEra, amount]) => {
-    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 * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
     unstakings.push({
       chain: chainInfo.slug,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   const bnActiveStake = new BN(poolMemberInfo.points.toString());
@@ -447,14 +447,14 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
   };
   const unstakings = [];
   Object.entries(poolMemberInfo.unbondingEras).forEach(([unlockingEra, amount]) => {
-    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 * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
     unstakings.push({
       chain: chainInfo.slug,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   const bnActiveStake = new BN(poolMemberInfo.points.toString());
@@ -588,17 +588,27 @@ export async function getRelayBondingExtrinsic(substrateApi, amount, targetValid
   const binaryAmount = new 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/koni/api/staking/bonding/utils.js

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

package/koni/api/xcm/xTokens.js

@@ -19,6 +19,6 @@ function getCurrencyId(tokenInfo) {
 }
 export function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = ['pioneer'].includes(originChainInfo.slug) ? FOUR_INSTRUCTIONS_WEIGHT : 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, getDestMultilocation(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }

package/koni/background/cron.d.ts

@@ -1,7 +1,6 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { ApiMap, ServiceInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { KoniSubscription } from '@subwallet/extension-base/koni/background/subscription';
-import { _ChainState, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { Subject } from 'rxjs';
 import KoniState from './handlers/State';
@@ -27,15 +26,11 @@ export declare class KoniCron {
     syncMantaPay: () => void;
     refreshNft: (address: string, apiMap: ApiMap, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>) => () => void;
     resetNft: (newAddress: string) => void;
-    resetStakingReward: () => void;
     refreshStakingReward: (address: string) => () => void;
     refreshStakingRewardFastInterval: (address: string) => () => void;
     setStakingRewardReady: () => void;
     checkNetworkAvailable: (serviceInfo: ServiceInfo) => boolean;
-    updateChainStakingMetadata: (chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>) => () => void;
-    updateNominatorMetadata: (address: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>) => () => void;
     reloadNft(): Promise<boolean>;
     reloadStaking(): Promise<boolean>;
     private needUpdateNft;
-    private needUpdateStaking;
 }