From 974029dd4b370b78dccfc921a60cd16187345d99 Mon Sep 17 00:00:00 2001 From: woodser Date: Thu, 12 Oct 2023 13:26:16 -0400 Subject: [PATCH] update monero binaries to v0.18.3.1 --- build.gradle | 12 ++++++------ docs/developer-guide.md | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 7847397579..9af342c3ce 100644 --- a/build.gradle +++ b/build.gradle @@ -436,12 +436,12 @@ configure(project(':core')) { doLast { // get monero binaries download url Map moneroBinaries = [ - 'linux' : 'https://github.com/haveno-dex/monero/releases/download/testing13/monero-bins-haveno-linux.tar.gz', - 'linux-sha256' : 'eac55092b97162854f2a94f7895d52cf4a20eba0a55a1769ce053060d6be6195', - 'mac' : 'https://github.com/haveno-dex/monero/releases/download/testing13/monero-bins-haveno-mac.tar.gz', - 'mac-sha256' : 'e7bf40ef35cb278649c63f8651cee6124d4a5e97448dfa407b193572ebd85fb6', - 'windows' : 'https://github.com/haveno-dex/monero/releases/download/testing13/monero-bins-haveno-windows.zip', - 'windows-sha256': 'f7da08d793041103c069b23229040fc4f9632009317b84d201f63f477d3ca3dd' + 'linux' : 'https://github.com/haveno-dex/monero/releases/download/v0.18.3.1/monero-bins-haveno-linux.tar.gz', + 'linux-sha256' : '7f71294304b691fc136b72bebe72238f30e42e6d8db549d75dfbf53276a7a738', + 'mac' : 'https://github.com/haveno-dex/monero/releases/download/v0.18.3.1/monero-bins-haveno-mac.tar.gz', + 'mac-sha256' : 'b0f999dcc2721da20eec0be3cad79d0c362472c3901cad6d01555f5f0a5a7135', + 'windows' : 'https://github.com/haveno-dex/monero/releases/download/v0.18.3.1/monero-bins-haveno-windows.zip', + 'windows-sha256': 'd02a4712e0b03320b8ee30a9830b2311d948bf8a1976f4bbf260a52aba12acb2' ] String osKey diff --git a/docs/developer-guide.md b/docs/developer-guide.md index ff3b9aeff0..f543b41220 100644 --- a/docs/developer-guide.md +++ b/docs/developer-guide.md @@ -46,7 +46,7 @@ Follow [instructions](https://github.com/haveno-dex/haveno-ts#run-tests) to run ## Release portable Monero binaries for each platform 1. Update the release-v0.18 branch on Haveno's [monero repo](https://github.com/haveno-dex/monero) to the latest release from upstream + any customizations (e.g. a commit to speed up testnet hardforks for local development). -2. `git tag && git push haveno ` +2. `git tag && git push haveno-monero ` 3. Follow instructions to [build portable binaries for each platform](#build-portable-monero-binaries-for-each-platform). 4. Publish a new release at https://github.com/haveno-dex/monero/releases with the updated binaries and hashes. 5. Update the paths and hashes in build.gradle and PR. @@ -57,11 +57,12 @@ Based on these instructions: https://github.com/monero-project/monero#cross-comp 1. Install Ubuntu 20.04. 2. `sudo apt-get update && sudo apt-get upgrade` -3. `sudo apt install cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev libtinfo5 autoconf libtool libtool-bin gperf` -4. `git clone https://github.com/haveno-dex/monero.git` -5. `cd ./monero (or rename this folder)` -6. `git fetch origin && git reset --hard origin/release-v0.18` -7. `git submodule update --init --force` +3. Install monero dependencies: `sudo apt update && sudo apt install build-essential cmake pkg-config libssl-dev libzmq3-dev libsodium-dev libunwind8-dev liblzma-dev libreadline6-dev libpgm-dev qttools5-dev-tools libhidapi-dev libusb-1.0-0-dev libprotobuf-dev protobuf-compiler libudev-dev libboost-chrono-dev libboost-date-time-dev libboost-filesystem-dev libboost-locale-dev libboost-program-options-dev libboost-regex-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev python3 ccache` +4. `sudo apt install cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev libtinfo5 autoconf libtool libtool-bin gperf git curl` +5. `git clone https://github.com/haveno-dex/monero.git` +6. `cd ./monero` (or rename to haveno-monero: `mv monero/ haveno-monero && cd ./haveno-monero`) +7. `git fetch origin && git reset --hard origin/release-v0.18` +8. `git submodule update --init --force` > Note: > If you get the prompt "Reversed (or previously applied) patch detected! Assume -R? [n]" then confirm 'y'.