fix: emily validate deposits

.generated-sources/emily/client/rust/private/docs/CreateDepositRequestBody.md

@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **bitcoin_txid** | **String** | Bitcoin transaction id. | 
 **deposit_script** | **String** | Deposit script. | 
 **reclaim_script** | **String** | Reclaim script. | 
+**transaction_hex** | **String** | The raw transaction hex. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

.generated-sources/emily/client/rust/private/src/apis/deposit_api.rs

@@ -20,6 +20,7 @@ pub enum CreateDepositError {
     Status400(models::ErrorResponse),
     Status404(models::ErrorResponse),
     Status405(models::ErrorResponse),
+    Status409(models::ErrorResponse),
     Status500(models::ErrorResponse),
     UnknownValue(serde_json::Value),
 }

.generated-sources/emily/client/rust/private/src/models/create_deposit_request_body.rs

@@ -26,6 +26,9 @@ pub struct CreateDepositRequestBody {
     /// Reclaim script.
     #[serde(rename = "reclaimScript")]
     pub reclaim_script: String,
+    /// The raw transaction hex.
+    #[serde(rename = "transactionHex")]
+    pub transaction_hex: String,
 }
 
 impl CreateDepositRequestBody {
@@ -35,12 +38,14 @@ impl CreateDepositRequestBody {
         bitcoin_txid: String,
         deposit_script: String,
         reclaim_script: String,
+        transaction_hex: String,
     ) -> CreateDepositRequestBody {
         CreateDepositRequestBody {
             bitcoin_tx_output_index,
             bitcoin_txid,
             deposit_script,
             reclaim_script,
+            transaction_hex,
         }
     }
 }

.generated-sources/emily/client/rust/public/docs/CreateDepositRequestBody.md

@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **bitcoin_txid** | **String** | Bitcoin transaction id. | 
 **deposit_script** | **String** | Deposit script. | 
 **reclaim_script** | **String** | Reclaim script. | 
+**transaction_hex** | **String** | The raw transaction hex. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

.generated-sources/emily/client/rust/public/src/apis/deposit_api.rs

@@ -20,6 +20,7 @@ pub enum CreateDepositError {
     Status400(models::ErrorResponse),
     Status404(models::ErrorResponse),
     Status405(models::ErrorResponse),
+    Status409(models::ErrorResponse),
     Status500(models::ErrorResponse),
     UnknownValue(serde_json::Value),
 }

.generated-sources/emily/client/rust/public/src/models/create_deposit_request_body.rs

@@ -26,6 +26,9 @@ pub struct CreateDepositRequestBody {
     /// Reclaim script.
     #[serde(rename = "reclaimScript")]
     pub reclaim_script: String,
+    /// The raw transaction hex.
+    #[serde(rename = "transactionHex")]
+    pub transaction_hex: String,
 }
 
 impl CreateDepositRequestBody {
@@ -35,12 +38,14 @@ impl CreateDepositRequestBody {
         bitcoin_txid: String,
         deposit_script: String,
         reclaim_script: String,
+        transaction_hex: String,
     ) -> CreateDepositRequestBody {
         CreateDepositRequestBody {
             bitcoin_tx_output_index,
             bitcoin_txid,
             deposit_script,
             reclaim_script,
+            transaction_hex,
         }
     }
 }

.generated-sources/emily/client/rust/testing/docs/CreateDepositRequestBody.md

@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **bitcoin_txid** | **String** | Bitcoin transaction id. | 
 **deposit_script** | **String** | Deposit script. | 
 **reclaim_script** | **String** | Reclaim script. | 
+**transaction_hex** | **String** | The raw transaction hex. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

.generated-sources/emily/client/rust/testing/src/apis/deposit_api.rs

@@ -20,6 +20,7 @@ pub enum CreateDepositError {
     Status400(models::ErrorResponse),
     Status404(models::ErrorResponse),
     Status405(models::ErrorResponse),
+    Status409(models::ErrorResponse),
     Status500(models::ErrorResponse),
     UnknownValue(serde_json::Value),
 }

.generated-sources/emily/client/rust/testing/src/models/create_deposit_request_body.rs

