feat: Manual Cooperative Redeem

.github/workflows/ci.yml

@@ -147,6 +147,10 @@ jobs:
             test_name: alice_empty_balance_after_started_btc_early_refund
           - package: swap
             test_name: alice_broken_wallet_rpc_after_started_btc_early_refund
+          - package: swap
+            test_name: manual_cooperative_redeem
+          - package: swap
+            test_name: manual_cooperative_redeem_malicious_key.rs
 
     runs-on: ubuntu-22.04
     if: github.event_name == 'push' || !github.event.pull_request.draft

.vscode/settings.json

@@ -78,4 +78,4 @@
     "rust-analyzer.cargo.extraEnv": {
         "CARGO_TARGET_DIR": "target-check"
     }
-}
+}

Cargo.toml

@@ -30,6 +30,14 @@ bdk_electrum = { version = "0.23.0", default-features = false }
 bdk_wallet = "2.0.0"
 bitcoin = { version = "0.32", features = ["rand", "serde"] }
 
+# Crypto
+curve25519-dalek = { package = "curve25519-dalek-ng", version = "4" }
+
+# Monero
+monero-oxide = { git = "https://github.com/monero-oxide/monero-oxide", default-features = false, features = ["std"] }
+
+swap-serde = { path = "./swap-serde" }
+
 anyhow = "1"
 backoff = { version = "0.4", features = ["futures", "tokio"] }
 futures = { version = "0.3", default-features = false, features = ["std"] }

justfile

@@ -75,9 +75,17 @@ swap:
 	cargo build -p swap-asb --bin asb && cd swap && cargo build --bin=swap
 
 # Run the asb on testnet
-asb-testnet:
+asb:
 	ASB_DEV_ADDR_OUTPUT_PATH="$(pwd)/src-gui/.env.development" cargo run -p swap-asb --bin asb -- --trace --testnet start --rpc-bind-port 9944 --rpc-bind-host 0.0.0.0
 
+# Run the asb on mainnet (only use for testing)
+asb-mainnet:
+	cargo run -p swap-asb --bin asb -- --trace start --rpc-bind-port 9944 --rpc-bind-host 0.0.0.0
+
+# Run the asb controller connecting to your already running asb
+asb-controller:
+    cargo run -p swap-controller --bin asb-controller -- --url http://127.0.0.1:9944
+
 # Updates our submodules (currently only Monero C++ codebase)
 update_submodules:
 	cd monero-sys && git submodule update --init --recursive --force

monero-rpc-pool/src/proxy.rs

@@ -16,7 +16,6 @@ use tokio::{
 };
 
 use tokio_rustls::rustls::{
-    self,
     client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier},
     pki_types::{CertificateDer, ServerName, UnixTime},
     DigitallySignedStruct, Error as TlsError, SignatureScheme,

monero-seed/Cargo.toml

