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

@@ -207,7 +207,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,11 +248,19 @@ pub async fn create_deposit(
             Err(e) => return Err(e),
         }
 
-        let status = Status::Pending;
+        let tx = (&body).try_into()?;
+        let limits = accessors::get_limits(&context).await?;
+        body.validate(&tx, &limits)?;
 
         // Get parameters from scripts.
-        let script_parameters =
-            scripts_to_resource_parameters(&body.deposit_script, &body.reclaim_script)?;
+        let script_parameters = scripts_to_resource_parameters(
+            &body.deposit_script,
+            &body.reclaim_script,
+            tx.tx_out(body.bitcoin_tx_output_index as usize)
+                .unwrap() // Safe to unwrap. We have already validated the output index in the try_into.
+                .value
+                .to_sat(),
+        )?;
 
         // Make table entry.
         let deposit_entry: DepositEntry = DepositEntry {
@@ -268,7 +279,7 @@ pub async fn create_deposit(
                 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,
@@ -305,6 +316,7 @@ struct ScriptParameters {
 fn scripts_to_resource_parameters(
     deposit_script: &str,
     reclaim_script: &str,
+    amount: u64,
 ) -> Result<ScriptParameters, Error> {
     let deposit_script_buf = ScriptBuf::from_hex(deposit_script)?;
     let deposit_script_inputs = sbtc::deposits::DepositScriptInputs::parse(&deposit_script_buf)?;
@@ -316,8 +328,7 @@ fn scripts_to_resource_parameters(
     let recipient_hex_string = hex::encode(&recipient_bytes);
 
     Ok(ScriptParameters {
-        // TODO(TBD): Get the amount from some script related data somehow.
-        amount: 0,
+        amount,
         max_fee: deposit_script_inputs.max_fee,
         recipient: recipient_hex_string,
         lock_time: reclaim_script_inputs.lock_time(),
@@ -422,7 +433,7 @@ mod tests {
         let reclaim_script = setup.reclaim.reclaim_script().to_hex_string();
 
         let script_parameters: ScriptParameters =
-            scripts_to_resource_parameters(&deposit_script, &reclaim_script).unwrap();
+            scripts_to_resource_parameters(&deposit_script, &reclaim_script, amount_sats).unwrap();
 
         assert_eq!(script_parameters.max_fee, max_fee);
         assert_eq!(script_parameters.lock_time, lock_time);