[Issue-3654] Extension - Re-check some old types from ExtrinsicType

packages/extension-base/src/background/KoniTypes.ts

@@ -228,13 +228,13 @@
   externalUrl?: string;
   rarity?: string;
   description?: string;
   properties?: Record<any, any> | null;
 }
 
 interface NftItemExtraInfo {
   type?: _AssetType.ERC721 | _AssetType.PSP34 | RMRK_VER; // for sending
   rmrk_ver?: RMRK_VER;
   onChainOption?: any; // for sending PSP-34 tokens, should be done better
   assetHubType?: AssetHubNftType // for sending assetHub nft. There're 2 types nft
 }
 
@@ -530,7 +530,7 @@
   [ExtrinsicType.STAKING_COMPOUNDING]: RequestTuringStakeCompound,
   [ExtrinsicType.STAKING_CANCEL_COMPOUNDING]: RequestTuringCancelStakeCompound,
   [ExtrinsicType.STAKING_CANCEL_UNSTAKE]: RequestStakeCancelWithdrawal,
   [ExtrinsicType.STAKING_POOL_WITHDRAW]: any,
 
   // Yield
   [ExtrinsicType.JOIN_YIELD_POOL]: RequestYieldStepSubmit,
@@ -559,9 +559,9 @@
   [ExtrinsicType.TOKEN_SPENDING_APPROVAL]: TokenSpendingApprovalParams,
 
   [ExtrinsicType.EVM_EXECUTE]: TransactionConfig,
   [ExtrinsicType.CROWDLOAN]: any,
   [ExtrinsicType.SWAP]: SwapTxData
   [ExtrinsicType.UNKNOWN]: any
 }
 
 export enum ExtrinsicStatus {
@@ -655,7 +655,7 @@
 //     : T extends ExtrinsicType.MINT_VDOT
 //       ? Pick<SubmitBifrostLiquidStaking, 'rewardTokenSlug' | 'estimatedAmountReceived'>
 //       : undefined;
 export interface TransactionHistoryItem<ET extends ExtrinsicType = ExtrinsicType.TRANSFER_BALANCE> {
   origin?: 'app' | 'migration' | 'subsquid' | 'subscan', // 'app' or history source
   callhash?: string,
   signature?: string,
@@ -680,7 +680,7 @@
   tip?: AmountData,
   fee?: AmountData,
   explorerUrl?: string,
   additionalInfo?: any,
   startBlock?: number,
   nonce?: number,
   addressPrefix?: number
@@ -911,12 +911,12 @@
   recipientAddress: string,
 
   nftItemName?: string, // Use for confirmation view only
   params: Record<string, any>,
   nftItem: NftItem
 }
 
 export interface EvmNftTransaction extends ValidateTransactionResponse {
   tx: Record<string, any> | null;
 }
 
 export interface ValidateNetworkResponse {
@@ -1887,7 +1887,7 @@
   'pri(bonding.subscribeNominatorMetadata)': [null, NominatorMetadata[], NominatorMetadata[]];
   'pri(bonding.getBondingOptions)': [BondingOptionParams, ValidatorInfo[]];
   'pri(bonding.getNominationPoolOptions)': [string, NominationPoolInfo[]];
-  'pri(bonding.nominationPool.submitBonding)': [RequestStakePoolingBonding, SWTransactionResponse];
+  'pri(bonding.nominationPool.submitBonding)': [RequestYieldStepSubmit, SWTransactionResponse];
   'pri(bonding.nominationPool.submitUnbonding)': [RequestStakePoolingUnbonding, SWTransactionResponse];
 
   // Chains, assets functions

packages/extension-base/src/koni/api/yield/helper/utils.ts

@@ -19,10 +19,9 @@ export const YIELD_EXTRINSIC_TYPES = [
   ExtrinsicType.REDEEM_VDOT,
   ExtrinsicType.REDEEM_LDOT,
   ExtrinsicType.REDEEM_STDOT,
-  ExtrinsicType.STAKING_JOIN_POOL,
+  ExtrinsicType.JOIN_YIELD_POOL,
   ExtrinsicType.STAKING_CLAIM_REWARD,
-  ExtrinsicType.STAKING_LEAVE_POOL,
-  ExtrinsicType.STAKING_POOL_WITHDRAW
+  ExtrinsicType.STAKING_LEAVE_POOL
 ];
 
 export const YIELD_POOL_STAT_REFRESH_INTERVAL = 90000;

packages/extension-base/src/services/earning-service/handlers/native-staking/amplitude.ts

@@ -563,7 +563,7 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
       extrinsic = chainApi.api.tx.parachainStaking.leaveDelegators();
     }
 
-    return [ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

packages/extension-base/src/services/earning-service/handlers/native-staking/astar.ts

@@ -459,7 +459,7 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
 
     const extrinsic = chainApi.api.tx.dappsStaking.unbondAndUnstake(dappParam, binaryAmount);
 
-    return [ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

packages/extension-base/src/services/earning-service/handlers/native-staking/para-chain.ts

@@ -606,7 +606,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
       extrinsic = apiPromise.api.tx.parachainStaking.scheduleRevokeDelegation(selectedTarget);
     }
 
-    return [ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

packages/extension-base/src/services/earning-service/handlers/native-staking/relay-chain.ts

@@ -774,7 +774,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       extrinsic = chainApi.api.tx.staking.unbond(binaryAmount);
     }
 
-    return [ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

packages/extension-base/src/services/earning-service/handlers/native-staking/tao.ts

@@ -466,7 +466,7 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
 
     const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, binaryAmount);
 
-    return [ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

packages/extension-base/src/services/earning-service/handlers/nomination-pool/index.ts

@@ -9,7 +9,7 @@ import KoniState from '@subwallet/extension-base/koni/background/handlers/State'
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
-import { BaseYieldPositionInfo, BasicTxErrorType, EarningRewardHistoryItem, EarningRewardItem, EarningStatus, HandleYieldStepData, NominationPoolInfo, NominationYieldPoolInfo, OptimalYieldPath, OptimalYieldPathParams, PalletNominationPoolsBondedPoolInner, PalletStakingActiveEraInfo, PalletStakingExposure, PalletStakingExposureItem, PalletStakingNominations, RequestStakePoolingBonding, SpStakingExposurePage, StakeCancelWithdrawalParams, StakingTxErrorType, SubmitJoinNominationPool, SubmitYieldJoinData, TransactionData, UnstakingStatus, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldStepType, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BaseYieldPositionInfo, BasicTxErrorType, EarningRewardHistoryItem, EarningRewardItem, EarningStatus, HandleYieldStepData, NominationPoolInfo, NominationYieldPoolInfo, OptimalYieldPath, OptimalYieldPathParams, PalletNominationPoolsBondedPoolInner, PalletStakingActiveEraInfo, PalletStakingExposure, PalletStakingExposureItem, PalletStakingNominations, RequestYieldStepSubmit, SpStakingExposurePage, StakeCancelWithdrawalParams, StakingTxErrorType, SubmitJoinNominationPool, SubmitYieldJoinData, TransactionData, UnstakingStatus, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldStepType, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
@@ -569,21 +569,19 @@ export default class NominationPoolHandler extends BasePoolHandler {
 
   async handleYieldJoin (_data: SubmitYieldJoinData, path: OptimalYieldPath, currentStep: number): Promise<HandleYieldStepData> {
     const data = _data as SubmitJoinNominationPool;
-    const { address, amount, selectedPool } = data;
+    const { address, amount } = data;
     const positionInfo = await this.getPoolPosition(address);
     const [extrinsic] = await this.createJoinExtrinsic(data, positionInfo);
 
-    const joinPoolData: RequestStakePoolingBonding = {
-      poolPosition: positionInfo,
-      slug: this.slug,
-      selectedPool,
-      amount,
-      address
+    const joinPoolData: RequestYieldStepSubmit = {
+      path,
+      data: data,
+      currentStep
     };
 
     return {
       txChain: this.chain,
-      extrinsicType: ExtrinsicType.STAKING_JOIN_POOL,
+      extrinsicType: ExtrinsicType.JOIN_YIELD_POOL,
       extrinsic,
       txData: joinPoolData,
       transferNativeAmount: amount,

packages/extension-base/src/services/transaction-service/index.ts

@@ -20,7 +20,7 @@ import { getBaseTransactionInfo, getTransactionId, isSubstrateTransaction, isTon
 import { SWTransaction, SWTransactionInput, SWTransactionResponse, TransactionEmitter, TransactionEventMap, TransactionEventResponse, ValidateTransactionResponseInput } from '@subwallet/extension-base/services/transaction-service/types';
 import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
 import { isWalletConnectRequest } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
-import { AccountJson, BasicTxErrorType, BasicTxWarningCode, LeavePoolAdditionalData, RequestStakePoolingBonding, RequestYieldStepSubmit, SpecialYieldPoolInfo, Web3Transaction, YieldPoolType } from '@subwallet/extension-base/types';
+import { AccountJson, BasicTxErrorType, BasicTxWarningCode, LeavePoolAdditionalData, RequestStakePoolingBonding, RequestYieldStepSubmit, SpecialYieldPoolInfo, SubmitJoinNominationPool, Web3Transaction, YieldPoolType } from '@subwallet/extension-base/types';
 import { _isRuntimeUpdated, anyNumberToBN, pairToAccount, reformatAddress } from '@subwallet/extension-base/utils';
 import { mergeTransactionAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
@@ -402,11 +402,12 @@ export default class TransactionService {
       }
 
         break;
-      case ExtrinsicType.STAKING_JOIN_POOL: {
-        const data = parseTransactionData<ExtrinsicType.STAKING_JOIN_POOL>(transaction.data);
+      case ExtrinsicType.JOIN_YIELD_POOL: {
+        const data = parseTransactionData<ExtrinsicType.JOIN_YIELD_POOL>(transaction.data);
+        const poolData = data.data as SubmitJoinNominationPool;
 
-        historyItem.amount = { ...baseNativeAmount, value: data.amount || '0' };
-        historyItem.to = data.selectedPool.name || data.selectedPool.id.toString();
+        historyItem.amount = { ...baseNativeAmount, value: poolData.amount || '0' };
+        historyItem.to = poolData.selectedPool.name || poolData.selectedPool.id.toString();
       }
 
         break;
@@ -717,7 +718,7 @@ export default class TransactionService {
       } catch (e) {
         console.error(e);
       }
-    } else if ([ExtrinsicType.STAKING_BOND, ExtrinsicType.STAKING_UNBOND, ExtrinsicType.STAKING_WITHDRAW, ExtrinsicType.STAKING_CANCEL_UNSTAKE, ExtrinsicType.STAKING_CLAIM_REWARD, ExtrinsicType.STAKING_JOIN_POOL, ExtrinsicType.STAKING_POOL_WITHDRAW, ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
+    } else if ([ExtrinsicType.STAKING_BOND, ExtrinsicType.STAKING_UNBOND, ExtrinsicType.STAKING_WITHDRAW, ExtrinsicType.STAKING_CANCEL_UNSTAKE, ExtrinsicType.STAKING_CLAIM_REWARD, ExtrinsicType.JOIN_YIELD_POOL, ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
       this.state.eventService.emit('transaction.submitStaking', transaction.chain);
     } else if (transaction.extrinsicType === ExtrinsicType.SWAP) {
       const inputData = parseTransactionData<ExtrinsicType.SWAP>(transaction.data);

packages/extension-koni-ui/src/Popup/Confirmations/variants/Transaction/index.tsx

@@ -34,11 +34,11 @@ const getTransactionComponent = (extrinsicType: ExtrinsicType): typeof BaseTrans
     case ExtrinsicType.SEND_NFT:
       return SendNftTransactionConfirmation;
     case ExtrinsicType.STAKING_JOIN_POOL:
+    case ExtrinsicType.JOIN_YIELD_POOL:
       return JoinPoolTransactionConfirmation;
     case ExtrinsicType.STAKING_LEAVE_POOL:
       return LeavePoolTransactionConfirmation;
     case ExtrinsicType.STAKING_BOND:
-    case ExtrinsicType.JOIN_YIELD_POOL:
       return BondTransactionConfirmation;
     case ExtrinsicType.STAKING_UNBOND:
       return UnbondTransactionConfirmation;

packages/extension-koni-ui/src/Popup/Confirmations/variants/Transaction/variants/JoinPool.tsx

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni-ui authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { RequestStakePoolingBonding } from '@subwallet/extension-base/background/KoniTypes';
+import { RequestYieldStepSubmit, SubmitJoinNominationPool } from '@subwallet/extension-base/types';
 import CommonTransactionInfo from '@subwallet/extension-koni-ui/components/Confirmation/CommonTransactionInfo';
 import MetaInfo from '@subwallet/extension-koni-ui/components/MetaInfo/MetaInfo';
 import useGetNativeTokenBasicInfo from '@subwallet/extension-koni-ui/hooks/common/useGetNativeTokenBasicInfo';
@@ -16,7 +16,8 @@ type Props = BaseTransactionConfirmationProps;
 
 const Component: React.FC<Props> = (props: Props) => {
   const { className, transaction } = props;
-  const data = transaction.data as RequestStakePoolingBonding;
+  const requestData = transaction.data as RequestYieldStepSubmit;
+  const data = requestData.data as SubmitJoinNominationPool;
 
   const { t } = useTranslation();
   const { decimals, symbol } = useGetNativeTokenBasicInfo(transaction.chain);
@@ -31,11 +32,11 @@ const Component: React.FC<Props> = (props: Props) => {
         className={'meta-info'}
         hasBackgroundWrapper
       >
-        {/* <MetaInfo.Account */}
-        {/*   address={'5DnokDpMdNEH8cApsZoWQnjsggADXQmGWUb6q8ZhHeEwvncL'} */}
-        {/*   label={t('Validator')} */}
-        {/*   networkPrefix={42} */}
-        {/* /> */}
+        <MetaInfo.Account
+          address={data.selectedPool.address}
+          label={t('Pool')}
+          networkPrefix={42}
+        />
 
         {/* <MetaInfo.AccountGroup */}
         {/*  accounts={data.address} */}

packages/extension-koni-ui/src/messaging/transaction/staking.ts

@@ -1,13 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-koni-ui authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ChainStakingMetadata, NominatorMetadata, RequestBondingSubmit, RequestStakePoolingBonding, RequestStakePoolingUnbonding, RequestSubscribeStaking, RequestSubscribeStakingReward, RequestTuringCancelStakeCompound, RequestTuringStakeCompound, RequestUnbondingSubmit, StakingJson, StakingRewardJson, StakingType, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainStakingMetadata, NominatorMetadata, RequestBondingSubmit, RequestStakePoolingUnbonding, RequestSubscribeStaking, RequestSubscribeStakingReward, RequestTuringCancelStakeCompound, RequestTuringStakeCompound, RequestUnbondingSubmit, StakingJson, StakingRewardJson, StakingType, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { SWTransactionResponse } from '@subwallet/extension-base/services/transaction-service/types';
-import { NominationPoolInfo, RequestStakeCancelWithdrawal, RequestStakeClaimReward } from '@subwallet/extension-base/types';
+import { NominationPoolInfo, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestYieldStepSubmit } from '@subwallet/extension-base/types';
 
 import { sendMessage } from '../base';
 
-export async function submitPoolBonding (request: RequestStakePoolingBonding): Promise<SWTransactionResponse> {
+export async function submitPoolBonding (request: RequestYieldStepSubmit): Promise<SWTransactionResponse> {
   return sendMessage('pri(bonding.nominationPool.submitBonding)', request);
 }
 

packages/extension-web-ui/src/Popup/Confirmations/variants/Transaction/index.tsx

@@ -33,11 +33,11 @@ const getTransactionComponent = (extrinsicType: ExtrinsicType): typeof BaseTrans
     case ExtrinsicType.SEND_NFT:
       return SendNftTransactionConfirmation;
     case ExtrinsicType.STAKING_JOIN_POOL:
+    case ExtrinsicType.JOIN_YIELD_POOL:
       return JoinPoolTransactionConfirmation;
     case ExtrinsicType.STAKING_LEAVE_POOL:
       return LeavePoolTransactionConfirmation;
     case ExtrinsicType.STAKING_BOND:
-    case ExtrinsicType.JOIN_YIELD_POOL:
       return BondTransactionConfirmation;
     case ExtrinsicType.STAKING_UNBOND:
       return UnbondTransactionConfirmation;

packages/extension-web-ui/src/Popup/Confirmations/variants/Transaction/variants/JoinPool.tsx

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-web-ui authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { RequestStakePoolingBonding } from '@subwallet/extension-base/background/KoniTypes';
+import { RequestYieldStepSubmit, SubmitJoinNominationPool } from '@subwallet/extension-base/types';
 import { AlertBox } from '@subwallet/extension-web-ui/components';
 import CommonTransactionInfo from '@subwallet/extension-web-ui/components/Confirmation/CommonTransactionInfo';
 import MetaInfo from '@subwallet/extension-web-ui/components/MetaInfo/MetaInfo';
@@ -17,7 +17,8 @@ type Props = BaseTransactionConfirmationProps;
 
 const Component: React.FC<Props> = (props: Props) => {
   const { className, transaction } = props;
-  const data = transaction.data as RequestStakePoolingBonding;
+  const requestData = transaction.data as RequestYieldStepSubmit;
+  const data = requestData.data as SubmitJoinNominationPool;
 
   const { t } = useTranslation();
   const { decimals, symbol } = useGetNativeTokenBasicInfo(transaction.chain);
@@ -32,11 +33,11 @@ const Component: React.FC<Props> = (props: Props) => {
         className={'meta-info'}
         hasBackgroundWrapper
       >
-        {/* <MetaInfo.Account */}
-        {/*   address={'5DnokDpMdNEH8cApsZoWQnjsggADXQmGWUb6q8ZhHeEwvncL'} */}
-        {/*   label={t('Validator')} */}
-        {/*   networkPrefix={42} */}
-        {/* /> */}
+        <MetaInfo.Account
+          address={data.selectedPool.address}
+          label={t('Pool')}
+          networkPrefix={42}
+        />
 
         {/* <MetaInfo.AccountGroup */}
         {/*  accounts={data.address} */}

packages/extension-web-ui/src/messaging/transaction/staking.ts

@@ -1,13 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-web-ui authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ChainStakingMetadata, NominatorMetadata, RequestBondingSubmit, RequestStakePoolingBonding, RequestStakePoolingUnbonding, RequestSubscribeStaking, RequestSubscribeStakingReward, RequestTuringCancelStakeCompound, RequestTuringStakeCompound, RequestUnbondingSubmit, StakingJson, StakingRewardJson, StakingType, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainStakingMetadata, NominatorMetadata, RequestBondingSubmit, RequestStakePoolingUnbonding, RequestSubscribeStaking, RequestSubscribeStakingReward, RequestTuringCancelStakeCompound, RequestTuringStakeCompound, RequestUnbondingSubmit, StakingJson, StakingRewardJson, StakingType, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { SWTransactionResponse } from '@subwallet/extension-base/services/transaction-service/types';
-import { NominationPoolInfo, RequestStakeCancelWithdrawal, RequestStakeClaimReward } from '@subwallet/extension-base/types';
+import { NominationPoolInfo, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestYieldStepSubmit } from '@subwallet/extension-base/types';
 
 import { sendMessage } from '../base';
 
-export async function submitPoolBonding (request: RequestStakePoolingBonding): Promise<SWTransactionResponse> {
+export async function submitPoolBonding (request: RequestYieldStepSubmit): Promise<SWTransactionResponse> {
   return sendMessage('pri(bonding.nominationPool.submitBonding)', request);
 }