@subwallet/extension-base 1.3.55-1 → 1.3.57-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.55-1",
+  "version": "1.3.57-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1171,6 +1171,11 @@
       "require": "./cjs/services/earning-service/handlers/native-staking/dtao.js",
       "default": "./services/earning-service/handlers/native-staking/dtao.js"
     },
+    "./services/earning-service/handlers/native-staking/energy": {
+      "types": "./services/earning-service/handlers/native-staking/energy.d.ts",
+      "require": "./cjs/services/earning-service/handlers/native-staking/energy.js",
+      "default": "./services/earning-service/handlers/native-staking/energy.js"
+    },
     "./services/earning-service/handlers/native-staking/mythos": {
       "types": "./services/earning-service/handlers/native-staking/mythos.d.ts",
       "require": "./cjs/services/earning-service/handlers/native-staking/mythos.js",
@@ -2873,11 +2878,11 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet-monorepos/subwallet-services-sdk": "^0.1.8",
-    "@subwallet/chain-list": "0.2.113",
-    "@subwallet/extension-base": "^1.3.55-1",
-    "@subwallet/extension-chains": "^1.3.55-1",
-    "@subwallet/extension-dapp": "^1.3.55-1",
-    "@subwallet/extension-inject": "^1.3.55-1",
+    "@subwallet/chain-list": "0.2.114",
+    "@subwallet/extension-base": "^1.3.57-0",
+    "@subwallet/extension-chains": "^1.3.57-0",
+    "@subwallet/extension-dapp": "^1.3.57-0",
+    "@subwallet/extension-inject": "^1.3.57-0",
     "@subwallet/keyring": "^0.1.13",
     "@subwallet/ui-keyring": "^0.1.13",
     "@ton/core": "^0.56.3",

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.55-1'
+  version: '1.3.57-0'
 };

package/services/chain-service/constants.js

@@ -107,8 +107,12 @@ export const _STAKING_ERA_LENGTH_MAP = {
   analog_timechain: 12,
   muse_testnet: 25 * 6 / 60 / 60,
   // 25 blocks per session
-  mythos: 24
+  mythos: 24,
+  energy_web_x_testnet: 22 * 12 / 3600,
+  // 22 blocks per era, 1 block per 12s
+  energy_web_x: 7200 * 12 / 3600 // 24 hours, 7200 blocks per era, 1 block per 12s
 };
