Merge pull request #3998

91959d3 build: prepare v0.18.1.0 (selsta)
monero-project · Aug 10, 2022 · 58ddd8c · 58ddd8c
2 parents 264d369 + 91959d3
commit 58ddd8c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(monero-gui)
 message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(VERSION_MAJOR "18")
-set(VERSION_MINOR "0")
+set(VERSION_MINOR "1")
 set(VERSION_REVISION "0")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
 

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -12,7 +12,7 @@ RUN apt update && \
 RUN update-alternatives --set x86_64-w64-mingw32-g++ $(which x86_64-w64-mingw32-g++-posix) && \
     update-alternatives --set x86_64-w64-mingw32-gcc $(which x86_64-w64-mingw32-gcc-posix)
 
-RUN git clone -b v0.18.0.0 --depth 1 https://github.com/monero-project/monero && \
+RUN git clone -b v0.18.1.0 --depth 1 https://github.com/monero-project/monero && \
     cd monero && \
     git reset --hard b6a029f222abada36c7bc6c65899a4ac969d7dee && \
     cp -a contrib/depends / && \

diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ Packaging for your favorite distribution would be a welcome contribution!
    ```
    git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
    ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.0.0`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.1.0`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui
@@ -131,7 +131,7 @@ Packaging for your favorite distribution would be a welcome contribution!
    ```
    git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
    ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.0.0`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.1.0`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui

diff --git a/monero b/monero
+1 −1		.github/workflows/build.yml
+5 −5		README.md
+6 −6		contrib/gitian/DOCKRUN.md
+1 −1		contrib/gitian/README.md
+1 −1		external/randomx
+9 −7		src/blockchain_db/blockchain_db.h
+46 −40		src/blockchain_db/lmdb/db_lmdb.cpp
+ −		src/blocks/checkpoints.dat
+1 −0		src/checkpoints/checkpoints.cpp
+14 −6		src/cryptonote_basic/cryptonote_format_utils.cpp
+1 −1		src/cryptonote_basic/cryptonote_format_utils.h
+1 −1		src/cryptonote_core/blockchain.cpp
+48 −3		src/cryptonote_core/cryptonote_core.cpp
+7 −0		src/cryptonote_core/cryptonote_core.h
+84 −22		src/cryptonote_core/tx_pool.cpp
+15 −2		src/cryptonote_core/tx_pool.h
+1 −0		src/device/device.hpp
+1 −1		src/device/device_default.hpp
+71 −4		src/device/device_ledger.cpp
+2 −1		src/device/device_ledger.hpp
+4 −0		src/device/log.cpp
+1 −0		src/device/log.hpp
+8 −20		src/device_trezor/device_trezor.cpp
+97 −128		src/device_trezor/trezor/protocol.cpp
+30 −15		src/device_trezor/trezor/protocol.hpp
+1 −1		src/version.cpp.in
+1 −1		tests/README.md
+1 −1		tests/core_tests/chaingen.cpp
+2 −2		tests/functional_tests/CMakeLists.txt
+2 −2		tests/functional_tests/functional_tests_rpc.py
+20 −0		tests/functional_tests/txpool.py
+79 −15		tests/trezor/trezor_tests.cpp
+16 −1		tests/trezor/trezor_tests.h
+49 −0		utils/python-rpc/framework/zmq.py