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

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;
@@ -47,40 +50,48 @@ class BaseNativeStakingPoolHandler extends _base.default {
   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;
+          }
+          if (!activeAddresses.includes(address)) {
+            continue;
           }
-        } catch (e) {
-          console.error(e);
+          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/cjs/services/earning-service/handlers/native-staking/dtao.js

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

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

@@ -126,6 +126,34 @@ class MythosNativeStakingPoolHandler extends _basePara.default {
 
   /* Subscribe pool position */
 
+  async checkAccountHaveStake(useAddresses) {
+    var _substrateApi$api$que, _substrateApi$api$que2, _substrateApi$api$que3;
+    const result = [];
+    const substrateApi = await this.substrateApi.isReady;
+    const ledgers = await ((_substrateApi$api$que = substrateApi.api.query.collatorStaking) === null || _substrateApi$api$que === void 0 ? void 0 : (_substrateApi$api$que2 = _substrateApi$api$que.userStake) === 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 _unstakings = await Promise.all(useAddresses.map(stakerAddress => {
+      var _substrateApi$api$que4, _substrateApi$api$que5;
+      return (_substrateApi$api$que4 = substrateApi.api.query.collatorStaking) === null || _substrateApi$api$que4 === void 0 ? void 0 : (_substrateApi$api$que5 = _substrateApi$api$que4.releaseQueues) === null || _substrateApi$api$que5 === void 0 ? void 0 : _substrateApi$api$que5.call(_substrateApi$api$que4, stakerAddress);
+    }));
+    if (!ledgers || !_unstakings) {
+      return [];
+    }
+    for (let i = 0; i < useAddresses.length; i++) {
+      const owner = useAddresses[i];
+      const _userStake = ledgers[i];
+      const userStake = _userStake.toPrimitive();
+      const _unstaking = _unstakings[i];
+      const unstakings = _unstaking.toPrimitive();
+
+      // TODO: Need to improve, check if can only load stake info
+      if (userStake && userStake.stake !== '0') {
+        result.push(owner);
+      } else if (unstakings && unstakings.some(unstake => unstake.amount !== '0')) {
+        result.push(owner);
+      }
+    }
+    return result;
+  }
   async subscribePoolPosition(useAddresses, resultCallback) {
     let cancel = false;
     const substrateApi = await this.substrateApi.isReady;

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

@@ -275,6 +275,23 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
       unsub();
     };
   }
+  async checkAccountHaveStake(useAddresses) {
+    var _substrateApi$api$que, _substrateApi$api$que2, _substrateApi$api$que3;
+    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));
+    if (!ledgers) {
+      return [];
+    }
+    for (let i = 0; i < useAddresses.length; i++) {
+      const owner = useAddresses[i];
+      const delegatorState = ledgers[i].toPrimitive();
+      if (delegatorState && delegatorState.total > 0) {
+        result.push(owner);
+      }
+    }
+    return result;
+  }
 
   /* Subscribe pool position */
 

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

@@ -290,6 +290,22 @@ class RelayNativeStakingPoolHandler extends _base.default {
       unsub === null || unsub === void 0 ? void 0 : unsub();
     };
   }
+  async checkAccountHaveStake(useAddresses) {
+    var _substrateApi$api$que22, _substrateApi$api$que23, _substrateApi$api$que24;
+    const result = [];
+    const substrateApi = await this.substrateApi.isReady;
+    const ledgers = await ((_substrateApi$api$que22 = substrateApi.api.query.staking) === null || _substrateApi$api$que22 === void 0 ? void 0 : (_substrateApi$api$que23 = _substrateApi$api$que22.ledger) === null || _substrateApi$api$que23 === void 0 ? void 0 : (_substrateApi$api$que24 = _substrateApi$api$que23.multi) === null || _substrateApi$api$que24 === void 0 ? void 0 : _substrateApi$api$que24.call(_substrateApi$api$que23, useAddresses));
+    if (ledgers) {
+      for (let i = 0; i < useAddresses.length; i++) {
+        const address = useAddresses[i];
+        const _ledger = ledgers[i].toPrimitive();
+        if (_ledger.total > 0) {
+          result.push(address);
+        }
+      }
+    }
+    return result;
+  }
 
   /* Subscribe pool position */
 
