From 3d12631d6949947ef481cb4b843a6ecb8395600d Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Mon, 7 Nov 2022 09:53:50 +0200 Subject: [PATCH] feat: upgrade monero images to v0.18.1.2 --- monero-harness/src/image.rs | 5 +++-- swap/src/monero/wallet_rpc.rs | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/monero-harness/src/image.rs b/monero-harness/src/image.rs index 1b8fc422..63cc4b20 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.18.0.0".to_owned() + "rinocommunity/monero:v0.18.1.2".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.18.0.0".to_owned() + "rinocommunity/monero:v0.18.1.2".to_owned() } fn wait_until_ready(&self, container: &Container<'_, D, Self>) { @@ -229,6 +229,7 @@ impl IntoIterator for MoneroWalletRpcArgs { format!("--daemon-address={}", self.daemon_address), format!("--rpc-bind-port={}", RPC_PORT), "--log-level=4".to_string(), + "--allow-mismatched-daemon-version".to_string(), /* https://github.com/monero-project/monero/issues/8600 */ ]; if self.disable_rpc_login { diff --git a/swap/src/monero/wallet_rpc.rs b/swap/src/monero/wallet_rpc.rs index e3fbb8f4..9cda2fe3 100644 --- a/swap/src/monero/wallet_rpc.rs +++ b/swap/src/monero/wallet_rpc.rs @@ -18,20 +18,20 @@ use tokio_util::io::StreamReader; compile_error!("unsupported operating system"); #[cfg(all(target_os = "macos", target_arch = "x86_64"))] -const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-mac-x64-v0.18.0.0.tar.bz2"; +const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-mac-x64-v0.18.1.2.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"; +const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-mac-armv8-v0.18.1.2.tar.bz2"; #[cfg(all(target_os = "linux", target_arch = "x86_64"))] -const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-linux-x64-v0.18.0.0.tar.bz2"; +const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-linux-x64-v0.18.1.2.tar.bz2"; #[cfg(all(target_os = "linux", target_arch = "arm"))] const DOWNLOAD_URL: &str = - "https://downloads.getmonero.org/cli/monero-linux-armv7-v0.18.0.0.tar.bz2"; + "https://downloads.getmonero.org/cli/monero-linux-armv7-v0.18.1.2.tar.bz2"; #[cfg(target_os = "windows")] -const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-win-x64-v0.18.0.0.zip"; +const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-win-x64-v0.18.1.2.zip"; #[cfg(any(target_os = "macos", target_os = "linux"))] const PACKED_FILE: &str = "monero-wallet-rpc"; @@ -39,7 +39,7 @@ const PACKED_FILE: &str = "monero-wallet-rpc"; #[cfg(target_os = "windows")] const PACKED_FILE: &str = "monero-wallet-rpc.exe"; -const CODENAME: &str = "Fluorine Fermi"; +const WALLET_RPC_VERSION: &str = "v0.18.1.2"; #[derive(Debug, Clone, Copy, thiserror::Error)] #[error("monero wallet rpc executable not found in downloaded archive")] @@ -86,7 +86,7 @@ impl WalletRpc { let version = String::from_utf8_lossy(&output.stdout); tracing::debug!("RPC version output: {}", version); - if !version.contains(CODENAME) { + if !version.contains(WALLET_RPC_VERSION) { tracing::info!("Removing old version of monero-wallet-rpc"); tokio::fs::remove_file(exec_path).await?; }