Skip to content

Commit 8fbe396

Browse files
committed
feat: upgrade to monero 0.18
1 parent 74e7c1e commit 8fbe396

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

monero-harness/src/image.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ impl Image for Monerod {
2525
type EntryPoint = str;
2626

2727
fn descriptor(&self) -> String {
28-
"rinocommunity/monero:v0.17.2.0".to_owned()
28+
"rinocommunity/monero:v0.18.0.0".to_owned()
2929
}
3030

3131
fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) {
@@ -70,7 +70,7 @@ impl Image for MoneroWalletRpc {
7070
type EntryPoint = str;
7171

7272
fn descriptor(&self) -> String {
73-
"rinocommunity/monero:v0.17.2.0".to_owned()
73+
"rinocommunity/monero:v0.18.0.0".to_owned()
7474
}
7575

7676
fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) {

monero-harness/src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,12 @@ impl<'c> Monero {
117117
let miner_wallet = self.wallet("miner")?;
118118
let miner_address = miner_wallet.address().await?.address;
119119

120-
// generate the first 70 as bulk
120+
// generate the first 120 as bulk
121+
let amount_of_blocks = 120;
121122
let monerod = &self.monerod;
122123
let res = monerod
123124
.client()
124-
.generateblocks(70, miner_address.clone())
125+
.generateblocks(amount_of_blocks, miner_address.clone())
125126
.await?;
126127
tracing::info!("Generated {:?} blocks", res.blocks.len());
127128
miner_wallet.refresh().await?;

swap/src/monero/wallet_rpc.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,21 @@ use tokio_util::io::StreamReader;
1717
#[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
1818
compile_error!("unsupported operating system");
1919

20-
#[cfg(target_os = "macos")]
21-
const DOWNLOAD_URL: &str = "http://downloads.getmonero.org/cli/monero-mac-x64-v0.17.3.0.tar.bz2";
20+
#[cfg(all(target_os = "macos", target_arch = "x86_64"))]
21+
const DOWNLOAD_URL: &str = "http://downloads.getmonero.org/cli/monero-mac-x64-v0.18.0.0.tar.bz2";
22+
23+
#[cfg(all(target_os = "macos", target_arch = "arm"))]
24+
const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-mac-armv8-v0.18.0.0.tar.bz2";
2225

2326
#[cfg(all(target_os = "linux", target_arch = "x86_64"))]
24-
const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-linux-x64-v0.17.3.0.tar.bz2";
27+
const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-linux-x64-v0.18.0.0.tar.bz2";
2528

2629
#[cfg(all(target_os = "linux", target_arch = "arm"))]
2730
const DOWNLOAD_URL: &str =
28-
"https://downloads.getmonero.org/cli/monero-linux-armv7-v0.17.3.0.tar.bz2";
31+
"https://downloads.getmonero.org/cli/monero-linux-armv7-v0.18.0.0.tar.bz2";
2932

3033
#[cfg(target_os = "windows")]
31-
const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-win-x64-v0.17.3.0.zip";
34+
const DOWNLOAD_URL: &str = "https://downloads.getmonero.org/cli/monero-win-x64-v0.18.0.0.zip";
3235

3336
#[cfg(any(target_os = "macos", target_os = "linux"))]
3437
const PACKED_FILE: &str = "monero-wallet-rpc";

0 commit comments

Comments
 (0)