program: place order returns early if max ts breached (#317)

* program: place order returns early if max ts breached * update CHANGELOG * tweak clause
drift-labs · Jan 3, 2023 · 99da841 · 99da841
1 parent c44af8a
commit 99da841
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+program: place order returns early if max ts breached ([#317](https://github.com/drift-labs/protocol-v2/pull/317))
 ts-sdk: batch getMultipleAccount calls in bulkAccountLoader ([#315](https://github.com/drift-labs/protocol-v2/pull/315))
 program: add clippy deny for panic, expect and unwrap
 program: add market index offset trait ([#287](https://github.com/drift-labs/protocol-v2/pull/287))

diff --git a/programs/drift/src/controller/orders.rs b/programs/drift/src/controller/orders.rs
@@ -119,6 +119,19 @@ pub fn place_perp_order(
         slot,
     )?;
 
+    let max_ts = match params.max_ts {
+        Some(max_ts) => max_ts,
+        None => match params.order_type {
+            OrderType::Market | OrderType::Oracle => now.safe_add(30)?,
+            _ => 0_i64,
+        },
+    };
+
+    if max_ts != 0 && max_ts < now {
+        msg!("max_ts ({}) < now ({}), skipping order", max_ts, now);
+        return Ok(());
+    }
+
     let new_order_index = user
         .orders
         .iter()
@@ -205,22 +218,6 @@ pub fn place_perp_order(
         state.min_perp_auction_duration,
     );
 
-    let max_ts = match params.max_ts {
-        Some(max_ts) => max_ts,
-        None => match params.order_type {
-            OrderType::Market | OrderType::Oracle => now.safe_add(30)?,
-            _ => 0_i64,
-        },
-    };
-
-    validate!(
-        max_ts == 0 || max_ts > now,
-        ErrorCode::InvalidOrderMaxTs,
-        "max_ts ({}) <= now ({})",
-        max_ts,
-        now
-    )?;
-
     let new_order = Order {
         status: OrderStatus::Open,
         order_type: params.order_type,
@@ -2557,6 +2554,19 @@ pub fn place_spot_order(
         slot,
     )?;
 
+    let max_ts = match params.max_ts {
+        Some(max_ts) => max_ts,
+        None => match params.order_type {
+            OrderType::Market | OrderType::Oracle => now.safe_add(30)?,
+            _ => 0_i64,
+        },
+    };
+
+    if max_ts != 0 && max_ts < now {
+        msg!("max_ts ({}) < now ({}), skipping order", max_ts, now);
+        return Ok(());
+    }
+
     let new_order_index = user
         .orders
         .iter()
@@ -2660,22 +2670,6 @@ pub fn place_spot_order(
         .auction_duration
         .unwrap_or(state.default_spot_auction_duration);
 
-    let max_ts = match params.max_ts {
-        Some(max_ts) => max_ts,
-        None => match params.order_type {
-            OrderType::Market | OrderType::Oracle => now.safe_add(30)?,
-            _ => 0_i64,
-        },
-    };
-
-    validate!(
-        max_ts == 0 || max_ts > now,
-        ErrorCode::InvalidOrderMaxTs,
-        "max_ts ({}) <= now ({})",
-        max_ts,
-        now
-    )?;
-
     let new_order = Order {
         status: OrderStatus::Open,
         order_type: params.order_type,