Merge branch 'master' into mainnet-beta

Author: jordy25519

src/swift_server.rs

@@ -12,7 +12,8 @@ use crate::{
     types::{
         messages::{
             DepositAndPlaceRequest, IncomingSignedMessage, OrderMetadataAndMessage,
-            ProcessOrderResponse, PROCESS_ORDER_RESPONSE_ERROR_MSG_DELIVERY_FAILED,
+            ProcessOrderResponse, PROCESS_ORDER_RESPONSE_ERROR_MSG_DELISTED_MARKET,
+            PROCESS_ORDER_RESPONSE_ERROR_MSG_DELIVERY_FAILED,
             PROCESS_ORDER_RESPONSE_ERROR_MSG_INVALID_ORDER,
             PROCESS_ORDER_RESPONSE_ERROR_MSG_INVALID_ORDER_AMOUNT,
             PROCESS_ORDER_RESPONSE_ERROR_MSG_ORDER_SLOT_TOO_OLD,
@@ -45,9 +46,9 @@ use drift_rs::{
     types::{
         accounts::{HighLeverageModeConfig, User},
         errors::ErrorCode,
-        CommitmentConfig, MarketId, MarketType, OrderParams, OrderType, PositionDirection,
-        ProgramError, SdkError, SdkResult, SignedMsgTriggerOrderParams, VersionedMessage,
-        VersionedTransaction,
+        CommitmentConfig, MarketId, MarketStatus, MarketType, OrderParams, OrderType,
+        PositionDirection, ProgramError, SdkError, SdkResult, SignedMsgTriggerOrderParams,
+        VersionedMessage, VersionedTransaction,
     },
     Context, DriftClient, RpcClient, TransactionBuilder, Wallet,
 };
@@ -260,6 +261,20 @@ pub async fn process_order(
     let market = server_params
         .drift
         .try_get_perp_market_account(order_params.market_index);
+
+    if market
+        .as_ref()
+        .is_ok_and(|m| matches!(m.status, MarketStatus::Delisted | MarketStatus::Settlement))
+    {
+        return Err((
+            axum::http::StatusCode::BAD_REQUEST,
+            ProcessOrderResponse {
+                message: PROCESS_ORDER_RESPONSE_ERROR_MSG_DELISTED_MARKET,
+                error: format!("market {} delisted", order_params.market_index).into(),
+            },
+        ));
+    }
+
     if let Err(err) = validate_signed_order_params(
         &order_params,
         market.map(|m| m.amm.min_order_size).unwrap_or(0),
@@ -444,7 +459,9 @@ pub async fn deposit_trade(
     // verify deposit ix exists and amount
     let mut has_place_ix = false;
     for ix in req.deposit_tx.message.instructions() {
-        if &ix.data[..8] == drift_idl::instructions::PlaceSignedMsgTakerOrder::DISCRIMINATOR {
+        if ix.data.len() > 8
+            && &ix.data[..8] == drift_idl::instructions::PlaceSignedMsgTakerOrder::DISCRIMINATOR
+        {
             has_place_ix = true;
         }
     }
@@ -623,7 +640,6 @@ pub async fn health_check(
 
 pub async fn start_server() {
     // Start server
-
     dotenv().ok();
 
     let use_kafka: bool = env::var("USE_KAFKA").unwrap_or_else(|_| "false".to_string()) == "true";

src/types/messages.rs

@@ -201,6 +201,7 @@ pub const PROCESS_ORDER_RESPONSE_ERROR_MSG_VERIFY_SIGNATURE: &str =
     "Error verifying signed message";
 pub const PROCESS_ORDER_RESPONSE_ERROR_MSG_ORDER_SLOT_TOO_OLD: &str = "Order slot too old";
 pub const PROCESS_ORDER_RESPONSE_ERROR_MSG_INVALID_ORDER: &str = "Invalid order";
+pub const PROCESS_ORDER_RESPONSE_ERROR_MSG_DELISTED_MARKET: &str = "Delisted market";
 pub const PROCESS_ORDER_RESPONSE_ERROR_MSG_INVALID_ORDER_AMOUNT: &str =
     "Invalid base_asset_amount in tp/sl";
 pub const PROCESS_ORDER_RESPONSE_ERROR_MSG_DELIVERY_FAILED: &str = "Failed to deliver message";