Skip to content

Commit 8996e05

Browse files
nampc1lw-cdm
nampc1
authored and
lw-cdm
committed
[Issue 3784] fix: eslint
1 parent a52962f commit 8996e05

File tree

2 files changed

+87
-89
lines changed

2 files changed

+87
-89
lines changed

‎packages/extension-base/src/services/storage-service/DatabaseService.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -784,10 +784,6 @@ export default class DatabaseService {
784784
return JSON.parse(await this.exportDB()) as DexieExportJsonStructure;
785785
}
786786

787-
public hasRunScript (key: string): Promise<boolean> {
788-
return this.stores.migration.hasRunScript(key);
789-
}
790-
791787
public upsertProcessTransaction (processTransaction: ProcessTransactionData) {
792788
return this.stores.processTransactions.upsert(processTransaction);
793789
}

‎packages/extension-base/src/services/swap-service/handler/hydradx-handler.ts

Lines changed: 87 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
77
import { ChainType, ExtrinsicType, RequestChangeFeeToken } from '@subwallet/extension-base/background/KoniTypes';
88
import { BalanceService } from '@subwallet/extension-base/services/balance-service';
99
import { ChainService } from '@subwallet/extension-base/services/chain-service';
10-
import { _getTokenOnChainAssetId, _isNativeToken, _isNativeTokenBySlug } from '@subwallet/extension-base/services/chain-service/utils';
10+
import { _getTokenOnChainAssetId, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
1111
import FeeService from '@subwallet/extension-base/services/fee-service/service';
1212
import { SwapBaseHandler, SwapBaseInterface } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
1313
import { DEFAULT_EXCESS_AMOUNT_WEIGHT } from '@subwallet/extension-base/services/swap-service/utils';
14-
import { BasicTxErrorType, DynamicSwapType, GenSwapStepFuncV2, HydrationSwapStepMetadata, OptimalSwapPathParamsV2, RuntimeDispatchInfo, ValidateSwapProcessParams } from '@subwallet/extension-base/types';
14+
import { BasicTxErrorType, DynamicSwapType, GenSwapStepFuncV2, HydrationSwapStepMetadata, OptimalSwapPathParamsV2, ValidateSwapProcessParams } from '@subwallet/extension-base/types';
1515
import { BaseStepDetail, CommonOptimalSwapPath, CommonStepFeeInfo, CommonStepType } from '@subwallet/extension-base/types/service-base';
16-
import { HydradxSwapTxData, SwapErrorType, SwapFeeType, SwapProviderId, SwapStepType, SwapSubmitParams, SwapSubmitStepData } from '@subwallet/extension-base/types/swap';
16+
import { HydradxSwapTxData, SwapErrorType, SwapProviderId, SwapStepType, SwapSubmitParams, SwapSubmitStepData } from '@subwallet/extension-base/types/swap';
1717
import { _reformatAddressWithChain } from '@subwallet/extension-base/utils';
1818
import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
1919
import { SwapQuote } from '@subwallet/subwallet-api-sdk/modules/swapApi';
@@ -96,88 +96,90 @@ export class HydradxHandler implements SwapBaseInterface {
9696
return undefined;
9797
}
9898

99-
const feeStep: BaseStepDetail = {
100-
name: 'Set fee token',
101-
type: CommonStepType.SET_FEE_TOKEN
102-
};
103-
104-
try {
105-
const customFeeTokenSlug = params.request.feeToken;
106-
107-
const substrateApi = this.chainService.getSubstrateApi(this.chain());
108-
const chainApi = await substrateApi.isReady;
109-
110-
const _currentFeeAssetId = await chainApi.api.query.multiTransactionPayment.accountCurrencyMap(params.request.address);
111-
const currentFeeAssetId = _currentFeeAssetId?.toString();
112-
113-
const nativeTokenInfo = this.chainService.getNativeTokenInfo(this.chain());
114-
const nativeTokenAssetId = _getTokenOnChainAssetId(nativeTokenInfo);
115-
116-
const userRequestChangeFeeToken = !!customFeeTokenSlug && !_isNativeTokenBySlug(customFeeTokenSlug);
117-
118-
if (!userRequestChangeFeeToken) {
119-
const isCurrentFeeTokenNative = !currentFeeAssetId || nativeTokenAssetId === currentFeeAssetId;
120-
121-
if (!isCurrentFeeTokenNative) {
122-
const setFeeTx = chainApi.api.tx.multiTransactionPayment.setCurrency(nativeTokenAssetId);
123-
const _txFee = await setFeeTx.paymentInfo(params.request.address);
124-
const txFee = _txFee.toPrimitive() as unknown as RuntimeDispatchInfo;
125-
126-
const fee: CommonStepFeeInfo = {
127-
feeComponent: [{
128-
feeType: SwapFeeType.NETWORK_FEE,
129-
amount: new BigNumber(txFee.partialFee).toString(),
130-
tokenSlug: nativeTokenInfo.slug
131-
}],
132-
selectedFeeToken: nativeTokenInfo.slug,
133-
defaultFeeToken: nativeTokenInfo.slug,
134-
feeOptions: [nativeTokenInfo.slug]
135-
};
136-
137-
return [
138-
feeStep,
139-
fee
140-
];
141-
}
142-
} else {
143-
const selectedFeeTokenInfo = this.chainService.getAssetBySlug(customFeeTokenSlug);
144-
const selectedFeeAssetId = _getTokenOnChainAssetId(selectedFeeTokenInfo);
145-
const isCurrentFeeTokenSameAsRequest = currentFeeAssetId && selectedFeeAssetId === currentFeeAssetId;
146-
147-
if (!isCurrentFeeTokenSameAsRequest) {
148-
const setFeeTx = chainApi.api.tx.multiTransactionPayment.setCurrency(selectedFeeAssetId);
149-
const _txFee = await setFeeTx.paymentInfo(params.request.address);
150-
const txFee = _txFee.toPrimitive() as unknown as RuntimeDispatchInfo;
151-
const spotPrice = await this.tradeRouter?.getBestSpotPrice(selectedFeeAssetId, nativeTokenAssetId);
152-
153-
if (!spotPrice) {
154-
return; // todo: should handle this better, can potentially cause failed transaction in the following steps
155-
}
156-
157-
const convertedFeeAmount = new BigNumber(txFee.partialFee).dividedBy(spotPrice.amount);
158-
159-
const fee: CommonStepFeeInfo = {
160-
feeComponent: [{
161-
feeType: SwapFeeType.NETWORK_FEE,
162-
amount: convertedFeeAmount.shiftedBy(_getAssetDecimals(selectedFeeTokenInfo)).toFixed(0),
163-
tokenSlug: selectedFeeTokenInfo.slug
164-
}],
165-
selectedFeeToken: selectedFeeTokenInfo.slug,
166-
defaultFeeToken: selectedFeeTokenInfo.slug,
167-
feeOptions: [selectedFeeTokenInfo.slug]
168-
};
169-
170-
return [
171-
feeStep,
172-
fee
173-
];
174-
}
175-
}
176-
177-
return undefined;
178-
} catch (e) {
179-
return undefined;
180-
}
99+
// const feeStep: BaseStepDetail = {
100+
// name: 'Set fee token',
101+
// type: CommonStepType.SET_FEE_TOKEN
102+
// };
103+
104+
// try {
105+
// const customFeeTokenSlug = params.request.feeToken;
106+
//
107+
// const substrateApi = this.chainService.getSubstrateApi(this.chain());
108+
// const chainApi = await substrateApi.isReady;
109+
//
110+
// const _currentFeeAssetId = await chainApi.api.query.multiTransactionPayment.accountCurrencyMap(params.request.address);
111+
// const currentFeeAssetId = _currentFeeAssetId?.toString();
112+
//
113+
// const nativeTokenInfo = this.chainService.getNativeTokenInfo(this.chain());
114+
// const nativeTokenAssetId = _getTokenOnChainAssetId(nativeTokenInfo);
115+
//
116+
// const userRequestChangeFeeToken = !!customFeeTokenSlug && !_isNativeTokenBySlug(customFeeTokenSlug);
117+
//
118+
// if (!userRequestChangeFeeToken) {
119+
// const isCurrentFeeTokenNative = !currentFeeAssetId || nativeTokenAssetId === currentFeeAssetId;
120+
//
121+
// if (!isCurrentFeeTokenNative) {
122+
// const setFeeTx = chainApi.api.tx.multiTransactionPayment.setCurrency(nativeTokenAssetId);
123+
// const _txFee = await setFeeTx.paymentInfo(params.request.address);
124+
// const txFee = _txFee.toPrimitive() as unknown as RuntimeDispatchInfo;
125+
//
126+
// const fee: CommonStepFeeInfo = {
127+
// feeComponent: [{
128+
// feeType: SwapFeeType.NETWORK_FEE,
129+
// amount: new BigN(txFee.partialFee).toString(),
130+
// tokenSlug: nativeTokenInfo.slug
131+
// }],
132+
// selectedFeeToken: nativeTokenInfo.slug,
133+
// defaultFeeToken: nativeTokenInfo.slug,
134+
// feeOptions: [nativeTokenInfo.slug]
135+
// };
136+
//
137+
// return [
138+
// feeStep,
139+
// fee
140+
// ];
141+
// }
142+
// } else {
143+
// const selectedFeeTokenInfo = this.chainService.getAssetBySlug(customFeeTokenSlug);
144+
// const selectedFeeAssetId = _getTokenOnChainAssetId(selectedFeeTokenInfo);
145+
// const isCurrentFeeTokenSameAsRequest = currentFeeAssetId && selectedFeeAssetId === currentFeeAssetId;
146+
//
147+
// if (!isCurrentFeeTokenSameAsRequest) {
148+
// const setFeeTx = chainApi.api.tx.multiTransactionPayment.setCurrency(selectedFeeAssetId);
149+
// const _txFee = await setFeeTx.paymentInfo(params.request.address);
150+
// const txFee = _txFee.toPrimitive() as unknown as RuntimeDispatchInfo;
151+
// const spotPrice = await this.tradeRouter?.getBestSpotPrice(selectedFeeAssetId, nativeTokenAssetId);
152+
//
153+
// if (!spotPrice) {
154+
// return; // todo: should handle this better, can potentially cause failed transaction in the following steps
155+
// }
156+
//
157+
// const convertedFeeAmount = new BigN(txFee.partialFee).dividedBy(spotPrice.amount);
158+
//
159+
// const fee: CommonStepFeeInfo = {
160+
// feeComponent: [{
161+
// feeType: SwapFeeType.NETWORK_FEE,
162+
// amount: convertedFeeAmount.shiftedBy(_getAssetDecimals(selectedFeeTokenInfo)).toFixed(0),
163+
// tokenSlug: selectedFeeTokenInfo.slug
164+
// }],
165+
// selectedFeeToken: selectedFeeTokenInfo.slug,
166+
// defaultFeeToken: selectedFeeTokenInfo.slug,
167+
// feeOptions: [selectedFeeTokenInfo.slug]
168+
// };
169+
//
170+
// return [
171+
// feeStep,
172+
// fee
173+
// ];
174+
// }
175+
// }
176+
//
177+
// return undefined;
178+
// } catch (e) {
179+
// return undefined;
180+
// }
181+
182+
return undefined;
181183
}
182184

183185
async getSubmitStep (params: OptimalSwapPathParamsV2, stepIndex: number): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined> {

0 commit comments

Comments
 (0)