Merge pull request #86 from drift-labs/feat/deposit-trade-2

depositToTrade changes:

Author: jordy25519

src/swift_server.rs

@@ -374,11 +374,11 @@ pub async fn deposit_trade(
     State(server_params): State<&'static ServerParams>,
     Json(req): Json<DepositAndPlaceRequest>,
 ) -> impl axum::response::IntoResponse {
-    let min_trade_value = 100 * PRICE_PRECISION as u64;
+    let min_deposit_value = 100 * PRICE_PRECISION as u64;
 
     if req.deposit_tx.signatures.is_empty()
-        || req.deposit_tx.message.instructions.len() != 1
-        || req.deposit_tx.verify().is_err()
+        || req.deposit_tx.message.instructions().len() != 1
+        || req.deposit_tx.verify_with_results().iter().all(|x| *x)
     {
         return (
             StatusCode::BAD_REQUEST,
@@ -390,20 +390,20 @@ pub async fn deposit_trade(
     }
 
     // verify deposit ix exists and amount
-    let ix = &req.deposit_tx.message.instructions[0];
+    let ix = &req.deposit_tx.message.instructions()[0];
     if &ix.data[..8] == drift_idl::instructions::Deposit::DISCRIMINATOR {
         if let Ok(deposit_ix) = drift_idl::instructions::Deposit::deserialize(&mut &ix.data[8..]) {
             let spot_oracle = server_params
                 .drift
                 .try_get_oracle_price_data_and_slot(MarketId::spot(deposit_ix.market_index))
                 .expect("got price");
             let deposit_value = spot_oracle.data.price as u64 * deposit_ix.amount;
-            if deposit_value < min_trade_value {
+            if deposit_value < min_deposit_value {
                 return (
                     StatusCode::BAD_REQUEST,
                     Json(ProcessOrderResponse {
                         message: "",
-                        error: Some(format!("deposit size must be > ${min_trade_value}")),
+                        error: Some(format!("deposit size must be > ${min_deposit_value}")),
                     }),
                 );
             }
@@ -426,6 +426,28 @@ pub async fn deposit_trade(
         );
     }
 
+    match server_params
+        .drift
+        .simulate_tx(req.deposit_tx.message.clone())
+        .await
+    {
+        Ok(res) => {
+            if let Some(err) = res.err {
+                log::info!(target: "server", "deposit sim failed: {err:?}");
+                return (
+                    StatusCode::BAD_REQUEST,
+                    Json(ProcessOrderResponse {
+                        message: "",
+                        error: Some("invalid deposit tx".into()),
+                    }),
+                );
+            }
+        }
+        Err(err) => {
+            log::info!(target: "server", "deposit sim network err: {err:?}");
+        }
+    }
+
     let context = RequestContext::from_incoming_message(&req.swift_order);
     let (status, resp) = match process_order(server_params, req.swift_order, &context).await {
         Ok(order_metadata) => {

src/types/messages.rs

@@ -13,12 +13,12 @@ use drift_rs::{
 };
 use ed25519_dalek::{PublicKey, Signature, Verifier};
 use serde_json::json;
-use solana_sdk::{pubkey::Pubkey, transaction::Transaction};
+use solana_sdk::{pubkey::Pubkey, transaction::VersionedTransaction};
 
 #[derive(serde::Deserialize, Clone, Debug, PartialEq)]
 pub struct DepositAndPlaceRequest {
     #[serde(deserialize_with = "deser_transaction")]
-    pub deposit_tx: Transaction,
+    pub deposit_tx: VersionedTransaction,
     pub swift_order: IncomingSignedMessage,
 }
 
@@ -289,7 +289,7 @@ where
 }
 
 /// Deserialize solana transaction
-pub fn deser_transaction<'de, D>(deserializer: D) -> Result<Transaction, D::Error>
+pub fn deser_transaction<'de, D>(deserializer: D) -> Result<VersionedTransaction, D::Error>
 where
     D: serde::Deserializer<'de>,
 {