fix uiFee
This commit is contained in:
@@ -14,12 +14,17 @@ import { getOrderInfo, isOrderForPositionByData, isVisibleOrder } from "../../ut
|
|||||||
|
|
||||||
import {createDecreaseOrderTxn} from "./transactions/createDecreaseOrderTxn.js";
|
import {createDecreaseOrderTxn} from "./transactions/createDecreaseOrderTxn.js";
|
||||||
import {createIncreaseOrderTxn} from "./transactions/createIncreaseOrderTxn.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 {Module} from "../base.js";
|
||||||
import {createSwapOrderTxn} from "./transactions/createSwapOrderTxn.js";
|
import {createSwapOrderTxn} from "./transactions/createSwapOrderTxn.js";
|
||||||
import {createWrapOrUnwrapTxn, WrapOrUnwrapParams} from "./transactions/createWrapOrUnwrapTxn.js";
|
import {createWrapOrUnwrapTxn, WrapOrUnwrapParams} from "./transactions/createWrapOrUnwrapTxn.js";
|
||||||
import {cancelOrdersTxn} from "./transactions/cancelOrdersTxn.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 {
|
export class Orders extends Module {
|
||||||
async getOrders({
|
async getOrders({
|
||||||
@@ -237,6 +242,7 @@ export class Orders extends Module {
|
|||||||
indexToken: marketInfo.indexToken,
|
indexToken: marketInfo.indexToken,
|
||||||
tokensData,
|
tokensData,
|
||||||
skipSimulation: skipSimulation || isLimit,
|
skipSimulation: skipSimulation || isLimit,
|
||||||
|
uiFeeReceiver: this.sdk.config.settings?.uiFeeReceiverAccount,
|
||||||
},
|
},
|
||||||
createDecreaseOrderParams: createSltpEntries?.map((entry, i) => {
|
createDecreaseOrderParams: createSltpEntries?.map((entry, i) => {
|
||||||
return {
|
return {
|
||||||
@@ -255,6 +261,7 @@ export class Orders extends Module {
|
|||||||
txnType: entry.txnType!,
|
txnType: entry.txnType!,
|
||||||
skipSimulation: isLimit,
|
skipSimulation: isLimit,
|
||||||
autoCancel: i < autoCancelOrdersLimit,
|
autoCancel: i < autoCancelOrdersLimit,
|
||||||
|
uiFeeReceiver: this.sdk.config.settings?.uiFeeReceiverAccount,
|
||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
cancelOrderParams: cancelSltpEntries?.map((entry) => ({
|
cancelOrderParams: cancelSltpEntries?.map((entry) => ({
|
||||||
@@ -265,6 +272,7 @@ export class Orders extends Module {
|
|||||||
sizeDeltaUsd: entry.order!.sizeDeltaUsd,
|
sizeDeltaUsd: entry.order!.sizeDeltaUsd,
|
||||||
txnType: entry.txnType!,
|
txnType: entry.txnType!,
|
||||||
initialCollateralDeltaAmount: entry.order?.initialCollateralDeltaAmount ?? 0n,
|
initialCollateralDeltaAmount: entry.order?.initialCollateralDeltaAmount ?? 0n,
|
||||||
|
uiFeeReceiver: this.sdk.config.settings?.uiFeeReceiverAccount,
|
||||||
})),
|
})),
|
||||||
updateOrderParams: updateSltpEntries?.map((entry) => ({
|
updateOrderParams: updateSltpEntries?.map((entry) => ({
|
||||||
...commonSecondaryOrderParams,
|
...commonSecondaryOrderParams,
|
||||||
@@ -278,6 +286,7 @@ export class Orders extends Module {
|
|||||||
txnType: entry.txnType!,
|
txnType: entry.txnType!,
|
||||||
initialCollateralDeltaAmount: entry.order?.initialCollateralDeltaAmount ?? 0n,
|
initialCollateralDeltaAmount: entry.order?.initialCollateralDeltaAmount ?? 0n,
|
||||||
autoCancel: entry.order!.autoCancel,
|
autoCancel: entry.order!.autoCancel,
|
||||||
|
uiFeeReceiver: this.sdk.config.settings?.uiFeeReceiverAccount,
|
||||||
})),
|
})),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ export function createDecreaseEncodedPayload({
|
|||||||
callbackContract: zeroAddress,
|
callbackContract: zeroAddress,
|
||||||
market: p.marketAddress,
|
market: p.marketAddress,
|
||||||
swapPath: p.swapPath,
|
swapPath: p.swapPath,
|
||||||
uiFeeReceiver: zeroAddress,
|
uiFeeReceiver: sdk.config.settings?.uiFeeReceiverAccount,
|
||||||
},
|
},
|
||||||
numbers: {
|
numbers: {
|
||||||
sizeDeltaUsd: p.sizeDeltaUsd,
|
sizeDeltaUsd: p.sizeDeltaUsd,
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ type IncreaseOrderParams = {
|
|||||||
referralCode: string | undefined;
|
referralCode: string | undefined;
|
||||||
indexToken: TokenData;
|
indexToken: TokenData;
|
||||||
tokensData: TokensData;
|
tokensData: TokensData;
|
||||||
|
uiFeeReceiver: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
type SecondaryOrderCommonParams = {
|
type SecondaryOrderCommonParams = {
|
||||||
@@ -244,7 +245,7 @@ function createOrderParams({
|
|||||||
callbackContract: zeroAddress,
|
callbackContract: zeroAddress,
|
||||||
market: p.marketAddress,
|
market: p.marketAddress,
|
||||||
swapPath: p.swapPath,
|
swapPath: p.swapPath,
|
||||||
uiFeeReceiver: zeroAddress,
|
uiFeeReceiver: p.uiFeeReceiver,
|
||||||
},
|
},
|
||||||
numbers: {
|
numbers: {
|
||||||
sizeDeltaUsd: p.sizeDeltaUsd,
|
sizeDeltaUsd: p.sizeDeltaUsd,
|
||||||
|
|||||||
Reference in New Issue
Block a user