@@ -26,6 +26,9 @@ pub struct CreateDepositRequestBody {
     /// Reclaim script.
     #[serde(rename = "reclaimScript")]
     pub reclaim_script: String,
+    /// The raw transaction hex.
+    #[serde(rename = "transactionHex")]
+    pub transaction_hex: String,
 }
 
 impl CreateDepositRequestBody {
@@ -35,12 +38,14 @@ impl CreateDepositRequestBody {
         bitcoin_txid: String,
         deposit_script: String,
         reclaim_script: String,
+        transaction_hex: String,
     ) -> CreateDepositRequestBody {
         CreateDepositRequestBody {
             bitcoin_tx_output_index,
             bitcoin_txid,
             deposit_script,
             reclaim_script,
+            transaction_hex,
         }
     }
 }

.generated-sources/emily/openapi/generated-specs/private-emily-openapi-spec.json

@@ -1768,7 +1768,8 @@
           "bitcoinTxid",
           "bitcoinTxOutputIndex",
           "reclaimScript",
-          "depositScript"
+          "depositScript",
+          "transactionHex"
         ],
         "properties": {
           "bitcoinTxOutputIndex": {
@@ -1788,6 +1789,10 @@
           "reclaimScript": {
             "type": "string",
             "description": "Reclaim script."
+          },
+          "transactionHex": {
+            "type": "string",
+            "description": "The raw transaction hex."
           }
         }
       },

.generated-sources/emily/openapi/generated-specs/public-emily-openapi-spec.json

@@ -1568,7 +1568,8 @@
           "bitcoinTxid",
           "bitcoinTxOutputIndex",
           "reclaimScript",
-          "depositScript"
+          "depositScript",
+          "transactionHex"
         ],
         "properties": {
           "bitcoinTxOutputIndex": {
@@ -1588,6 +1589,10 @@
           "reclaimScript": {
             "type": "string",
             "description": "Reclaim script."
+          },
+          "transactionHex": {
+            "type": "string",
+            "description": "The raw transaction hex."
           }
         }
       },

.generated-sources/emily/openapi/generated-specs/testing-emily-openapi-spec.json

@@ -1822,7 +1822,8 @@
           "bitcoinTxid",
           "bitcoinTxOutputIndex",
           "reclaimScript",
-          "depositScript"
+          "depositScript",
+          "transactionHex"
         ],
         "properties": {
           "bitcoinTxOutputIndex": {
@@ -1842,6 +1843,10 @@
           "reclaimScript": {
             "type": "string",
             "description": "Reclaim script."
+          },
+          "transactionHex": {
+            "type": "string",
+            "description": "The raw transaction hex."
           }
         }
       },

emily/handler/src/api/handlers/deposit.rs

@@ -4,7 +4,6 @@ use crate::api::models::deposit::responses::{
     GetDepositsForTransactionResponse, UpdateDepositsResponse,
 };
 use crate::database::entries::StatusEntry;
-use stacks_common::codec::StacksMessageCodec as _;
 use tracing::{debug, instrument};
 use warp::reply::{json, with_status, Reply};
 
@@ -23,7 +22,6 @@ use crate::database::entries::deposit::{
     DepositEntry, DepositEntryKey, DepositEvent, DepositParametersEntry,
     ValidatedUpdateDepositsRequest,
 };
-use bitcoin::ScriptBuf;
 use warp::http::StatusCode;
 
 /// Get deposit handler.