@@ -659,8 +675,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/native-staking/tao.js

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

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);

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

@@ -30,6 +30,7 @@ const fetchPoolsData = async () => {
 class EarningService {
   handlers = {};
   handlerCache = new Map();
+  inactivePoolSlug = new Set();
   earningRewardSubject = new _rxjs.BehaviorSubject({
     ready: false,
     data: {}
@@ -43,6 +44,7 @@ class EarningService {
   yieldPositionListSubject = new _rxjs.BehaviorSubject([]); // virtual list of yieldPositionSubject with filter values
 
   useOnlineCacheOnly = true;
+  inactivePoolReady = (0, _utils2.createPromiseHandler)();
   constructor(state) {
     this.state = state;
     this.dbService = state.dbService;
@@ -60,10 +62,23 @@ class EarningService {
       }
     }
     const minAmountPercent = {};
+    const ahMapChain = await this.state.chainService.fetchAhMapChain();
     for (const chain of chains) {
       const handlers = [];
+      const chainInfo = this.state.getChainInfo(chain);
+      const symbol = (0, _utils._getChainSubstrateTokenSymbol)(chainInfo);
       if (_constants2._STAKING_CHAIN_GROUP.relay.includes(chain)) {
-        handlers.push(new _handlers.RelayNativeStakingPoolHandler(this.state, chain));
+        if (_constants2._STAKING_CHAIN_GROUP.assetHub.includes(chain)) {
+          continue;
+        }
+        const ahChain = ahMapChain[chain];
+        if (ahChain) {
+          handlers.push(new _handlers.RelayNativeStakingPoolHandler(this.state, ahChain));
+          const relaySlug = _handlers.RelayNativeStakingPoolHandler.generateSlug(symbol, chain);
+          this.inactivePoolSlug.add(relaySlug);
+        } else {
+          handlers.push(new _handlers.RelayNativeStakingPoolHandler(this.state, chain));
+        }
       }
       if (_constants2._STAKING_CHAIN_GROUP.para.includes(chain)) {
         handlers.push(new _handlers.ParaNativeStakingPoolHandler(this.state, chain));
@@ -84,7 +99,14 @@ class EarningService {
         handlers.push(new _mythos.default(this.state, chain));
       }
       if (_constants2._STAKING_CHAIN_GROUP.nominationPool.includes(chain)) {
-        handlers.push(new _handlers.NominationPoolHandler(this.state, chain));
+        const ahChain = ahMapChain[chain];
+        if (ahChain) {
+          handlers.push(new _handlers.NominationPoolHandler(this.state, ahChain));
+          const relaySlug = _handlers.NominationPoolHandler.generateSlug(symbol, chain);
+          this.inactivePoolSlug.add(relaySlug);
+        } else {
+          handlers.push(new _handlers.NominationPoolHandler(this.state, chain));
+        }
       }
       if (_constants2._STAKING_CHAIN_GROUP.liquidStaking.includes(chain)) {
         if (chain === 'bifrost_dot') {
@@ -117,6 +139,7 @@ class EarningService {
     }
     minAmountPercent.default = _base.default.defaultMinAmountPercent;
     this.minAmountPercentSubject.next(minAmountPercent);
+    this.inactivePoolReady.resolve();
 
     // Emit earning ready
     this.eventService.emit('earning.ready', true);
@@ -136,7 +159,7 @@ class EarningService {
       next: data => {
         const activeMap = this.state.getActiveChainInfoMap();
         const activePositions = Object.values(data).filter(item => {
-          return !!activeMap[item.chain];
+          return !!activeMap[item.chain] && !this.inactivePoolSlug.has(item.slug);
         });
         this.yieldPositionListSubject.next(Object.values(activePositions));
       }
@@ -319,7 +342,9 @@ class EarningService {
     const yieldPoolInfo = {};
     const existedYieldPoolInfo = await this.dbService.getYieldPools();
     existedYieldPoolInfo.forEach(info => {
-      yieldPoolInfo[info.slug] = info;
+      if (!this.inactivePoolSlug.has(info.slug)) {
+        yieldPoolInfo[info.slug] = info;
+      }
     });
     this.yieldPoolInfoSubject.next(yieldPoolInfo);
   }
@@ -354,6 +379,10 @@ class EarningService {
   }
   async fetchingPoolsInfoOnline() {
     const onlineData = await fetchPoolsData();
+    await this.inactivePoolReady.promise;
+    for (const inactiveSlug of this.inactivePoolSlug) {
+      delete onlineData[inactiveSlug];
+    }
     Object.values(onlineData).forEach(item => {
       this.updateYieldPoolInfo(item);
     });
@@ -396,14 +425,11 @@ class EarningService {
   async subscribePoolPositions(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
-    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {
       if (activeChains.includes(handler.chain)) {
-        const chainInfo = handler.chainInfo;
-        const useAddresses = (0, _utils._isChainEvmCompatible)(chainInfo) ? evmAddresses : substrateAddresses;
+        const [useAddresses] = (0, _utils2.filterAddressByChainInfo)(addresses, handler.chainInfo);
         handler.subscribePoolPosition(useAddresses, callback).then(unsub => {
           if (cancel) {
             unsub();
@@ -451,7 +477,9 @@ class EarningService {
     const existedYieldPosition = await this.dbService.getYieldNominationPoolPosition(addresses, this.state.activeChainSlugs);
     const yieldPositionInfo = this.yieldPositionSubject.getValue();
     existedYieldPosition.forEach(item => {
-      yieldPositionInfo[this._getYieldPositionKey(item.slug, item.address)] = item;
+      if (!this.inactivePoolSlug.has(item.slug)) {
+        yieldPositionInfo[this._getYieldPositionKey(item.slug, item.address)] = item;
+      }
     });
     this.yieldPositionSubject.next(yieldPositionInfo);
   }
@@ -543,14 +571,11 @@ class EarningService {
   async getPoolReward(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
-    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {
       if (activeChains.includes(handler.chain)) {
-        const chainInfo = handler.chainInfo;
-        const useAddresses = (0, _utils._isChainEvmCompatible)(chainInfo) ? evmAddresses : substrateAddresses;
+        const [useAddresses] = (0, _utils2.filterAddressByChainInfo)(addresses, handler.chainInfo);
         handler.getPoolReward(useAddresses, callback).then(unsub => {
           if (cancel) {
             unsub();
@@ -599,14 +624,11 @@ class EarningService {
   async fetchPoolRewardHistory(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
-    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {
       if (activeChains.includes(handler.chain)) {
-        const chainInfo = handler.chainInfo;
-        const useAddresses = (0, _utils._isChainEvmCompatible)(chainInfo) ? evmAddresses : substrateAddresses;
+        const [useAddresses] = (0, _utils2.filterAddressByChainInfo)(addresses, handler.chainInfo);
         handler.getPoolRewardHistory(useAddresses, callback).then(unsub => {
           if (cancel) {
             unsub();
@@ -648,18 +670,39 @@ class EarningService {
     if (!addresses.length) {
       return;
     }
-    this.fetchPoolRewardHistory(addresses, result => {
-      this.updateEarningRewardHistory(result);
-    }).catch(console.error);
-    this.earningsRewardHistoryInterval = setInterval(() => {
+    let cancel = false;
+    let unsub;
+    this.unSubFetchEarningRewardHistory = () => {
+      if (!cancel) {
+        var _unsub2;
+        (_unsub2 = unsub) === null || _unsub2 === void 0 ? void 0 : _unsub2();
+        cancel = true;
+      }
+    };
+    const fetchData = () => {
       this.fetchPoolRewardHistory(addresses, result => {
+        if (cancel) {
+          return;
+        }
         this.updateEarningRewardHistory(result);
+      }).then(_unsub => {
+        if (!cancel) {
+          var _unsub3;
+          (_unsub3 = unsub) === null || _unsub3 === void 0 ? void 0 : _unsub3();
+          unsub = _unsub;
+        }
       }).catch(console.error);
-    }, _constants.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL);
+    };
+    if (!cancel) {
+      fetchData();
+    }
+    this.earningsRewardHistoryInterval = setInterval(fetchData, _constants.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL);
   }
   runUnsubscribeEarningRewardHistoryInterval() {
+    var _this$unSubFetchEarni;
     (0, _utils2.removeLazy)('updateEarningRewardHistory');
     this.earningRewardHistoryQueue = [];
+    (_this$unSubFetchEarni = this.unSubFetchEarningRewardHistory) === null || _this$unSubFetchEarni === void 0 ? void 0 : _this$unSubFetchEarni.call(this);
     this.earningsRewardHistoryInterval && clearInterval(this.earningsRewardHistoryInterval);
   }
 

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

@@ -81,7 +81,7 @@ class HistoryService {
   /**
    * @todo: Must improve performance of this function
    * */
-  fetchSubscanTransactionHistory(chain, addresses) {
+  fetchSubscanTransactionHistory(chain, addresses, groupId) {
     if (!this.subscanService.checkSupportedSubscanChain(chain) || !addresses.length) {
       return;
     }
@@ -94,7 +94,7 @@ class HistoryService {
     // However, fetchAllPossibleTransferItems-sent must run after fetchAllPossibleExtrinsicItems,
     // to avoid "duplicate Extrinsic Hash between items" problem
 
-    this.subscanService.fetchAllPossibleExtrinsicItems(chain, address, extrinsicItems => {
+    this.subscanService.fetchAllPossibleExtrinsicItems(groupId, chain, address, extrinsicItems => {
       const result = [];
       extrinsicItems.forEach(x => {
         const item = (0, _subscanHistory.parseSubscanExtrinsicData)(address, x, chainInfo);
@@ -112,7 +112,7 @@ class HistoryService {
           excludeTransferExtrinsicHash.push(x.extrinsic_hash);
         }
       });
-      this.subscanService.fetchAllPossibleTransferItems(chain, address, 'sent').then(rsMap => {
+      this.subscanService.fetchAllPossibleTransferItems(groupId, chain, address, 'sent').then(rsMap => {
         const result = [];
         Object.keys(rsMap).forEach(hash => {
           // only push item that does not have same hash with another item
@@ -132,7 +132,7 @@ class HistoryService {
     }).catch(e => {
       console.log('fetchAllPossibleExtrinsicItems error', e);
     });
-    this.subscanService.fetchAllPossibleTransferItems(chain, address, 'received').then(rsMap => {
+    this.subscanService.fetchAllPossibleTransferItems(groupId, chain, address, 'received').then(rsMap => {
       const result = [];
       Object.keys(rsMap).forEach(hash => {
         // only push item that does not have same hash with another item
@@ -179,14 +179,19 @@ class HistoryService {
     const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
     const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const bitcoinAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.BITCOIN], chainInfo);
+    const groupId = this.subscanService.getGroupId();
     const subscription = this.historySubject.subscribe(items => {
       cb(items.filter(filterHistoryItemByAddressAndChain(chain, addresses)));
     });
+    const unsubscribe = () => {
+      subscription.unsubscribe();
+      this.subscanService.cancelGroupRequest(groupId);
+    };
     if ((0, _utils._isChainSubstrateCompatible)(chainInfo)) {
       if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
-        this.fetchSubscanTransactionHistory(chain, evmAddresses);
+        this.fetchSubscanTransactionHistory(chain, evmAddresses, groupId);
       } else {
-        this.fetchSubscanTransactionHistory(chain, substrateAddresses);
+        this.fetchSubscanTransactionHistory(chain, substrateAddresses, groupId);
       }
     } else if ((0, _utils._isChainBitcoinCompatible)(chainInfo)) {
       this.fetchBitcoinTransactionHistory(chain, bitcoinAddresses).catch(e => {
@@ -194,7 +199,7 @@ class HistoryService {
       });
     }
     return {
-      unsubscribe: subscription.unsubscribe,
+      unsubscribe,
       value: this.historySubject.getValue().filter(filterHistoryItemByAddressAndChain(chain, addresses))
     };
   }

package/cjs/services/keyring-service/context/handlers/Json.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AccountJsonHandler = void 0;
 var _constants = require("@subwallet/extension-base/constants");
+var _types = require("@subwallet/extension-base/types");
 var _utils = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _keyring = require("@subwallet/keyring");
@@ -326,7 +327,7 @@ class AccountJsonHandler extends _Base.AccountBaseHandler {
         let [, proxy] = _ref8;
         return _proxyIds.includes(proxy.id);
       }));
-      const addresses = Object.values(_account).filter(account => _proxyIds.includes(account.id)).flatMap(proxy => proxy.accounts.map(account => account.address));
+      const addresses = Object.values(_account).filter(account => _proxyIds.includes(account.id) && account.accountType !== _types.AccountProxyType.LEDGER).flatMap(proxy => proxy.accounts.map(account => account.address));
       const rs = await _uiKeyring.keyring.backupAccounts(password, addresses);
       if (Object.keys(modifyPairs).length && Object.keys(accountProxies).length) {
         rs.accountProxies = accountProxies;

package/cjs/services/keyring-service/context/handlers/Ledger.js

@@ -101,6 +101,7 @@ class AccountLedgerHandler extends _Base.AccountBaseHandler {
         isEthereum,
         isGeneric,
         isLedgerRecovery,
+        isSubstrateECDSA,
         name,
         originGenesisHash
       } = account;
@@ -112,9 +113,13 @@ class AccountLedgerHandler extends _Base.AccountBaseHandler {
         genesisHash,
         originGenesisHash,
         isGeneric,
-        isLedgerRecovery
+        isLedgerRecovery,
+        isSubstrateECDSA
       };
-      const type = isEthereum ? 'ethereum' : 'sr25519';
+      let type = 'sr25519';
+      if (isEthereum || isSubstrateECDSA) {
+        type = 'ethereum';
+      }
       const pair = _uiKeyring.keyring.keyring.createFromAddress(address, {
         ...baseMeta,
         isExternal: true,

package/cjs/services/request-service/handler/AuthRequestHandler.js

@@ -55,6 +55,9 @@ class AuthRequestHandler {
       } else if (!value.currentNetworkMap) {
         value.currentNetworkMap = {};
       }
+      if (existKeyBothConnectAuthType) {
+        value.canConnectSubstrateEcdsa = true;
+      }
       acc[key] = {
         ...value
       };
@@ -91,6 +94,18 @@ class AuthRequestHandler {
       [v]: value
     }), {});
   }
+  getEcdsaAddressList() {
+    const addressList = Object.keys(this.keyringService.context.pairs);
+    const pairs = this.keyringService.context.pairs;
+    const ecdsaAddressList = new Set();
+    addressList.forEach(address => {
+      const pair = pairs[address];
+      if (pair && pair.json.meta.isSubstrateECDSA) {
+        ecdsaAddressList.add(address);
+      }
+    });
+    return ecdsaAddressList;
+  }
   get numAuthRequestsV2() {
     return Object.keys(this.#authRequestsV2).length;
   }
@@ -201,6 +216,7 @@ class AuthRequestHandler {
   }
   authCompleteV2 = (id, url, resolve, reject) => {
     const isAllowedMap = this.getAddressList();
+    const ecdsaAddressList = this.getEcdsaAddressList();
     const complete = (result, cb, accounts) => {
       const isAllowed = result === true;
       let isCancelled = false;
@@ -221,6 +237,7 @@ class AuthRequestHandler {
         idStr,
         request: {
           allowedAccounts,
+          canConnectSubstrateEcdsa,
           origin
         },
         url
@@ -228,10 +245,9 @@ class AuthRequestHandler {
 
       // Note: accountAuthTypes represents the accountAuthType of this request
       //       allowedAccounts is a list of connected accounts that exist for this origin during this request.
-
       if (accountAuthTypes.length !== _constants.ALL_ACCOUNT_AUTH_TYPES.length) {
         const backupAllowed = (allowedAccounts || []).filter(a => {
-          if ((0, _utilCrypto.isEthereumAddress)(a) && !accountAuthTypes.includes('evm')) {
+          if ((0, _utilCrypto.isEthereumAddress)(a) && (canConnectSubstrateEcdsa || !ecdsaAddressList.has(a)) && !accountAuthTypes.includes('evm')) {
             return true;
           }
           if ((0, _keyring.isSubstrateAddress)(a) && !accountAuthTypes.includes('substrate')) {
@@ -294,7 +310,8 @@ class AuthRequestHandler {
           currentNetworkMap: existed ? {
             ...defaultNetworkMap,
             ...existed.currentNetworkMap
-          } : defaultNetworkMap
+          } : defaultNetworkMap,
+          canConnectSubstrateEcdsa: canConnectSubstrateEcdsa || (existed === null || existed === void 0 ? void 0 : existed.canConnectSubstrateEcdsa)
         };
         this.setAuthorize(authorizeList, () => {
           cb();
@@ -326,6 +343,7 @@ class AuthRequestHandler {
     const idStr = (0, _utils2.stripUrl)(url);
     const isAllowedDappConnectBothType = !!_constants2.DAPP_CONNECT_BOTH_TYPE_ACCOUNT_URL.find(url_ => url.includes(url_));
     let accountAuthTypes = [...new Set(isAllowedDappConnectBothType ? ['evm', 'substrate'] : request.accountAuthTypes || ['substrate'])];
+    let canConnectSubstrateEcdsa = !!request.canConnectSubstrateEcdsa || isAllowedDappConnectBothType;
     if (!authList) {
       authList = {};
     }
@@ -360,6 +378,9 @@ class AuthRequestHandler {
         if (accountAuthTypes && _request.accountAuthTypes) {
           const filteredAccountAuthTypes = new Set([..._request.accountAuthTypes, ...accountAuthTypes]);
           accountAuthTypes = [...filteredAccountAuthTypes];
+          if (_request.request.canConnectSubstrateEcdsa) {
+            canConnectSubstrateEcdsa = true;
+          }
         }
         mergeKeys.push(key);
       }
@@ -391,9 +412,10 @@ class AuthRequestHandler {
         return allowed ? address : '';
       }).filter(item => item !== '');
       let allowedListByRequestType = [...request.allowedAccounts];
+      const ecdsaAddressList = this.getEcdsaAddressList();
       allowedListByRequestType = accountAuthTypes.reduce((list, accountAuthType) => {
         if (accountAuthType === 'evm') {
-          list.push(...allowedListByRequestType.filter(a => (0, _utilCrypto.isEthereumAddress)(a)));
+          list.push(...allowedListByRequestType.filter(a => (0, _utilCrypto.isEthereumAddress)(a) && (canConnectSubstrateEcdsa || !ecdsaAddressList.has(a))));
         } else if (accountAuthType === 'substrate') {
           list.push(...allowedListByRequestType.filter(a => (0, _keyring.isSubstrateAddress)(a)));
         } else if (accountAuthType === 'ton') {
@@ -424,7 +446,8 @@ class AuthRequestHandler {
           origin,
           url,
           accountAuthTypes: _constants.ALL_ACCOUNT_AUTH_TYPES,
-          currentNetworkMap: {}
+          currentNetworkMap: {},
+          canConnectSubstrateEcdsa
         };
         this.setAuthorize(authList);
         return true;
@@ -436,7 +459,8 @@ class AuthRequestHandler {
       idStr,
       request: {
         ...request,
-        accountAuthTypes
+        accountAuthTypes,
+        canConnectSubstrateEcdsa
       },
       url,
       accountAuthTypes: accountAuthTypes || ['substrate']