Skip to content

program: modify order trigger limit to limit #2077

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

Open
0xbigz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

program: modify order trigger limit to limit #2077

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
035a806
feat: convert triggered TriggerLimit orders to Limit orders in modify…
0xbigz Jan 19, 2026
995059d
feat: convert triggered TriggerLimit orders to Limit orders in modify…
0xbigz Jan 19, 2026
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
36 changes: 21 additions & 15 deletions programs/drift/src/controller/orders.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,15 @@ fn merge_modify_order_params_with_existing_order(
existing_order: &Order,
modify_order_params: &ModifyOrderParams,
) -> DriftResult<Option<OrderParams>> {
let order_type = existing_order.order_type;
let existing_order_triggered = existing_order.order_type == OrderType::TriggerLimit
&& existing_order.triggered();
let user_modifying_trigger_price = modify_order_params.trigger_price.is_some();

let order_type = if existing_order_triggered && !user_modifying_trigger_price {
OrderType::Limit
} else {
existing_order.order_type
};
let market_type = existing_order.market_type;
let direction = modify_order_params
.direction
Expand Down Expand Up @@ -935,20 +943,18 @@ fn merge_modify_order_params_with_existing_order(
});
let bit_flags = 0;
let max_ts = modify_order_params.max_ts.or(Some(existing_order.max_ts));
let trigger_price = modify_order_params
.trigger_price
.or(Some(existing_order.trigger_price));
let trigger_condition =
modify_order_params
.trigger_condition
.unwrap_or(match existing_order.trigger_condition {
OrderTriggerCondition::TriggeredAbove | OrderTriggerCondition::Above => {
OrderTriggerCondition::Above
}
OrderTriggerCondition::TriggeredBelow | OrderTriggerCondition::Below => {
OrderTriggerCondition::Below
}
});
let (trigger_price, trigger_condition) = if existing_order_triggered && !user_modifying_trigger_price {
(None, OrderTriggerCondition::Above)
} else {
(
modify_order_params
.trigger_price
.or(Some(existing_order.trigger_price)),
modify_order_params

@lilperp lilperp Feb 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if it's already been triggered you have to reset the trigger condition as the previous code did?

.trigger_condition
.unwrap_or(existing_order.trigger_condition),
)
};
let oracle_price_offset = modify_order_params
.oracle_price_offset
.or(Some(existing_order.oracle_price_offset));
Expand Down
Loading