Skip to content

Commit

Permalink
Merge pull request #4220
Browse files Browse the repository at this point in the history
f5cb244 build: prepare v0.18.3.0 (selsta)
  • Loading branch information
luigi1111 committed Sep 30, 2023
2 parents 3612866 + f5cb244 commit 8983cae
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ project(monero-gui)
message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")

set(VERSION_MAJOR "18")
set(VERSION_MINOR "2")
set(VERSION_REVISION "2")
set(VERSION_MINOR "3")
set(VERSION_REVISION "0")
set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")

option(STATIC "Link libraries statically, requires static Qt")
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2`) to build the release binaries.
\* `master` - replace with the desired version tag (e.g. `v0.18.3.0`) to build the release binaries.
3. Prepare build environment
```
cd monero-gui
Expand All @@ -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.2`) to build the release binaries.
\* `master` - replace with the desired version tag (e.g. `v0.18.3.0`) to build the release binaries.
3. Prepare build environment
```
cd monero-gui
Expand Down
2 changes: 1 addition & 1 deletion monero
Submodule monero updated 53 files
+1 −1 .github/workflows/build.yml
+5 −5 README.md
+2 −2 contrib/depends/packages/openssl.mk
+1 −0 contrib/epee/include/file_io_utils.h
+1 −4 contrib/epee/include/net/abstract_tcp_server2.inl
+10 −0 contrib/epee/include/span.h
+1 −0 contrib/epee/include/storages/parserse_base_utils.h
+3 −0 contrib/epee/include/storages/portable_storage_from_bin.h
+3 −0 contrib/epee/include/storages/portable_storage_from_json.h
+8 −5 contrib/epee/src/net_ssl.cpp
+1 −1 contrib/gitian/DOCKRUN.md
+1 −1 contrib/gitian/README.md
+ src/blocks/checkpoints.dat
+1 −0 src/checkpoints/checkpoints.cpp
+1 −0 src/common/combinator.h
+1 −1 src/common/perf_timer.cpp
+15 −20 src/common/util.cpp
+1 −1 src/cryptonote_basic/cryptonote_format_utils.cpp
+8 −1 src/cryptonote_basic/miner.cpp
+3 −3 src/cryptonote_core/blockchain.cpp
+10 −0 src/cryptonote_core/cryptonote_core.cpp
+17 −0 src/cryptonote_core/cryptonote_core.h
+235 −23 src/cryptonote_core/tx_pool.cpp
+38 −1 src/cryptonote_core/tx_pool.h
+10 −0 src/cryptonote_protocol/cryptonote_protocol_handler.inl
+13 −0 src/daemon/main.cpp
+152 −87 src/rpc/core_rpc_server.cpp
+51 −1 src/rpc/core_rpc_server_commands_defs.h
+26 −0 src/serialization/json_object.cpp
+3 −0 src/serialization/json_object.h
+7 −3 src/simplewallet/simplewallet.cpp
+1 −1 src/version.cpp.in
+6 −2 src/wallet/api/wallet.cpp
+1 −0 src/wallet/api/wallet2_api.h
+52 −0 src/wallet/node_rpc_proxy.cpp
+2 −0 src/wallet/node_rpc_proxy.h
+842 −281 src/wallet/wallet2.cpp
+65 −16 src/wallet/wallet2.h
+19 −0 src/wallet/wallet_errors.h
+49 −8 src/wallet/wallet_rpc_server.cpp
+61 −157 src/wallet/wallet_rpc_server_commands_defs.h
+2 −8 tests/CMakeLists.txt
+1 −1 tests/README.md
+ tests/data/wallet_00fd416a
+ tests/data/wallet_00fd416a.keys
+2 −2 tests/functional_tests/CMakeLists.txt
+10 −0 tests/functional_tests/mining.py
+236 −37 tests/functional_tests/multisig.py
+221 −5 tests/functional_tests/transfer.py
+2 −0 tests/unit_tests/CMakeLists.txt
+50 −0 tests/unit_tests/util.cpp
+266 −0 tests/unit_tests/wallet_storage.cpp
+2 −1 utils/python-rpc/framework/wallet.py

0 comments on commit 8983cae

Please sign in to comment.