From 0a7a27327e5653d945042b28ed7a9152533852d9 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Tue, 9 Aug 2022 12:36:18 +0200 Subject: [PATCH] feat: upgrade to monero 0.18 --- CHANGELOG.md | 2 +- monero-harness/src/image.rs | 4 ++-- monero-harness/src/lib.rs | 5 +++-- swap/src/monero/wallet_rpc.rs | 13 ++++++++----- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24cd669d..fc3d0395 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Update from Monero v0.17.2.0 to Monero v0.18.0.0 - Change Monero nodes to [Rino tool nodes](https://community.rino.io/nodes.html) -- Update from monero v17.2.0 to monero v17.3.0 - Always write logs as JSON to files - Change to UTC time for log messages, due to a bug causing no logging at all to be printed (linux/macos), and an [unsoundness issue](https://docs.rs/tracing-subscriber/latest/tracing_subscriber/fmt/time/struct.LocalTime.html) with local time in [the time crate](https://github.com/time-rs/time/issues/293#issuecomment-748151025) - Fix potential integer overflow in ASB when calculating maximum Bitcoin amount for Monero balance diff --git a/monero-harness/src/image.rs b/monero-harness/src/image.rs index 20370288..1b8fc422 100644 --- a/monero-harness/src/image.rs +++ b/monero-harness/src/image.rs @@ -25,7 +25,7 @@ impl Image for Monerod { type EntryPoint = str; fn descriptor(&self) -> String { - "rinocommunity/monero:v0.17.2.0".to_owned() + "rinocommunity/monero:v0.18.0.0".to_owned() } fn wait_until_ready(&self, container: &Container<'_, D, Self>) { @@ -70,7 +70,7 @@ impl Image for MoneroWalletRpc { type EntryPoint = str; fn descriptor(&self) -> String { - "rinocommunity/monero:v0.17.2.0".to_owned() + "rinocommunity/monero:v0.18.0.0".to_owned() } fn wait_until_ready(&self, container: &Container<'_, D, Self>) { diff --git a/monero-harness/src/lib.rs b/monero-harness/src/lib.rs index 0267c754..bdcfc206 100644 --- a/monero-harness/src/lib.rs +++ b/monero-harness/src/lib.rs @@ -117,11 +117,12 @@ impl<'c> Monero { let miner_wallet = self.wallet("miner")?; let miner_address = miner_wallet.address().await?.address; - // generate the first 70 as bulk + // generate the first 120 as bulk + let amount_of_blocks = 120; let monerod = &self.monerod; let res = monerod .client() - .generateblocks(70, miner_address.clone()) + .generateblocks(amount_of_blocks, miner_address.clone()) .await?; tracing::info!("Generated {:?} blocks", res.blocks.len()); miner_wallet.refresh().await?; diff --git a/swap/src/monero/wallet_rpc.rs b/swap/src/monero/wallet_rpc.rs index f3fbec90..7b391288 100644 --- a/swap/src/monero/wallet_rpc.rs +++ b/swap/src/monero/wallet_rpc.rs @@ -17,18 +17,21 @@ use tokio_util::io::StreamReader; #[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))] compile_error!("unsupported operating system"); -#[cfg(target_os = "macos")] -const DOWNLOAD_URL: &str = "http://downloads.getmonero.org/cli/monero-mac-x64-v0.17.3.0.tar.bz2"; +#[cfg(all(target_os = "macos", target_arch = "x86_64"))] +const DOWNLOAD_URL: &str = "http://downloads.getmonero.org/cli/monero-mac-x64-v0.18.0.0.tar.bz2"; + +#[cfg(all(target_os = "macos", target_arch = "arm"))] +const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-mac-armv8-v0.18.0.0.tar.bz2"; #[cfg(all(target_os = "linux", target_arch = "x86_64"))] -const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-linux-x64-v0.17.3.0.tar.bz2"; +const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-linux-x64-v0.18.0.0.tar.bz2"; #[cfg(all(target_os = "linux", target_arch = "arm"))] const DOWNLOAD_URL: &str = - "https://downloads.getmonero.org/cli/monero-linux-armv7-v0.17.3.0.tar.bz2"; + "https://downloads.getmonero.org/cli/monero-linux-armv7-v0.18.0.0.tar.bz2"; #[cfg(target_os = "windows")] -const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-win-x64-v0.17.3.0.zip"; +const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-win-x64-v0.18.0.0.zip"; #[cfg(any(target_os = "macos", target_os = "linux"))] const PACKED_FILE: &str = "monero-wallet-rpc";