+
 export const _EXPECTED_BLOCK_TIME = {
   // in seconds
   alephTest: 1,
@@ -142,7 +146,9 @@ export const _EXPECTED_BLOCK_TIME = {
   avail_mainnet: 20,
   dentnet: 3,
   muse_testnet: 6,
-  mythos: 6
+  mythos: 6,
+  energy_web_x_testnet: 12,
+  energy_web_x: 12
 };
 export const _PARACHAIN_INFLATION_DISTRIBUTION = {
   moonbeam: {

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

@@ -623,9 +623,6 @@ export const _isChainInfoCompatibleWithAccountInfo = (chainInfo, accountInfo) =>
     if (accountSignMode === AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {
       return _isSubstrateEvmCompatibleChain(chainInfo) && EthereumKeypairTypes.includes(accountType);
     }
-    if (accountSignMode === AccountSignMode.GENERIC_LEDGER) {
-      return _isChainCompatibleLedgerEvm(chainInfo) && EthereumKeypairTypes.includes(accountType);
-    }
     return _isChainEvmCompatible(chainInfo) && EthereumKeypairTypes.includes(accountType);
   }
   if (accountChainType === AccountChainType.TON) {

package/services/chain-service/utils/patch.d.ts

@@ -1,5 +1,5 @@
 import { _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-export declare const ChainListVersion = "0.2.113";
+export declare const ChainListVersion = "0.2.114";
 export interface PatchInfo {
     patchVersion: string;
     appliedVersion: string;

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 = process.env.PATCH_CHAIN_LIST_URL || (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';
-export const ChainListVersion = '0.2.113'; // update this when build chain-list
+export const ChainListVersion = '0.2.114'; // update this when build chain-list
 
 // todo: move this interface to chainlist
 

package/services/earning-service/constants/chains.d.ts

@@ -13,6 +13,7 @@ export declare const _STAKING_CHAIN_GROUP: {
     krest_network: string[];
     manta: string[];
     bittensor: string[];
+    energy: string[];
     mythos: string[];
 };
 export declare const TON_CHAINS: string[];

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

@@ -18,6 +18,7 @@ export const _STAKING_CHAIN_GROUP = {
   krest_network: ['krest_network'],
   manta: ['manta_network'],
   bittensor: ['bittensor', 'bittensor_testnet'],
+  energy: ['energy_web_x_testnet', 'energy_web_x'],
   mythos: ['mythos', 'muse_testnet']
 };
 export const TON_CHAINS = ['ton', 'ton_testnet'];

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

@@ -0,0 +1,30 @@
+import { _ChainInfo } from '@subwallet/chain-list/types';
+import { ExtrinsicType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { BaseYieldPositionInfo, PalletParachainStakingDelegationInfo, PalletParachainStakingRequestType, StakeCancelWithdrawalParams, SubmitJoinNativeStaking, TransactionData, ValidatorInfo, YieldPoolInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import BaseParaNativeStakingPoolHandler from './base-para';
+declare type PalletEnergyStakingNominationInfo = PalletParachainStakingDelegationInfo;
+interface PalletEnergyStakingNominator {
+    id: string;
+    nominations: PalletEnergyStakingNominationInfo[];
+    total: number;
+    lessTotal: number;
+    status: number;
+}
+export interface PalletEnergyStakingNominationRequestsScheduledRequest {
+    nominator: string;
+    whenExecutable: number;
+    action: Record<PalletParachainStakingRequestType, number>;
+}
+export default class EnergyNativeStakingPoolHandler extends BaseParaNativeStakingPoolHandler {
+    subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
+    parseNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, nominatorState: PalletEnergyStakingNominator): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
+    subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
+    checkAccountHaveStake(useAddresses: string[]): Promise<string[]>;
+    getPoolTargets(): Promise<ValidatorInfo[]>;
+    createJoinExtrinsic(data: SubmitJoinNativeStaking, positionInfo?: YieldPositionInfo): Promise<[TransactionData, YieldTokenBaseInfo]>;
+    handleYieldUnstake(amount: string, address: string, selectedTarget?: string): Promise<[ExtrinsicType, TransactionData]>;
+    handleYieldCancelUnstake(params: StakeCancelWithdrawalParams): Promise<TransactionData>;
+    handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
+}
+export {};

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

@@ -0,0 +1,386 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
+import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { getBondedValidators, getEarningStatusByNominations, isUnstakeAll } 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 { parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
+import { BasicTxErrorType, EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
+import { balanceFormatter, formatNumber, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import { BN, BN_ZERO } from '@polkadot/util';
+import BaseParaNativeStakingPoolHandler from "./base-para.js";
+export default class EnergyNativeStakingPoolHandler extends BaseParaNativeStakingPoolHandler {
+  /* Subscribe pool info */
+
+  async subscribePoolInfo(callback) {
+    let cancel = false;
+    const chainApi = 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 chainApi.isReady;
+    const unsub = await chainApi.api.query.parachainStaking.era(async _era => {
+      var _chainApi$api$consts, _chainApi$api$consts$, _chainApi$api$consts$2, _chainApi$api$consts$3, _chainApi$api$query$p;
+      if (cancel) {
+        unsub();
+        return;
+      }
+      const eraObj = _era.toHuman();
+      const era = parseRawNumber(eraObj.current);
+      const maxNominations = (_chainApi$api$consts = chainApi.api.consts) === null || _chainApi$api$consts === void 0 ? void 0 : (_chainApi$api$consts$ = _chainApi$api$consts.parachainStaking) === null || _chainApi$api$consts$ === void 0 ? void 0 : (_chainApi$api$consts$2 = _chainApi$api$consts$.maxNominationsPerNominator) === null || _chainApi$api$consts$2 === void 0 ? void 0 : _chainApi$api$consts$2.toString();
+      const maxTopNominatorsPerCollator = (_chainApi$api$consts$3 = chainApi.api.consts.parachainStaking.maxTopNominationsPerCandidate) === null || _chainApi$api$consts$3 === void 0 ? void 0 : _chainApi$api$consts$3.toPrimitive();
+      const [_totalStake, unstakingDelay] = await Promise.all([(_chainApi$api$query$p = chainApi.api.query.parachainStaking) === null || _chainApi$api$query$p === void 0 ? void 0 : _chainApi$api$query$p.staked(era), chainApi.api.query.parachainStaking.delay()]);
+      const totalStake = _totalStake ? new BN(_totalStake.toString()) : BN_ZERO;
+      const eraTime = _STAKING_ERA_LENGTH_MAP[this.chain] || _STAKING_ERA_LENGTH_MAP.default; // in hours
+      const unstakingPeriod = parseInt(unstakingDelay.toString()) * eraTime;
+      const minStake = '0';
+      const minToHuman = formatNumber(minStake.toString(), nativeToken.decimals || 0, balanceFormatter);
+      const data = {
+        ...this.baseInfo,
+        type: this.type,
+        metadata: {
+          ...this.metadataInfo,
+          description: this.getDescription(minToHuman)
+        },
+        statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug
+          }],
+          maxCandidatePerFarmer: parseInt(maxNominations),
+          maxWithdrawalRequestPerFarmer: 1,
+          // by default
+          earningThreshold: {
+            join: minStake.toString(),
+            defaultUnstake: '0',
+            fastUnstake: '0'
+          },
+          farmerCount: 0,
+          // TODO recheck
+          era,
+          eraTime,
+          totalApy: undefined,
+          // not have
+          tvl: totalStake.toString(),
+          unstakingPeriod: unstakingPeriod
+        },
+        maxPoolMembers: maxTopNominatorsPerCollator
+      };
+      callback(data);
+    });
+    return () => {
+      cancel = true;
+      unsub();
+    };
+  }
+
+  /* Subscribe pool info */
+
+  /* Subscribe pool position */
+
+  async parseNominatorMetadata(chainInfo, address, substrateApi, nominatorState) {
+    const nominationList = [];
+    const unstakingMap = {};
+    const substrateIdentityApi = this.substrateIdentityApi;
+    let bnTotalActiveStake = BN_ZERO;
+    let bnTotalStake = BN_ZERO;
+    let bnTotalUnstaking = BN_ZERO;
+    const _eraInfo = await substrateApi.api.query.parachainStaking.era();
+    const roundInfo = _eraInfo.toPrimitive();
+    const currentRound = roundInfo.current;
+    await Promise.all(nominatorState.nominations.map(async nomination => {
+      const [_nominationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.parachainStaking.nominationScheduledRequests(nomination.owner), parseIdentity(substrateIdentityApi, nomination.owner), substrateApi.api.query.parachainStaking.candidateInfo(nomination.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+      const currentBlock = _currentBlock.toPrimitive();
+      const currentTimestamp = _currentTimestamp.toPrimitive();
+      const collatorInfo = _collatorInfo.toPrimitive();
+      const minNomination = collatorInfo === null || collatorInfo === void 0 ? void 0 : collatorInfo.lowestTopNominationAmount.toString();
+      const nominationScheduledRequests = _nominationScheduledRequests.toPrimitive();
+      let hasUnstaking = false;
+      let nominationStatus = EarningStatus.NOT_EARNING;
+
+      // parse unstaking info
+      if (nominationScheduledRequests) {
+        for (const scheduledRequest of nominationScheduledRequests) {
+          if (reformatAddress(scheduledRequest.nominator, 0) === reformatAddress(address, 0)) {
+            // add network prefix
+            const isClaimable = scheduledRequest.whenExecutable - parseInt(currentRound) <= 0;
+            const remainingEra = scheduledRequest.whenExecutable - parseInt(currentRound);
+            const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
+            const claimable = Object.values(scheduledRequest.action)[0];
+
+            // noted: target timestamp in parachainStaking easily volatile if block time volatile
+            const targetBlock = remainingEra * parseInt(roundInfo.length) + parseInt(roundInfo.first);
+            const remainingBlock = targetBlock - currentBlock;
+            const targetTimestampMs = remainingBlock * _EXPECTED_BLOCK_TIME[chainInfo.slug] * 1000 + currentTimestamp;
+            unstakingMap[nomination.owner] = {
+              chain: chainInfo.slug,
+              status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
+              validatorAddress: nomination.owner,
+              claimable: claimable.toString(),
+              waitingTime,
+              targetTimestampMs: targetTimestampMs
+            };
+            hasUnstaking = true;
+            break; // only handle 1 scheduledRequest per collator
+          }
+        }
+      }
+
+      const bnStake = new BN(nomination.amount);
+      const bnUnstakeBalance = unstakingMap[nomination.owner] ? new BN(unstakingMap[nomination.owner].claimable) : BN_ZERO;
+      const bnActiveStake = bnStake.sub(bnUnstakeBalance);
+      if (bnActiveStake.gt(BN_ZERO) && bnActiveStake.gte(new BN(minNomination))) {
+        nominationStatus = EarningStatus.EARNING_REWARD;
+      }
+      bnTotalActiveStake = bnTotalActiveStake.add(bnActiveStake);
+      bnTotalStake = bnTotalStake.add(bnStake);
+      bnTotalUnstaking = bnTotalUnstaking.add(bnUnstakeBalance);
+      nominationList.push({
+        chain: chainInfo.slug,
+        status: nominationStatus,
+        validatorAddress: nomination.owner,
+        validatorIdentity: identity,
+        activeStake: bnActiveStake.toString(),
+        hasUnstaking,
+        validatorMinStake: collatorInfo.lowestTopNominationAmount.toString()
+      });
+    }));
+    const stakingStatus = getEarningStatusByNominations(bnTotalActiveStake, nominationList);
+    const totalStake = bnTotalStake.toString();
+    const activeStake = bnTotalActiveStake.toString();
+    const unstakingBalance = bnTotalUnstaking.toString();
+    const tokenInfo = this.state.chainService.getAssetBySlug(this.nativeToken.slug);
+    await this.createWithdrawNotifications(Object.values(unstakingMap), tokenInfo, address);
+    return {
+      status: stakingStatus,
+      totalStake,
+      balanceToken: this.nativeToken.slug,
+      activeStake: activeStake,
+      unstakeBalance: unstakingBalance,
+      isBondedBefore: !!nominationList.length,
+      nominations: nominationList,
+      unstakings: Object.values(unstakingMap)
+    };
+  }
+  async subscribePoolPosition(useAddresses, resultCallback) {
+    let cancel = false;
+    const substrateApi = this.substrateApi;
+    const defaultInfo = this.baseInfo;
+    const chainInfo = this.chainInfo;
+    await substrateApi.isReady;
+    const unsub = await substrateApi.api.query.parachainStaking.nominatorState.multi(useAddresses, async ledgers => {
+      if (cancel) {
+        unsub();
+        return;
+      }
+      if (ledgers) {
+        await Promise.all(ledgers.map(async (_nominatorState, i) => {
+          const nominatorState = _nominatorState.toPrimitive();
+          const owner = reformatAddress(useAddresses[i], 42);
+          if (nominatorState) {
+            const nominatorMetadata = await this.parseNominatorMetadata(chainInfo, owner, substrateApi, nominatorState);
+            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 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.nominatorState) === 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 nominatorState = ledgers[i].toPrimitive();
+      if (nominatorState && nominatorState.total > 0) {
+        result.push(owner);
+      }
+    }
+    return result;
+  }
+
+  /* Subscribe pool position */
+
+  /* Get pool targets */
+  async getPoolTargets() {
+    const apiProps = await this.substrateApi.isReady;
+    const substrateIdentityApi = this.substrateIdentityApi;
+    const allCollators = [];
+    const [_allCollators, _selectedCandidates] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(),
+    // use it when energy support collatorCommission
+    // apiProps.api.query.parachainStaking.collatorCommission(),
+    apiProps.api.query.parachainStaking.selectedCandidates()]);
+    const maxNominationPerCollator = apiProps.api.consts.parachainStaking.maxTopNominationsPerCandidate.toString();
+    const selectedCollators = _selectedCandidates.toPrimitive();
+    for (const collator of _allCollators) {
+      const _collatorAddress = collator[0].toHuman();
+      const collatorAddress = _collatorAddress[0];
+      const collatorInfo = collator[1].toPrimitive();
+      const bnTotalStake = new BN(collatorInfo.totalCounted);
+      const bnOwnStake = new BN(collatorInfo.bond);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      const bnMinBond = new BN(collatorInfo.lowestTopNominationAmount);
+      const maxNominatorRewarded = parseInt(maxNominationPerCollator);
+      if (selectedCollators.includes(collatorAddress)) {
+        allCollators.push({
+          commission: 0,
+          expectedReturn: 0,
+          address: collatorAddress,
+          totalStake: bnTotalStake.toString(),
+          ownStake: bnOwnStake.toString(),
+          otherStake: bnOtherStake.toString(),
+          nominatorCount: collatorInfo.nominationCount,
+          blocked: false,
+          isVerified: false,
+          minBond: bnMinBond.toString(),
+          chain: this.chain,
+          isCrowded: collatorInfo.nominationCount >= maxNominatorRewarded
+        });
+      }
+    }
+    const extraInfoMap = {};
+    await Promise.all(allCollators.map(async collator => {
+      const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(substrateIdentityApi, collator.address)]);
+      const rawInfo = _info.toHuman();
+      const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
+      extraInfoMap[collator.address] = {
+        identity,
+        isVerified: isReasonable,
+        active
+      };
+    }));
+    for (const validator of allCollators) {
+      validator.blocked = !extraInfoMap[validator.address].active;
+      validator.identity = extraInfoMap[validator.address].identity;
+      validator.isVerified = extraInfoMap[validator.address].isVerified;
+    }
+    return allCollators;
+  }
+
+  /* Get pool targets */
+
+  /* Join pool action */
+
+  async createJoinExtrinsic(data, positionInfo) {
+    const {
+      amount,
+      selectedValidators
+    } = data;
+    const apiPromise = await this.substrateApi.isReady;
+    const binaryAmount = new BN(amount);
+    const selectedCollatorInfo = selectedValidators[0];
+    const {
+      address: selectedCollatorAddress,
+      nominatorCount: selectedCollatorNominatorCount
+    } = selectedCollatorInfo;
+    const compoundResult = extrinsic => {
+      return Promise.resolve([extrinsic, {
+        slug: this.nativeToken.slug,
+        amount: '0'
+      }]);
+    };
+    if (!positionInfo) {
+      const extrinsic = apiPromise.api.tx.parachainStaking.nominate(selectedCollatorAddress, binaryAmount, new BN(selectedCollatorNominatorCount), 0);
+      return compoundResult(extrinsic);
+    }
+    const {
+      bondedValidators,
+      nominationCount
+    } = getBondedValidators(positionInfo.nominations);
+    const parsedSelectedCollatorAddress = reformatAddress(selectedCollatorInfo.address, 0);
+    if (!bondedValidators.includes(parsedSelectedCollatorAddress)) {
+      const extrinsic = apiPromise.api.tx.parachainStaking.nominate(selectedCollatorAddress, binaryAmount, new BN(selectedCollatorNominatorCount), nominationCount);
+      return compoundResult(extrinsic);
+    } else {
+      const extrinsic = apiPromise.api.tx.parachainStaking.bondExtra(selectedCollatorAddress, binaryAmount);
+      return compoundResult(extrinsic);
+    }
+  }
+
+  /* Join pool action */
+
+  /* Leave pool action */
+
+  async handleYieldUnstake(amount, address, selectedTarget) {
+    const apiPromise = await this.substrateApi.isReady;
+    const binaryAmount = new BN(amount);
+    const poolPosition = await this.getPoolPosition(address);
+    if (!selectedTarget || !poolPosition) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
+    }
+    const unstakeAll = isUnstakeAll(selectedTarget, poolPosition.nominations, amount);
+    let extrinsic;
+    if (!unstakeAll) {
+      extrinsic = apiPromise.api.tx.parachainStaking.scheduleNominatorUnbond(selectedTarget, binaryAmount);
+    } else {
+      extrinsic = apiPromise.api.tx.parachainStaking.scheduleRevokeNomination(selectedTarget);
+    }
+    return [ExtrinsicType.STAKING_UNBOND, extrinsic];
+  }
+
+  /* Leave pool action */
+
+  /* Other action */
+
+  async handleYieldCancelUnstake(params) {
+    const {
+      selectedUnstaking
+    } = params;
+    const chainApi = await this.substrateApi.isReady;
+    return chainApi.api.tx.parachainStaking.cancelNominationRequest(selectedUnstaking.validatorAddress);
+  }
+  async handleYieldWithdraw(address, unstakingInfo) {
+    const collatorAddress = unstakingInfo.validatorAddress;
+    if (!collatorAddress) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
+    }
+    const chainApi = await this.substrateApi.isReady;
+    return chainApi.api.tx.parachainStaking.executeNominationRequest(address, collatorAddress);
+  }
+
+  /* Other actions */
+}

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

@@ -4,3 +4,4 @@ export { default as RelayNativeStakingPoolHandler } from './relay-chain';
 export { default as ParaNativeStakingPoolHandler } from './para-chain';
 export { default as TaoNativeStakingPoolHandler } from './tao';
 export { default as SubnetTaoStakingPoolHandler } from './dtao';
+export { default as EnergyNativeStakingPoolHandler } from './energy';

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

@@ -6,4 +6,5 @@ export { default as AstarNativeStakingPoolHandler } from "./astar.js";
 export { default as RelayNativeStakingPoolHandler } from "./relay-chain.js";
 export { default as ParaNativeStakingPoolHandler } from "./para-chain.js";
 export { default as TaoNativeStakingPoolHandler } from "./tao.js";
-export { default as SubnetTaoStakingPoolHandler } from "./dtao.js";
+export { default as SubnetTaoStakingPoolHandler } from "./dtao.js";
+export { default as EnergyNativeStakingPoolHandler } from "./energy.js";

package/services/earning-service/service.js

@@ -13,7 +13,7 @@ import { BasicTxErrorType, YieldPoolType } from '@subwallet/extension-base/types
 import { addLazy, createPromiseHandler, filterAddressByChainInfo, removeLazy } from '@subwallet/extension-base/utils';
 import { fetchStaticCache } from '@subwallet/extension-base/utils/fetchStaticCache';
 import { BehaviorSubject, combineLatest } from 'rxjs';
-import { AcalaLiquidStakingPoolHandler, AmplitudeNativeStakingPoolHandler, AstarNativeStakingPoolHandler, BifrostLiquidStakingPoolHandler, BifrostMantaLiquidStakingPoolHandler, InterlayLendingPoolHandler, NominationPoolHandler, ParallelLiquidStakingPoolHandler, ParaNativeStakingPoolHandler, RelayNativeStakingPoolHandler, StellaSwapLiquidStakingPoolHandler, SubnetTaoStakingPoolHandler, TaoNativeStakingPoolHandler } from "./handlers/index.js";
+import { AcalaLiquidStakingPoolHandler, AmplitudeNativeStakingPoolHandler, AstarNativeStakingPoolHandler, BifrostLiquidStakingPoolHandler, BifrostMantaLiquidStakingPoolHandler, EnergyNativeStakingPoolHandler, InterlayLendingPoolHandler, NominationPoolHandler, ParallelLiquidStakingPoolHandler, ParaNativeStakingPoolHandler, RelayNativeStakingPoolHandler, StellaSwapLiquidStakingPoolHandler, SubnetTaoStakingPoolHandler, TaoNativeStakingPoolHandler } from "./handlers/index.js";
 export const fetchPoolsData = async () => {
   const fetchData = await fetchStaticCache('earning/yield-pools.json', {
     data: {}
@@ -92,6 +92,9 @@ export default class EarningService {
       if (_STAKING_CHAIN_GROUP.mythos.includes(chain)) {
         handlers.push(new MythosNativeStakingPoolHandler(this.state, chain));
       }
+      if (_STAKING_CHAIN_GROUP.energy.includes(chain)) {
+        handlers.push(new EnergyNativeStakingPoolHandler(this.state, chain));
+      }
       if (_STAKING_CHAIN_GROUP.nominationPool.includes(chain)) {
         const ahChain = ahMapChain[chain];
         if (ahChain) {

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

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

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

@@ -110,10 +110,10 @@ export class AccountJsonHandler extends AccountBaseHandler {
             name: (exists === null || exists === void 0 ? void 0 : exists.name) || (exists === null || exists === void 0 ? void 0 : exists.address) || _pair.address
           }
         }));
+        const _name = _pair.meta.name || '';
+        const nameExists = this.state.checkNameExists(_name);
         keyring.restoreAccount(file, password, withMasterPassword);
         const pair = keyring.getPair(_pair.address);
-        const _name = pair.meta.name || '';
-        const nameExists = this.state.checkNameExists(_name);
         if (nameExists) {
           const newName = _name.concat(' - ').concat(generateRandomString());
           keyring.saveAccountMeta(pair, {

package/services/migration-service/scripts/index.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import MigrateChainPatrol from '@subwallet/extension-base/services/migration-service/scripts/MigrateChainPatrol';
 import ClearMetadataDatabase from "./databases/ClearMetadataDatabase.js";
 import ClearMetadataForMythos from "./databases/ClearMetadataForMythos.js";
 import MigrateAssetSetting from "./databases/MigrateAssetSetting.js";
@@ -65,5 +66,6 @@ export default {
   [MYTHOS_MIGRATION_KEY]: ClearMetadataForMythos,
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
-  '1.3.42-01': MigrateNewUnifiedAccount
+  '1.3.42-01': MigrateNewUnifiedAccount,
+  '1.3.54-01': MigrateChainPatrol
 };

package/services/setting-service/constants.d.ts

@@ -4,7 +4,7 @@ export declare const DEFAULT_THEME: ThemeNames;
 export declare const DEFAULT_NOTIFICATION_TYPE: BrowserConfirmationType;
 export declare const DEFAULT_AUTO_LOCK_TIME = 15;
 export declare const DEFAULT_UNLOCK_TYPE: WalletUnlockType;
-export declare const DEFAULT_CHAIN_PATROL_ENABLE = false;
+export declare const DEFAULT_CHAIN_PATROL_ENABLE = true;
 export declare const DEFAULT_LANGUAGE: LanguageType;
 export declare const DEFAULT_CURRENCY = "usd";
 export declare const DEFAULT_SHOW_ZERO_BALANCE = true;

package/services/setting-service/constants.js

@@ -7,7 +7,7 @@ export const DEFAULT_THEME = ThemeNames.DARK;
 export const DEFAULT_NOTIFICATION_TYPE = 'popup';
 export const DEFAULT_AUTO_LOCK_TIME = 15;
 export const DEFAULT_UNLOCK_TYPE = targetIsExtension ? WalletUnlockType.ALWAYS_REQUIRED : WalletUnlockType.WHEN_NEEDED;
-export const DEFAULT_CHAIN_PATROL_ENABLE = false;
+export const DEFAULT_CHAIN_PATROL_ENABLE = true;
 export const DEFAULT_LANGUAGE = 'en';
 export const DEFAULT_CURRENCY = 'usd';
 export const DEFAULT_SHOW_ZERO_BALANCE = true;