fix uiFee

This commit is contained in:
2025-06-09 15:56:32 +07:00
parent 894f518d2c
commit fa5ad081d7
3 changed files with 56 additions and 46 deletions

View File

@@ -14,12 +14,17 @@ import { getOrderInfo, isOrderForPositionByData, isVisibleOrder } from "../../ut
import {createDecreaseOrderTxn} from "./transactions/createDecreaseOrderTxn.js";
import {createIncreaseOrderTxn} from "./transactions/createIncreaseOrderTxn.js";
import { buildGetOrdersMulticall, getExecutionFeeAmountForEntry, matchByMarket, parseGetOrdersResponse } from "./utils.js";
import {
buildGetOrdersMulticall,
getExecutionFeeAmountForEntry,
matchByMarket,
parseGetOrdersResponse
} from "./utils.js";
import {Module} from "../base.js";
import {createSwapOrderTxn} from "./transactions/createSwapOrderTxn.js";
import {createWrapOrUnwrapTxn, WrapOrUnwrapParams} from "./transactions/createWrapOrUnwrapTxn.js";
import {cancelOrdersTxn} from "./transactions/cancelOrdersTxn.js";
import { PositionIncreaseParams, SwapParams, increaseOrderHelper, swap } from "./helpers.js";
import {increaseOrderHelper, PositionIncreaseParams, swap, SwapParams} from "./helpers.js";
export class Orders extends Module {
async getOrders({
@@ -237,6 +242,7 @@ export class Orders extends Module {
indexToken: marketInfo.indexToken,
tokensData,
skipSimulation: skipSimulation || isLimit,
uiFeeReceiver: this.sdk.config.settings?.uiFeeReceiverAccount,
},
createDecreaseOrderParams: createSltpEntries?.map((entry, i) => {
return {
@@ -255,6 +261,7 @@ export class Orders extends Module {
txnType: entry.txnType!,
skipSimulation: isLimit,
autoCancel: i < autoCancelOrdersLimit,
uiFeeReceiver: this.sdk.config.settings?.uiFeeReceiverAccount,
};
}),
cancelOrderParams: cancelSltpEntries?.map((entry) => ({
@@ -265,6 +272,7 @@ export class Orders extends Module {
sizeDeltaUsd: entry.order!.sizeDeltaUsd,
txnType: entry.txnType!,
initialCollateralDeltaAmount: entry.order?.initialCollateralDeltaAmount ?? 0n,
uiFeeReceiver: this.sdk.config.settings?.uiFeeReceiverAccount,
})),
updateOrderParams: updateSltpEntries?.map((entry) => ({
...commonSecondaryOrderParams,
@@ -278,6 +286,7 @@ export class Orders extends Module {
txnType: entry.txnType!,
initialCollateralDeltaAmount: entry.order?.initialCollateralDeltaAmount ?? 0n,
autoCancel: entry.order!.autoCancel,
uiFeeReceiver: this.sdk.config.settings?.uiFeeReceiverAccount,
})),
});
}

View File

@@ -114,7 +114,7 @@ export function createDecreaseEncodedPayload({
callbackContract: zeroAddress,
market: p.marketAddress,
swapPath: p.swapPath,
uiFeeReceiver: zeroAddress,
uiFeeReceiver: sdk.config.settings?.uiFeeReceiverAccount,
},
numbers: {
sizeDeltaUsd: p.sizeDeltaUsd,

View File

@@ -39,6 +39,7 @@ type IncreaseOrderParams = {
referralCode: string | undefined;
indexToken: TokenData;
tokensData: TokensData;
uiFeeReceiver: string;
};
type SecondaryOrderCommonParams = {
@@ -244,7 +245,7 @@ function createOrderParams({
callbackContract: zeroAddress,
market: p.marketAddress,
swapPath: p.swapPath,
uiFeeReceiver: zeroAddress,
uiFeeReceiver: p.uiFeeReceiver,
},
numbers: {
sizeDeltaUsd: p.sizeDeltaUsd,