@subwallet/extension-base 1.3.46-0 → 1.3.47-0

package/cjs/utils/gear/vft.js

@@ -3,33 +3,32 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VftService = exports.VFT = void 0;
-var _api = require("@gear-js/api");
+exports.sailsCache = exports.VftService = exports.VFT = void 0;
 var _sailsJs = require("sails-js");
-var _types = require("@polkadot/types");
+var _sailsJsParser = require("sails-js-parser");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 class VFT {
   constructor(api) {
     let programId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '0x';
+    let sails = arguments.length > 2 ? arguments[2] : undefined;
     this.api = api;
     this.programId = programId;
-    const types = {};
-    this.registry = new _types.TypeRegistry();
-    this.registry.setKnownTypes({
-      types
-    });
-    this.registry.register(types);
+    this.sails = sails;
+    this.sails.setApi(api);
+    this.sails.setProgramId(programId);
     this.service = new VftService(this);
   }
   newCtorFromCode(code, name, symbol, decimals) {
-    const builder = new _sailsJs.TransactionBuilder(this.api, this.registry, 'upload_program', ['New', name, symbol, decimals], '(String, String, String, u8)', 'String', code);
+    const ctor = this.sails.ctors.New;
+    const builder = ctor.fromCode(code, name, symbol, decimals);
     this.programId = builder.programId;
     return builder;
   }
   newCtorFromCodeId(codeId, name, symbol, decimals) {
-    const builder = new _sailsJs.TransactionBuilder(this.api, this.registry, 'create_program', ['New', name, symbol, decimals], '(String, String, String, u8)', 'String', codeId);
+    const ctor = this.sails.ctors.New;
+    const builder = ctor.fromCodeId(codeId, name, symbol, decimals);
     this.programId = builder.programId;
     return builder;
   }
@@ -39,135 +38,105 @@ class VftService {
   constructor(_program) {
     this._program = _program;
   }
+  get functions() {
+    return this._program.sails.services.Vft.functions;
+  }
+  get queries() {
+    return this._program.sails.services.Vft.queries;
+  }
   approve(spender, value) {
-    if (!this._program.programId) {
-      throw new Error('Program ID is not set');
-    }
-    return new _sailsJs.TransactionBuilder(this._program.api, this._program.registry, 'send_message', ['Vft', 'Approve', spender, value], '(String, String, [u8;32], U256)', 'bool', this._program.programId);
+    return this.functions.Approve(spender, value);
   }
   transfer(to, value) {
-    if (!this._program.programId) {
-      throw new Error('Program ID is not set');
-    }
-    return new _sailsJs.TransactionBuilder(this._program.api, this._program.registry, 'send_message', ['Vft', 'Transfer', to, value], '(String, String, [u8;32], U256)', 'bool', this._program.programId);
+    return this.functions.Transfer(to, value);
   }
   transferFrom(from, to, value) {
-    if (!this._program.programId) {
-      throw new Error('Program ID is not set');
+    return this.functions.TransferFrom(from, to, value);
+  }
+  allowance(owner, spender, originAddress, value, atBlock) {
+    return this.queries.Allowance(originAddress, BigInt(value || 0), atBlock, owner, spender);
+  }
+  balanceOf(account, originAddress, value, atBlock) {
+    return this.queries.BalanceOf(originAddress, BigInt(value || 0), atBlock, account);
+  }
+  decimals(originAddress, value, atBlock) {
+    return this.queries.Decimals(originAddress, BigInt(value || 0), atBlock);
+  }
+  name(originAddress, value, atBlock) {
+    return this.queries.Name(originAddress, BigInt(value || 0), atBlock);
+  }
+  symbol(originAddress, value, atBlock) {
+    return this.queries.Symbol(originAddress, BigInt(value || 0), atBlock);
+  }
+  totalSupply(originAddress, value, atBlock) {
+    return this.queries.TotalSupply(originAddress, BigInt(value || 0), atBlock);
+  }
+  async subscribeToApprovalEvent(callback) {
+    return this._program.sails.services.Vft.events.Approval.subscribe(callback);
+  }
+  async subscribeToTransferEvent(callback) {
+    return this._program.sails.services.Vft.events.Transfer.subscribe(callback);
+  }
+}
+
+// Cache sai
+exports.VftService = VftService;
+const vftIdl = `
+constructor {
+  New : (name: str, symbol: str, decimals: u8);
+};
+
+service Vft {
+  Approve : (spender: actor_id, value: u256) -> bool;
+  Transfer : (to: actor_id, value: u256) -> bool;
+  TransferFrom : (from: actor_id, to: actor_id, value: u256) -> bool;
+
+  query Allowance : (owner: actor_id, spender: actor_id) -> u256;
+  query BalanceOf : (account: actor_id) -> u256;
+  query Decimals : () -> u8;
+  query Name : () -> str;
+  query Symbol : () -> str;
+  query TotalSupply : () -> u256;
+
+  events {
+    Approval: struct {
+      owner: actor_id,
+      spender: actor_id,
+      value: u256,
+    };
+    Transfer: struct {
+      from: actor_id,
+      to: actor_id,
+      value: u256,
+    };
+  }
+};
+`;
+class SailsCache {
+  static instance = null;
+  sail = null;
+
+  // eslint-disable-next-line no-useless-constructor, @typescript-eslint/no-empty-function
+  constructor() {}
+  static getInstance() {
+    if (!SailsCache.instance) {
+      SailsCache.instance = new SailsCache();
+    }
+    return SailsCache.instance;
+  }
+  async init() {
+    if (!this.sail) {
+      const parser = await _sailsJsParser.SailsIdlParser.new();
+      const sails = new _sailsJs.Sails(parser);
+      this.sail = sails.parseIdl(vftIdl);
+    }
+  }
+  get() {
+    if (!this.sail) {
+      throw new Error('Sails is not init yet');
     }
-    return new _sailsJs.TransactionBuilder(this._program.api, this._program.registry, 'send_message', ['Vft', 'TransferFrom', from, to, value], '(String, String, [u8;32], [u8;32], U256)', 'bool', this._program.programId);
-  }
-  async allowance(owner, spender, originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String, [u8;32], [u8;32])', ['Vft', 'Allowance', owner, spender]).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, U256)', reply.payload);
-    return result[2].toBigInt();
-  }
-  async balanceOf(account, originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String, [u8;32])', ['Vft', 'BalanceOf', account]).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, U256)', reply.payload);
-    return result[2].toBigInt();
-  }
-  async decimals(originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String)', ['Vft', 'Decimals']).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, u8)', reply.payload);
-    return result[2].toNumber();
-  }
-  async name(originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String)', ['Vft', 'Name']).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, String)', reply.payload);
-    return result[2].toString();
-  }
-  async symbol(originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String)', ['Vft', 'Symbol']).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, String)', reply.payload);
-    return result[2].toString();
-  }
-  async totalSupply(originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String)', ['Vft', 'TotalSupply']).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, U256)', reply.payload);
-    return result[2].toBigInt();
-  }
-  subscribeToApprovalEvent(callback) {
-    return this._program.api.gearEvents.subscribeToGearEvent('UserMessageSent', _ref => {
-      let {
-        data: {
-          message
-        }
-      } = _ref;
-      if (!message.source.eq(this._program.programId) || !message.destination.eq(_sailsJs.ZERO_ADDRESS)) {
-        return;
-      }
-      const payload = message.payload.toHex();
-      if ((0, _sailsJs.getServiceNamePrefix)(payload) === 'Vft' && (0, _sailsJs.getFnNamePrefix)(payload) === 'Approval') {
-        // eslint-disable-next-line node/no-callback-literal,@typescript-eslint/no-floating-promises
-        callback(this._program.registry.createType('(String, String, {"owner":"[u8;32]","spender":"[u8;32]","value":"U256"})', message.payload)[2].toJSON());
-      }
-    });
-  }
-  subscribeToTransferEvent(callback) {
-    return this._program.api.gearEvents.subscribeToGearEvent('UserMessageSent', _ref2 => {
-      let {
-        data: {
-          message
-        }
-      } = _ref2;
-      if (!message.source.eq(this._program.programId) || !message.destination.eq(_sailsJs.ZERO_ADDRESS)) {
-        return;
-      }
-      const payload = message.payload.toHex();
-      if ((0, _sailsJs.getServiceNamePrefix)(payload) === 'Service' && (0, _sailsJs.getFnNamePrefix)(payload) === 'Transfer') {
-        // eslint-disable-next-line node/no-callback-literal,@typescript-eslint/no-floating-promises
-        callback(this._program.registry.createType('(String, String, {"from":"[u8;32]","to":"[u8;32]","value":"U256"})', message.payload)[2].toJSON());
-      }
-    });
+    return this.sail;
   }
 }
