@subwallet/extension-base 1.3.45-1 → 1.3.46-0

package/cjs/page/evm/index.js

@@ -4,124 +4,51 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createSubWalletEvmProvider = createSubWalletEvmProvider;
 var _safeEventEmitter = _interopRequireDefault(require("@metamask/safe-event-emitter"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-let subscribeFlag = false;
-class SubWalletEvmProvider extends _safeEventEmitter.default {
-  isSubWallet = true;
-  isMetaMask = false;
-  _connected = false;
-  constructor(sendMessage, version) {
-    super();
-    this.version = version;
-    this.sendMessage = sendMessage;
-    this._connected = true;
-  }
-  get connected() {
-    return this._connected;
-  }
-  isConnected() {
-    return this._connected;
-  }
-  subscribeExtensionEvents() {
+function createSubWalletEvmProvider(sendMessage, version) {
+  const emitter = new _safeEventEmitter.default();
+  let connected = true;
+  let subscribeFlag = false;
+  const provider = Object.assign(emitter, {
+    isSubWallet: true,
+    isMetaMask: false,
+    version
+  });
+  function subscribeExtensionEvents() {
     if (subscribeFlag) {
       return;
     }
-    this.sendMessage('evm(events.subscribe)', null, _ref => {
+    sendMessage('evm(events.subscribe)', null, _ref => {
       let {
         payload,
         type
       } = _ref;
       if (['connect', 'disconnect', 'accountsChanged', 'chainChanged', 'message', 'data', 'reconnect', 'error'].includes(type)) {
         if (type === 'connect') {
-          this._connected = true;
+          connected = true;
         } else if (type === 'disconnect') {
-          this._connected = false;
+          connected = false;
         }
         const finalType = type === 'data' ? 'message' : type;
-
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-        this.emit(finalType, payload);
+        emitter.emit(finalType, payload);
       } else {
         console.warn('Can not handle event', type, payload);
       }
-    }).then(done => {
+    }).then(() => {
       subscribeFlag = true;
     }).catch(() => {
       subscribeFlag = false;
     });
-    subscribeFlag = true;
-  }
-  async enable() {
-    return this.request({
-      method: 'eth_requestAccounts'
-    });
-  }
-  on(eventName, listener) {
-    this.subscribeExtensionEvents();
-    super.on(eventName, listener);
-    return this;
   }
-  once(eventName, listener) {
-    this.subscribeExtensionEvents();
-    super.once(eventName, listener);
-    return this;
-  }
-  request(_ref2) {
-    let {
-      method,
-      params
-    } = _ref2;
-    // if (!this._isEnable) {
-    //   if (method === 'eth_accounts') {
-    //     return this.request<T>({ method: 'eth_requestAccounts' });
-    //   }
-    // }
-
-    // Subscribe events
-    switch (method) {
-      case 'eth_requestAccounts':
-        return new Promise((resolve, reject) => {
-          const origin = document.title !== '' ? document.title : window.location.hostname;
-          this.sendMessage('pub(authorize.tabV2)', {
-            origin,
-            accountAuthTypes: ['evm']
-          }).then(() => {
-            // Return account list
-            this.request({
-              method: 'eth_accounts'
-            }).then(accounts => {
-              // @ts-ignore
-              resolve(accounts);
-            }).catch(e => {
-              reject(e);
-            });
-          }).catch(e => {
-            reject(e);
-          });
-        });
-      default:
-        return new Promise((resolve, reject) => {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-          this.sendMessage('evm(request)', {
-            params,
-            method
-          }).then(result => {
-            resolve(result);
-          }).catch(e => {
-            reject(e);
-          });
-        });
-    }
-  }
-  _sendSync(payload) {
+  const _sendSync = payload => {
     let result;
     switch (payload.method) {
       case 'net_version':
-        result = this.version ? `SubWallet v${this.version}` : null;
+        result = version ? `SubWallet v${version}` : null;
         break;
       default:
         throw new Error(`Not support ${payload.method}`);
@@ -131,29 +58,61 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
       jsonrpc: payload.jsonrpc,
       result
     };
-  }
-  send(methodOrPayload, callbackOrArgs) {
+  };
+  provider.isConnected = () => connected;
+  provider.request = arg => {
+    if (arg.method === 'eth_requestAccounts') {
+      const origin = document.title || window.location.hostname;
+      return sendMessage('pub(authorize.tabV2)', {
+        origin,
+        accountAuthTypes: ['evm']
+      }).then(() => provider.request({
+        method: 'eth_accounts'
+      }));
+    }
+    return sendMessage('evm(request)', arg);
+  };
+  provider.send = (methodOrPayload, callbackOrArgs) => {
     if (typeof methodOrPayload === 'string' && (!callbackOrArgs || Array.isArray(callbackOrArgs))) {
-      return this.request({
+      return provider.request({
         method: methodOrPayload,
         params: callbackOrArgs
       });
-    } else if (methodOrPayload && typeof methodOrPayload === 'object' && typeof callbackOrArgs === 'function') {
-      return this.request(methodOrPayload).then(rs => {
-        callbackOrArgs(rs);
+    } else if (typeof methodOrPayload === 'object' && typeof callbackOrArgs === 'function') {
+      return provider.request(methodOrPayload).then(result => {
+        callbackOrArgs(null, result);
       });
     }
-    return this._sendSync(methodOrPayload);
-  }
-  sendAsync(payload, callback) {
-    this.request(payload).then(result => {
-      // @ts-ignore
+    return _sendSync(methodOrPayload);
+  };
+  provider.enable = async () => {
+    const accounts = await provider.request({
+      method: 'eth_requestAccounts'
+    });
+    connected = accounts.length > 0;
+    return accounts;
+  };
+  provider.sendAsync = (payload, callback) => {
+    provider.request(payload).then(result => {
       callback(null, {
+        id: payload.id,
+        jsonrpc: payload.jsonrpc,
+        // @ts-ignore
         result
       });
     }).catch(e => {
       callback(e);
     });
-  }
-}
-exports.default = SubWalletEvmProvider;
+  };
+  provider.on = (eventName, listener) => {
+    subscribeExtensionEvents();
+    _safeEventEmitter.default.prototype.on.call(emitter, eventName, listener);
+    return provider;
+  };
+  provider.once = (eventName, listener) => {
+    subscribeExtensionEvents();
+    _safeEventEmitter.default.prototype.once.call(emitter, eventName, listener);
+    return provider;
+  };
+  return provider;
+}

package/cjs/page/index.js

@@ -14,7 +14,7 @@ var _ProviderError = require("@subwallet/extension-base/background/errors/Provid
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _bitcoin = _interopRequireDefault(require("@subwallet/extension-base/page/bitcoin"));
 var _cardano = _interopRequireDefault(require("@subwallet/extension-base/page/cardano"));
-var _evm = _interopRequireDefault(require("@subwallet/extension-base/page/evm"));
+var _evm = require("@subwallet/extension-base/page/evm");
 var _substrate = _interopRequireDefault(require("@subwallet/extension-base/page/substrate"));
 var _defaults = require("../defaults");
 var _getId = require("../utils/getId");
@@ -48,9 +48,11 @@ function sendMessage(message, request, subscriber) {
 
 async function enable(origin, opt) {
   const accountAuthTypes = (opt === null || opt === void 0 ? void 0 : opt.accountAuthType) === 'both' ? ['substrate', 'evm'] : [(opt === null || opt === void 0 ? void 0 : opt.accountAuthType) || 'substrate'];
+  const canConnectSubstrateEcdsa = accountAuthTypes.includes('evm');
   await sendMessage('pub(authorize.tabV2)', {
     origin,
-    accountAuthTypes
+    accountAuthTypes,
+    canConnectSubstrateEcdsa
   });
   return new _substrate.default(sendMessage);
 }
@@ -74,7 +76,7 @@ function handleResponse(data) {
   }
 }
 function initEvmProvider(version) {
-  return new _evm.default(sendMessage, version);
+  return (0, _evm.createSubWalletEvmProvider)(sendMessage, version);
 }
 function initCardanoProvider() {
   return new _cardano.default(sendMessage);

package/cjs/page/substrate/Accounts.js

@@ -15,7 +15,8 @@ class Accounts {
   }
   get(anyType) {
     return sendRequest('pub(accounts.listV2)', {
-      anyType
+      anyType,
+      isSubstrateConnector: true
     });
   }
   subscribe(cb) {

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

@@ -1,94 +1,21 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAccountJsonByAddress = void 0;
 exports.subscribeBalance = subscribeBalance;
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _bitcoin2 = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/bitcoin");
+var _bitcoin = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/bitcoin");
 var _cardano = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
-var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
 var _ton = require("./ton/ton");
 var _evm = require("./evm");
 var _substrate = require("./substrate");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-/**
- * @function getAccountJsonByAddress
- * @desc Get account info by address
- * <p>
- *   Note: Use on the background only
- * </p>
- * @param {string} address - Address
- * @returns {AccountJson|null}  - Account info or null if not found
- */
-const getAccountJsonByAddress = address => {
-  try {
-    const pair = _uiKeyring.default.getPair(address);
-    if (pair) {
-      return (0, _utils2.pairToAccount)(pair);
-    } else {
-      return null;
-    }
-  } catch (e) {
-    console.warn(e);
-    return null;
-  }
-};
-
-/** Filter addresses to subscribe by chain info */
-exports.getAccountJsonByAddress = getAccountJsonByAddress;
-const filterAddress = (addresses, chainInfo) => {
-  const {
-    _bitcoin,
-    bitcoin,
-    cardano,
-    evm,
-    substrate,
-    ton
-  } = (0, _utils2.getAddressesByChainTypeMap)(addresses, chainInfo);
-  if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
-    return [evm, [bitcoin, substrate, ton, cardano, _bitcoin].flat()];
-  } else if ((0, _utils._isChainBitcoinCompatible)(chainInfo)) {
-    return [bitcoin, [evm, substrate, ton, cardano, _bitcoin].flat()];
-  } else if ((0, _utils._isChainTonCompatible)(chainInfo)) {
-    return [ton, [bitcoin, evm, substrate, cardano, _bitcoin].flat()];
-  } else if ((0, _utils._isChainCardanoCompatible)(chainInfo)) {
-    return [cardano, [bitcoin, evm, substrate, ton, _bitcoin].flat()];
-  } else {
-    const fetchList = [];
-    const unfetchList = [];
-    substrate.forEach(address => {
-      const account = getAccountJsonByAddress(address);
-      if (account) {
-        if (account.isHardware) {
-          if (account.isGeneric) {
-            fetchList.push(address);
-          } else {
-            const availGen = account.availableGenesisHashes || [];
-            const gen = (0, _utils._getSubstrateGenesisHash)(chainInfo);
-            if (availGen.includes(gen)) {
-              fetchList.push(address);
-            } else {
-              unfetchList.push(address);
-            }
-          }
-        } else {
-          fetchList.push(address);
-        }
-      } else {
-        fetchList.push(address);
-      }
-    });
-    return [fetchList, [unfetchList, bitcoin, evm, ton, cardano, _bitcoin].flat()];
-  }
-};
 const handleUnsupportedOrPendingAddresses = (addresses, chainSlug, chainAssetMap, state, callback) => {
   const tokens = (0, _utils2.filterAssetsByChainAndType)(chainAssetMap, chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL, _types._AssetType.GRC20, _types._AssetType.VFT, _types._AssetType.TEP74, _types._AssetType.CIP26]);
   const now = new Date().getTime();
@@ -120,7 +47,7 @@ function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoM
   // Looping over each chain
   const unsubList = Object.values(chainInfoMap).map(async chainInfo => {
     const chainSlug = chainInfo.slug;
-    const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
+    const [useAddresses, notSupportAddresses] = (0, _utils2.filterAddressByChainInfo)(addresses, chainInfo);
     if (notSupportAddresses.length) {
       handleUnsupportedOrPendingAddresses(notSupportAddresses, chainSlug, chainAssetMap, _KoniTypes.APIItemState.NOT_SUPPORT, callback);
     }
@@ -156,7 +83,7 @@ function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoM
     }
     const bitcoinApi = bitcoinApiMap[chainSlug];
     if ((0, _utils._isPureBitcoinChain)(chainInfo)) {
-      return (0, _bitcoin2.subscribeBitcoinBalance)({
+      return (0, _bitcoin.subscribeBitcoinBalance)({
         addresses: useAddresses,
         assetMap: chainAssetMap,
         bitcoinApi,

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

@@ -1043,6 +1043,9 @@ class ChainService {
   async fetchLatestSufficientChains() {
     return (await (0, _utils2.fetchStaticData)('chains/supported-sufficient-chains')) || [];
   }
+  async fetchAhMapChain() {
+    return await (0, _utils2.fetchStaticData)('asset-hub-staking-map');
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const defaultChainInfoMap = filterChainInfoMap(_chainList.ChainInfoMap, ignoredList);

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

@@ -28,6 +28,8 @@ var _exportNames = {
   _isBridgedToken: true,
   _getTokenMinAmount: true,
   _isChainEvmCompatible: true,
+  _isChainCompatibleLedgerEvm: true,
+  _isSubstrateEvmCompatibleChain: true,
   _isChainBitcoinCompatible: true,
   _isChainTonCompatible: true,
   _isChainCardanoCompatible: true,
@@ -56,6 +58,7 @@ var _exportNames = {
   _getTokenTypesSupportedByChain: true,
   _getChainNativeTokenBasicInfo: true,
   _getChainNativeTokenSlug: true,
+  _getChainSubstrateTokenSymbol: true,
   _isLocalToken: true,
   _isTokenEvmSmartContract: true,
   _isTokenTonSmartContract: true,
@@ -120,6 +123,7 @@ exports._getChainName = _getChainName;
 exports._getChainNativeTokenBasicInfo = _getChainNativeTokenBasicInfo;
 exports._getChainNativeTokenSlug = _getChainNativeTokenSlug;
 exports._getChainSubstrateAddressPrefix = _getChainSubstrateAddressPrefix;
+exports._getChainSubstrateTokenSymbol = _getChainSubstrateTokenSymbol;
 exports._getContractAddressOfToken = _getContractAddressOfToken;
 exports._getCrowdloanUrlFromChain = _getCrowdloanUrlFromChain;
 exports._getCustomAssets = _getCustomAssets;
@@ -152,6 +156,7 @@ exports._isBridgedToken = _isBridgedToken;
 exports._isCIP26Token = _isCIP26Token;
 exports._isChainBitcoinCompatible = _isChainBitcoinCompatible;
 exports._isChainCardanoCompatible = _isChainCardanoCompatible;
+exports._isChainCompatibleLedgerEvm = _isChainCompatibleLedgerEvm;
 exports._isChainEnabled = _isChainEnabled;
 exports._isChainEvmCompatible = _isChainEvmCompatible;
 exports._isChainInfoCompatibleWithAccountInfo = void 0;
@@ -184,6 +189,7 @@ exports._isPureSubstrateChain = _isPureSubstrateChain;
 exports._isPureTonChain = _isPureTonChain;
 exports._isRelayChain = _isRelayChain;
 exports._isSmartContractToken = _isSmartContractToken;
+exports._isSubstrateEvmCompatibleChain = _isSubstrateEvmCompatibleChain;
 exports._isSubstrateParaChain = _isSubstrateParaChain;
 exports._isSubstrateRelayChain = _isSubstrateRelayChain;
 exports._isSupportOrdinal = void 0;
@@ -358,6 +364,12 @@ function _getTokenMinAmount(tokenInfo) {
 function _isChainEvmCompatible(chainInfo) {
   return !!chainInfo.evmInfo;
 }
+function _isChainCompatibleLedgerEvm(chainInfo) {
+  return !!chainInfo.evmInfo && chainInfo.evmInfo.evmChainId > 0;
+}
+function _isSubstrateEvmCompatibleChain(chainInfo) {
+  return !!chainInfo.evmInfo && !!chainInfo.substrateInfo;
+}
 function _isChainBitcoinCompatible(chainInfo) {
   return !!chainInfo.bitcoinInfo;
 }
@@ -529,6 +541,13 @@ function _getChainNativeTokenSlug(chainInfo) {
   }
   return `${chainInfo.slug}-${_types._AssetType.NATIVE}-${_getChainNativeTokenBasicInfo(chainInfo).symbol}`;
 }
+function _getChainSubstrateTokenSymbol(chainInfo) {
+  if (chainInfo.substrateInfo) {
+    return chainInfo.substrateInfo.symbol || '';
+  } else {
+    return '';
+  }
+}
 function _isLocalToken(tokenInfo) {
   return tokenInfo.assetType === _types._AssetType.LOCAL;
 }
@@ -816,11 +835,22 @@ const _chainInfoToChainType = chainInfo => {
   return _types3.AccountChainType.SUBSTRATE;
 };
 exports._chainInfoToChainType = _chainInfoToChainType;
-const _isChainInfoCompatibleWithAccountInfo = (chainInfo, accountChainType, accountType) => {
+const _isChainInfoCompatibleWithAccountInfo = (chainInfo, accountInfo) => {
+  const {
+    chainType: accountChainType,
+    signMode: accountSignMode,
+    type: accountType
+  } = accountInfo;
   if (accountChainType === _types3.AccountChainType.SUBSTRATE) {
     return _isPureSubstrateChain(chainInfo) && _types4.SubstrateKeypairTypes.includes(accountType);
   }
   if (accountChainType === _types3.AccountChainType.ETHEREUM) {
+    if (accountSignMode === _types3.AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {
+      return _isSubstrateEvmCompatibleChain(chainInfo) && _types4.EthereumKeypairTypes.includes(accountType);
+    }
+    if (accountSignMode === _types3.AccountSignMode.GENERIC_LEDGER) {
+      return _isChainCompatibleLedgerEvm(chainInfo) && _types4.EthereumKeypairTypes.includes(accountType);
+    }
     return _isChainEvmCompatible(chainInfo) && _types4.EthereumKeypairTypes.includes(accountType);
   }
   if (accountChainType === _types3.AccountChainType.TON) {

package/cjs/services/earning-service/constants/chains.js

@@ -8,7 +8,8 @@ exports._STAKING_CHAIN_GROUP = exports.TON_CHAINS = exports.ST_LIQUID_TOKEN_ABI
 // SPDX-License-Identifier: Apache-2.0
 
 const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet', 'vara_testnet', 'dentnet', 'cere'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet', 'vara_testnet', 'dentnet', 'cere', 'statemine', 'statemint', 'westend_assethub'],
+  assetHub: ['statemine', 'statemint', 'westend_assethub'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari', 'manta_network', 'polimec'],
   astar: ['astar', 'shiden', 'shibuya'],
   amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum', 'krest_network'],

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

@@ -23,6 +23,9 @@ class BaseNativeStakingPoolHandler extends _base.default {
     withdraw: true,
     claimReward: false
   };
+  static generateSlug(symbol, chain) {
+    return `${symbol}___native_staking___${chain}`;
+  }
   constructor(state, chain) {
     super(state, chain);
     const _chainAsset = this.nativeToken;

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -659,8 +659,15 @@ class RelayNativeStakingPoolHandler extends _base.default {
   async handleYieldWithdraw(address, unstakingInfo) {
     const chainApi = await this.substrateApi.isReady;
     if (chainApi.api.tx.staking.withdrawUnbonded.meta.args.length === 1) {
-      const _slashingSpans = (await chainApi.api.query.staking.slashingSpans(address)).toHuman();
-      const slashingSpanCount = _slashingSpans !== null ? _slashingSpans.spanIndex : '0';
+      let slashingSpanCount;
+      if (chainApi.api.query.staking.nominatorSlashInEra) {
+        const currentEra = await chainApi.api.query.staking.currentEra();
+        const slashingSpans = (await chainApi.api.query.staking.nominatorSlashInEra(currentEra.toPrimitive(), address)).toPrimitive();
+        slashingSpanCount = slashingSpans !== null ? slashingSpans.toString() : '0';
+      } else {
+        const _slashingSpans = (await chainApi.api.query.staking.slashingSpans(address)).toHuman();
+        slashingSpanCount = _slashingSpans !== null ? _slashingSpans.spanIndex : '0';
+      }
       return chainApi.api.tx.staking.withdrawUnbonded(slashingSpanCount);
     } else {
       // @ts-ignore

package/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -29,6 +29,9 @@ class NominationPoolHandler extends _base.default {
     withdraw: true,
     claimReward: true
   };
+  static generateSlug(symbol, chain) {
+    return `${symbol}___nomination_pool___${chain}`;
+  }
   constructor(state, chain) {
     super(state, chain);
     const _chainAsset = this.nativeToken;
@@ -87,7 +90,8 @@ class NominationPoolHandler extends _base.default {
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
       const maxSupportedEras = substrateApi.api.consts.staking.historyDepth.toString();
-      const erasPerDay = 24 / _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug]; // Can be exactly calculate from epochDuration, blockTime, sessionsPerEra
+      const eraInHours = _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._STAKING_ERA_LENGTH_MAP.default; // in hours
+      const erasPerDay = 24 / eraInHours; // Can be exactly calculate from epochDuration, blockTime, sessionsPerEra
 
       const supportedDays = (0, _utils.getSupportedDaysByHistoryDepth)(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
@@ -569,8 +573,7 @@ class NominationPoolHandler extends _base.default {
   async handleYieldWithdraw(address, unstakingInfo) {
     const chainApi = await this.substrateApi.isReady;
     if (chainApi.api.tx.nominationPools.withdrawUnbonded.meta.args.length === 2) {
-      const _slashingSpans = (await chainApi.api.query.staking.slashingSpans(address)).toHuman();
-      const slashingSpanCount = _slashingSpans !== null ? _slashingSpans.spanIndex : '0';
+      const slashingSpanCount = await chainApi.api.call.nominationPoolsApi.memberPendingSlash(address);
       return chainApi.api.tx.nominationPools.withdrawUnbonded({
         Id: address
       }, slashingSpanCount);