feature: test deposit command

Author: cdxker

bin/utxo-spend/src/main.rs

@@ -4,16 +4,17 @@ use node::wallet::SimpleWallet;
 use protocol::oracle::Oracle;
 use std::str::FromStr;
 
-const FEE_SATS: u64 = 200;
-
 #[tokio::main]
 async fn main() {
     dotenvy::dotenv().ok();
 
     // Get command line arguments
     let args: Vec<String> = std::env::args().collect();
-    if args.len() != 3 {
-        println!("Usage: {} <destination_address> <amount_in_sats>", args[0]);
+    if args.len() != 4 {
+        println!(
+            "Usage: {} <destination_address> <amount_in_sats> [fee_in_sats]",
+            args[0]
+        );
         std::process::exit(1);
     }
 
@@ -24,14 +25,18 @@ async fn main() {
         .parse::<u64>()
         .expect("Amount must be a valid number");
 
+    let fee = args[3]
+        .parse::<u64>()
+        .expect("Fee sats must be a valid number");
+
     let mnemonic = std::env::var("MNEMONIC").expect("MNEMONIC env variable not set");
     let (address, private_key) = generate_keys_from_mnemonic(mnemonic.as_str());
     println!("Sender address: {}. Loading wallet utxos...", address);
 
     let oracle = protocol::oracle::EsploraOracle::new(true);
     let mut wallet = SimpleWallet::new(&address, oracle.clone(), Some(true)).await;
 
-    let (tx, sighash) = wallet.create_spend(amount, FEE_SATS, &address_to).unwrap();
+    let (tx, sighash) = wallet.create_spend(amount, fee, &address_to).unwrap();
     println!(
         "Created Transaction for amount: {} to address: {}",
         amount, address_to

bootstrap.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # -----------------------------------------------------------------------------
-# Bootstrap multiple TheVault nodes for local testing / development.
+# Bootstrap multiple threshold nodes for local testing / development.
 #
 # This script will:
 #   1. Generate N node identities & config files via the CLI (`cargo run --bin cli setup`).

crates/clients/src/lib.rs

@@ -163,6 +163,7 @@ impl WindowedConfirmedTransactionProvider for EsploraApiClient {
                             continue;
                         }
                     };
+                    tracing::info!("Current height: {}", current_height);
 
                     let new_confirmed_height = current_height - 6;
 
@@ -205,8 +206,7 @@ impl WindowedConfirmedTransactionProvider for EsploraApiClient {
                     if addresses.insert(
                         Address::from_str(&address_str)
                             .unwrap()
-                            .require_network(Network::Bitcoin)
-                            .unwrap(),
+                            .assume_checked()
                     ) {
                         info!("Now polling {} addresses.", addresses.len());
                     }

crates/node/src/handlers/deposit/handler.rs

@@ -19,6 +19,7 @@ impl<N: Network, D: Db, O: Oracle> Handler<N, D, O> for DepositIntentState {
         message: Option<NetworkEvent>,
     ) -> Result<(), types::errors::NodeError> {
         if let Ok(tx) = self.transaction_rx.try_recv() {
+            tracing::info!("New transaction: {}", tx.compute_txid());
             if let Err(e) = self.update_user_balance(node, tx) {
                 info!("Failed to update user balance: {}", e);
             }

docker-compose.yaml

@@ -6,6 +6,7 @@ services:
     image: vault-node
     environment:
       - KEY_PASSWORD=
+      - IS_TESTNET=true
     entrypoint: "/app/cli run --key-file-path one.json --config-file-path one.yaml"
     ports:
       - "50051:50051"
@@ -22,6 +23,7 @@ services:
       dockerfile: Dockerfile
     environment:
       - KEY_PASSWORD=
+      - IS_TESTNET=true
     entrypoint: "/app/cli run --key-file-path two.json --config-file-path two.yaml"
     volumes:
       - ./keys/two.json:/app/two.json
@@ -36,6 +38,7 @@ services:
     image: vault-node
     environment:
       - KEY_PASSWORD=
+      - IS_TESTNET=true
     entrypoint: "/app/cli run --key-file-path three.json --config-file-path three.yaml"
     volumes:
       - ./keys/three.json:/app/three.json
@@ -50,6 +53,7 @@ services:
     image: vault-node
     environment:
       - KEY_PASSWORD=
+      - IS_TESTNET=true
     entrypoint: "/app/cli run --key-file-path four.json --config-file-path four.yaml"
     volumes:
       - ./keys/four.json:/app/four.json
@@ -64,6 +68,7 @@ services:
     image: vault-node
     environment:
       - KEY_PASSWORD=
+      - IS_TESTNET=true
     entrypoint: "/app/cli run --key-file-path five.json --config-file-path five.yaml"
     volumes:
       - ./keys/five.json:/app/five.json

test-deposit.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Set the deposit amount
+deposit_amount=$1
+fee=$2
+
+# Check if the deposit amount is provided
+if [ -z "$deposit_amount" ]; then
+  echo "Error: Please provide a deposit amount."
+  exit 1
+fi
+
+# Check if the fee is provided
+if [ -z "$fee" ]; then
+  fee=200
+  echo "Fee not provided, using default value: $fee"
+fi
+
+# Run the deposit command and extract the deposit_address
+deposit_output=$(cargo run --bin "cli" -- deposit "$deposit_amount" 2>&1)
+echo "$deposit_output"
+deposit_address=$(echo "$deposit_output" | grep "deposit_address" | sed 's/.*deposit_address: "\([^"]*\)".*/\1/')
+
+# Check if deposit_address is empty
+if [ -z "$deposit_address" ]; then
+  echo "Error: Could not extract deposit_address from deposit command output."
+  exit 1
+fi
+
+echo "Deposit Address: $deposit_address"
+
+# Run the utxo-spend command with the extracted address and extract the transaction_id
+  utxo_spend_output=$(cargo run --bin "utxo-spend" -- "$deposit_address" "$deposit_amount" "$fee" 2>&1)
+
+  echo "$utxo_spend_output"
+  transaction_id=$(echo "$utxo_spend_output" | grep "Broadcast Transaction txid:" | sed 's/.*Broadcast Transaction txid: //')
+
+  # Check if transaction_id is empty
+  if [ -z "$transaction_id" ]; then
+    echo "Error: Could not extract transaction_id from utxo-spend command output."
+    exit 1
+  fi
+
+  # Print the transaction ID
+  echo "Submitted Transaction ID: $transaction_id"