Merge pull request #4137

9f33c77 build: prepare v0.18.2.2 (selsta)
monero-project · Apr 4, 2023 · f650e96 · f650e96
2 parents 91e3d3a + 9f33c77
commit f650e96
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(VERSION_MAJOR "18")
 set(VERSION_MINOR "2")
-set(VERSION_REVISION "0")
+set(VERSION_REVISION "2")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
 
 option(STATIC "Link libraries statically, requires static Qt")

diff --git a/README.md b/README.md
@@ -107,7 +107,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.2.0`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.2.2`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui
@@ -130,7 +130,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.2.0`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.2.2`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui

diff --git a/monero b/monero
+14 −13		.github/workflows/build.yml
+6 −5		.github/workflows/depends.yml
+1 −1		.github/workflows/gitian.yml
+5 −5		README.md
+1 −1		contrib/gitian/DOCKRUN.md
+1 −1		contrib/gitian/README.md
+ −		src/blocks/checkpoints.dat
+2 −0		src/checkpoints/checkpoints.cpp
+6 −4		src/crypto/c_threads.h
+2 −1		src/crypto/rx-slow-hash.c
+7 −1		src/cryptonote_basic/verification_context.h
+6 −0		src/cryptonote_config.h
+3 −1		src/cryptonote_core/CMakeLists.txt
+19 −64		src/cryptonote_core/blockchain.cpp
+13 −9		src/cryptonote_core/blockchain.h
+1 −1		src/cryptonote_core/cryptonote_core.cpp
+2 −0		src/cryptonote_core/cryptonote_tx_utils.cpp
+11 −0		src/cryptonote_core/tx_pool.cpp
+167 −0		src/cryptonote_core/tx_verification_utils.cpp
+78 −0		src/cryptonote_core/tx_verification_utils.h
+1 −1		src/cryptonote_protocol/cryptonote_protocol_handler.inl
+1 −0		src/device/device_ledger.cpp
+22 −2		src/p2p/net_node.inl
+0 −37		src/ringct/rctSigs.cpp
+0 −1		src/ringct/rctSigs.h
+8 −0		src/ringct/rctTypes.h
+2 −0		src/rpc/core_rpc_server.cpp
+3 −1		src/rpc/core_rpc_server_commands_defs.h
+1 −1		src/version.cpp.in
+3 −3		src/wallet/wallet2.cpp
+1 −0		src/wallet/wallet2.h
+ −		tests/data/txs/bpp_tx_e89415.bin
+1 −0		tests/unit_tests/CMakeLists.txt
+426 −0		tests/unit_tests/ver_rct_non_semantics_simple_cached.cpp