@@ -207,7 +205,10 @@ pub async fn create_deposit(
     context: EmilyContext,
     body: CreateDepositRequestBody,
 ) -> impl warp::reply::Reply {
-    debug!("In create deposit");
+    debug!(
+        "Creating deposit with txid: {}, output index: {}",
+        body.bitcoin_txid, body.bitcoin_tx_output_index
+    );
     // Internal handler so `?` can be used correctly while still returning a reply.
     async fn handler(
         context: EmilyContext,
@@ -245,33 +246,30 @@ pub async fn create_deposit(
             Err(e) => return Err(e),
         }
 
-        let status = Status::Pending;
-
-        // Get parameters from scripts.
-        let script_parameters =
-            scripts_to_resource_parameters(&body.deposit_script, &body.reclaim_script)?;
+        let limits = accessors::get_limits(&context).await?;
+        let deposit_info = body.validate(&limits)?;
 
         // Make table entry.
         let deposit_entry: DepositEntry = DepositEntry {
             key: DepositEntryKey {
                 bitcoin_txid: body.bitcoin_txid,
                 bitcoin_tx_output_index: body.bitcoin_tx_output_index,
             },
-            recipient: script_parameters.recipient,
+            recipient: deposit_info.recipient.to_string(),
             parameters: DepositParametersEntry {
-                max_fee: script_parameters.max_fee,
-                lock_time: script_parameters.lock_time,
+                max_fee: deposit_info.max_fee,
+                lock_time: deposit_info.lock_time.to_consensus_u32(),
             },
             history: vec![DepositEvent {
                 status: StatusEntry::Pending,
                 message: "Just received deposit".to_string(),
                 stacks_block_hash: stacks_block_hash.clone(),
                 stacks_block_height,
             }],
-            status,
+            status: Status::Pending,
             last_update_block_hash: stacks_block_hash,
             last_update_height: stacks_block_height,
-            amount: script_parameters.amount,
+            amount: deposit_info.amount,
             reclaim_script: body.reclaim_script,
             deposit_script: body.deposit_script,
             ..Default::default()
@@ -290,40 +288,6 @@ pub async fn create_deposit(
         .map_or_else(Reply::into_response, Reply::into_response)
 }
 
-/// Parameters from the deposit and reclaim scripts.
-struct ScriptParameters {
-    amount: u64,
-    max_fee: u64,
-    recipient: String,
-    lock_time: u32,
-}
-
-/// Convert scripts to resource parameters.
-///
-/// This function is used to convert the deposit and reclaim scripts into the
-/// parameters that are stored in the database.
-fn scripts_to_resource_parameters(
-    deposit_script: &str,
-    reclaim_script: &str,
-) -> Result<ScriptParameters, Error> {
-    let deposit_script_buf = ScriptBuf::from_hex(deposit_script)?;
-    let deposit_script_inputs = sbtc::deposits::DepositScriptInputs::parse(&deposit_script_buf)?;
-
-    let reclaim_script_buf = ScriptBuf::from_hex(reclaim_script)?;
-    let reclaim_script_inputs = sbtc::deposits::ReclaimScriptInputs::parse(&reclaim_script_buf)?;
-
-    let recipient_bytes = deposit_script_inputs.recipient.serialize_to_vec();
-    let recipient_hex_string = hex::encode(&recipient_bytes);
-
-    Ok(ScriptParameters {
-        // TODO(TBD): Get the amount from some script related data somehow.
-        amount: 0,
-        max_fee: deposit_script_inputs.max_fee,
-        recipient: recipient_hex_string,
-        lock_time: reclaim_script_inputs.lock_time(),
-    })
-}
-
 /// Update deposits handler.
 #[utoipa::path(
     put,
@@ -404,30 +368,3 @@ pub async fn update_deposits(
 }
 
 // TODO(393): Add handler unit tests.
-
-// Test module
-#[cfg(test)]
-mod tests {
-
-    use super::*;
-    use sbtc::testing::{self, deposits::TxSetup};
-    use test_case::test_case;
-
-    #[test_case(15000, 500_000, 150; "All parameters are normal numbers")]
-    #[test_case(0, 0, 0; "All parameters are zeros")]
-    fn test_scripts_to_resource_parameters(max_fee: u64, amount_sats: u64, lock_time: u32) {
-        let setup: TxSetup = testing::deposits::tx_setup(lock_time, max_fee, amount_sats);
-
-        let deposit_script = setup.deposit.deposit_script().to_hex_string();
-        let reclaim_script = setup.reclaim.reclaim_script().to_hex_string();
-
-        let script_parameters: ScriptParameters =
-            scripts_to_resource_parameters(&deposit_script, &reclaim_script).unwrap();
-
-        assert_eq!(script_parameters.max_fee, max_fee);
-        assert_eq!(script_parameters.lock_time, lock_time);
-
-        // TODO: Test the recipient with an input value.
-        assert!(script_parameters.recipient.len() > 0);
-    }
-}