Skip to content

refactor(common-ts): add oracle limit order support for swift #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChesterSim merged 1 commit into from
Mar 30, 2026
Merged

refactor(common-ts): add oracle limit order support for swift #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions common-ts/src/drift/Drift/clients/CentralServerDrift/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import {
createSwiftLimitOrderMessage,
} from '../../../base/actions/trade/openPerpOrder/openPerpNonMarketOrder';
import { SwiftOrderMessage } from '../../../base/actions/trade/openPerpOrder/openSwiftOrder';
import { LimitOrderParamsOrderConfig } from '../../../base/actions/trade/openPerpOrder/types';
import { SwiftLimitOrderParamsOrderConfig } from '../../../base/actions/trade/openPerpOrder/types';
import { createEditOrderTxn } from '../../../base/actions/trade/editOrder';
import { createCancelOrdersTxn } from '../../../base/actions/trade/cancelOrder';
import { createSwapTxn } from '../../../base/actions/trade/swap';
Expand Down Expand Up @@ -728,8 +728,13 @@ export class CentralServerDrift {
const { swiftOptions, ...rest } =
genericRest as CentralServerGetOpenPerpNonMarketOrderTxnParams<true>;

if (rest.orderConfig.orderType !== 'limit') {
throw new Error('Only limit orders are supported with Swift');
if (
rest.orderConfig.orderType !== 'limit' &&
rest.orderConfig.orderType !== 'oracleLimit'
) {
throw new Error(
'Only limit and oracle limit orders are supported with Swift'
);
}

return this.driftClientContextWrapper(
Expand All @@ -739,7 +744,7 @@ export class CentralServerDrift {
...rest,
driftClient: this._driftClient,
user,
orderConfig: rest.orderConfig as LimitOrderParamsOrderConfig,
orderConfig: rest.orderConfig as SwiftLimitOrderParamsOrderConfig,
userSigningSlotBuffer: swiftOptions?.userSigningSlotBuffer,
isDelegate: swiftOptions?.isDelegate ?? !!rest.mainSignerOverride,
});
Expand Down
125 changes: 81 additions & 44 deletions common-ts/src/drift/base/actions/trade/openPerpOrder/openPerpNonMarketOrder/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
TxnOrSwiftResult,
LimitAuctionConfig,
LimitOrderParamsOrderConfig,
SwiftLimitOrderParamsOrderConfig,
NonMarketOrderParamsConfig,
IsolatedPositionDepositsOverride,
} from '../types';
Expand Down Expand Up @@ -396,58 +397,89 @@ export const createOpenPerpNonMarketOrderIxs = async (
*/
async function prepSwiftLimitOrderData(
params: OpenPerpNonMarketOrderBaseParams & {
orderConfig: LimitOrderParamsOrderConfig;
orderConfig: SwiftLimitOrderParamsOrderConfig;
}
) {
const { user, marketIndex, orderConfig } = params;

const limitPrice = orderConfig.limitPrice;
let orderParams: OptionalOrderParams;

if (limitPrice.isZero()) {
throw new Error('LIMIT orders require limitPrice');
}
if (orderConfig.orderType === 'limit') {
const limitPrice = orderConfig.limitPrice;

const finalBaseAssetAmount = resolveBaseAssetAmount({
amount: 'amount' in params ? params.amount : undefined,
assetType: 'assetType' in params ? params.assetType : undefined,
baseAssetAmount:
'baseAssetAmount' in params ? params.baseAssetAmount : undefined,
limitPrice,
});
if (limitPrice.isZero()) {
throw new Error('LIMIT orders require limitPrice');
}

const orderParams = orderConfig.limitAuction?.enable
? await getLimitAuctionOrderParams({
...params,
marketType: MarketType.PERP,
baseAssetAmount: finalBaseAssetAmount,
orderConfig: orderConfig as LimitOrderParamsOrderConfig & {
limitAuction: LimitAuctionConfig;
},
})
: buildNonMarketOrderParams({
marketIndex,
marketType: MarketType.PERP,
direction: params.direction,
baseAssetAmount: finalBaseAssetAmount,
orderConfig,
reduceOnly: params.reduceOnly,
postOnly: params.postOnly,
userOrderId: params.userOrderId,
});
const finalBaseAssetAmount = resolveBaseAssetAmount({
amount: 'amount' in params ? params.amount : undefined,
assetType: 'assetType' in params ? params.assetType : undefined,
baseAssetAmount:
'baseAssetAmount' in params ? params.baseAssetAmount : undefined,
limitPrice,
});

orderParams = orderConfig.limitAuction?.enable
? await getLimitAuctionOrderParams({
...params,
marketType: MarketType.PERP,
baseAssetAmount: finalBaseAssetAmount,
orderConfig: orderConfig as LimitOrderParamsOrderConfig & {
limitAuction: LimitAuctionConfig;
},
})
: buildNonMarketOrderParams({
marketIndex,
marketType: MarketType.PERP,
direction: params.direction,
baseAssetAmount: finalBaseAssetAmount,
orderConfig,
reduceOnly: params.reduceOnly,
postOnly: params.postOnly,
userOrderId: params.userOrderId,
});
} else if (orderConfig.orderType === 'oracleLimit') {
if (orderConfig.oraclePriceOffset.isZero()) {
throw new Error('ORACLE_LIMIT orders require oraclePriceOffset');
}

const finalBaseAssetAmount = resolveBaseAssetAmount({
amount: 'amount' in params ? params.amount : undefined,
assetType: 'assetType' in params ? params.assetType : undefined,
baseAssetAmount:
'baseAssetAmount' in params ? params.baseAssetAmount : undefined,
});

orderParams = buildNonMarketOrderParams({
marketIndex,
marketType: MarketType.PERP,
direction: params.direction,
baseAssetAmount: finalBaseAssetAmount,
orderConfig,
reduceOnly: params.reduceOnly,
postOnly: params.postOnly,
userOrderId: params.userOrderId,
});
} else {
throw new Error(`Unsupported orderType for Swift limit order`);
}

const userAccount = user.getUserAccount();
const bracketOrders =
orderConfig.orderType === 'limit' ? orderConfig.bracketOrders : undefined;

return { userAccount, orderParams };
return { userAccount, orderParams, bracketOrders };
}

export const createSwiftLimitOrder = async (
params: OpenPerpNonMarketOrderParamsWithSwift & {
orderConfig: LimitOrderParamsOrderConfig;
orderConfig: SwiftLimitOrderParamsOrderConfig;
}
): Promise<void> => {
const { driftClient, user, marketIndex, swiftOptions, orderConfig } = params;
const { driftClient, user, marketIndex, swiftOptions } = params;

const { userAccount, orderParams } = await prepSwiftLimitOrderData(params);
const { userAccount, orderParams, bracketOrders } =
await prepSwiftLimitOrderData(params);

const resolvedDeposits = resolveIsolatedPositionDepositsWithOverride(
params.isolatedPositionDepositsOverride,
Expand All @@ -474,8 +506,8 @@ export const createSwiftLimitOrder = async (
swiftOptions,
orderParams: {
main: orderParams,
takeProfit: orderConfig.bracketOrders?.takeProfit,
stopLoss: orderConfig.bracketOrders?.stopLoss,
takeProfit: bracketOrders?.takeProfit,
stopLoss: bracketOrders?.stopLoss,
positionMaxLeverage: params.positionMaxLeverage,
isolatedPositionDeposit: resolvedDeposits?.mainDeposit,
},
Expand All @@ -487,7 +519,7 @@ export type CreateSwiftLimitOrderMessageParams = Omit<
OpenPerpNonMarketOrderBaseParams,
'mainSignerOverride'
> & {
orderConfig: LimitOrderParamsOrderConfig;
orderConfig: SwiftLimitOrderParamsOrderConfig;
isDelegate?: boolean;
userSigningSlotBuffer?: number;
};
Expand All @@ -504,12 +536,12 @@ export const createSwiftLimitOrderMessage = async (
driftClient,
user,
marketIndex,
orderConfig,
isDelegate = false,
userSigningSlotBuffer,
} = params;

const { userAccount, orderParams } = await prepSwiftLimitOrderData(params);
const { userAccount, orderParams, bracketOrders } =
await prepSwiftLimitOrderData(params);

const resolvedDeposits = resolveIsolatedPositionDepositsWithOverride(
params.isolatedPositionDepositsOverride,
Expand All @@ -536,8 +568,8 @@ export const createSwiftLimitOrderMessage = async (
isDelegate,
orderParams: {
main: orderParams,
takeProfit: orderConfig.bracketOrders?.takeProfit,
stopLoss: orderConfig.bracketOrders?.stopLoss,
takeProfit: bracketOrders?.takeProfit,
stopLoss: bracketOrders?.stopLoss,
positionMaxLeverage: params.positionMaxLeverage,
isolatedPositionDeposit: resolvedDeposits?.mainDeposit,
},
Expand Down Expand Up @@ -567,8 +599,13 @@ export const createOpenPerpNonMarketOrder = async <T extends boolean>(

// If useSwift is true, return the Swift result directly
if (useSwift) {
if (orderConfig.orderType !== 'limit') {
throw new Error('Only limit orders are supported with Swift');
if (
orderConfig.orderType !== 'limit' &&
orderConfig.orderType !== 'oracleLimit'
) {
throw new Error(
'Only limit and oracle limit orders are supported with Swift'
);
}

if (!swiftOptions) {
Expand Down
9 changes: 9 additions & 0 deletions common-ts/src/drift/base/actions/trade/openPerpOrder/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ export interface LimitOrderParamsOrderConfig {
limitAuction?: LimitAuctionConfig;
}

export interface OracleLimitOrderParamsOrderConfig {
orderType: Extract<NonMarketOrderType, 'oracleLimit'>;
oraclePriceOffset: BN;
}

export type SwiftLimitOrderParamsOrderConfig =
| LimitOrderParamsOrderConfig
| OracleLimitOrderParamsOrderConfig;

export interface NonMarketOrderParamsConfig {
marketIndex: number;
marketType: MarketType;
Expand Down
Loading