@subwallet/extension-base 1.3.29-0 → 1.3.30-0

package/types/swap/index.d.ts

@@ -1,7 +1,6 @@
 import { _ChainAsset, _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 { DynamicSwapAction } from '@subwallet/extension-base/services/swap-service/interface';
 import { BaseStepDetail, BaseStepType, CommonOptimalSwapPath, CommonStepFeeInfo } from '@subwallet/extension-base/types/service-base';
 import BigN from 'bignumber.js';
 import { BaseProcessRequestSign, TransactionData } from '../transaction';
@@ -96,8 +95,7 @@ export interface SimpleSwapTxData extends SwapBaseTxData {
 export interface HydradxSwapTxData extends SwapBaseTxData {
     txHex: string;
 }
-export declare type GenSwapStepFunc = (params: OptimalSwapPathParams) => Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
-export declare type GenSwapStepFuncV2 = (params: OptimalSwapPathParamsV2) => Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
+export declare type GenSwapStepFuncV2 = (params: OptimalSwapPathParamsV2, stepIndex: number) => Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
 export interface ChainflipPreValidationMetadata {
     minSwap: AmountData;
     maxSwap?: AmountData;
@@ -131,6 +129,15 @@ export interface SwapRequest {
     feeToken?: string;
     currentQuote?: SwapProvider;
 }
+export interface SwapRequestV2 {
+    address: string;
+    pair: SwapPair;
+    fromAmount: string;
+    slippage: number;
+    recipient?: string;
+    feeToken?: string;
+    preferredProvider?: SwapProviderId;
+}
 export interface SwapRequestResult {
     process: CommonOptimalSwapPath;
     quote: SwapQuoteResponse;
@@ -159,9 +166,17 @@ export interface SwapSubmitStepData {
     chainType: ChainType;
     isPermit?: boolean;
 }
-export interface OptimalSwapPathParams {
-    request: SwapRequest;
-    selectedQuote?: SwapQuote;
+export declare enum DynamicSwapType {
+    SWAP = "SWAP",
+    BRIDGE = "BRIDGE"
+}
+export interface DynamicSwapAction {
+    action: DynamicSwapType;
+    pair: ActionPair;
+}
+export declare const enum BridgeStepPosition {
+    FIRST = 0,
+    AFTER_SWAP = 1
 }
 export interface OptimalSwapPathParamsV2 {
     request: SwapRequest;
@@ -194,11 +209,12 @@ export declare const CHAINFLIP_SLIPPAGE = 0.02;
 export declare const SIMPLE_SWAP_SLIPPAGE = 0.05;
 export interface BaseSwapStepMetadata {
     sendingValue: string;
+    expectedReceive: string;
     originTokenInfo: _ChainAsset;
     destinationTokenInfo: _ChainAsset;
-}
-export interface BriefXCMStep extends BaseSwapStepMetadata {
-    expectedReceive?: string;
+    sender: string;
+    receiver: string;
+    version: number;
 }
 export interface HydrationSwapStepMetadata extends BaseSwapStepMetadata {
     txHex: `0x${string}`;

package/types/swap/index.js

@@ -49,5 +49,15 @@ export let SwapFeeType;
   SwapFeeType["NETWORK_FEE"] = "NETWORK_FEE";
   SwapFeeType["WALLET_FEE"] = "WALLET_FEE";
 })(SwapFeeType || (SwapFeeType = {}));
+export let DynamicSwapType;
+(function (DynamicSwapType) {
+  DynamicSwapType["SWAP"] = "SWAP";
+  DynamicSwapType["BRIDGE"] = "BRIDGE";
+})(DynamicSwapType || (DynamicSwapType = {}));
+export let BridgeStepPosition;
+(function (BridgeStepPosition) {
+  BridgeStepPosition[BridgeStepPosition["FIRST"] = 0] = "FIRST";
+  BridgeStepPosition[BridgeStepPosition["AFTER_SWAP"] = 1] = "AFTER_SWAP";
+})(BridgeStepPosition || (BridgeStepPosition = {}));
 export const CHAINFLIP_SLIPPAGE = 0.02; // Example: 0.01 for 1%
 export const SIMPLE_SWAP_SLIPPAGE = 0.05;

package/types/transaction/process.d.ts

@@ -1,3 +1,4 @@
+import { _ChainAsset } from '@subwallet/chain-list/types';
 import { TransactionEventResponse } from '@subwallet/extension-base/services/transaction-service/types';
 import { CommonStepDetail, CommonStepFeeInfo } from '../service-base';
 import { SwapPair, SwapProvider, SwapRate, SwapRoute, SwapSubmitParams } from '../swap';
@@ -51,6 +52,24 @@ export interface BriefProcessStep {
     processId: string;
     stepId: number;
 }
+export interface BriefXcmStep {
+    sendingValue: string;
+    originTokenInfo: _ChainAsset;
+    destinationTokenInfo: _ChainAsset;
+}
+export interface BriefXcmStepV2 {
+    sendingValue: string;
+    originTokenInfo: _ChainAsset;
+    destinationValue: string;
+    destinationTokenInfo: _ChainAsset;
+}
+export interface BriefSwapStepV2 {
+    sendingValue: string;
+    originTokenInfo: _ChainAsset;
+    destinationValue: string;
+    destinationTokenInfo: _ChainAsset;
+}
+export declare type BriefStepV2 = BriefXcmStepV2 | BriefSwapStepV2;
 export interface BriefSwapStep {
     pair: SwapPair;
     fromAmount: string;

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

@@ -20,7 +20,10 @@ export interface SubmitJoinNativeStaking extends AbstractSubmitYieldJoinData {
         mindBond: string;
     };
     selectedValidators: ValidatorInfo[];
-    netuid?: number;
+    subnetData: {
+        netuid: number;
+        slippage: number;
+    };
 }
 export interface SubmitJoinNominationPool extends AbstractSubmitYieldJoinData {
     selectedPool: NominationPoolInfo;

package/types/yield/actions/others.d.ts

@@ -24,6 +24,8 @@ export interface YieldLeaveParams extends BaseRequestSign {
     fastLeave: boolean;
     /** Pool's info - use for create history */
     poolInfo: YieldPoolInfo;
+    /** Slippage (subnet staking) */
+    slippage?: number;
 }
 export declare type RequestYieldLeave = InternalRequestSign<YieldLeaveParams>;
 /**

package/utils/swap.d.ts

@@ -1,3 +1,6 @@
 import { NumberFormatter } from '@subwallet/extension-base/utils/number';
+export declare const swapNumberMetadata: {
+    minNumberFormat: number;
+};
 export declare const swapCustomFormatter: NumberFormatter;
 export declare const formatNumberString: (numberString: string) => string;

package/utils/swap.js

@@ -19,6 +19,9 @@ const NUM_1B = new BigNumber(1e9);
 const BLIM = new BigNumber(1e14);
 const NUM_1M = new BigNumber(1e6);
 const NUM_100M = new BigNumber(1e8);
+export const swapNumberMetadata = {
+  minNumberFormat: 4
+};
 export const swapCustomFormatter = (input, metadata) => {
   const minNumberFormat = 2;
   const maxNumberFormat = (metadata === null || metadata === void 0 ? void 0 : metadata.maxNumberFormat) || 6;

package/cjs/services/swap-service/interface.js

@@ -1,14 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.DynamicSwapType = void 0;
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-let DynamicSwapType;
-exports.DynamicSwapType = DynamicSwapType;
-(function (DynamicSwapType) {
-  DynamicSwapType["SWAP"] = "SWAP";
-  DynamicSwapType["BRIDGE"] = "BRIDGE";
-})(DynamicSwapType || (exports.DynamicSwapType = DynamicSwapType = {}));

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

@@ -1,9 +0,0 @@
-import { ActionPair } from '@subwallet/extension-base/types';
-export declare enum DynamicSwapType {
-    SWAP = "SWAP",
-    BRIDGE = "BRIDGE"
-}
-export interface DynamicSwapAction {
-    action: DynamicSwapType;
-    pair: ActionPair;
-}

package/services/swap-service/interface.js

@@ -1,8 +0,0 @@
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-
-export let DynamicSwapType;
-(function (DynamicSwapType) {
-  DynamicSwapType["SWAP"] = "SWAP";
-  DynamicSwapType["BRIDGE"] = "BRIDGE";
-})(DynamicSwapType || (DynamicSwapType = {}));