diff --git a/Cargo.lock b/Cargo.lock index 20dc8849..628f9198 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9861,7 +9861,6 @@ dependencies = [ "monero", "rust_decimal", "serde", - "serde_json", "swap-fs", "swap-serde", "thiserror 1.0.69", diff --git a/Cargo.toml b/Cargo.toml index f16e3fd0..7bbb5287 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = [ "electrum-pool", "monero-rpc", "monero-rpc-pool", "monero-sys", "seed", "src-tauri", "swap", "swap-env", "swap-fs", "swap-serde"] +members = [ "electrum-pool", "monero-rpc", "monero-rpc-pool", "monero-sys", "monero-seed", "src-tauri", "swap", "swap-env", "swap-fs", "swap-serde"] [workspace.dependencies] anyhow = "1" diff --git a/monero-harness/src/lib.rs b/monero-harness/src/lib.rs index 38d5ba75..b6610eec 100644 --- a/monero-harness/src/lib.rs +++ b/monero-harness/src/lib.rs @@ -316,6 +316,7 @@ fn random_prefix() -> String { rand::thread_rng() .sample_iter(rand::distributions::Alphanumeric) .take(4) + .map(char::from) .collect() } diff --git a/seed/Cargo.toml b/monero-seed/Cargo.toml similarity index 100% rename from seed/Cargo.toml rename to monero-seed/Cargo.toml diff --git a/seed/LICENSE b/monero-seed/LICENSE similarity index 100% rename from seed/LICENSE rename to monero-seed/LICENSE diff --git a/seed/README.md b/monero-seed/README.md similarity index 100% rename from seed/README.md rename to monero-seed/README.md diff --git a/seed/src/lib.rs b/monero-seed/src/lib.rs similarity index 100% rename from seed/src/lib.rs rename to monero-seed/src/lib.rs diff --git a/seed/src/tests.rs b/monero-seed/src/tests.rs similarity index 100% rename from seed/src/tests.rs rename to monero-seed/src/tests.rs diff --git a/seed/src/words/ang.rs b/monero-seed/src/words/ang.rs similarity index 100% rename from seed/src/words/ang.rs rename to monero-seed/src/words/ang.rs diff --git a/seed/src/words/de.rs b/monero-seed/src/words/de.rs similarity index 100% rename from seed/src/words/de.rs rename to monero-seed/src/words/de.rs diff --git a/seed/src/words/en.rs b/monero-seed/src/words/en.rs similarity index 100% rename from seed/src/words/en.rs rename to monero-seed/src/words/en.rs diff --git a/seed/src/words/eo.rs b/monero-seed/src/words/eo.rs similarity index 100% rename from seed/src/words/eo.rs rename to monero-seed/src/words/eo.rs diff --git a/seed/src/words/es.rs b/monero-seed/src/words/es.rs similarity index 100% rename from seed/src/words/es.rs rename to monero-seed/src/words/es.rs diff --git a/seed/src/words/fr.rs b/monero-seed/src/words/fr.rs similarity index 100% rename from seed/src/words/fr.rs rename to monero-seed/src/words/fr.rs diff --git a/seed/src/words/it.rs b/monero-seed/src/words/it.rs similarity index 100% rename from seed/src/words/it.rs rename to monero-seed/src/words/it.rs diff --git a/seed/src/words/ja.rs b/monero-seed/src/words/ja.rs similarity index 100% rename from seed/src/words/ja.rs rename to monero-seed/src/words/ja.rs diff --git a/seed/src/words/jbo.rs b/monero-seed/src/words/jbo.rs similarity index 100% rename from seed/src/words/jbo.rs rename to monero-seed/src/words/jbo.rs diff --git a/seed/src/words/nl.rs b/monero-seed/src/words/nl.rs similarity index 100% rename from seed/src/words/nl.rs rename to monero-seed/src/words/nl.rs diff --git a/seed/src/words/pt.rs b/monero-seed/src/words/pt.rs similarity index 100% rename from seed/src/words/pt.rs rename to monero-seed/src/words/pt.rs diff --git a/seed/src/words/ru.rs b/monero-seed/src/words/ru.rs similarity index 100% rename from seed/src/words/ru.rs rename to monero-seed/src/words/ru.rs diff --git a/seed/src/words/zh.rs b/monero-seed/src/words/zh.rs similarity index 100% rename from seed/src/words/zh.rs rename to monero-seed/src/words/zh.rs diff --git a/swap/Cargo.toml b/swap/Cargo.toml index 092e3107..50c051f7 100644 --- a/swap/Cargo.toml +++ b/swap/Cargo.toml @@ -46,7 +46,7 @@ moka = { version = "0.12", features = ["sync", "future"] } monero = { workspace = true } monero-rpc = { path = "../monero-rpc" } monero-rpc-pool = { path = "../monero-rpc-pool" } -monero-seed = { version = "0.1.0", path = "../seed" } +monero-seed = { version = "0.1.0", path = "../monero-seed" } monero-sys = { path = "../monero-sys" } once_cell = "1.19" pem = "3.0" diff --git a/swap/src/bin/asb.rs b/swap/src/bin/asb.rs index d1c85756..7ef8a8f4 100644 --- a/swap/src/bin/asb.rs +++ b/swap/src/bin/asb.rs @@ -445,6 +445,7 @@ async fn init_bitcoin_wallet( config: &Config, seed: &Seed, env_config: swap_env::env::Config, + sync: bool, ) -> Result { tracing::debug!("Opening Bitcoin wallet"); let wallet = bitcoin::wallet::WalletBuilder::default() diff --git a/swap/src/cli/api.rs b/swap/src/cli/api.rs index 881ad100..5aa701e3 100644 --- a/swap/src/cli/api.rs +++ b/swap/src/cli/api.rs @@ -5,6 +5,7 @@ use crate::cli::command::{Bitcoin, Monero}; use crate::common::tor::init_tor_client; use crate::common::tracing_util::Format; use crate::database::{open_db, AccessMode}; +use crate::monero::Wallets; use swap_env::env::{Config as EnvConfig, GetConfig, Mainnet, Testnet}; use swap_fs::system_data_dir; use crate::network::rendezvous::XmrBtcNamespace;