@@ -24,7 +24,7 @@ curve25519-dalek = { version = "4", default-features = false, features = ["alloc
 
 [dev-dependencies]
 hex = { version = "0.4", default-features = false, features = ["std"] }
-monero-oxide = { git = "https://github.com/monero-oxide/monero-oxide", default-features = false, features = ["std"] }
+monero-oxide = { workspace = true }
 
 [features]
 std = [

monero-seed/src/tests.rs

@@ -3,7 +3,7 @@ use zeroize::Zeroizing;
 
 use curve25519_dalek::scalar::Scalar;
 
-use monero_primitives::keccak256;
+use monero_oxide::primitives::keccak256;
 
 use crate::*;
 

monero-sys/build.rs

@@ -110,7 +110,7 @@ fn main() {
         .display()
         .to_string();
     config.define("CMAKE_TOOLCHAIN_FILE", toolchain_file.clone());
-    println!("cargo:warning=Using toolchain file: {}", toolchain_file);
+    println!("cargo:debug=Using toolchain file: {}", toolchain_file);
 
     let depends_lib_dir = contrib_depends_dir.join(format!("{}/lib", target));
 
@@ -414,7 +414,7 @@ fn compile_dependencies(
         "aarch64-apple-ios-sim" => "aarch64-apple-iossimulator".to_string(),
         _ => target,
     };
-    println!("cargo:warning=Building for target: {}", target);
+    println!("cargo:debug=Building for target: {}", target);
 
     match target.as_str() {
         "x86_64-apple-darwin"
@@ -431,7 +431,7 @@ fn compile_dependencies(
     }
 
     println!(
-        "cargo:warning=Running make HOST={} in contrib/depends",
+        "cargo:debug=Running make HOST={} in contrib/depends",
         target
     );
 
@@ -496,14 +496,14 @@ fn execute_child_with_pipe(
     // Spawn threads to handle stdout and stderr
     let stdout_handle = thread::spawn(move || {
         let reader = BufReader::new(stdout);
-        for line in reader.lines().flatten() {
+        for line in reader.lines().map_while(Result::ok) {
             println!("cargo:debug={}{}", &prefix_clone, line);
         }
     });
 
     let stderr_handle = thread::spawn(move || {
         let reader = BufReader::new(stderr);
-        for line in reader.lines().flatten() {
+        for line in reader.lines().map_while(Result::ok) {
             println!("cargo:debug={}{}", &prefix, line);
         }
     });
@@ -528,7 +528,7 @@ fn apply_patches() -> Result<(), Box<dyn std::error::Error>> {
 
     for embedded in EMBEDDED_PATCHES {
         println!(
-            "cargo:warning=Processing embedded patch: {} ({})",
+            "cargo:debug=Processing embedded patch: {} ({})",
             embedded.name, embedded.description
         );
 
@@ -541,14 +541,14 @@ fn apply_patches() -> Result<(), Box<dyn std::error::Error>> {
         }
 
         println!(
-            "cargo:warning=Found {} file(s) in patch {}",
+            "cargo:debug=Found {} file(s) in patch {}",
             file_patches.len(),
             embedded.name
         );
 
         // Apply each file patch individually
         for (file_path, patch_content) in file_patches {
-            println!("cargo:warning=Applying patch to file: {}", file_path);
+            println!("cargo:debug=Applying patch to file: {}", file_path);
 
             // Parse the individual file patch
             let patch = diffy::Patch::from_str(&patch_content)
@@ -566,7 +566,7 @@ fn apply_patches() -> Result<(), Box<dyn std::error::Error>> {
             // Check if patch is already applied by trying to reverse it
             if diffy::apply(&current, &patch.reverse()).is_ok() {
                 println!(
-                    "cargo:warning=Patch for {} already applied – skipping",
+                    "cargo:debug=Patch for {} already applied – skipping",
                     file_path
                 );
                 continue;
@@ -578,11 +578,11 @@ fn apply_patches() -> Result<(), Box<dyn std::error::Error>> {
             fs::write(&target_path, patched)
                 .map_err(|e| format!("Failed to write {}: {}", file_path, e))?;
 
-            println!("cargo:warning=Successfully applied patch to: {}", file_path);
+            println!("cargo:debug=Successfully applied patch to: {}", file_path);
         }
 
         println!(
-            "cargo:warning=Successfully applied all file patches for: {} ({})",
+            "cargo:debug=Successfully applied all file patches for: {} ({})",
             embedded.name, embedded.description
         );
     }

monero-sys/src/lib.rs

@@ -152,10 +152,10 @@ pub struct Daemon {
     pub ssl: bool,
 }
 
-impl TryFrom<String> for Daemon {
+impl<'a> TryFrom<&'a str> for Daemon {
     type Error = anyhow::Error;
 
-    fn try_from(address: String) -> Result<Self, Self::Error> {
+    fn try_from(address: &'a str) -> Result<Self, Self::Error> {
         let url = Url::parse(&address).context("Failed to parse daemon URL")?;
 
         let hostname = url
@@ -177,6 +177,14 @@ impl TryFrom<String> for Daemon {
     }
 }
 
+impl<'a> TryFrom<&'a String> for Daemon {
+    type Error = anyhow::Error;
+
+    fn try_from(value: &'a String) -> std::result::Result<Self, Self::Error> {
+        Daemon::try_from(value.as_str())
+    }
+}
+
 impl Daemon {
     /// Try to convert the daemon configuration to a URL
     pub fn to_url_string(&self) -> String {

monero-sys/tests/sign_message.rs

@@ -10,10 +10,7 @@ async fn test_sign_message() {
         .init();
 
     let temp_dir = tempfile::tempdir().unwrap();
-    let daemon = Daemon {
-        address: PLACEHOLDER_NODE.into(),
-        ssl: false,
-    };
+    let daemon = Daemon::try_from(PLACEHOLDER_NODE).unwrap();
 
     let wallet_name = "test_signing_wallet";
     let wallet_path = temp_dir.path().join(wallet_name).display().to_string();

monero-sys/tests/simple.rs

@@ -15,10 +15,7 @@ async fn main() {
         .init();
 
     let temp_dir = tempfile::tempdir().unwrap();
-    let daemon = Daemon {
-        address: STAGENET_REMOTE_NODE.into(),
-        ssl: true,
-    };
+    let daemon = Daemon::try_from(STAGENET_REMOTE_NODE).unwrap();
 
     let wallet_name = "recovered_wallet";
     let wallet_path = temp_dir.path().join(wallet_name).display().to_string();

monero-sys/tests/special_paths.rs

@@ -13,10 +13,7 @@ async fn test_wallet_with_special_paths() {
         "path-with-hyphen",
     ];
 
-    let daemon = Daemon {
-        address: "https://moneronode.org:18081".into(),
-        ssl: true,
-    };
+    let daemon = Daemon::try_from("https://moneronode.org:18081").unwrap();
 
     let futures = special_paths
         .into_iter()

monero-sys/tests/wallet_closing.rs

@@ -10,10 +10,7 @@ async fn main() {
         .init();
 
     let temp_dir = tempfile::tempdir().unwrap();
-    let daemon = Daemon {
-        address: STAGENET_REMOTE_NODE.into(),
-        ssl: true,
-    };
+    let daemon = Daemon::try_from(STAGENET_REMOTE_NODE).unwrap();
 
     {
         let wallet = WalletHandle::open_or_create(

src-gui/package.json

@@ -27,7 +27,7 @@
     "@tauri-apps/api": "^2.8.0",
     "@tauri-apps/plugin-cli": "^2.4.0",
     "@tauri-apps/plugin-clipboard-manager": "^2.3.0",
-    "@tauri-apps/plugin-dialog": "^2.0.0",
+    "@tauri-apps/plugin-dialog": "2.4.0",
     "@tauri-apps/plugin-opener": "^2.5.0",
     "@tauri-apps/plugin-process": "^2.3.0",
     "@tauri-apps/plugin-shell": "^2.3.0",