Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: upgrade monero images to v0.18.1.2

Browse Source
This commit is contained in:
Byron Hambly 2022-11-07 09:53:50 +02:00
parent f224c49584
commit 3d12631d69
No known key found for this signature in database
GPG Key ID: DE8F6EA20A661697
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monero-harness/src/image.rs
View File

@ -25,7 +25,7 @@ impl Image for Monerod {
type EntryPoint = str; type EntryPoint = str;
fn descriptor(&self) -> String { fn descriptor(&self) -> String {
"rinocommunity/monero:v0.18.0.0".to_owned() "rinocommunity/monero:v0.18.1.2".to_owned()
} }
fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) { fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) {
@ -70,7 +70,7 @@ impl Image for MoneroWalletRpc {
type EntryPoint = str; type EntryPoint = str;
fn descriptor(&self) -> String { fn descriptor(&self) -> String {
"rinocommunity/monero:v0.18.0.0".to_owned() "rinocommunity/monero:v0.18.1.2".to_owned()
} }
fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) { fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) {
@ -229,6 +229,7 @@ impl IntoIterator for MoneroWalletRpcArgs {
format!("--daemon-address={}", self.daemon_address), format!("--daemon-address={}", self.daemon_address),
format!("--rpc-bind-port={}", RPC_PORT), format!("--rpc-bind-port={}", RPC_PORT),
"--log-level=4".to_string(), "--log-level=4".to_string(),
"--allow-mismatched-daemon-version".to_string(), /* https://github.com/monero-project/monero/issues/8600 */
]; ];
if self.disable_rpc_login { if self.disable_rpc_login {

14
swap/src/monero/wallet_rpc.rs
View File

@ -18,20 +18,20 @@ use tokio_util::io::StreamReader;
compile_error!("unsupported operating system"); compile_error!("unsupported operating system");
#[cfg(all(target_os = "macos", target_arch = "x86_64"))] #[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"))] #[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"))] #[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"))] #[cfg(all(target_os = "linux", target_arch = "arm"))]
const DOWNLOAD_URL: &str = 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")] #[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"))] #[cfg(any(target_os = "macos", target_os = "linux"))]
const PACKED_FILE: &str = "monero-wallet-rpc"; const PACKED_FILE: &str = "monero-wallet-rpc";
@ -39,7 +39,7 @@ const PACKED_FILE: &str = "monero-wallet-rpc";
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
const PACKED_FILE: &str = "monero-wallet-rpc.exe"; 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)] #[derive(Debug, Clone, Copy, thiserror::Error)]
#[error("monero wallet rpc executable not found in downloaded archive")] #[error("monero wallet rpc executable not found in downloaded archive")]
@ -86,7 +86,7 @@ impl WalletRpc {
let version = String::from_utf8_lossy(&output.stdout); let version = String::from_utf8_lossy(&output.stdout);
tracing::debug!("RPC version output: {}", version); 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"); tracing::info!("Removing old version of monero-wallet-rpc");
tokio::fs::remove_file(exec_path).await?; tokio::fs::remove_file(exec_path).await?;
} }