-exports.VftService = VftService;
+const sailsCache = SailsCache.getInstance();
+exports.sailsCache = sailsCache;

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

@@ -46,10 +46,11 @@ export default class OrdinalNftApi extends BaseNftApi {
     this.subscanService = SubscanService.getInstance();
   }
   async handleNft(address, handleNftParams) {
-    const events = await this.subscanService.getAccountRemarkEvents(this.subscanChain, address);
+    const groupId = this.subscanService.getGroupId();
+    const events = await this.subscanService.getAccountRemarkEvents(groupId, this.subscanChain, address);
     if (events && events.length) {
       const extrinsicIds = events.map(data => data.extrinsic_index);
-      const extrinsicParams = await this.subscanService.getExtrinsicParams(this.subscanChain, extrinsicIds);
+      const extrinsicParams = await this.subscanService.getExtrinsicParams(groupId, this.subscanChain, extrinsicIds);
       const items = [];
       for (const data of extrinsicParams) {
         const {

package/koni/background/handlers/State.js

@@ -41,7 +41,7 @@ import TransactionService from '@subwallet/extension-base/services/transaction-s
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { BasicTxErrorType } from '@subwallet/extension-base/types';
-import { addLazy, isManifestV3, isSameAddress, reformatAddress, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
+import { addLazy, isManifestV3, isSameAddress, reformatAddress, sailsCache, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
 import { convertCardanoHexToBech32, validateAddressNetwork } from '@subwallet/extension-base/utils/cardano';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
@@ -238,6 +238,9 @@ export default class KoniState {
       this.afterChainServiceInit();
     });
 
+    // init sails
+    await sailsCache.init();
+
     // Mark app is ready
     this.eventService.emit('general.init', true);
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.46-0",
+  "version": "1.3.47-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2201,6 +2201,16 @@
       "require": "./cjs/strategy/api-request-strategy/index.js",
       "default": "./strategy/api-request-strategy/index.js"
     },
+    "./strategy/api-request-strategy-v2": {
+      "types": "./strategy/api-request-strategy-v2/index.d.ts",
+      "require": "./cjs/strategy/api-request-strategy-v2/index.js",
+      "default": "./strategy/api-request-strategy-v2/index.js"
+    },
+    "./strategy/api-request-strategy-v2/types": {
+      "types": "./strategy/api-request-strategy-v2/types.d.ts",
+      "require": "./cjs/strategy/api-request-strategy-v2/types.js",
+      "default": "./strategy/api-request-strategy-v2/types.js"
+    },
     "./strategy/api-request-strategy/context/base": {
       "types": "./strategy/api-request-strategy/context/base.d.ts",
       "require": "./cjs/strategy/api-request-strategy/context/base.js",
@@ -2829,7 +2839,7 @@
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
-    "@gear-js/api": "^0.38.1",
+    "@gear-js/api": "^0.42.0",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/eth-sig-util": "^7.0.3",
     "@metamask/safe-event-emitter": "^2.0.0",
@@ -2855,13 +2865,13 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.107",
-    "@subwallet/extension-base": "^1.3.46-0",
-    "@subwallet/extension-chains": "^1.3.46-0",
-    "@subwallet/extension-dapp": "^1.3.46-0",
-    "@subwallet/extension-inject": "^1.3.46-0",
+    "@subwallet/chain-list": "0.2.109",
+    "@subwallet/extension-base": "^1.3.47-0",
+    "@subwallet/extension-chains": "^1.3.47-0",
+    "@subwallet/extension-dapp": "^1.3.47-0",
+    "@subwallet/extension-inject": "^1.3.47-0",
     "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.46-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.47-0",
     "@subwallet/ui-keyring": "^0.1.12",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",
@@ -2894,7 +2904,8 @@
     "moment": "^2.29.4",
     "protobufjs": "^7.2.4",
     "rxjs": "^7.8.1",
-    "sails-js": "^0.1.6",
+    "sails-js": "^0.4.2",
+    "sails-js-parser": "^0.4.2",
     "ts-md5": "^1.3.1",
     "tweetnacl": "^1.0.3",
     "uuid": "^9.0.0",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.46-0'
+  version: '1.3.47-0'
 };

package/services/balance-service/helpers/subscribe/substrate/index.js

@@ -324,17 +324,15 @@ const subscribeTokensAccountsPallet = async ({
   const tokensAccountsKey = 'query_tokens_accounts';
   const tokenTypes = includeNativeToken ? [_AssetType.NATIVE, _AssetType.LOCAL] : [_AssetType.LOCAL];
   const tokenMap = filterAssetsByChainAndType(assetMap, chainInfo.slug, tokenTypes);
-
-  // Hotfix balance for gdot
-  const getGdotBalance = async () => {
-    const gdotBalances = await queryGdotBalance(substrateApi, addresses, assetMap[gdotSlug], extrinsicType);
-    callback(gdotBalances);
-  };
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
-    // Hotfix balance for gdot
-    if (tokenInfo.slug === gdotSlug) {
+    var _tokenInfo$metadata;
+    if ((_tokenInfo$metadata = tokenInfo.metadata) !== null && _tokenInfo$metadata !== void 0 && _tokenInfo$metadata.isGigaToken) {
       return timer(0, CRON_REFRESH_PRICE_INTERVAL).subscribe(() => {
-        getGdotBalance().catch(console.error);
+        const getGigaTokenBalance = async () => {
+          const gigaTokenBalances = await queryGigaTokenBalance(substrateApi, addresses, assetMap[tokenInfo.slug], extrinsicType);
+          callback(gigaTokenBalances);
+        };
+        getGigaTokenBalance().catch(console.error);
       });
     }
     try {
@@ -543,11 +541,7 @@ const subscribeSubnetAlphaPallet = async ({
     clearInterval(interval);
   };
 };
-
-// Hot fix for gdot balance
-
-const gdotSlug = 'hydradx_main-LOCAL-GDOT';
-async function queryGdotBalance(substrateApi, addresses, tokenInfo, extrinsicType) {
+async function queryGigaTokenBalance(substrateApi, addresses, tokenInfo, extrinsicType) {
   return await Promise.all(addresses.map(async address => {
     const _balanceInfo = await substrateApi.api.call.currenciesApi.account(_getTokenOnChainAssetId(tokenInfo), address);
     const balanceInfo = _balanceInfo.toPrimitive();

package/services/buy-service/index.js

@@ -15,6 +15,8 @@ const convertSupportType = support => {
       return AccountChainType.CARDANO;
     case 'TON':
       return AccountChainType.TON;
+    case 'BITCOIN':
+      return AccountChainType.BITCOIN;
     default:
       return null;
   }

package/services/chain-service/utils/index.js

@@ -432,6 +432,9 @@ export function _getBlockExplorerFromChain(chainInfo) {
   } else if (_isPureBitcoinChain(chainInfo)) {
     var _chainInfo$bitcoinInf;
     blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$bitcoinInf = chainInfo.bitcoinInfo) === null || _chainInfo$bitcoinInf === void 0 ? void 0 : _chainInfo$bitcoinInf.blockExplorer;
+  } else if (_isPureTonChain(chainInfo)) {
+    var _chainInfo$tonInfo;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$tonInfo = chainInfo.tonInfo) === null || _chainInfo$tonInfo === void 0 ? void 0 : _chainInfo$tonInfo.blockExplorer;
   } else {
     var _chainInfo$substrateI18;
     blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI18 = chainInfo.substrateInfo) === null || _chainInfo$substrateI18 === void 0 ? void 0 : _chainInfo$substrateI18.blockExplorer;

package/services/chain-service/utils/patch.js

@@ -5,7 +5,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-const ChainListVersion = '0.2.107'; // update this when build chainlist
+const ChainListVersion = '0.2.109'; // update this when build chainlist
 
 // todo: move this interface to chainlist
 

package/services/earning-service/handlers/native-staking/amplitude.d.ts

@@ -7,6 +7,7 @@ import BaseParaNativeStakingPoolHandler from './base-para';
 export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeStakingPoolHandler {
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, delegatorState: ParachainStakingStakeOption[], unstakingInfo: Record<string, number>): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
+    checkAccountHaveStake(useAddresses: string[]): Promise<string[]>;
     subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
     getPoolReward(useAddresses: string[], callBack: (rs: EarningRewardItem) => void): Promise<VoidFunction>;
     getKrestPoolTargets(chainApi: _SubstrateApi): Promise<ValidatorInfo[]>;

package/services/earning-service/handlers/native-staking/amplitude.js

@@ -171,6 +171,38 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
       unstakings: unstakingList
     };
   }
+  async checkAccountHaveStake(useAddresses) {
+    var _substrateApi$api$que, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
+    const result = [];
+    const substrateApi = await this.substrateApi.isReady;
+    const ledgers = await ((_substrateApi$api$que = substrateApi.api.query.parachainStaking) === null || _substrateApi$api$que === void 0 ? void 0 : (_substrateApi$api$que2 = _substrateApi$api$que.delegatorState) === null || _substrateApi$api$que2 === void 0 ? void 0 : (_substrateApi$api$que3 = _substrateApi$api$que2.multi) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.call(_substrateApi$api$que2, useAddresses));
+    const _unstakingStates = await ((_substrateApi$api$que4 = substrateApi.api.query.parachainStaking) === null || _substrateApi$api$que4 === void 0 ? void 0 : (_substrateApi$api$que5 = _substrateApi$api$que4.unstaking) === null || _substrateApi$api$que5 === void 0 ? void 0 : (_substrateApi$api$que6 = _substrateApi$api$que5.multi) === null || _substrateApi$api$que6 === void 0 ? void 0 : _substrateApi$api$que6.call(_substrateApi$api$que5, useAddresses));
+    if (!ledgers || !_unstakingStates) {
+      return [];
+    }
+    for (let i = 0; i < useAddresses.length; i++) {
+      const owner = useAddresses[i];
+      const _delegatorState = ledgers[i];
+      let delegatorState = [];
+      const unstakingInfo = _unstakingStates[i].toPrimitive();
+      if (_STAKING_CHAIN_GROUP.krest_network.includes(this.chain)) {
+        const krestDelegatorState = _delegatorState.toPrimitive();
+        const delegates = krestDelegatorState === null || krestDelegatorState === void 0 ? void 0 : krestDelegatorState.delegations;
+        if (delegates) {
+          delegatorState = delegatorState.concat(delegates);
+        }
+      } else {
+        const delegate = _delegatorState.toPrimitive();
+        if (delegate) {
+          delegatorState.push(delegate);
+        }
+      }
+      if (delegatorState.length || unstakingInfo && Object.keys(unstakingInfo).length) {
+        result.push(owner);
+      }
+    }
+    return Promise.resolve(result);
+  }
   async subscribePoolPosition(useAddresses, resultCallback) {
     let cancel = false;
     const substrateApi = await this.substrateApi.isReady;

package/services/earning-service/handlers/native-staking/astar.d.ts

@@ -9,6 +9,7 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, ledger: PalletDappsStakingAccountLedger): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
     subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
+    checkAccountHaveStake(useAddresses: string[]): Promise<Array<string>>;
     getPoolTargets(): Promise<ValidatorInfo[]>;
     get defaultSubmitStep(): YieldStepBaseInfo;
     createJoinExtrinsic(data: SubmitJoinNativeStaking, positionInfo?: YieldPositionInfo, bondDest?: string): Promise<[TransactionData, YieldTokenBaseInfo]>;

package/services/earning-service/handlers/native-staking/astar.js

@@ -286,6 +286,24 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
       unsub && unsub();
     };
   }
+  async checkAccountHaveStake(useAddresses) {
+    var _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4;
+    const result = [];
+    const substrateApi = await this.substrateApi.isReady;
+    const ledgers = await ((_substrateApi$api$que2 = substrateApi.api.query.dappsStaking) === null || _substrateApi$api$que2 === void 0 ? void 0 : (_substrateApi$api$que3 = _substrateApi$api$que2.ledger) === null || _substrateApi$api$que3 === void 0 ? void 0 : (_substrateApi$api$que4 = _substrateApi$api$que3.multi) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.call(_substrateApi$api$que3, useAddresses));
+    if (!ledgers) {
+      return [];
+    }
+    for (let i = 0; i < useAddresses.length; i++) {
+      const owner = useAddresses[i];
+      const _ledger = ledgers[i];
+      const ledger = _ledger.toPrimitive();
+      if (ledger && ledger.locked > 0) {
+        result.push(owner);
+      }
+    }
+    return result;
+  }
 
   /* Subscribe pool position */
 

package/services/earning-service/handlers/native-staking/base.d.ts

@@ -12,6 +12,7 @@ export default abstract class BaseNativeStakingPoolHandler extends BasePoolHandl
     constructor(state: KoniState, chain: string);
     protected getDescription(amount?: string): string;
     getPoolReward(useAddresses: string[], callBack: (rs: EarningRewardItem) => void): Promise<VoidFunction>;
+    abstract checkAccountHaveStake(useAddresses: string[]): Promise<Array<string>>;
     getPoolRewardHistory(useAddresses: string[], callBack: (rs: EarningRewardHistoryItem) => void): Promise<VoidFunction>;
     get defaultSubmitStep(): YieldStepBaseInfo;
     abstract createJoinExtrinsic(data: SubmitJoinNativeStaking, positionInfo?: YieldPositionInfo, bondDest?: string, netuid?: number): Promise<[TransactionData, YieldTokenBaseInfo]>;

package/services/earning-service/handlers/native-staking/base.js

@@ -42,40 +42,48 @@ export default class BaseNativeStakingPoolHandler extends BasePoolHandler {
   async getPoolRewardHistory(useAddresses, callBack) {
     let cancel = false;
     const haveSubscanService = this.state.subscanService.checkSupportedSubscanChain(this.chain);
+    const requestGroupId = this.state.subscanService.getGroupId();
     if (haveSubscanService) {
-      for (const address of useAddresses) {
-        if (cancel) {
-          break;
-        }
-        try {
-          const rs = await this.state.subscanService.getRewardHistoryList(this.chain, address);
-          const items = rs === null || rs === void 0 ? void 0 : rs.list;
-          if (items) {
-            for (const item of items) {
-              const now = new Date();
-              const isMillisecond = now.getTime().toString().length === item.block_timestamp.toString().length;
-              const timeStamp = isMillisecond ? item.block_timestamp : item.block_timestamp * 1000;
-              const data = {
-                slug: this.slug,
-                type: this.type,
-                chain: this.chain,
-                address: address,
-                group: this.group,
-                blockTimestamp: timeStamp,
-                amount: item.amount,
-                eventIndex: item.event_index
-              };
-              callBack(data);
-            }
+      this.checkAccountHaveStake(useAddresses).then(activeAddresses => {
+        for (const address of useAddresses) {
+          if (cancel) {
+            break;
           }
-        } catch (e) {
-          console.error(e);
+          if (!activeAddresses.includes(address)) {
+            continue;
+          }
+          this.state.subscanService.getRewardHistoryList(requestGroupId, this.chain, address).then(rs => {
+            const items = rs === null || rs === void 0 ? void 0 : rs.list;
+            if (cancel) {
+              return;
+            }
+            if (items) {
+              for (const item of items) {
+                const now = new Date();
+                const isMillisecond = now.getTime().toString().length === item.block_timestamp.toString().length;
+                const timeStamp = isMillisecond ? item.block_timestamp : item.block_timestamp * 1000;
+                const data = {
+                  slug: this.slug,
+                  type: this.type,
+                  chain: this.chain,
+                  address: address,
+                  group: this.group,
+                  blockTimestamp: timeStamp,
+                  amount: item.amount,
+                  eventIndex: item.event_index
+                };
+                callBack(data);
+              }
+            }
+          }).catch(console.error);
         }
-      }
+      }).catch(console.error);
     }
-    return () => {
+    return Promise.resolve(() => {
+      console.log('Cancel get pool reward history', requestGroupId);
       cancel = false;
-    };
+      this.state.subscanService.cancelGroupRequest(requestGroupId);
+    });
   }
 
   /* Get pool reward */

package/services/earning-service/handlers/native-staking/dtao.d.ts

@@ -61,6 +61,7 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, delegatorState: TaoStakingStakeOption[]): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
     subscribePoolPosition(useAddresses: string[], rsCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
+    checkAccountHaveStake(useAddresses: string[]): Promise<string[]>;
     private getDevnetPoolTargets;
     private getMainnetPoolTargets;
     getPoolTargets(): Promise<ValidatorInfo[]>;

package/services/earning-service/handlers/native-staking/dtao.js

@@ -364,6 +364,11 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     };
   }
 
+  // Because not have subscan api
+  async checkAccountHaveStake(useAddresses) {
+    return Promise.resolve([]);
+  }
+
   /* Subscribe pool position */
 
   /* Get pool targets */

package/services/earning-service/handlers/native-staking/mythos.d.ts

@@ -13,6 +13,7 @@ interface PalletCollatorStakingUserStakeInfo {
 export default class MythosNativeStakingPoolHandler extends BaseParaStakingPoolHandler {
     protected readonly availableMethod: YieldPoolMethodInfo;
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
+    checkAccountHaveStake(useAddresses: string[]): Promise<Array<string>>;
     subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
     parseCollatorMetadata(chainInfo: _ChainInfo, stakerAddress: string, substrateApi: _SubstrateApi, userStake: PalletCollatorStakingUserStakeInfo): Promise<{
         status: EarningStatus;