Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-24 06:59:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat: upgrade to monero 0.18

Browse Source
This commit is contained in:
Byron Hambly 2022-08-09 12:36:18 +02:00
parent 0d794a13d0
commit 0a7a27327e
No known key found for this signature in database
GPG Key ID: DE8F6EA20A661697
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -9,8 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### 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) - 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 - 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) - 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 - Fix potential integer overflow in ASB when calculating maximum Bitcoin amount for Monero balance

4
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.17.2.0".to_owned() "rinocommunity/monero:v0.18.0.0".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.17.2.0".to_owned() "rinocommunity/monero:v0.18.0.0".to_owned()
} }
fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) { fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) {

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

@ -117,11 +117,12 @@ impl<'c> Monero {
let miner_wallet = self.wallet("miner")?; let miner_wallet = self.wallet("miner")?;
let miner_address = miner_wallet.address().await?.address; 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 monerod = &self.monerod;
let res = monerod let res = monerod
.client() .client()
.generateblocks(70, miner_address.clone()) .generateblocks(amount_of_blocks, miner_address.clone())
.await?; .await?;
tracing::info!("Generated {:?} blocks", res.blocks.len()); tracing::info!("Generated {:?} blocks", res.blocks.len());
miner_wallet.refresh().await?; miner_wallet.refresh().await?;

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

@ -17,18 +17,21 @@ use tokio_util::io::StreamReader;
#[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))] #[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
compile_error!("unsupported operating system"); compile_error!("unsupported operating system");
#[cfg(target_os = "macos")] #[cfg(all(target_os = "macos", target_arch = "x86_64"))]
const DOWNLOAD_URL: &str = "http://downloads.getmonero.org/cli/monero-mac-x64-v0.17.3.0.tar.bz2"; 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"))] #[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"))] #[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.17.3.0.tar.bz2"; "https://downloads.getmonero.org/cli/monero-linux-armv7-v0.18.0.0.tar.bz2";
#[cfg(target_os = "windows")] #[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"))] #[cfg(any(target_os = "macos", target_os = "linux"))]
const PACKED_FILE: &str = "monero-wallet-rpc"; const PACKED_FILE: &str = "monero-wallet-rpc";