@subwallet/extension-base 1.3.21-0 → 1.3.23-0

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

@@ -0,0 +1,329 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
+import { APIItemState, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { getCommission } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { _EXPECTED_BLOCK_TIME, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
+import BaseParaStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para';
+import { BasicTxErrorType, EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
+import { balanceFormatter, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
+export default class MythosNativeStakingPoolHandler extends BaseParaStakingPoolHandler {
+  availableMethod = {
+    join: true,
+    defaultUnstake: true,
+    fastUnstake: false,
+    cancelUnstake: false,
+    withdraw: true,
+    claimReward: true
+  };
+
+  /* Subscribe pool info */
+
+  async subscribePoolInfo(callback) {
+    let cancel = false;
+    const substrateApi = this.substrateApi;
+    const nativeToken = this.nativeToken;
+    const defaultCallback = async () => {
+      const data = {
+        ...this.baseInfo,
+        type: this.type,
+        metadata: {
+          ...this.metadataInfo,
+          description: this.getDescription()
+        }
+      };
+      const poolInfo = await this.getPoolInfo();
+      !poolInfo && callback(data);
+    };
+    if (!this.isActive) {
+      await defaultCallback();
+      return () => {
+        cancel = true;
+      };
+    }
+    await defaultCallback();
+    await substrateApi.isReady;
+    const unsub = await substrateApi.api.query.collatorStaking.currentSession(async _session => {
+      if (cancel) {
+        unsub();
+        return;
+      }
+      const currentSession = _session.toString();
+      const maxStakers = substrateApi.api.consts.collatorStaking.maxStakers.toString();
+      const unstakeDelay = substrateApi.api.consts.collatorStaking.stakeUnlockDelay.toString();
+      const maxStakedCandidates = substrateApi.api.consts.collatorStaking.maxStakedCandidates.toString();
+      const sessionTime = _STAKING_ERA_LENGTH_MAP[this.chain] || _STAKING_ERA_LENGTH_MAP.default; // in hours
+      const blockTime = _EXPECTED_BLOCK_TIME[this.chain];
+      const unstakingPeriod = parseInt(unstakeDelay) * blockTime / 60 / 60;
+      const _minStake = await substrateApi.api.query.collatorStaking.minStake();
+      const minStake = _minStake.toString();
+      const minStakeToHuman = formatNumber(minStake, nativeToken.decimals || 0, balanceFormatter);
+      const data = {
+        ...this.baseInfo,
+        type: this.type,
+        metadata: {
+          ...this.metadataInfo,
+          description: this.getDescription(minStakeToHuman)
+        },
+        statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug
+          }],
+          maxCandidatePerFarmer: parseInt(maxStakedCandidates),
+          maxWithdrawalRequestPerFarmer: 3,
+          earningThreshold: {
+            join: minStake,
+            defaultUnstake: '0',
+            fastUnstake: '0'
+          },
+          era: parseInt(currentSession),
+          eraTime: sessionTime,
+          unstakingPeriod: unstakingPeriod,
+          totalApy: undefined
+          // tvl: totalStake.toString(),
+          // inflation
+        },
+
+        maxPoolMembers: parseInt(maxStakers)
+      };
+      callback(data);
+    });
+    return () => {
+      cancel = true;
+      unsub();
+    };
+  }
+
+  /* Subscribe pool info */
+
+  /* Subscribe pool position */
+
+  async subscribePoolPosition(useAddresses, resultCallback) {
+    let cancel = false;
+    const substrateApi = await this.substrateApi.isReady;
+    const defaultInfo = this.baseInfo;
+    const unsub = await substrateApi.api.query.collatorStaking.userStake.multi(useAddresses, async userStakes => {
+      if (cancel) {
+        unsub();
+        return;
+      }
+      if (userStakes) {
+        await Promise.all(userStakes.map(async (_userStake, i) => {
+          const userStake = _userStake.toPrimitive();
+          const owner = reformatAddress(useAddresses[i], 42);
+          if (userStake) {
+            const nominatorMetadata = await this.parseCollatorMetadata(this.chainInfo, useAddresses[i], substrateApi, userStake);
+            resultCallback({
+              ...defaultInfo,
+              ...nominatorMetadata,
+              address: owner,
+              type: this.type
+            });
+          } else {
+            resultCallback({
+              ...defaultInfo,
+              type: this.type,
+              address: owner,
+              balanceToken: this.nativeToken.slug,
+              totalStake: '0',
+              activeStake: '0',
+              unstakeBalance: '0',
+              status: EarningStatus.NOT_STAKING,
+              isBondedBefore: false,
+              nominations: [],
+              unstakings: []
+            });
+          }
+        }));
+      }
+    });
+    return () => {
+      cancel = true;
+      unsub();
+    };
+  }
+  async parseCollatorMetadata(chainInfo, stakerAddress, substrateApi, userStake) {
+    const nominationList = [];
+    const unstakingList = [];
+    let unstakingBalance = BigInt(0);
+    const {
+      candidates,
+      stake
+    } = userStake;
+    const [_minStake, _unstaking, _currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.collatorStaking.minStake(), substrateApi.api.query.collatorStaking.releaseQueues(stakerAddress), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+    const minStake = _minStake.toPrimitive();
+    const stakingStatus = candidates && !!candidates.length ? EarningStatus.EARNING_REWARD : EarningStatus.NOT_EARNING;
+    const isBondedBefore = candidates && !!candidates.length;
+    const unstakings = _unstaking.toPrimitive();
+    const currentBlock = _currentBlock.toPrimitive();
+    const currentTimestamp = _currentTimestamp.toPrimitive();
+    const blockDuration = _EXPECTED_BLOCK_TIME[chainInfo.slug];
+    if (candidates.length) {
+      await Promise.all(candidates.map(async collatorAddress => {
+        const _stakeInfo = await substrateApi.api.query.collatorStaking.candidateStake(collatorAddress, stakerAddress);
+        const stakeInfo = _stakeInfo.toPrimitive();
+        const activeStake = stakeInfo.stake.toString();
+        const earningStatus = BigInt(activeStake) > BigInt(0) && BigInt(activeStake) >= BigInt(minStake) ? EarningStatus.EARNING_REWARD : EarningStatus.NOT_EARNING;
+        nominationList.push({
+          status: earningStatus,
+          chain: chainInfo.slug,
+          validatorAddress: collatorAddress,
+          activeStake,
+          validatorMinStake: minStake,
+          hasUnstaking: !!unstakings.length
+        });
+      }));
+    }
+    if (unstakings.length) {
+      unstakings.forEach(unstaking => {
+        const releaseBlock = unstaking.block;
+        const unstakeAmount = unstaking.amount;
+        const isClaimable = currentBlock >= releaseBlock;
+        const targetTimestampMs = (releaseBlock - currentBlock) * blockDuration * 1000 + currentTimestamp;
+        unstakingBalance = unstakingBalance + BigInt(unstakeAmount);
+        unstakingList.push({
+          chain: chainInfo.slug,
+          status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
+          claimable: unstakeAmount,
+          targetTimestampMs
+        });
+      });
+    }
+    return {
+      status: stakingStatus,
+      balanceToken: this.nativeToken.slug,
+      totalStake: (BigInt(stake) + unstakingBalance).toString(),
+      activeStake: stake,
+      unstakeBalance: unstakingBalance.toString() || '0',
+      isBondedBefore: isBondedBefore,
+      nominations: nominationList,
+      unstakings: unstakingList
+    };
+  }
+
+  /* Subscribe pool position */
+
+  /* Get pool targets */
+
+  async getPoolTargets() {
+    const substrateApi = await this.substrateApi.isReady;
+    const [_allCollators, _minStake, _commission] = await Promise.all([substrateApi.api.query.collatorStaking.candidates.entries(), substrateApi.api.query.collatorStaking.minStake(), substrateApi.api.query.collatorStaking.collatorRewardPercentage()]);
+    const maxStakersPerCollator = substrateApi.api.consts.collatorStaking.maxStakers.toPrimitive();
+    return _allCollators.map(_collator => {
+      const _collatorAddress = _collator[0].toHuman();
+      const collatorAddress = _collatorAddress[0];
+      const collatorInfo = _collator[1].toPrimitive();
+      const bnTotalStake = BigInt(collatorInfo.stake);
+      const numOfStakers = parseInt(collatorInfo.stakers);
+      const isCrowded = numOfStakers >= maxStakersPerCollator;
+      return {
+        address: collatorAddress,
+        chain: this.chain,
+        totalStake: bnTotalStake.toString(),
+        ownStake: '0',
+        otherStake: bnTotalStake.toString(),
+        minBond: _minStake.toPrimitive(),
+        nominatorCount: numOfStakers,
+        commission: getCommission(_commission.toString()),
+        blocked: false,
+        isVerified: false,
+        isCrowded
+      };
+    });
+  }
+
+  /* Get pool targets */
+
+  /* Join pool action */
+
+  async createJoinExtrinsic(data, positionInfo) {
+    var _substrateApi$api$cal, _substrateApi$api$cal2;
+    const substrateApi = await this.substrateApi.isReady;
+    const {
+      address,
+      amount,
+      selectedValidators
+    } = data;
+    const selectedValidatorInfo = selectedValidators[0];
+    const _hasReward = await ((_substrateApi$api$cal = substrateApi.api.call) === null || _substrateApi$api$cal === void 0 ? void 0 : (_substrateApi$api$cal2 = _substrateApi$api$cal.collatorStakingApi) === null || _substrateApi$api$cal2 === void 0 ? void 0 : _substrateApi$api$cal2.shouldClaim(address));
+    const hasReward = _hasReward === null || _hasReward === void 0 ? void 0 : _hasReward.toPrimitive();
+    const extrinsicList = [];
+    if (positionInfo !== null && positionInfo !== void 0 && positionInfo.isBondedBefore && hasReward) {
+      extrinsicList.push(substrateApi.api.tx.collatorStaking.claimRewards());
+    }
+    extrinsicList.push(...[substrateApi.api.tx.collatorStaking.lock(amount), substrateApi.api.tx.collatorStaking.stake([{
+      candidate: selectedValidatorInfo.address,
+      stake: amount
+    }])]);
+    return [substrateApi.api.tx.utility.batchAll(extrinsicList), {
+      slug: this.nativeToken.slug,
+      amount: '0'
+    }];
+  }
+
+  /* Join pool action */
+
+  /* Leave pool action */
+
+  async handleYieldUnstake(amount, address, selectedTarget) {
+    var _substrateApi$api$cal3, _substrateApi$api$cal4;
+    const substrateApi = await this.substrateApi.isReady;
+    const _hasReward = await ((_substrateApi$api$cal3 = substrateApi.api.call) === null || _substrateApi$api$cal3 === void 0 ? void 0 : (_substrateApi$api$cal4 = _substrateApi$api$cal3.collatorStakingApi) === null || _substrateApi$api$cal4 === void 0 ? void 0 : _substrateApi$api$cal4.shouldClaim(address));
+    const hasReward = _hasReward === null || _hasReward === void 0 ? void 0 : _hasReward.toPrimitive();
+    const extrinsicList = [];
+    if (hasReward) {
+      extrinsicList.push(substrateApi.api.tx.collatorStaking.claimRewards());
+    }
+    extrinsicList.push(...[substrateApi.api.tx.collatorStaking.unstakeFrom(selectedTarget), substrateApi.api.tx.collatorStaking.unlock(null) // ignore amount to unlock all
+    ]);
+
+    return [ExtrinsicType.STAKING_UNBOND, substrateApi.api.tx.utility.batchAll(extrinsicList)];
+  }
+
+  /* Leave pool action */
+
+  /* Get pool reward */
+  async getPoolReward(useAddresses, callback) {
+    let cancel = false;
+    const substrateApi = this.substrateApi;
+    await substrateApi.isReady;
+    if (substrateApi.api.call.collatorStakingApi) {
+      await Promise.all(useAddresses.map(async address => {
+        if (!cancel) {
+          const _unclaimedReward = await substrateApi.api.call.collatorStakingApi.totalRewards(address);
+          const earningRewardItem = {
+            ...this.baseInfo,
+            address: address,
+            type: this.type,
+            unclaimedReward: (_unclaimedReward === null || _unclaimedReward === void 0 ? void 0 : _unclaimedReward.toString()) || '0',
+            state: APIItemState.READY
+          };
+          if (_unclaimedReward.toString() !== '0') {
+            await this.createClaimNotification(earningRewardItem, this.nativeToken);
+          }
+          callback(earningRewardItem);
+        }
+      }));
+    }
+    return () => {
+      cancel = false;
+    };
+  }
+  /* Get pool reward */
+
+  /* Other action */
+
+  async handleYieldCancelUnstake() {
+    return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
+  }
+  async handleYieldWithdraw(address, unstakingInfo) {
+    const substrateApi = await this.substrateApi.isReady;
+    return substrateApi.api.tx.collatorStaking.release();
+  }
+  async handleYieldClaimReward(address, bondReward) {
+    const substrateApi = await this.substrateApi.isReady;
+    return substrateApi.api.tx.collatorStaking.claimRewards();
+  }
+  /* Other action */
+}

package/services/earning-service/service.js

@@ -2,14 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL } from '@subwallet/extension-base/constants';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { _isChainEnabled, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
 import BaseLiquidStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/liquid-staking/base';
+import MythosNativeStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/mythos';
 import { BasicTxErrorType, YieldPoolType } from '@subwallet/extension-base/types';
-import { addLazy, categoryAddresses, createPromiseHandler, removeLazy } from '@subwallet/extension-base/utils';
+import { addLazy, createPromiseHandler, getAddressesByChainType, removeLazy } from '@subwallet/extension-base/utils';
 import { fetchStaticCache } from '@subwallet/extension-base/utils/fetchStaticCache';
 import { BehaviorSubject } from 'rxjs';
 import { AcalaLiquidStakingPoolHandler, AmplitudeNativeStakingPoolHandler, AstarNativeStakingPoolHandler, BifrostLiquidStakingPoolHandler, BifrostMantaLiquidStakingPoolHandler, InterlayLendingPoolHandler, NominationPoolHandler, ParallelLiquidStakingPoolHandler, ParaNativeStakingPoolHandler, RelayNativeStakingPoolHandler, StellaSwapLiquidStakingPoolHandler, TaoNativeStakingPoolHandler } from "./handlers/index.js";
@@ -68,6 +69,9 @@ export default class EarningService {
       if (_STAKING_CHAIN_GROUP.bittensor.includes(chain)) {
         handlers.push(new TaoNativeStakingPoolHandler(this.state, chain));
       }
+      if (_STAKING_CHAIN_GROUP.mythos.includes(chain)) {
+        handlers.push(new MythosNativeStakingPoolHandler(this.state, chain));
+      }
       if (_STAKING_CHAIN_GROUP.nominationPool.includes(chain)) {
         handlers.push(new NominationPoolHandler(this.state, chain));
       }
@@ -376,10 +380,8 @@ export default class EarningService {
   async subscribePoolPositions(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const {
-      evm: evmAddresses,
-      substrate: substrateAddresses
-    } = categoryAddresses(addresses);
+    const evmAddresses = getAddressesByChainType(addresses, [ChainType.EVM]);
+    const substrateAddresses = getAddressesByChainType(addresses, [ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {
@@ -522,10 +524,8 @@ export default class EarningService {
   async getPoolReward(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const {
-      evm: evmAddresses,
-      substrate: substrateAddresses
-    } = categoryAddresses(addresses);
+    const evmAddresses = getAddressesByChainType(addresses, [ChainType.EVM]);
+    const substrateAddresses = getAddressesByChainType(addresses, [ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {
@@ -580,10 +580,8 @@ export default class EarningService {
   async fetchPoolRewardHistory(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const {
-      evm: evmAddresses,
-      substrate: substrateAddresses
-    } = categoryAddresses(addresses);
+    const evmAddresses = getAddressesByChainType(addresses, [ChainType.EVM]);
+    const substrateAddresses = getAddressesByChainType(addresses, [ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {

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

@@ -105,6 +105,8 @@ export function isActionFromValidator(stakingType, chain) {
     return true;
   } else if (_STAKING_CHAIN_GROUP.bittensor.includes(chain)) {
     return true;
+  } else if (_STAKING_CHAIN_GROUP.mythos.includes(chain)) {
+    return true;
   }
   return false;
 }

package/services/fee-service/service.js

@@ -9,7 +9,8 @@ export default class FeeService {
   chainFeeSubscriptionMap = {
     evm: {},
     substrate: {},
-    ton: {}
+    ton: {},
+    cardano: {}
   };
   constructor(state) {
     this.state = state;
@@ -103,21 +104,31 @@ export default class FeeService {
             const api = this.state.getEvmApi(chain);
 
             // TODO: Handle case type === evm and not have api
-            if (type === 'evm' && api) {
-              calculateGasFeeParams(api, chain).then(info => {
-                observer.next(info);
-              }).catch(e => {
-                console.warn(`Cannot get fee param for ${chain}`, e);
+            if (type === 'evm') {
+              if (api) {
+                calculateGasFeeParams(api, chain).then(info => {
+                  observer.next(info);
+                }).catch(e => {
+                  console.warn(`Cannot get fee param for ${chain}`, e);
+                  observer.next({
+                    type: 'evm',
+                    gasPrice: '0',
+                    baseGasFee: undefined,
+                    options: undefined
+                  });
+                });
+              } else {
+                console.warn(`Cannot get fee param for ${chain}`, 'Cannot get api');
                 observer.next({
                   type: 'evm',
                   gasPrice: '0',
                   baseGasFee: undefined,
                   options: undefined
                 });
-              });
+              }
             } else {
               observer.next({
-                type: type,
+                type,
                 busyNetwork: false,
                 options: {
                   slow: {

package/services/history-service/index.js

@@ -1,14 +1,14 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { ExtrinsicStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainType, ExtrinsicStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { CRON_RECOVER_HISTORY_INTERVAL } from '@subwallet/extension-base/constants';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { _isChainEvmCompatible, _isChainSubstrateCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { historyRecover, HistoryRecoverStatus } from '@subwallet/extension-base/services/history-service/helpers/recoverHistoryStatus';
 import { getExtrinsicParserKey } from '@subwallet/extension-base/services/history-service/helpers/subscan-extrinsic-parser-helper';
 import { parseSubscanExtrinsicData, parseSubscanTransferData } from '@subwallet/extension-base/services/history-service/subscan-history';
-import { categoryAddresses } from '@subwallet/extension-base/utils';
+import { getAddressesByChainType } from '@subwallet/extension-base/utils';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { keyring } from '@subwallet/ui-keyring';
 import { BehaviorSubject } from 'rxjs';
@@ -144,19 +144,17 @@ export class HistoryService {
   }
   subscribeHistories(chain, proxyId, cb) {
     const addresses = this.keyringService.context.getDecodedAddresses(proxyId, false);
-    const {
-      evm,
-      substrate
-    } = categoryAddresses(addresses);
+    const evmAddresses = getAddressesByChainType(addresses, [ChainType.EVM]);
+    const substrateAddresses = getAddressesByChainType(addresses, [ChainType.SUBSTRATE]);
     const subscription = this.historySubject.subscribe(items => {
       cb(items.filter(filterHistoryItemByAddressAndChain(chain, addresses)));
     });
     const chainInfo = this.chainService.getChainInfoByKey(chain);
     if (_isChainSubstrateCompatible(chainInfo)) {
       if (_isChainEvmCompatible(chainInfo)) {
-        this.fetchSubscanTransactionHistory(chain, evm);
+        this.fetchSubscanTransactionHistory(chain, evmAddresses);
       } else {
-        this.fetchSubscanTransactionHistory(chain, substrate);
+        this.fetchSubscanTransactionHistory(chain, substrateAddresses);
       }
     }
     return {

package/services/inapp-notification-service/index.d.ts

@@ -28,10 +28,8 @@ export declare class InappNotificationService implements CronServiceInterface {
     validateAndWriteNotificationsToDB(notifications: _BaseNotificationInfo[], address: string): Promise<void>;
     cronCreateBridgeClaimNotification(): void;
     getCategorizedAddresses(): {
-        substrate: string[];
-        evm: string[];
-        ton: string[];
-        bitcoin: string[];
+        evmAddresses: string[];
+        substrateAddresses: string[];
     };
     createAvailBridgeClaimNotification(): void;
     processWriteAvailBridgeClaim(address: string, transactions: AvailBridgeTransaction[], token: _ChainAsset): Promise<void>;
@@ -44,4 +42,5 @@ export declare class InappNotificationService implements CronServiceInterface {
     stopCron(): Promise<void>;
     onAccountProxyRemove(): void;
     removeAccountNotifications(proxyId: string): void;
+    migrateNotificationProxyId(proxyIds: string[], newProxyId: string, newName: string): void;
 }

package/services/inapp-notification-service/index.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { COMMON_ASSETS, COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
-import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { CRON_LISTEN_AVAIL_BRIDGE_CLAIM } from '@subwallet/extension-base/constants';
 import { fetchLastestRemindNotificationTime } from '@subwallet/extension-base/constants/remind-notification-time';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
@@ -11,7 +11,7 @@ import { NotificationDescriptionMap, NotificationTitleMap, ONE_DAY_MILLISECOND }
 import { NotificationActionType, NotificationTab } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
 import { AvailBridgeSourceChain, fetchAllAvailBridgeClaimable, fetchPolygonBridgeTransactions, hrsToMillisecond } from '@subwallet/extension-base/services/inapp-notification-service/utils';
 import { ProcessType, YieldPoolType } from '@subwallet/extension-base/types';
-import { categoryAddresses, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import { formatNumber, getAddressesByChainType, reformatAddress } from '@subwallet/extension-base/utils';
 import { isSubstrateAddress } from '@subwallet/keyring';
 export class InappNotificationService {
   constructor(dbService, keyringService, eventService, chainService) {
@@ -170,12 +170,17 @@ export class InappNotificationService {
   }
   getCategorizedAddresses() {
     const addresses = this.keyringService.context.getAllAddresses();
-    return categoryAddresses(addresses);
+    const evmAddresses = getAddressesByChainType(addresses, [ChainType.EVM]);
+    const substrateAddresses = getAddressesByChainType(addresses, [ChainType.SUBSTRATE]);
+    return {
+      evmAddresses: evmAddresses,
+      substrateAddresses: substrateAddresses
+    };
   }
   createAvailBridgeClaimNotification() {
     const {
-      evm: evmAddresses,
-      substrate: substrateAddresses
+      evmAddresses,
+      substrateAddresses
     } = this.getCategorizedAddresses();
     const chainAssets = this.chainService.getAssetRegistry();
     let ASSET_TYPE;
@@ -262,7 +267,7 @@ export class InappNotificationService {
   // Polygon Claimable Handle
   async createPolygonClaimableTransactions() {
     const {
-      evm: evmAddresses
+      evmAddresses
     } = this.getCategorizedAddresses();
     const etherChains = [COMMON_ASSETS.ETH, COMMON_ASSETS.ETH_SEPOLIA];
     const polygonAssets = Object.values(this.chainService.getAssetRegistry()).filter(asset => etherChains.includes(asset.slug));
@@ -433,4 +438,7 @@ export class InappNotificationService {
   removeAccountNotifications(proxyId) {
     this.dbService.removeAccountNotifications(proxyId).catch(console.error);
   }
+  migrateNotificationProxyId(proxyIds, newProxyId, newName) {
+    this.dbService.updateNotificationProxyId(proxyIds, newProxyId, newName);
+  }
 }

package/services/keyring-service/context/account-context.d.ts

@@ -1,4 +1,4 @@
-import { AccountExternalError, RequestAccountCreateExternalV2, RequestAccountCreateHardwareMultiple, RequestAccountCreateHardwareV2, RequestAccountCreateWithSecretKey, RequestAccountExportPrivateKey, RequestChangeMasterPassword, RequestMigratePassword, ResponseAccountCreateWithSecretKey, ResponseAccountExportPrivateKey, ResponseChangeMasterPassword, ResponseMigratePassword } from '@subwallet/extension-base/background/KoniTypes';
+import { AccountExternalError, RequestAccountCreateExternalV2, RequestAccountCreateHardwareMultiple, RequestAccountCreateHardwareV2, RequestAccountCreateWithSecretKey, RequestAccountExportPrivateKey, RequestChangeMasterPassword, RequestMigratePassword, RequestMigrateSoloAccount, RequestMigrateUnifiedAndFetchEligibleSoloAccounts, RequestPingSession, ResponseAccountCreateWithSecretKey, ResponseAccountExportPrivateKey, ResponseChangeMasterPassword, ResponseMigratePassword } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import { AccountProxyMap, CurrentAccountInfo, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestChangeTonWalletContractVersion, RequestCheckPublicAndSecretKey, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseJsonGetAccountInfo, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2 } from '@subwallet/extension-base/types';
@@ -15,6 +15,7 @@ export declare class AccountContext {
     private readonly ledgerHandler;
     private readonly modifyHandler;
     private readonly secretHandler;
+    private readonly migrationHandler;
     constructor(koniState: KoniState, parentService: KeyringService);
     get pairs(): SubjectInfo;
     get observable(): {
@@ -81,9 +82,12 @@ export declare class AccountContext {
     getListDeriveAccounts(request: RequestGetDeriveAccounts): ResponseGetDeriveAccounts;
     validateDerivePath(request: RequestDeriveValidateV2): ResponseDeriveValidateV2;
     getDeriveSuggestion(request: RequestGetDeriveSuggestion): ResponseGetDeriveSuggestion;
-    derivationAccountProxyCreate(request: RequestDeriveCreateV3): boolean;
+    derivationAccountProxyCreate(request: RequestDeriveCreateV3, isMigration?: boolean): boolean;
     addInjectAccounts(accounts: InjectedAccountWithMeta[]): void;
     removeInjectAccounts(_addresses: string[]): void;
+    migrateUnifiedAndFetchEligibleSoloAccounts(request: RequestMigrateUnifiedAndFetchEligibleSoloAccounts, setMigratingModeFn: () => void): Promise<import("@subwallet/extension-base/background/KoniTypes").ResponseMigrateUnifiedAndFetchEligibleSoloAccounts>;
+    migrateSoloAccount(request: RequestMigrateSoloAccount): import("@subwallet/extension-base/background/KoniTypes").ResponseMigrateSoloAccount;
+    pingSession(request: RequestPingSession): boolean;
     removeNoneHardwareGenesisHash(): void;
     updateMetadataForPair(): void;
     resetWallet(): void;

package/services/keyring-service/context/account-context.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { AccountMigrationHandler } from '@subwallet/extension-base/services/keyring-service/context/handlers/Migration';
 import { AccountDeriveHandler, AccountInjectHandler, AccountJsonHandler, AccountLedgerHandler, AccountMnemonicHandler, AccountModifyHandler, AccountSecretHandler } from "./handlers/index.js";
 import { AccountState } from "./state.js";
 export class AccountContext {
@@ -15,6 +16,7 @@ export class AccountContext {
     this.ledgerHandler = new AccountLedgerHandler(this.parentService, this.state);
     this.modifyHandler = new AccountModifyHandler(this.parentService, this.state);
     this.secretHandler = new AccountSecretHandler(this.parentService, this.state);
+    this.migrationHandler = new AccountMigrationHandler(this.parentService, this.state);
   }
 
   // TODO: Merge to value
@@ -222,8 +224,8 @@ export class AccountContext {
   }
 
   /* Derive account proxy  */
-  derivationAccountProxyCreate(request) {
-    return this.deriveHandler.derivationAccountProxyCreate(request);
+  derivationAccountProxyCreate(request, isMigration) {
+    return this.deriveHandler.derivationAccountProxyCreate(request, isMigration);
   }
 
   /* Derive */
@@ -239,6 +241,19 @@ export class AccountContext {
 
   /* Inject */
 
+  /* Migration */
+  async migrateUnifiedAndFetchEligibleSoloAccounts(request, setMigratingModeFn) {
+    return await this.migrationHandler.migrateUnifiedAndFetchEligibleSoloAccounts(request, setMigratingModeFn);
+  }
+  migrateSoloAccount(request) {
+    return this.migrationHandler.migrateSoloToUnifiedAccount(request);
+  }
+  pingSession(request) {
+    return this.migrationHandler.pingSession(request);
+  }
+
+  /* Migration */
+
   /* Others */
 
   removeNoneHardwareGenesisHash() {

package/services/keyring-service/context/handlers/Derive.d.ts

@@ -25,5 +25,5 @@ export declare class AccountDeriveHandler extends AccountBaseHandler {
     /**
      * Derive account proxy
      *  */
-    derivationAccountProxyCreate(request: RequestDeriveCreateV3): boolean;
+    derivationAccountProxyCreate(request: RequestDeriveCreateV3, isMigration?: boolean): boolean;
 }