@subwallet/extension-base 1.2.8-1 → 1.2.9-0

package/services/swap-service/handler/base-handler.d.ts

@@ -2,13 +2,13 @@ import { SwapError } from '@subwallet/extension-base/background/errors/SwapError
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
-import { BaseStepDetail } from '@subwallet/extension-base/types/service-base';
-import { GenSwapStepFunc, OptimalSwapPath, OptimalSwapPathParams, SwapEarlyValidation, SwapFeeInfo, SwapProvider, SwapProviderId, SwapQuote, SwapRequest, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
+import { BaseStepDetail, CommonOptimalPath, CommonStepFeeInfo } from '@subwallet/extension-base/types/service-base';
+import { GenSwapStepFunc, OptimalSwapPathParams, SwapEarlyValidation, SwapProvider, SwapProviderId, SwapQuote, SwapRequest, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
 export interface SwapBaseInterface {
     providerSlug: SwapProviderId;
     getSwapQuote: (request: SwapRequest) => Promise<SwapQuote | SwapError>;
-    generateOptimalProcess: (params: OptimalSwapPathParams) => Promise<OptimalSwapPath>;
-    getSubmitStep: (params: OptimalSwapPathParams) => Promise<[BaseStepDetail, SwapFeeInfo] | undefined>;
+    generateOptimalProcess: (params: OptimalSwapPathParams) => Promise<CommonOptimalPath>;
+    getSubmitStep: (params: OptimalSwapPathParams) => Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
     validateSwapRequest: (request: SwapRequest) => Promise<SwapEarlyValidation>;
     validateSwapProcess: (params: ValidateSwapProcessParams) => Promise<TransactionError[]>;
     handleSwapProcess: (params: SwapSubmitParams) => Promise<SwapSubmitStepData>;
@@ -28,7 +28,7 @@ export declare class SwapBaseHandler {
     chainService: ChainService;
     balanceService: BalanceService;
     constructor({ balanceService, chainService, providerName, providerSlug }: SwapBaseHandlerInitParams);
-    generateOptimalProcess(params: OptimalSwapPathParams, genStepFuncList: GenSwapStepFunc[]): Promise<OptimalSwapPath>;
+    generateOptimalProcess(params: OptimalSwapPathParams, genStepFuncList: GenSwapStepFunc[]): Promise<CommonOptimalPath>;
     validateXcmStep(params: ValidateSwapProcessParams, stepIndex: number): Promise<TransactionError[]>;
     validateTokenApproveStep(params: ValidateSwapProcessParams, stepIndex: number): Promise<TransactionError[]>;
     validateSetFeeTokenStep(params: ValidateSwapProcessParams, stepIndex: number): Promise<TransactionError[]>;

package/services/swap-service/handler/base-handler.js

@@ -5,7 +5,8 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { BasicTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { _validateBalanceToSwap, _validateSwapRecipient } from '@subwallet/extension-base/core/logic-validation/swap';
 import { _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
-import { DEFAULT_SWAP_FIRST_STEP, getSwapAlternativeAsset, MOCK_SWAP_FEE } from '@subwallet/extension-base/services/swap-service/utils';
+import { getSwapAlternativeAsset } from '@subwallet/extension-base/services/swap-service/utils';
+import { DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/types/service-base';
 import { SwapErrorType, SwapFeeType } from '@subwallet/extension-base/types/swap';
 import { formatNumber } from '@subwallet/extension-base/utils';
 import BigNumber from 'bignumber.js';
@@ -26,8 +27,8 @@ export class SwapBaseHandler {
   // public abstract getSwapQuote(request: SwapRequest): Promise<SwapQuote | SwapError>;
   async generateOptimalProcess(params, genStepFuncList) {
     const result = {
-      totalFee: [MOCK_SWAP_FEE],
-      steps: [DEFAULT_SWAP_FIRST_STEP]
+      totalFee: [MOCK_STEP_FEE],
+      steps: [DEFAULT_FIRST_STEP]
     };
     try {
       for (const genStepFunc of genStepFuncList) {

package/services/swap-service/handler/chainflip-handler.d.ts

@@ -4,8 +4,8 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { SwapBaseInterface } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
-import { BaseStepDetail } from '@subwallet/extension-base/types/service-base';
-import { OptimalSwapPath, OptimalSwapPathParams, SwapEarlyValidation, SwapFeeInfo, SwapProviderId, SwapQuote, SwapRequest, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
+import { BaseStepDetail, CommonOptimalPath, CommonStepFeeInfo } from '@subwallet/extension-base/types/service-base';
+import { OptimalSwapPathParams, SwapEarlyValidation, SwapProviderId, SwapQuote, SwapRequest, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
 export declare class ChainflipSwapHandler implements SwapBaseInterface {
     private swapSdk;
     private readonly isTestnet;
@@ -26,6 +26,6 @@ export declare class ChainflipSwapHandler implements SwapBaseInterface {
     validateSwapProcess(params: ValidateSwapProcessParams): Promise<TransactionError[]>;
     handleSubmitStep(params: SwapSubmitParams): Promise<SwapSubmitStepData>;
     handleSwapProcess(params: SwapSubmitParams): Promise<SwapSubmitStepData>;
-    getSubmitStep(params: OptimalSwapPathParams): Promise<[BaseStepDetail, SwapFeeInfo] | undefined>;
-    generateOptimalProcess(params: OptimalSwapPathParams): Promise<OptimalSwapPath>;
+    getSubmitStep(params: OptimalSwapPathParams): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
+    generateOptimalProcess(params: OptimalSwapPathParams): Promise<CommonOptimalPath>;
 }

package/services/swap-service/handler/chainflip-handler.js

@@ -7,11 +7,12 @@ import { SwapError } from '@subwallet/extension-base/background/errors/SwapError
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getChainflipEarlyValidationError } from '@subwallet/extension-base/core/logic-validation/swap';
-import { createTransferExtrinsic } from '@subwallet/extension-base/koni/api/dotsama/transfer';
-import { getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/extension-base/koni/api/tokens/evm/transfer';
+import { getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/extension-base/services/balance-service/transfer/smart-contract';
+import { createTransferExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
 import { _getAssetDecimals, _getChainNativeTokenSlug, _getContractAddressOfToken, _isNativeToken, _isSubstrateChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { SwapBaseHandler } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
 import { calculateSwapRate, CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING, CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING, CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING, CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+import { CommonStepType } from '@subwallet/extension-base/types/service-base';
 import { SwapErrorType, SwapFeeType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
 import BigNumber from 'bignumber.js';
 var ChainflipFeeType;
@@ -285,9 +286,9 @@ export class ChainflipSwapHandler {
     for (const [index, step] of params.process.steps.entries()) {
       const getErrors = async () => {
         switch (step.type) {
-          case SwapStepType.DEFAULT:
+          case CommonStepType.DEFAULT:
             return Promise.resolve([]);
-          case SwapStepType.TOKEN_APPROVAL:
+          case CommonStepType.TOKEN_APPROVAL:
             return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
           default:
             return this.swapBaseHandler.validateSwapStep(params, isXcmOk, index);
@@ -296,7 +297,7 @@ export class ChainflipSwapHandler {
       const errors = await getErrors();
       if (errors.length) {
         return errors;
-      } else if (step.type === SwapStepType.XCM) {
+      } else if (step.type === CommonStepType.XCM) {
         isXcmOk = true;
       }
     }
@@ -377,7 +378,7 @@ export class ChainflipSwapHandler {
     } = params;
     const type = process.steps[currentStep].type;
     switch (type) {
-      case SwapStepType.DEFAULT:
+      case CommonStepType.DEFAULT:
         return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
       case SwapStepType.SWAP:
         return this.handleSubmitStep(params);

package/services/swap-service/handler/hydradx-handler.d.ts

@@ -3,8 +3,8 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { SwapBaseInterface } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
-import { BaseStepDetail } from '@subwallet/extension-base/types/service-base';
-import { OptimalSwapPath, OptimalSwapPathParams, SwapEarlyValidation, SwapFeeInfo, SwapProviderId, SwapQuote, SwapRequest, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
+import { BaseStepDetail, CommonOptimalPath, CommonStepFeeInfo } from '@subwallet/extension-base/types/service-base';
+import { OptimalSwapPathParams, SwapEarlyValidation, SwapProviderId, SwapQuote, SwapRequest, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
 export declare class HydradxHandler implements SwapBaseInterface {
     private swapBaseHandler;
     private tradeRouter;
@@ -19,10 +19,10 @@ export declare class HydradxHandler implements SwapBaseInterface {
     get providerInfo(): import("@subwallet/extension-base/types/swap").SwapProvider;
     get name(): string;
     get slug(): string;
-    getXcmStep(params: OptimalSwapPathParams): Promise<[BaseStepDetail, SwapFeeInfo] | undefined>;
-    getFeeOptionStep(params: OptimalSwapPathParams): Promise<[BaseStepDetail, SwapFeeInfo] | undefined>;
-    getSubmitStep(params: OptimalSwapPathParams): Promise<[BaseStepDetail, SwapFeeInfo] | undefined>;
-    generateOptimalProcess(params: OptimalSwapPathParams): Promise<OptimalSwapPath>;
+    getXcmStep(params: OptimalSwapPathParams): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
+    getFeeOptionStep(params: OptimalSwapPathParams): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
+    getSubmitStep(params: OptimalSwapPathParams): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
+    generateOptimalProcess(params: OptimalSwapPathParams): Promise<CommonOptimalPath>;
     private getSwapPathErrors;
     private parseSwapPath;
     getSwapQuote(request: SwapRequest): Promise<SwapQuote | SwapError>;

package/services/swap-service/handler/hydradx-handler.js

@@ -8,10 +8,11 @@ import { SwapError } from '@subwallet/extension-base/background/errors/SwapError
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getEarlyHydradxValidationError } from '@subwallet/extension-base/core/logic-validation/swap';
-import { createXcmExtrinsic } from '@subwallet/extension-base/koni/api/xcm';
+import { createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { _getAssetDecimals, _getChainNativeTokenSlug, _getTokenOnChainAssetId, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { SwapBaseHandler } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
 import { calculateSwapRate, getSwapAlternativeAsset, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+import { CommonStepType } from '@subwallet/extension-base/types/service-base';
 import { SwapErrorType, SwapFeeType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
 import BigNumber from 'bignumber.js';
 const HYDRADX_LOW_LIQUIDITY_THRESHOLD = 0.15;
@@ -94,7 +95,7 @@ export class HydradxHandler {
           destinationTokenInfo: fromAsset
         },
         name: `Transfer ${alternativeAsset.symbol} from ${alternativeChainInfo.name}`,
-        type: SwapStepType.XCM
+        type: CommonStepType.XCM
       };
       const xcmOriginSubstrateApi = await this.chainService.getSubstrateApi(alternativeAsset.originChain).isReady;
       const xcmTransfer = await createXcmExtrinsic({
@@ -131,7 +132,7 @@ export class HydradxHandler {
     }
     const feeStep = {
       name: 'Set fee token',
-      type: SwapStepType.SET_FEE_TOKEN
+      type: CommonStepType.SET_FEE_TOKEN
     };
     try {
       const substrateApi = this.chainService.getSubstrateApi(this.chain());
@@ -377,7 +378,7 @@ export class HydradxHandler {
     const referral = _referral === null || _referral === void 0 ? void 0 : _referral.toString();
     const needSetReferral = !referral || referral === '';
     const steps = params.process.steps.map(step => step.type);
-    const needSetFeeToken = steps.includes(SwapStepType.SET_FEE_TOKEN);
+    const needSetFeeToken = steps.includes(CommonStepType.SET_FEE_TOKEN);
     if (!needSetReferral && !needSetFeeToken) {
       extrinsic = swapTx;
     } else {
@@ -408,11 +409,11 @@ export class HydradxHandler {
     } = params;
     const type = process.steps[currentStep].type;
     switch (type) {
-      case SwapStepType.DEFAULT:
+      case CommonStepType.DEFAULT:
         return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
-      case SwapStepType.XCM:
+      case CommonStepType.XCM:
         return this.handleXcmStep(params);
-      case SwapStepType.SET_FEE_TOKEN:
+      case CommonStepType.SET_FEE_TOKEN:
         return this.handleSetFeeStep(params);
       case SwapStepType.SWAP:
         return this.handleSubmitStep(params);
@@ -430,11 +431,11 @@ export class HydradxHandler {
     for (const [index, step] of params.process.steps.entries()) {
       const getErrors = async () => {
         switch (step.type) {
-          case SwapStepType.DEFAULT:
+          case CommonStepType.DEFAULT:
             return Promise.resolve([]);
-          case SwapStepType.XCM:
+          case CommonStepType.XCM:
             return this.swapBaseHandler.validateXcmStep(params, index);
-          case SwapStepType.SET_FEE_TOKEN:
+          case CommonStepType.SET_FEE_TOKEN:
             return this.swapBaseHandler.validateSetFeeTokenStep(params, index);
           default:
             return this.swapBaseHandler.validateSwapStep(params, isXcmOk, index);
@@ -443,7 +444,7 @@ export class HydradxHandler {
       const errors = await getErrors();
       if (errors.length) {
         return errors;
-      } else if (step.type === SwapStepType.XCM) {
+      } else if (step.type === CommonStepType.XCM) {
         isXcmOk = true;
       }
     }

package/services/swap-service/index.d.ts

@@ -1,7 +1,8 @@
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { ServiceStatus, ServiceWithProcessInterface, StoppableServiceInterface } from '@subwallet/extension-base/services/base/types';
-import { OptimalSwapPath, OptimalSwapPathParams, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
+import { CommonOptimalPath } from '@subwallet/extension-base/types/service-base';
+import { OptimalSwapPathParams, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
 import { PromiseHandler } from '@subwallet/extension-base/utils';
 export declare class SwapService implements ServiceWithProcessInterface, StoppableServiceInterface {
     protected readonly state: KoniState;
@@ -15,7 +16,7 @@ export declare class SwapService implements ServiceWithProcessInterface, Stoppab
     constructor(state: KoniState);
     private askProvidersForQuote;
     private getDefaultProcess;
-    generateOptimalProcess(params: OptimalSwapPathParams): Promise<OptimalSwapPath>;
+    generateOptimalProcess(params: OptimalSwapPathParams): Promise<CommonOptimalPath>;
     handleSwapRequest(request: SwapRequest): Promise<SwapRequestResult>;
     getLatestQuotes(request: SwapRequest): Promise<SwapQuoteResponse>;
     private initHandlers;

package/services/swap-service/index.js

@@ -7,7 +7,8 @@ import { BasicTxErrorType } from '@subwallet/extension-base/background/KoniTypes
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { ChainflipSwapHandler } from '@subwallet/extension-base/services/swap-service/handler/chainflip-handler';
 import { HydradxHandler } from '@subwallet/extension-base/services/swap-service/handler/hydradx-handler';
-import { _PROVIDER_TO_SUPPORTED_PAIR_MAP, DEFAULT_SWAP_FIRST_STEP, getSwapAltToken, MOCK_SWAP_FEE, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+import { _PROVIDER_TO_SUPPORTED_PAIR_MAP, getSwapAltToken, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+import { DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/types/service-base';
 import { _SUPPORTED_SWAP_PROVIDERS, SwapErrorType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
 import { createPromiseHandler } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
@@ -50,8 +51,8 @@ export class SwapService {
 
   getDefaultProcess(params) {
     const result = {
-      totalFee: [MOCK_SWAP_FEE],
-      steps: [DEFAULT_SWAP_FIRST_STEP]
+      totalFee: [MOCK_STEP_FEE],
+      steps: [DEFAULT_FIRST_STEP]
     };
     result.totalFee.push({
       feeComponent: [],

package/services/swap-service/utils.d.ts

@@ -1,6 +1,6 @@
 import { Asset, Chain } from '@chainflip/sdk/swap';
 import { _ChainAsset } from '@subwallet/chain-list/types';
-import { SwapFeeInfo, SwapPair, SwapStepDetail } from '@subwallet/extension-base/types/swap';
+import { SwapPair } from '@subwallet/extension-base/types/swap';
 export declare const CHAIN_FLIP_TESTNET_EXPLORER = "https://blocks-perseverance.chainflip.io";
 export declare const CHAIN_FLIP_MAINNET_EXPLORER = "https://scan.chainflip.io";
 export declare const CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING: Record<string, Chain>;
@@ -8,8 +8,6 @@ export declare const CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING: Record<string, Chain>
 export declare const CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING: Record<string, Asset>;
 export declare const CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING: Record<string, Asset>;
 export declare const SWAP_QUOTE_TIMEOUT_MAP: Record<string, number>;
-export declare const DEFAULT_SWAP_FIRST_STEP: SwapStepDetail;
-export declare const MOCK_SWAP_FEE: SwapFeeInfo;
 export declare const _PROVIDER_TO_SUPPORTED_PAIR_MAP: Record<string, string[]>;
 export declare function getSwapAlternativeAsset(swapPair: SwapPair): string | undefined;
 export declare function getSwapAltToken(chainAsset: _ChainAsset): string | undefined;

package/services/swap-service/utils.js

@@ -4,7 +4,7 @@
 import { Assets, Chains } from '@chainflip/sdk/swap';
 import { COMMON_ASSETS, COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { _getAssetDecimals } from '@subwallet/extension-base/services/chain-service/utils';
-import { SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
+import { SwapProviderId } from '@subwallet/extension-base/types/swap';
 import BigN from 'bignumber.js';
 export const CHAIN_FLIP_TESTNET_EXPLORER = 'https://blocks-perseverance.chainflip.io';
 export const CHAIN_FLIP_MAINNET_EXPLORER = 'https://scan.chainflip.io';
@@ -32,16 +32,6 @@ export const SWAP_QUOTE_TIMEOUT_MAP = {
   [SwapProviderId.CHAIN_FLIP_TESTNET]: 30000,
   [SwapProviderId.CHAIN_FLIP_MAINNET]: 30000
 };
-export const DEFAULT_SWAP_FIRST_STEP = {
-  id: 0,
-  name: 'Fill information',
-  type: SwapStepType.DEFAULT
-};
-export const MOCK_SWAP_FEE = {
-  feeComponent: [],
-  defaultFeeToken: '',
-  feeOptions: []
-};
 export const _PROVIDER_TO_SUPPORTED_PAIR_MAP = {
   [SwapProviderId.HYDRADX_MAINNET]: [COMMON_CHAIN_SLUGS.HYDRADX],
   [SwapProviderId.HYDRADX_TESTNET]: [COMMON_CHAIN_SLUGS.HYDRADX_TESTNET],

package/services/transaction-service/index.js

@@ -539,10 +539,10 @@ export default class TransactionService {
           }
           break;
         }
-      case ExtrinsicType.TOKEN_APPROVE:
+      case ExtrinsicType.TOKEN_SPENDING_APPROVAL:
         {
           const data = parseTransactionData(transaction.data);
-          const inputAsset = this.state.chainService.getAssetBySlug(data.inputTokenSlug);
+          const inputAsset = this.state.chainService.getAssetBySlug(data.contractAddress);
           historyItem.amount = {
             value: '0',
             symbol: _getAssetSymbol(inputAsset),

package/types/service-base.d.ts

@@ -1,10 +1,38 @@
-import { OptimalSwapPath, OptimalSwapPathParams, SwapStepType } from '@subwallet/extension-base/types/swap';
+import { OptimalSwapPathParams, SwapFeeType, SwapStepType } from '@subwallet/extension-base/types/swap';
 import { OptimalYieldPath, OptimalYieldPathParams, YieldStepType } from '@subwallet/extension-base/types/yield';
 export declare type OptimalProcessParams = OptimalYieldPathParams | OptimalSwapPathParams;
-export declare type OptimalProcessResult = OptimalYieldPath | OptimalSwapPath;
-export declare type BaseStepType = SwapStepType | YieldStepType;
+export declare type OptimalProcessResult = OptimalYieldPath | CommonOptimalPath;
+export declare enum CommonStepType {
+    DEFAULT = "DEFAULT",
+    XCM = "XCM",
+    TOKEN_APPROVAL = "TOKEN_APPROVAL",
+    SET_FEE_TOKEN = "SET_FEE_TOKEN",
+    TRANSFER = "TRANSFER"
+}
+export declare type BaseStepType = CommonStepType | SwapStepType | YieldStepType;
+export declare type BaseFeeType = SwapFeeType;
 export interface BaseStepDetail {
     type: BaseStepType;
     name: string;
     metadata?: Record<string, unknown>;
 }
+export interface CommonFeeComponent {
+    feeType: BaseFeeType;
+    amount: string;
+    tokenSlug: string;
+}
+export interface CommonStepFeeInfo {
+    feeComponent: CommonFeeComponent[];
+    defaultFeeToken: string;
+    feeOptions: string[];
+    selectedFeeToken?: string;
+}
+export interface CommonStepDetail extends BaseStepDetail {
+    id: number;
+}
+export interface CommonOptimalPath {
+    totalFee: CommonStepFeeInfo[];
+    steps: CommonStepDetail[];
+}
+export declare const DEFAULT_FIRST_STEP: CommonStepDetail;
+export declare const MOCK_STEP_FEE: CommonStepFeeInfo;

package/types/service-base.js

@@ -1 +1,23 @@
-export {};
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+/* ServiceWithProcess */
+
+export let CommonStepType;
+(function (CommonStepType) {
+  CommonStepType["DEFAULT"] = "DEFAULT";
+  CommonStepType["XCM"] = "XCM";
+  CommonStepType["TOKEN_APPROVAL"] = "TOKEN_APPROVAL";
+  CommonStepType["SET_FEE_TOKEN"] = "SET_FEE_TOKEN";
+  CommonStepType["TRANSFER"] = "TRANSFER";
+})(CommonStepType || (CommonStepType = {}));
+export const DEFAULT_FIRST_STEP = {
+  id: 0,
+  name: 'Fill information',
+  type: CommonStepType.DEFAULT
+};
+export const MOCK_STEP_FEE = {
+  feeComponent: [],
+  defaultFeeToken: '',
+  feeOptions: []
+};

package/types/swap/index.d.ts

@@ -2,7 +2,7 @@ import { _ChainInfo } from '@subwallet/chain-list/types';
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
 import { AmountData, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { TransactionData } from '@subwallet/extension-base/types';
-import { BaseStepDetail } from '@subwallet/extension-base/types/service-base';
+import { BaseStepDetail, CommonOptimalPath, CommonStepFeeInfo } from '@subwallet/extension-base/types/service-base';
 import BigN from 'bignumber.js';
 export declare type SwapRate = number;
 export interface SwapPair {
@@ -24,7 +24,7 @@ export interface SwapQuote {
     estimatedArrivalTime?: number;
     isLowLiquidity?: boolean;
     metadata?: any;
-    feeInfo: SwapFeeInfo;
+    feeInfo: CommonStepFeeInfo;
 }
 export interface SwapRoute {
     path: string[];
@@ -42,11 +42,7 @@ export declare enum SwapErrorType {
     AMOUNT_CANNOT_BE_ZERO = "AMOUNT_CANNOT_BE_ZERO"
 }
 export declare enum SwapStepType {
-    DEFAULT = "DEFAULT",
-    TOKEN_APPROVAL = "TOKEN_APPROVAL",
-    SET_FEE_TOKEN = "SET_FEE_TOKEN",
-    SWAP = "SWAP",
-    XCM = "XCM"
+    SWAP = "SWAP"
 }
 export declare enum SwapProviderId {
     CHAIN_FLIP_TESTNET = "CHAIN_FLIP_TESTNET",
@@ -65,24 +61,6 @@ export declare enum SwapFeeType {
     NETWORK_FEE = "NETWORK_FEE",
     WALLET_FEE = "WALLET_FEE"
 }
-export interface SwapFeeComponent {
-    feeType: SwapFeeType;
-    amount: string;
-    tokenSlug: string;
-}
-export interface SwapFeeInfo {
-    feeComponent: SwapFeeComponent[];
-    defaultFeeToken: string;
-    feeOptions: string[];
-    selectedFeeToken?: string;
-}
-export interface SwapStepDetail extends BaseStepDetail {
-    id: number;
-}
-export interface OptimalSwapPath {
-    totalFee: SwapFeeInfo[];
-    steps: SwapStepDetail[];
-}
 export declare type SwapTxData = ChainflipSwapTxData | HydradxSwapTxData;
 export interface SwapBaseTxData {
     provider: SwapProvider;
@@ -90,7 +68,7 @@ export interface SwapBaseTxData {
     address: string;
     slippage: number;
     recipient?: string;
-    process: OptimalSwapPath;
+    process: CommonOptimalPath;
 }
 export interface ChainflipSwapTxData extends SwapBaseTxData {
     depositChannelId: string;
@@ -100,7 +78,7 @@ export interface ChainflipSwapTxData extends SwapBaseTxData {
 export interface HydradxSwapTxData extends SwapBaseTxData {
     txHex: string;
 }
-export declare type GenSwapStepFunc = (params: OptimalSwapPathParams) => Promise<[BaseStepDetail, SwapFeeInfo] | undefined>;
+export declare type GenSwapStepFunc = (params: OptimalSwapPathParams) => Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
 export interface ChainflipPreValidationMetadata {
     minSwap: AmountData;
     maxSwap?: AmountData;
@@ -123,7 +101,7 @@ export interface SwapRequest {
     feeToken?: string;
 }
 export interface SwapRequestResult {
-    process: OptimalSwapPath;
+    process: CommonOptimalPath;
     quote: SwapQuoteResponse;
 }
 export interface SwapQuoteResponse {
@@ -133,7 +111,7 @@ export interface SwapQuoteResponse {
     error?: SwapError;
 }
 export interface SwapSubmitParams {
-    process: OptimalSwapPath;
+    process: CommonOptimalPath;
     currentStep: number;
     quote: SwapQuote;
     address: string;
@@ -158,7 +136,7 @@ export interface SwapEarlyValidation {
 }
 export interface ValidateSwapProcessParams {
     address: string;
-    process: OptimalSwapPath;
+    process: CommonOptimalPath;
     selectedQuote: SwapQuote;
     recipient?: string;
 }

package/types/swap/index.js

@@ -18,11 +18,7 @@ export let SwapErrorType;
 })(SwapErrorType || (SwapErrorType = {}));
 export let SwapStepType;
 (function (SwapStepType) {
-  SwapStepType["DEFAULT"] = "DEFAULT";
-  SwapStepType["TOKEN_APPROVAL"] = "TOKEN_APPROVAL";
-  SwapStepType["SET_FEE_TOKEN"] = "SET_FEE_TOKEN";
   SwapStepType["SWAP"] = "SWAP";
-  SwapStepType["XCM"] = "XCM";
 })(SwapStepType || (SwapStepType = {}));
 export let SwapProviderId;
 (function (SwapProviderId) {

package/types/yield/actions/join/submit.d.ts

@@ -1,4 +1,4 @@
-import { BaseRequestSign, ChainType, ExtrinsicType, InternalRequestSign } from '@subwallet/extension-base/background/KoniTypes';
+import { _Address, BaseRequestSign, ChainType, ExtrinsicType, InternalRequestSign } from '@subwallet/extension-base/background/KoniTypes';
 import { TransactionData } from '../../../transaction';
 import { NominationPoolInfo, ValidatorInfo, YieldPositionInfo } from '../../info';
 import { OptimalYieldPath } from './step';
@@ -34,9 +34,12 @@ export interface HandleYieldStepParams extends BaseRequestSign {
     data: SubmitYieldJoinData;
     currentStep: number;
 }
-export interface TokenApproveData {
-    inputTokenSlug: string;
-    spenderTokenSlug: string;
+export interface TokenSpendingApprovalParams {
+    chain: string;
+    contractAddress: _Address;
+    spenderAddress: _Address;
+    owner: _Address;
+    amount?: string;
 }
 export declare type RequestYieldStepSubmit = InternalRequestSign<HandleYieldStepParams>;
 export interface StakePoolingBondingParams extends BaseRequestSign {

package/utils/eth/parseTransaction/index.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { _ERC20_ABI, _ERC721_ABI } from '@subwallet/extension-base/services/chain-service/helper';
+import { _ERC20_ABI, _ERC721_ABI } from '@subwallet/extension-base/koni/api/contract-handler/utils';
 import { _getEvmAbiExplorer, _getEvmChainId, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { fetchJson } from '@subwallet/extension-base/utils';
 import { createTransactionFromRLP } from '@subwallet/extension-base/utils/eth';

package/cjs/koni/api/tokens/evm/balance.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getEVMBalance = getEVMBalance;
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-
-async function getEVMBalance(networkKey, addresses, web3Api) {
-  return await Promise.all(addresses.map(async address => {
-    try {
-      return await web3Api.api.eth.getBalance(address);
-    } catch (e) {
-      return '0';
-    }
-  }));
-}

package/cjs/koni/api/tokens/evm/web3.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getERC20Contract = void 0;
-var _helper = require("@subwallet/extension-base/services/chain-service/helper");
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-
-const getERC20Contract = function (assetAddress, evmApi) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  // @ts-ignore
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
-  return new evmApi.api.eth.Contract(_helper._ERC20_ABI, assetAddress, options);
-};
-exports.getERC20Contract = getERC20Contract;

package/cjs/koni/api/tokens/index.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isEqualContractAddress = isEqualContractAddress;
-var _utilCrypto = require("@polkadot/util-crypto");
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-
-function isEqualContractAddress(address1, address2) {
-  if ((0, _utilCrypto.isEthereumAddress)(address1) && (0, _utilCrypto.isEthereumAddress)(address2)) {
-    return address1.toLowerCase() === address2.toLowerCase(); // EVM address is case-insensitive
-  }
-
-  return address2 === address1;
-}