Merge #323 #324

323: Minor fixes r=thomaseizinger a=rishflab



324: Enable dependabot r=thomaseizinger a=thomaseizinger



Co-authored-by: rishflab <rishflab@hotmail.com>
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

swap/src/protocol/alice/state.rs

@@ -106,7 +106,7 @@ impl State0 {
         let a = bitcoin::SecretKey::new_random(rng);
         let v_a = monero::PrivateViewKey::new_random(rng);
         let redeem_address = bitcoin_wallet.new_address().await?;
-        let punish_address = redeem_address.clone();
+        let punish_address = bitcoin_wallet.new_address().await?;
 
         let s_a = monero::Scalar::random(rng);
         let (dleq_proof_s_a, (S_a_bitcoin, S_a_monero)) = CROSS_CURVE_PROOF_SYSTEM.prove(&s_a, rng);

swap/src/protocol/bob/swap.rs

@@ -106,10 +106,6 @@ async fn run_until_internal(
                     .context("Failed to sign Bitcoin lock transaction")?;
                 let (..) = bitcoin_wallet.broadcast(signed_tx, "lock").await?;
 
-                bitcoin_wallet
-                    .watch_until_status(&tx_lock, |status| status.is_confirmed())
-                    .await?;
-
                 let state = BobState::BtcLocked(state3);
                 let db_state = state.clone().into();
                 db.insert_latest_state(swap_id, Swap::Bob(db_state)).await?;