Merge pull request #3180

954c9725 repo: prepare v0.17.1.1 (selsta)
Merge pull request #3181
2020-10-19 00:14:37 -07:00 · 2020-10-19 00:14:12 -07:00 · 2020-10-19 00:13:24 -07:00 · 2020-10-19 00:12:52 -07:00 · 2020-10-19 00:12:31 -07:00 · 2020-10-19 00:12:05 -07:00
41 changed files with 241 additions and 2549 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(monero-gui)
 message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")

 set(VERSION_MAJOR "17")
-set(VERSION_MINOR "0")
+set(VERSION_MINOR "1")
 set(VERSION_REVISION "1")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")

@@ -175,6 +175,7 @@ find_package(Boost 1.58 REQUIRED COMPONENTS
 		locale)

 if(UNIX AND NOT APPLE)
+    set(CMAKE_SKIP_RPATH ON)
    find_package(X11 REQUIRED)
    message(STATUS "X11_FOUND = ${X11_FOUND}")
    message(STATUS "X11_INCLUDE_DIR = ${X11_INCLUDE_DIR}")
--- a/Dockerfile.linux
+++ b/Dockerfile.linux
@@ -47,7 +47,7 @@ RUN git clone -b v1.2.11 --depth 1 https://github.com/madler/zlib && \
    make -j$THREADS install && \
    rm -rf $(pwd)

-RUN git clone -b VER-2-10-2 --depth 1 https://git.sv.nongnu.org/r/freetype/freetype2.git && \
+RUN git clone -b VER-2-10-2 --depth 1 https://git.savannah.gnu.org/git/freetype/freetype2.git && \
    cd freetype2 && \
    git reset --hard 132f19b779828b194b3fede187cee719785db4d8 && \
    ./autogen.sh && \
--- a/5
+++ b/5
@@ -36,6 +36,11 @@ scanner:
 release:
 	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="x86-64" -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)

+release-linux-armv8:
+	mkdir -p $(builddir)/release
+	cd $(builddir)/release
+	cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="armv8-a" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="linux-armv8" $(topdir) && $(MAKE)
+
 release-static:
 	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)

--- a/README.md
+++ b/README.md
@@ -44,8 +44,8 @@ GUI development funding and/or some supporting services are also graciously prov

 [<img width="150" src="https://www.getmonero.org/img/sponsors/tarilabs.png"/>](https://tarilabs.com/)
 [<img width="150" src="https://www.getmonero.org/img/sponsors/globee.png"/>](https://globee.com/)
-[<img width="150" src="https://www.getmonero.org/img/sponsors/symas.png"/>](https://www.symas.com/)
-[<img width="150" src="https://www.getmonero.org/img/sponsors/forked_logo.png"/>](https://www.forked.net/)
+[<img width="150" src="https://www.getmonero.org/img/sponsors/symas.png"/>](https://symas.com/)
+[<img width="150" src="https://www.getmonero.org/img/sponsors/forked_logo.png"/>](http://www.forked.net/)
 [<img width="150" src="https://www.getmonero.org/img/sponsors/macstadium.png"/>](https://www.macstadium.com/)

 There are also several mining pools that kindly donate a portion of their fees, [a list of them can be found on our Bitcointalk post](https://bitcointalk.org/index.php?topic=583449.0).
--- a/cmake/Doxyfile.in
+++ b/cmake/Doxyfile.in
--- a/cmake/Doxygen.extra.css.in
+++ b/cmake/Doxygen.extra.css.in
@@ -1,14 +0,0 @@
-/* increase vertical space */
-#titlearea, #nav-path {
-    display: none;
-    height: 0px;
-}
-
-
-/* uncomment these lines for some extra vertical space */
-
-/*
-.tablist li {
-    line-height: 26px;
-}
-*/
--- a/cmake/FindBacktrace.cmake
+++ b/cmake/FindBacktrace.cmake
@@ -1,98 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#.rst:
-# FindBacktrace
-# -------------
-#
-# Find provider for backtrace(3).
-#
-# Checks if OS supports backtrace(3) via either libc or custom library.
-# This module defines the following variables:
-#
-# ``Backtrace_HEADER``
-#   The header file needed for backtrace(3). Cached.
-#   Could be forcibly set by user.
-# ``Backtrace_INCLUDE_DIRS``
-#   The include directories needed to use backtrace(3) header.
-# ``Backtrace_LIBRARIES``
-#   The libraries (linker flags) needed to use backtrace(3), if any.
-# ``Backtrace_FOUND``
-#   Is set if and only if backtrace(3) support detected.
-#
-# The following cache variables are also available to set or use:
-#
-# ``Backtrace_LIBRARY``
-#   The external library providing backtrace, if any.
-# ``Backtrace_INCLUDE_DIR``
-#   The directory holding the backtrace(3) header.
-#
-# Typical usage is to generate of header file using configure_file() with the
-# contents like the following::
-#
-#  #cmakedefine01 Backtrace_FOUND
-#  #if Backtrace_FOUND
-#  # include <${Backtrace_HEADER}>
-#  #endif
-#
-# And then reference that generated header file in actual source.
-
-include(CMakePushCheckState)
-include(CheckSymbolExists)
-include(FindPackageHandleStandardArgs)
-
-# List of variables to be provided to find_package_handle_standard_args()
-set(_Backtrace_STD_ARGS Backtrace_INCLUDE_DIR)
-
-if(Backtrace_HEADER)
-  set(_Backtrace_HEADER_TRY "${Backtrace_HEADER}")
-else(Backtrace_HEADER)
-  set(_Backtrace_HEADER_TRY "execinfo.h")
-endif(Backtrace_HEADER)
-
-find_path(Backtrace_INCLUDE_DIR "${_Backtrace_HEADER_TRY}")
-set(Backtrace_INCLUDE_DIRS ${Backtrace_INCLUDE_DIR})
-
-if (NOT DEFINED Backtrace_LIBRARY)
-  # First, check if we already have backtrace(), e.g., in libc
-  cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_INCLUDES ${Backtrace_INCLUDE_DIRS})
-  set(CMAKE_REQUIRED_QUIET ${Backtrace_FIND_QUIETLY})
-  check_symbol_exists("backtrace" "${_Backtrace_HEADER_TRY}" _Backtrace_SYM_FOUND)
-  cmake_pop_check_state()
-endif()
-
-if(_Backtrace_SYM_FOUND)
-  # Avoid repeating the message() call below each time CMake is run.
-  if(NOT Backtrace_FIND_QUIETLY AND NOT DEFINED Backtrace_LIBRARY)
-    message(STATUS "backtrace facility detected in default set of libraries")
-  endif()
-  set(Backtrace_LIBRARY "" CACHE FILEPATH "Library providing backtrace(3), empty for default set of libraries")
-else()
-  # Check for external library, for non-glibc systems
-  if(Backtrace_INCLUDE_DIR)
-    # OpenBSD has libbacktrace renamed to libexecinfo
-    find_library(Backtrace_LIBRARY "execinfo")
-  elseif()     # respect user wishes
-    set(_Backtrace_HEADER_TRY "backtrace.h")
-    find_path(Backtrace_INCLUDE_DIR ${_Backtrace_HEADER_TRY})
-    find_library(Backtrace_LIBRARY "backtrace")
-  endif()
-
-  # Prepend list with library path as it's more common practice
-  set(_Backtrace_STD_ARGS Backtrace_LIBRARY ${_Backtrace_STD_ARGS})
-endif()
-
-message(STATUS "Backtrace_LIBRARY: ${Backtrace_LIBRARY}")
-if(Backtrace_LIBRARY STREQUAL "NOTFOUND")
-  set(Backtrace_LIBRARY "")
-endif()
-if(Backtrace_LIBRARY STREQUAL "Backtrace_LIBRARY-NOTFOUND")
-  set(Backtrace_LIBRARY "")
-endif()
-
-set(Backtrace_LIBRARIES ${Backtrace_LIBRARY})
-set(Backtrace_HEADER "${_Backtrace_HEADER_TRY}" CACHE STRING "Header providing backtrace(3) facility")
-
-find_package_handle_standard_args(Backtrace FOUND_VAR Backtrace_FOUND REQUIRED_VARS ${_Backtrace_STD_ARGS})
-mark_as_advanced(Backtrace_HEADER Backtrace_INCLUDE_DIR Backtrace_LIBRARY)
--- a/cmake/FindBerkeleyDB.cmake
+++ b/cmake/FindBerkeleyDB.cmake
@@ -1,25 +0,0 @@
-# - Try to find Berkeley DB
-# Once done this will define
-#
-#  BERKELEY_DB_FOUND - system has Berkeley DB
-#  BERKELEY_DB_INCLUDE_DIR - the Berkeley DB include directory
-#  BERKELEY_DB_LIBRARIES - Link these to use Berkeley DB
-#  BERKELEY_DB_DEFINITIONS - Compiler switches required for using Berkeley DB
-
-# Copyright (c) 2006, Alexander Dymo, <adymo@kdevelop.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-find_path(BERKELEY_DB_INCLUDE_DIR db_cxx.h
-  /usr/include/db4
-  /usr/local/include/db4
-)
-
-find_library(BERKELEY_DB_LIBRARIES NAMES db_cxx )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Berkeley "Could not find Berkeley DB >= 4.1" BERKELEY_DB_INCLUDE_DIR BERKELEY_DB_LIBRARIES)
-# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
-mark_as_advanced(BERKELEY_DB_INCLUDE_DIR BERKELEY_DB_LIBRARIES )
-
--- a/cmake/FindLibunwind.cmake
+++ b/cmake/FindLibunwind.cmake
@@ -1,41 +0,0 @@
-# - Try to find libunwind
-# Once done this will define
-#
-#  LIBUNWIND_FOUND - system has libunwind
-#  LIBUNWIND_INCLUDE_DIR - the libunwind include directory
-#  LIBUNWIND_LIBRARIES - Link these to use libunwind
-#  LIBUNWIND_DEFINITIONS - Compiler switches required for using libunwind
-
-# Copyright (c) 2006, Alexander Dymo, <adymo@kdevelop.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-find_path(LIBUNWIND_INCLUDE_DIR libunwind.h
-  /usr/include
-  /usr/local/include
-)
-
-find_library(LIBUNWIND_LIBRARIES NAMES unwind )
-if(NOT LIBUNWIND_LIBRARIES STREQUAL "LIBUNWIND_LIBRARIES-NOTFOUND")
-  if (CMAKE_COMPILER_IS_GNUCC)
-    set(LIBUNWIND_LIBRARIES "gcc_eh;${LIBUNWIND_LIBRARIES}")
-  endif()
-endif()
-
-# some versions of libunwind need liblzma, and we don't use pkg-config
-# so we just look whether liblzma is installed, and add it if it is.
-# It might not be actually needed, but doesn't hurt if it is not.
-# We don't need any headers, just the lib, as it's privately needed.
-message(STATUS "looking for liblzma")
-find_library(LIBLZMA_LIBRARIES lzma )
-if(NOT LIBLZMA_LIBRARIES STREQUAL "LIBLZMA_LIBRARIES-NOTFOUND")
-  message(STATUS "liblzma found")
-  set(LIBUNWIND_LIBRARIES "${LIBUNWIND_LIBRARIES};${LIBLZMA_LIBRARIES}")
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libunwind "Could not find libunwind" LIBUNWIND_INCLUDE_DIR LIBUNWIND_LIBRARIES)
-# show the LIBUNWIND_INCLUDE_DIR and LIBUNWIND_LIBRARIES variables only in the advanced view
-mark_as_advanced(LIBUNWIND_INCLUDE_DIR LIBUNWIND_LIBRARIES )
-
--- a/cmake/FindMiniupnpc.cmake
+++ b/cmake/FindMiniupnpc.cmake
@@ -1,59 +0,0 @@
-# --------------------------------- FindMiniupnpc Start ---------------------------------
-# Locate miniupnp library
-# This module defines
-#  MINIUPNP_FOUND, if false, do not try to link to miniupnp
-#  MINIUPNP_LIBRARY, the miniupnp variant
-#  MINIUPNP_INCLUDE_DIR, where to find miniupnpc.h and family)
-#  MINIUPNPC_VERSION_1_7_OR_HIGHER, set if we detect the version of miniupnpc is 1.7 or higher
-#
-# Note that the expected include convention is
-#  #include "miniupnpc.h"
-# and not
-#  #include <miniupnpc/miniupnpc.h>
-# This is because, the miniupnpc location is not standardized and may exist
-# in locations other than miniupnpc/
-
-if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
-	# Already in cache, be silent
-	set(MINIUPNP_FIND_QUIETLY TRUE)
-endif ()
-
-find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h
-  HINTS $ENV{MINIUPNP_INCLUDE_DIR}
-  PATH_SUFFIXES miniupnpc
-)
-
-find_library(MINIUPNP_LIBRARY miniupnpc
-  HINTS $ENV{MINIUPNP_LIBRARY}
-)
-
-find_library(MINIUPNP_STATIC_LIBRARY libminiupnpc.a
-  HINTS $ENV{MINIUPNP_STATIC_LIBRARY}
-)
-
-set(MINIUPNP_INCLUDE_DIRS ${MINIUPNP_INCLUDE_DIR})
-set(MINIUPNP_LIBRARIES ${MINIUPNP_LIBRARY})
-set(MINIUPNP_STATIC_LIBRARIES ${MINIUPNP_STATIC_LIBRARY})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
-  MiniUPnPc DEFAULT_MSG
-  MINIUPNP_INCLUDE_DIR
-  MINIUPNP_LIBRARY
-)
-
-IF(MINIUPNPC_FOUND)
-  file(STRINGS "${MINIUPNP_INCLUDE_DIR}/miniupnpc.h" MINIUPNPC_API_VERSION_STR REGEX "^#define[\t ]+MINIUPNPC_API_VERSION[\t ]+[0-9]+")
-  if(MINIUPNPC_API_VERSION_STR MATCHES "^#define[\t ]+MINIUPNPC_API_VERSION[\t ]+([0-9]+)")
-    set(MINIUPNPC_API_VERSION "${CMAKE_MATCH_1}")
-	if (${MINIUPNPC_API_VERSION} GREATER "10" OR ${MINIUPNPC_API_VERSION} EQUAL "10")
-		message(STATUS "Found miniupnpc API version " ${MINIUPNPC_API_VERSION})
-		set(MINIUPNP_FOUND true)
-		set(MINIUPNPC_VERSION_1_7_OR_HIGHER true)
-	endif()
-  endif()
-
-ENDIF()
-
-mark_as_advanced(MINIUPNP_INCLUDE_DIR MINIUPNP_LIBRARY MINIUPNP_STATIC_LIBRARY)
-# --------------------------------- FindMiniupnpc End ---------------------------------
--- a/cmake/FindReadline.cmake
+++ b/cmake/FindReadline.cmake
@@ -1,91 +0,0 @@
-# - Try to find readline include dirs and libraries 
-#
-# Usage of this module as follows:
-#
-#     find_package(Readline)
-#
-# Variables used by this module, they can change the default behaviour and need
-# to be set before calling find_package:
-#
-#  Readline_ROOT_DIR         Set this variable to the root installation of
-#                            readline if the module has problems finding the
-#                            proper installation path.
-#
-# Variables defined by this module:
-#
-#  READLINE_FOUND            System has readline, include and lib dirs found
-#  GNU_READLINE_FOUND        Version of readline found is GNU readline, not libedit!
-#  LIBEDIT_FOUND             Version of readline found is libedit, not GNU readline!
-#  Readline_INCLUDE_DIR      The readline include directories. 
-#  Readline_LIBRARY          The readline library.
-#  GNU_READLINE_LIBRARY      The GNU readline library or empty string.
-#  LIBEDIT_LIBRARY           The libedit library or empty string.
-
-find_path(Readline_ROOT_DIR
-    NAMES include/readline/readline.h
-    PATHS /usr/local/opt/readline/ /opt/local/ /usr/local/ /usr/
-    NO_DEFAULT_PATH
-)
-
-find_path(Readline_INCLUDE_DIR
-    NAMES readline/readline.h
-    PATHS ${Readline_ROOT_DIR}/include
-    NO_DEFAULT_PATH
-)
-
-find_library(Readline_LIBRARY
-    NAMES readline
-    PATHS ${Readline_ROOT_DIR}/lib
-    NO_DEFAULT_PATH
-)
-
-find_library(Termcap_LIBRARY
-  NAMES tinfo termcap ncursesw ncurses cursesw curses
-)
-
-if(Readline_INCLUDE_DIR AND Readline_LIBRARY)
-  set(READLINE_FOUND TRUE)
-else(Readline_INCLUDE_DIR AND Readline_LIBRARY)
-  FIND_LIBRARY(Readline_LIBRARY NAMES readline PATHS Readline_ROOT_DIR)
-  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG Readline_INCLUDE_DIR Readline_LIBRARY )
-  MARK_AS_ADVANCED(Readline_INCLUDE_DIR Readline_LIBRARY)
-endif(Readline_INCLUDE_DIR AND Readline_LIBRARY)
-
-mark_as_advanced(
-    Readline_ROOT_DIR
-    Readline_INCLUDE_DIR
-    Readline_LIBRARY
-)
-
-set(CMAKE_REQUIRED_INCLUDES ${Readline_INCLUDE_DIR})
-set(CMAKE_REQUIRED_LIBRARIES ${Readline_LIBRARY})
-
-include(CheckFunctionExists)
-check_function_exists(rl_copy_text HAVE_COPY_TEXT)
-check_function_exists(rl_filename_completion_function HAVE_COMPLETION_FUNCTION)
-
-if(NOT HAVE_COMPLETION_FUNCTION)
-  if (Readline_LIBRARY)
-    set(CMAKE_REQUIRED_LIBRARIES ${Readline_LIBRARY} ${Termcap_LIBRARY})
-  endif(Readline_LIBRARY)
-  check_function_exists(rl_copy_text HAVE_COPY_TEXT_TC)
-  check_function_exists(rl_filename_completion_function HAVE_COMPLETION_FUNCTION_TC)
-  set(HAVE_COMPLETION_FUNCTION ${HAVE_COMPLETION_FUNCTION_TC})
-  set(HAVE_COPY_TEXT ${HAVE_COPY_TEXT_TC})
-  if(HAVE_COMPLETION_FUNCTION)
-    set(Readline_LIBRARY ${Readline_LIBRARY} ${Termcap_LIBRARY})
-  endif(HAVE_COMPLETION_FUNCTION)
-endif(NOT HAVE_COMPLETION_FUNCTION)
-
-set(LIBEDIT_LIBRARY "")
-set(GNU_READLINE_LIBRARY "")
-
-if(HAVE_COMPLETION_FUNCTION AND HAVE_COPY_TEXT)
-  set(GNU_READLINE_FOUND TRUE)
-  set(GNU_READLINE_LIBRARY ${Readline_LIBRARY})
-elseif(READLINE_FOUND AND NOT HAVE_COPY_TEXT)
-  set(LIBEDIT_FOUND TRUE)
-  set(LIBEDIT_LIBRARY ${Readline_LIBRARY})
-endif(HAVE_COMPLETION_FUNCTION AND HAVE_COPY_TEXT)
-
--- a/cmake/FindUnbound.cmake
+++ b/cmake/FindUnbound.cmake
@@ -1,40 +0,0 @@
-# Copyright (c) 2014-2019, The Monero Project
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-MESSAGE(STATUS "Looking for libunbound")
-
-FIND_PATH(UNBOUND_INCLUDE_DIR
-  NAMES unbound.h
-  PATH_SUFFIXES include/ include/unbound/
-  PATHS "${PROJECT_SOURCE_DIR}"
-  ${UNBOUND_ROOT}
-  $ENV{UNBOUND_ROOT}
-  /usr/local/
-  /usr/
-)
-
-find_library(UNBOUND_LIBRARIES unbound)
--- a/cmake/GenVersion.cmake
+++ b/cmake/GenVersion.cmake
@@ -1,68 +0,0 @@
-# Copyright (c) 2014-2019, The Monero Project
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
-
-# Check what commit we're on
-execute_process(COMMAND "${GIT}" rev-parse --short=9 HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-if(RET)
-	# Something went wrong, set the version tag to -unknown
-	
-    message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.")
-    set(VERSIONTAG "unknown")
-    set(VERSION_IS_RELEASE "false")
-    configure_file("monero/src/version.cpp.in" "${TO}")
-else()
-	string(SUBSTRING ${COMMIT} 0 9 COMMIT)
-	message(STATUS "You are currently on commit ${COMMIT}")
-	
-	# Get all the tags
-	execute_process(COMMAND "${GIT}" rev-list --tags --max-count=1 --abbrev-commit RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
-	
-    if(NOT TAGGEDCOMMIT)
-        message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")
-        set(VERSIONTAG "${COMMIT}")
-        set(VERSION_IS_RELEASE "false")
-    else()
-        message(STATUS "The most recent tag was at ${TAGGEDCOMMIT}")
-        
-        # Check if we're building that tagged commit or a different one
-        if(COMMIT STREQUAL TAGGEDCOMMIT)
-            message(STATUS "You are building a tagged release")
-            set(VERSIONTAG "release")
-            set(VERSION_IS_RELEASE "true")
-        else()
-            message(STATUS "You are ahead of or behind a tagged release")
-            set(VERSIONTAG "${COMMIT}")
-            set(VERSION_IS_RELEASE "false")
-        endif()
-    endif()	    
-
-    configure_file("monero/src/version.cpp.in" "${TO}")
-endif()
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,81 +0,0 @@
-# Copyright (c) 2014-2017, The Monero Project
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-function (write_static_version_header hash)
-  set(VERSIONTAG "${hash}")
-  configure_file("${CMAKE_SOURCE_DIR}/monero/src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp")
-endfunction ()
-
-find_package(Git QUIET)
-if ("$Format:$" STREQUAL "")
-  # We're in a tarball; use hard-coded variables.
-  write_static_version_header("release")
-elseif (GIT_FOUND OR Git_FOUND)
-  add_custom_command(
-    OUTPUT            "${CMAKE_BINARY_DIR}/version.cpp"
-    COMMAND           "${CMAKE_COMMAND}"
-                      "-D" "GIT=${GIT_EXECUTABLE}"
-                      "-D" "TO=${CMAKE_BINARY_DIR}/version.cpp"
-                      "-P" "cmake/GenVersion.cmake"
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
-
-  #message(STATUS "Found Git: ${GIT_EXECUTABLE}")
-  #    COMMAND           "${CMAKE_COMMAND}"
-  #                    "-D" "GIT=${GIT_EXECUTABLE}"
-  #                    "-D" "TO=${CMAKE_BINARY_DIR}/monero/version.cpp"
-  #                    "-P" "cmake/GenVersion.cmake"
-  #  BYPRODUCTS        "${CMAKE_BINARY_DIR}/monero/version.cpp"
-  #  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
-else()
-  message(STATUS "WARNING: Git was not found!")
-  write_static_version_header("unknown")
-endif ()
-add_custom_target(genversion ALL
-  DEPENDS "${CMAKE_BINARY_DIR}/version.cpp")
-
-
-#find_package(Git QUIET)
-#if ("$Format:$" STREQUAL "")
-#  # We're in a tarball; use hard-coded variables.
-#  write_static_version_header("release")
-#elseif (GIT_FOUND OR Git_FOUND)
-#  message(STATUS "Found Git: ${GIT_EXECUTABLE}")
-#  add_custom_command(
-#    OUTPUT            "${CMAKE_BINARY_DIR}/version.cpp"
-#    COMMAND           "${CMAKE_COMMAND}"
-#                      "-D" "GIT=${GIT_EXECUTABLE}"
-#                      "-D" "TO=${CMAKE_BINARY_DIR}/version.cpp"
-#                      "-P" "cmake/GenVersion.cmake"
-#    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
-#else()
-#  message(STATUS "WARNING: Git was not found!")
-#  write_static_version_header("unknown")
-#endif ()
-#add_custom_target(genversion ALL
-#  DEPENDS "${CMAKE_BINARY_DIR}/version.cpp")
-
--- a/cmake/test-protobuf.cpp
+++ b/cmake/test-protobuf.cpp
@@ -1,43 +0,0 @@
-// Copyright (c) 2014-2019, The Monero Project
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <string>
-#include <iostream>
-#include <google/protobuf/message.h>
-#include <google/protobuf/unknown_field_set.h>
-#include "test-protobuf.pb.h"
-
-int main(int argc, char *argv[]) {
-  google::protobuf::UnknownFieldSet ufs;
-  ufs.ClearAndFreeMemory();
-
-  Success sc;
-  sc.set_message("test");
-  sc.SerializeToOstream(&std::cerr);
-  return 0;
-}
--- a/cmake/test-protobuf.proto
+++ b/cmake/test-protobuf.proto
@@ -1,7 +0,0 @@
-syntax = "proto2";
-
-import "google/protobuf/descriptor.proto";
-
-message Success {
-    optional string message = 1;
-}
--- a/cmake/test-static-assert.c
+++ b/cmake/test-static-assert.c
@@ -1,34 +0,0 @@
-// Copyright (c) 2014-2019, The Monero Project
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <assert.h>
-
-static_assert(1, "FAIL");
-int main(int argc, char *argv[]) {
-	return 0;
-}
--- a/cmake/test-static-assert.cpp
+++ b/cmake/test-static-assert.cpp
@@ -1,34 +0,0 @@
-// Copyright (c) 2014-2019, The Monero Project
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <assert.h>
-
-static_assert(1, "FAIL");
-int main(int argc, char *argv[]) {
-	return 0;
-}
--- a/components/NetworkStatusItem.qml
+++ b/components/NetworkStatusItem.qml
@@ -39,6 +39,15 @@ Rectangle {
    property var connected: Wallet.ConnectionStatus_Disconnected

    function getConnectionStatusString(status) {
+        switch (appWindow.daemonStartStopInProgress)
+        {
+            case 1:
+                return qsTr("Starting the node");
+            case 2:
+                return qsTr("Stopping the node");
+            default:
+                break;
+        }
        switch (status) {
            case Wallet.ConnectionStatus_Connected:
                if (!appWindow.daemonSynced)
--- a/get_libwallet_api.sh
+++ b/get_libwallet_api.sh
@@ -17,7 +17,7 @@ if [ ! -d $MONERO_DIR/src ]; then
 fi
 git submodule update --remote
 git -C $MONERO_DIR fetch
-git -C $MONERO_DIR checkout v0.17.0.1
+git -C $MONERO_DIR checkout v0.17.1.1

 # get monero core tag
 pushd $MONERO_DIR
--- a/main.qml
+++ b/main.qml
@@ -72,7 +72,7 @@ ApplicationWindow {
    property bool walletSynced: false
    property int maxWindowHeight: (isAndroid || isIOS)? screenHeight : (screenHeight < 900)? 720 : 800;
    property bool daemonRunning: !persistentSettings.useRemoteNode && !disconnected
-    property bool daemonStartStopInProgress: false
+    property int daemonStartStopInProgress: 0
    property alias toolTip: toolTip
    property string walletName
    property bool viewOnly: false
@@ -707,31 +707,33 @@ ApplicationWindow {
    }

    function startDaemon(flags){
-        daemonStartStopInProgress = true;
+        daemonStartStopInProgress = 1;

        // Pause refresh while starting daemon
        currentWallet.pauseRefresh();

-        appWindow.showProcessingSplash(qsTr("Waiting for daemon to start..."))
        const noSync = appWindow.walletMode === 0;
        const bootstrapNodeAddress = persistentSettings.walletMode < 2 ? "auto" : persistentSettings.bootstrapNodeAddress
        daemonManager.start(flags, persistentSettings.nettype, persistentSettings.blockchainDataDir, bootstrapNodeAddress, noSync);
    }

-    function stopDaemon(callback){
-        daemonStartStopInProgress = true;
-        appWindow.showProcessingSplash(qsTr("Waiting for daemon to stop..."))
+    function stopDaemon(callback, splash){
+        daemonStartStopInProgress = 2;
+        if (splash) {
+            appWindow.showProcessingSplash(qsTr("Waiting for daemon to stop..."));
+        }
        daemonManager.stopAsync(persistentSettings.nettype, function(result) {
-            daemonStartStopInProgress = false;
-            hideProcessingSplash();
+            daemonStartStopInProgress = 0;
+            if (splash) {
+                hideProcessingSplash();
+            }
            callback(result);
        });
    }

    function onDaemonStarted(){
        console.log("daemon started");
-        daemonStartStopInProgress = false;
-        hideProcessingSplash();
+        daemonStartStopInProgress = 0;
        currentWallet.connected(true);
        // resume refresh
        currentWallet.startRefresh();
@@ -744,8 +746,7 @@ ApplicationWindow {

    function onDaemonStartFailure(error) {
        console.log("daemon start failed");
-        daemonStartStopInProgress = false;
-        hideProcessingSplash();
+        daemonStartStopInProgress = 0;
        // resume refresh
        currentWallet.startRefresh();
        informationPopup.title = qsTr("Daemon failed to start") + translationManager.emptyString;
@@ -997,16 +998,9 @@ ApplicationWindow {
            informationPopup.title = qsTr("Error") + translationManager.emptyString
            informationPopup.text  = qsTr("Couldn't send the money: ") + transaction.errorString
            informationPopup.icon  = StandardIcon.Critical
+            informationPopup.onCloseCallback = null;
+            informationPopup.open();
        } else {
-            var txid_text = ""
-            informationPopup.title = qsTr("Information") + translationManager.emptyString
-            for (var i = 0; i < txid.length; ++i) {
-                if (txid_text.length > 0)
-                    txid_text += ", "
-                txid_text += txid[i]
-            }
-            informationPopup.text  = (viewOnly)? qsTr("Transaction saved to file: %1").arg(path) : qsTr("Monero sent successfully: %1 transaction(s) ").arg(txid.length) + txid_text + translationManager.emptyString
-            informationPopup.icon  = StandardIcon.Information
            if (transactionDescription.length > 0) {
                for (var i = 0; i < txid.length; ++i)
                  currentWallet.setUserNote(txid[i], transactionDescription);
@@ -1015,10 +1009,7 @@ ApplicationWindow {
            // Clear tx fields
            middlePanel.transferView.clearFields()
            successfulTxPopup.open(txid)
-
        }
-        informationPopup.onCloseCallback = null
-        informationPopup.open()
        currentWallet.refresh()
        currentWallet.disposeTransaction(transaction)
        currentWallet.storeAsync(function(success) {
@@ -1299,7 +1290,7 @@ ApplicationWindow {
    function fiatApiConvertToFiat(amount) {
        var ticker = persistentSettings.fiatPriceCurrency === "xmrusd" ? appWindow.fiatPriceXMRUSD : appWindow.fiatPriceXMREUR;
        if(ticker <= 0){
-            console.log(fiatApiError("Invalid ticker value: " + ticker));
+            fiatApiError("Invalid ticker value: " + ticker);
            return "?.??";
        }
        return (amount * ticker).toFixed(2);
@@ -1367,6 +1358,7 @@ ApplicationWindow {
        } else {
            wizard.wizardState = "wizardHome";
            rootItem.state = "normal"
+            logger.resetLogFilePath(persistentSettings.portable);
            openWallet("wizard");
        }

@@ -1895,7 +1887,7 @@ ApplicationWindow {
        repeat: true
        running: persistentSettings.autosave
        onTriggered: {
-            if (currentWallet) {
+            if (currentWallet && !currentWallet.refreshing) {
                currentWallet.storeAsync(function(success) {
                    if (success) {
                        appWindow.showStatusMessage(qsTr("Autosaved the wallet"), 3);
@@ -1974,7 +1966,7 @@ ApplicationWindow {
        // Simple mode connection check timer
        id: simpleModeConnectionTimer
        interval: 2000
-        running: appWindow.walletMode < 2 && currentWallet != undefined && !daemonStartStopInProgress
+        running: appWindow.walletMode < 2 && currentWallet != undefined && daemonStartStopInProgress == 0
        repeat: true
        onTriggered: appWindow.checkSimpleModeConnection()
    }
@@ -2052,7 +2044,7 @@ ApplicationWindow {
        if(daemonManager == undefined || persistentSettings.useRemoteNode) {
            closeAccepted();
        } else if (appWindow.walletMode == 0) {
-            stopDaemon(closeAccepted);
+            stopDaemon(closeAccepted, true);
        } else {
            showProcessingSplash(qsTr("Checking local node status..."));
            const handler = function(running) {
--- a/2
+++ b/2
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -764,12 +764,18 @@ Rectangle {
                                    font.pixelSize: 15
                                    text: {
                                        if (isout) {
+                                            if (isFailed) {
+                                                return qsTr("Failed") + translationManager.emptyString;
+                                            }
+                                            if (isPending) {
+                                                return qsTr("Waiting confirmation...") + translationManager.emptyString;
+                                            }
                                            if (address) {
                                                const addressBookName = currentWallet ? currentWallet.addressBook.getDescription(address) : null;
                                                return (addressBookName ? FontAwesome.addressBook + " " + addressBookName : TxUtils.addressTruncate(address, 8));
                                            }
                                            if (amount != 0) {
-                                                return (blockheight ? qsTr("Unknown recipient") : qsTr("Waiting confirmation...")) + translationManager.emptyString;
+                                                return qsTr("Unknown recipient") + translationManager.emptyString;
                                            } else {
                                                return qsTr("My wallet") + translationManager.emptyString;
                                            }
@@ -1489,6 +1495,8 @@ Rectangle {

        for (var i = 0; i < count; ++i) {
            var idx = _model.index(i, 0);
+            var isPending = model.data(idx, TransactionHistoryModel.TransactionPendingRole);
+            var isFailed = model.data(idx, TransactionHistoryModel.TransactionFailedRole);
            var isout = _model.data(idx, TransactionHistoryModel.TransactionIsOutRole);
            var amount = _model.data(idx, TransactionHistoryModel.TransactionAmountRole);
            var hash = _model.data(idx, TransactionHistoryModel.TransactionHashRole);
@@ -1525,6 +1533,8 @@ Rectangle {

            root.txModelData.push({
                "i": i,
+                "isPending": isPending,
+                "isFailed": isFailed,
                "isout": isout,
                "amount": amount,
                "displayAmount": displayAmount,
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -553,7 +553,8 @@ Rectangle {
                if (appWindow.viewOnly && !appWindow.isTrustedDaemon()){
                    errorMessage = "<p class='orange'>" + qsTr("* To import, you must connect to a local node or a trusted remote node") + "</p>";
                }
-                return "<style type='text/css'>p{line-height:20px; margin-top:0px; margin-bottom:0px; color:#ffffff;} p.orange{color:#ff9323;}</style>" +
+                return "<style type='text/css'>p{line-height:20px; margin-top:0px; margin-bottom:0px; color:" + MoneroComponents.Style.defaultFontColor +
+                       ";} p.orange{color:#ff9323;}</style>" +
                       "<p>" + qsTr("1. Using cold wallet, export the key images into a file") + "</p>" +
                       "<p>" + qsTr("2. Using view-only wallet, import the key images file") + "</p>" +
                       errorMessage + translationManager.emptyString
@@ -593,7 +594,8 @@ Rectangle {
                if (appWindow.viewOnly && !pageRoot.checkInformation(amountLine.text, addressLine.text, appWindow.persistentSettings.nettype)){
                    errorMessage = "<p class='orange'>" + qsTr("* To create a transaction file, please enter address and amount above") + "</p>";
                }
-                return "<style type='text/css'>p{line-height:20px; margin-top:0px; margin-bottom:0px; color:#ffffff;} p.orange{color:#ff9323;}</style>" +
+                return "<style type='text/css'>p{line-height:20px; margin-top:0px; margin-bottom:0px; color:" + MoneroComponents.Style.defaultFontColor + 
+                       ";} p.orange{color:#ff9323;}</style>" +
                       "<p>" + qsTr("1. Using view-only wallet, export the outputs into a file") + "</p>" +
                       "<p>" + qsTr("2. Using cold wallet, import the outputs file and export the key images") + "</p>" +
                       "<p>" + qsTr("3. Using view-only wallet, import the key images file and create a transaction file") + "</p>" +
--- a/pages/settings/SettingsInfo.qml
+++ b/pages/settings/SettingsInfo.qml
@@ -272,9 +272,9 @@ Rectangle {
                    <style type='text/css'>\
                        a {cursor:pointer;text-decoration: none; color: #FF6C3C}\
                    </style>\
-                    <a href='#'>%1</a>".arg(walletLogPath)
+                    <a href='#'>%1</a>".arg(logger.logFilePath)
                textFormat: Text.RichText
-                onLinkActivated: oshelper.openContainingFolder(walletLogPath)
+                onLinkActivated: oshelper.openContainingFolder(logger.logFilePath)

                MouseArea {
                    anchors.fill: parent
@@ -397,7 +397,7 @@ Rectangle {
                    if(currentWallet)
                        data += currentWallet.walletCreationHeight;

-                    data += "\nWallet log path: " + walletLogPath;
+                    data += "\nWallet log path: " + logger.logFilePath;
                    data += "\nWallet mode: " + walletModeString;
                    data += "\nGraphics mode: " + isOpenGL ? "OpenGL" : "Low graphics mode";
                    if (isTails)
--- a/pages/settings/SettingsNode.qml
+++ b/pages/settings/SettingsNode.qml
@@ -136,6 +136,7 @@ Rectangle{
            MouseArea {
                cursorShape: Qt.PointingHandCursor
                anchors.fill: parent
+                enabled: persistentSettings.useRemoteNode
                onClicked: {
                    persistentSettings.useRemoteNode = false;
                    appWindow.disconnectRemoteNode();
@@ -227,6 +228,7 @@ Rectangle{
                MouseArea {
                    cursorShape: Qt.PointingHandCursor
                    anchors.fill: parent
+                    enabled: !persistentSettings.useRemoteNode
                    onClicked: {
                        appWindow.connectRemoteNode();
                    }
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -178,5 +178,5 @@ add_custom_command(TARGET monero-wallet-gui POST_BUILD COMMAND ${CMAKE_COMMAND}
 include(Deploy)

 install(TARGETS monero-wallet-gui
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
+    DESTINATION bin
 )
--- a/src/daemon/DaemonManager.cpp
+++ b/src/daemon/DaemonManager.cpp
@@ -112,6 +112,10 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const
        arguments << "--no-sync";
    }

+    if (!flags.contains("--out-peers", Qt::CaseSensitive) && bootstrapNodeAddress == "auto") {
+        arguments << "--out-peers" << "16";
+    }
+
    arguments << "--check-updates" << "disabled";

    // --max-concurrency based on threads available.
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -27,6 +27,11 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include "Wallet.h"
+
+#include <chrono>
+#include <stdexcept>
+#include <thread>
+
 #include "PendingTransaction.h"
 #include "UnsignedTransaction.h"
 #include "TransactionHistory.h"
@@ -50,6 +55,8 @@
 #include <QVector>
 #include <QMutexLocker>

+#include "qt/ScopeGuard.h"
+
 namespace {
    static const int DAEMON_BLOCKCHAIN_HEIGHT_CACHE_TTL_SECONDS = 5;
    static const int DAEMON_BLOCKCHAIN_TARGET_HEIGHT_CACHE_TTL_SECONDS = 30;
@@ -124,6 +131,19 @@ bool Wallet::disconnected() const
    return m_disconnected;
 }

+bool Wallet::refreshing() const
+{
+    return m_refreshing;
+}
+
+void Wallet::refreshingSet(bool value)
+{
+    if (m_refreshing.exchange(value) != value)
+    {
+        emit refreshingChanged();
+    }
+}
+
 void Wallet::setConnectionStatus(ConnectionStatus value)
 {
    if (m_connectionStatus == value)
@@ -196,7 +216,7 @@ void Wallet::storeAsync(const QJSValue &callback, const QString &path /* = "" */
 {
    const auto future = m_scheduler.run(
        [this, path] {
-            QMutexLocker locker(&m_storeMutex);
+            QMutexLocker locker(&m_asyncMutex);

            return QJSValueList({m_walletImpl->store(path.toStdString())});
        },
@@ -263,7 +283,7 @@ void Wallet::initAsync(
            emit walletCreationHeightChanged();
            qDebug() << "init async finished - starting refresh";
            connected(true);
-            m_walletImpl->startRefresh();
+            startRefresh();
        }
    });
    if (future.first)
@@ -466,41 +486,37 @@ bool Wallet::importKeyImages(const QString& path)
    return m_walletImpl->importKeyImages(path.toStdString());
 }

-bool Wallet::refresh()
+bool Wallet::refresh(bool historyAndSubaddresses /* = true */)
 {
-    bool result = m_walletImpl->refresh();
-    m_history->refresh(currentSubaddressAccount());
-    m_subaddress->refresh(currentSubaddressAccount());
-    m_subaddressAccount->getAll();
-    if (result)
-        emit updated();
-    return result;
+    refreshingSet(true);
+    const auto cleanup = sg::make_scope_guard([this]() noexcept {
+        refreshingSet(false);
+    });
+
+    {
+        QMutexLocker locker(&m_asyncMutex);
+
+        bool result = m_walletImpl->refresh();
+        if (historyAndSubaddresses)
+        {
+            m_history->refresh(currentSubaddressAccount());
+            m_subaddress->refresh(currentSubaddressAccount());
+            m_subaddressAccount->getAll();
+        }
+        if (result)
+            emit updated();
+        return result;
+    }
 }

-void Wallet::refreshAsync()
+void Wallet::startRefresh()
 {
-    qDebug() << "refresh async";
-    m_walletImpl->refreshAsync();
+    m_refreshEnabled = true;
 }

-void Wallet::setAutoRefreshInterval(int seconds)
+void Wallet::pauseRefresh()
 {
-    m_walletImpl->setAutoRefreshInterval(seconds);
-}
-
-int Wallet::autoRefreshInterval() const
-{
-    return m_walletImpl->autoRefreshInterval();
-}
-
-void Wallet::startRefresh() const
-{
-    m_walletImpl->startRefresh();
-}
-
-void Wallet::pauseRefresh() const
-{
-    m_walletImpl->pauseRefresh();
+    m_refreshEnabled = false;
 }

 PendingTransaction *Wallet::createTransaction(const QString &dst_addr, const QString &payment_id,
@@ -874,6 +890,8 @@ bool Wallet::parse_uri(const QString &uri, QString &address, QString &payment_id

 bool Wallet::rescanSpent()
 {
+    QMutexLocker locker(&m_asyncMutex);
+
    return m_walletImpl->rescanSpent();
 }

@@ -1041,6 +1059,8 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent)
    , m_subaddressModel(nullptr)
    , m_subaddressAccount(nullptr)
    , m_subaddressAccountModel(nullptr)
+    , m_refreshEnabled(false)
+    , m_refreshing(false)
    , m_scheduler(this)
 {
    m_history = new TransactionHistory(m_walletImpl->history(), this);
@@ -1058,12 +1078,16 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent)
    m_connectionStatusRunning = false;
    m_daemonUsername = "";
    m_daemonPassword = "";
+
+    startRefreshThread();
 }

 Wallet::~Wallet()
 {
    qDebug("~Wallet: Closing wallet");

+    pauseRefresh();
+    m_walletImpl->stop();
    m_scheduler.shutdownWaitForFinished();

    delete m_addressBook;
@@ -1090,3 +1114,32 @@ Wallet::~Wallet()
    m_walletListener = NULL;
    qDebug("m_walletImpl deleted");
 }
+
+void Wallet::startRefreshThread()
+{
+    const auto future = m_scheduler.run([this] {
+        constexpr const std::chrono::seconds refreshInterval{10};
+        constexpr const std::chrono::milliseconds intervalResolution{100};
+
+        auto last = std::chrono::steady_clock::now();
+        while (!m_scheduler.stopping())
+        {
+            if (m_refreshEnabled)
+            {
+                const auto now = std::chrono::steady_clock::now();
+                const auto elapsed = now - last;
+                if (elapsed >= refreshInterval)
+                {
+                    refresh(false);
+                    last = std::chrono::steady_clock::now();
+                }
+            }
+
+            std::this_thread::sleep_for(intervalResolution);
+        }
+    });
+    if (!future.first)
+    {
+        throw std::runtime_error("failed to start auto refresh thread");
+    }
+}
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -63,6 +63,7 @@ class Wallet : public QObject, public PassprasePrompter
 {
    Q_OBJECT
    Q_PROPERTY(bool disconnected READ disconnected NOTIFY disconnectedChanged)
+    Q_PROPERTY(bool refreshing READ refreshing NOTIFY refreshingChanged)
    Q_PROPERTY(QString seed READ getSeed)
    Q_PROPERTY(QString seedLanguage READ getSeedLanguage)
    Q_PROPERTY(Status status READ status)
@@ -207,20 +208,11 @@ public:
    Q_INVOKABLE bool importKeyImages(const QString& path);

    //! refreshes the wallet
-    Q_INVOKABLE bool refresh();
-
-    //! refreshes the wallet asynchronously
-    Q_INVOKABLE void refreshAsync();
-
-    //! setup auto-refresh interval in seconds
-    Q_INVOKABLE void setAutoRefreshInterval(int seconds);
-
-    //! return auto-refresh interval in seconds
-    Q_INVOKABLE int autoRefreshInterval() const;
+    Q_INVOKABLE bool refresh(bool historyAndSubaddresses = true);

    // pause/resume refresh
-    Q_INVOKABLE void startRefresh() const;
-    Q_INVOKABLE void pauseRefresh() const;
+    Q_INVOKABLE void startRefresh();
+    Q_INVOKABLE void pauseRefresh();

    //! creates transaction
    Q_INVOKABLE PendingTransaction * createTransaction(const QString &dst_addr, const QString &payment_id,
@@ -394,6 +386,7 @@ signals:
    void currentSubaddressAccountChanged() const;
    void disconnectedChanged() const;
    void proxyAddressChanged() const;
+    void refreshingChanged() const;

 private:
    Wallet(QObject * parent = nullptr);
@@ -421,9 +414,12 @@ private:
        const QString& proxyAddress);

    bool disconnected() const;
+    bool refreshing() const;
+    void refreshingSet(bool value);
    void setConnectionStatus(ConnectionStatus value);
    QString getProxyAddress() const;
    void setProxyAddress(QString address);
+    void startRefreshThread();

 private:
    friend class WalletManager;
@@ -454,15 +450,17 @@ private:
    mutable SubaddressModel * m_subaddressModel;
    SubaddressAccount * m_subaddressAccount;
    mutable SubaddressAccountModel * m_subaddressAccountModel;
+    QMutex m_asyncMutex;
    QMutex m_connectionStatusMutex;
    bool m_connectionStatusRunning;
    QString m_daemonUsername;
    QString m_daemonPassword;
    QString m_proxyAddress;
    mutable QMutex m_proxyMutex;
+    std::atomic<bool> m_refreshEnabled;
+    std::atomic<bool> m_refreshing;
    WalletListenerImpl *m_walletListener;
    FutureScheduler m_scheduler;
-    QMutex m_storeMutex;
 };


--- a/src/main/Logger.cpp
+++ b/src/main/Logger.cpp
@@ -26,6 +26,8 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+#include "Logger.h"
+
 #include <QCoreApplication>
 #include <QStandardPaths>
 #include <QFileInfo>
@@ -33,9 +35,11 @@
 #include <QDir>
 #include <QDebug>

-#include "Logger.h"
+#include <easylogging++.h>
+#include <wallet/api/wallet2_api.h>
+
+#include "qt/MoneroSettings.h"
 #include "qt/TailsOS.h"
-#include "wallet/api/wallet2_api.h"

 // default log path by OS (should be writable)
 static const QString defaultLogName = "monero-wallet-gui.log";
@@ -63,15 +67,21 @@ static const QString defaultLogName = "monero-wallet-gui.log";


 // return the absolute path of the logfile and ensure path folder exists
-const QString getLogPath(const QString logPath)
+const QString getLogPath(const QString &userDefinedLogFilePath, bool portable)
 {
-    const QFileInfo fi(logPath);
+    const QFileInfo fi(userDefinedLogFilePath);
+    if (!userDefinedLogFilePath.isEmpty() && !fi.isDir())
+    {
+        return fi.absoluteFilePath();
+    }
+
+    if (portable)
+    {
+        return QDir(MoneroSettings::portableFolderName()).filePath(defaultLogName);
+    }

    if(TailsOS::detect() && TailsOS::usePersistence)
        return QDir::homePath() + "/Persistent/Monero/logs/" + defaultLogName;
-
-    if(!logPath.isEmpty() && !fi.isDir())
-        return fi.absoluteFilePath();
    else {
        QDir appDir(osPath + "/" + appFolder);
        if(!appDir.exists())
@@ -98,3 +108,26 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt
    }
 }

+Logger::Logger(QCoreApplication &parent, QString userDefinedLogFilePath)
+    : QObject(&parent)
+    , m_applicationFilePath(parent.applicationFilePath().toStdString())
+    , m_userDefinedLogFilePath(std::move(userDefinedLogFilePath))
+{
+    el::Configurations c;
+    c.setGlobally(el::ConfigurationType::ToFile, "false");
+    c.setGlobally(el::ConfigurationType::ToStandardOutput, "true");
+    el::Loggers::setDefaultConfigurations(c, true);
+}
+
+void Logger::resetLogFilePath(bool portable)
+{
+    m_logFilePath = QDir::toNativeSeparators(getLogPath(m_userDefinedLogFilePath, portable));
+    Monero::Wallet::init(m_applicationFilePath.c_str(), "monero-wallet-gui", m_logFilePath.toStdString(), true);
+    qInstallMessageHandler(messageHandler);
+    emit logFilePathChanged();
+}
+
+QString Logger::logFilePath() const
+{
+    return m_logFilePath;
+}
--- a/src/main/Logger.h
+++ b/src/main/Logger.h
@@ -26,11 +26,28 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#ifndef LOGGER_H
-#define LOGGER_H
+#pragma once

-const QString getLogPath(const QString logPath);
-void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);
+#include <QCoreApplication>
+#include <QObject>
+#include <QString>

-#endif // LOGGER_H
+class Logger : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString logFilePath READ logFilePath NOTIFY logFilePathChanged)

+public:
+    Logger(QCoreApplication &parent, QString userDefinedLogFilePath);
+
+    Q_INVOKABLE void resetLogFilePath(bool portable);
+    QString logFilePath() const;
+
+signals:
+    void logFilePathChanged() const;
+
+private:
+    const std::string m_applicationFilePath;
+    QString m_logFilePath;
+    const QString m_userDefinedLogFilePath;
+};
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -61,7 +61,6 @@
 #include "model/SubaddressModel.h"
 #include "SubaddressAccount.h"
 #include "model/SubaddressAccountModel.h"
-#include "wallet/api/wallet2_api.h"
 #include "Logger.h"
 #include "MainApp.h"
 #include "qt/downloader.h"
@@ -269,10 +268,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw

    Monero::Utils::onStartup();

-    // Log settings
-    const QString logPath = QDir::toNativeSeparators(getLogPath(parser.value(logPathOption)));
-    Monero::Wallet::init(argv[0], "monero-wallet-gui", logPath.toStdString().c_str(), true);
-    qInstallMessageHandler(messageHandler);
+    Logger logger(app, parser.value(logPathOption));

    // loglevel is configured in main.qml. Anything lower than
    // qWarning is not shown here unless MONERO_LOG_LEVEL env var is set
@@ -281,7 +277,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
    if (logLevelOk && logLevel >= 0 && logLevel <= Monero::WalletManagerFactory::LogLevel_Max){
        Monero::WalletManagerFactory::setLogLevel(logLevel);
    }
-    qWarning().noquote() << "app startd" << "(log: " + logPath + ")";
+    qWarning().noquote() << "app startd" << "(log: " + logger.logFilePath() + ")";

    if (parser.isSet(verifyUpdateOption))
    {
@@ -446,14 +442,14 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw

    engine.addImageProvider(QLatin1String("qrcode"), new QRCodeImageProvider());

+    engine.rootContext()->setContextProperty("logger", &logger);
+
    engine.rootContext()->setContextProperty("mainApp", &app);

    engine.rootContext()->setContextProperty("IPC", ipc);

    engine.rootContext()->setContextProperty("qtRuntimeVersion", qVersion());

-    engine.rootContext()->setContextProperty("walletLogPath", logPath);
-
    engine.rootContext()->setContextProperty("tailsUsePersistence", TailsOS::usePersistence);

 // Exclude daemon manager from IOS
--- a/src/qt/FutureScheduler.cpp
+++ b/src/qt/FutureScheduler.cpp
@@ -65,6 +65,11 @@ QPair<bool, QFuture<QJSValueList>> FutureScheduler::run(std::function<QJSValueLi
    });
 }

+bool FutureScheduler::stopping() const noexcept
+{
+    return Stopping;
+}
+
 bool FutureScheduler::add() noexcept
 {
    QMutexLocker locker(&Mutex);
--- a/src/qt/FutureScheduler.h
+++ b/src/qt/FutureScheduler.h
@@ -23,6 +23,7 @@ public:

    QPair<bool, QFuture<void>> run(std::function<void()> function) noexcept;
    QPair<bool, QFuture<QJSValueList>> run(std::function<QJSValueList()> function, const QJSValue &callback);
+    bool stopping() const noexcept;

 private:
    bool add() noexcept;
@@ -59,7 +60,7 @@ private:
    size_t Alive;
    QWaitCondition Condition;
    QMutex Mutex;
-    bool Stopping;
+    std::atomic<bool> Stopping;
 };

 #endif // FUTURE_SCHEDULER_H
--- a/src/qt/KeysFiles.cpp
+++ b/src/qt/KeysFiles.cpp
@@ -108,8 +108,10 @@ void WalletKeysFilesModel::refresh(const QString &moneroAccountsDir)
 void WalletKeysFilesModel::findWallets(const QString &moneroAccountsDir)
 {
    QDirIterator it(moneroAccountsDir, QDirIterator::Subdirectories);
-    for (; it.hasNext(); it.next())
+    while (it.hasNext())
    {
+        it.next();
+
        QFileInfo keysFileinfo = it.fileInfo();

        constexpr const char keysFileExtension[] = "keys";
--- a/src/qt/MoneroSettings.cpp
+++ b/src/qt/MoneroSettings.cpp
@@ -191,7 +191,7 @@ QString MoneroSettings::portableFilePath() const
    return filename;
 }

-QString MoneroSettings::portableFolderName() const
+QString MoneroSettings::portableFolderName()
 {
    return "monero-storage";
 }
--- a/src/qt/MoneroSettings.h
+++ b/src/qt/MoneroSettings.h
@@ -63,6 +63,8 @@ public:
    Q_INVOKABLE bool setPortable(bool enabled);
    Q_INVOKABLE void setWritable(bool enabled);

+    static QString portableFolderName();
+
 public slots:
    void _q_propertyChanged();

@@ -84,7 +86,6 @@ private:
    bool portable() const;
    bool portableConfigExists() const;
    QString portableFilePath() const;
-    QString portableFolderName() const;
    std::unique_ptr<QSettings> portableSettings() const;
    std::unique_ptr<QSettings> unportableSettings() const;
    void swap(std::unique_ptr<QSettings> newSettings);
--- a/wizard/WizardHome.qml
+++ b/wizard/WizardHome.qml
@@ -222,7 +222,6 @@ Rectangle {
                    validator: IntValidator { bottom: 1 }
                    text: persistentSettings.kdfRounds ? persistentSettings.kdfRounds : "1"
                    onTextChanged: {
-                        console.log('x');
                        kdfRoundsText.text = persistentSettings.kdfRounds = parseInt(kdfRoundsText.text) >= 1 ? parseInt(kdfRoundsText.text) : 1;
                    }
                }
--- a/wizard/WizardModeSelection.qml
+++ b/wizard/WizardModeSelection.qml
@@ -48,6 +48,7 @@ Rectangle {
            return;
        }

+        logger.resetLogFilePath(portable);
        appWindow.changeWalletMode(mode);
        wizardController.wizardStackView.backTransition = false;
        wizardController.wizardState = wizardState;
--- a/wizard/WizardRestoreWallet1.qml
+++ b/wizard/WizardRestoreWallet1.qml
@@ -48,8 +48,7 @@ Rectangle {

        var valid = false;
        if(wizardController.walletRestoreMode === "keys") {
-            valid = wizardRestoreWallet1.verifyFromKeys();
-            return valid;
+            return wizardWalletInput.verify() && wizardRestoreWallet1.verifyFromKeys();
        } else if(wizardController.walletRestoreMode === "seed") {
            valid = wizardWalletInput.verify();
            if(!valid) return false;
Author	SHA1	Message	Date
Alexander Blair	33afd0bb83	Merge pull request #3180 `954c9725` repo: prepare v0.17.1.1 (selsta)	2020-10-19 00:14:37 -07:00
Alexander Blair	a165a14519	Merge pull request #3181 `6ee5effc` Wallet: fix different signedness comparison (-Werror=sign-compare) (xiphon)	2020-10-19 00:14:12 -07:00
Alexander Blair	33e1801c57	Merge pull request #3175 `e5b0837c` SettingsNode: ignore selecting the same mode twice (xiphon)	2020-10-19 00:13:24 -07:00
Alexander Blair	fac3fcb518	Merge pull request #3174 `a73ae625` DaemonManager: set out-peers to 16 in simple mode / bootstrap (selsta)	2020-10-19 00:12:52 -07:00
Alexander Blair	8457055f08	Merge pull request #3172 `44df1bcc` cmake: fix install targets (Bertrand Jacquin)	2020-10-19 00:12:31 -07:00
Alexander Blair	e01c847fde	Merge pull request #3171 `0a0dbf88` WizardRestoreWallet1: fix "wallet name" check in keys mode (selsta)	2020-10-19 00:12:05 -07:00
Alexander Blair	bedf04d08a	Merge pull request #3161 `b932df85` Wallet: interrupt refresh thread on wallet close (xiphon)	2020-10-19 00:11:35 -07:00
Alexander Blair	83da709436	Merge pull request #3158 `79ee8934` History: fix failed and pending tx statuses (xiphon)	2020-10-19 00:11:09 -07:00
Alexander Blair	f51b0d7d0c	Merge pull request #3156 `1b2d9408` Makefile: add 'release-linux-armv8' target (xiphon)	2020-10-19 00:10:31 -07:00
Alexander Blair	1f9d60602a	Merge pull request #3155 `db4273ee` NetworkStatusItem: 'starting/stopping the node' status (no splash) (xiphon)	2020-10-19 00:10:19 -07:00
Alexander Blair	7a285b3613	Merge pull request #3136 `05733c14` Transfer: fix help text (white theme) (selsta)	2020-10-19 00:09:52 -07:00
xiphon	6ee5effc15	Wallet: fix different signedness comparison (-Werror=sign-compare) Co-authored-by: Bertrand Jacquin <bertrand@jacquin.bzh>	2020-10-18 20:58:40 +00:00
selsta	954c972530	repo: prepare v0.17.1.1	2020-10-18 18:01:44 +02:00
xiphon	e5b0837c8e	SettingsNode: ignore selecting the same mode twice	2020-10-18 02:53:57 +00:00
selsta	a73ae62526	DaemonManager: set out-peers to 16 in simple mode / bootstrap	2020-10-18 02:07:29 +02:00
Bertrand Jacquin	44df1bccfc	cmake: fix install targets Binary should be installed in bin/ relative to CMAKE_INSTALL_PREFIX, prior to this commit, monero-wallet-gui is installed in usr/ instead of usr/bin -- Installing: image/usr/monero-wallet-gui With this comment, file is installed in the right location: -- Installing: image/usr/bin/monero-wallet-gui See: https://cmake.org/cmake/help/latest/command/install.html	2020-10-17 23:08:21 +01:00
selsta	0a0dbf8853	WizardRestoreWallet1: fix "wallet name" check in keys mode	2020-10-17 20:23:29 +02:00
xiphon	b932df85fd	Wallet: interrupt refresh thread on wallet close	2020-10-17 02:58:23 +00:00
xiphon	79ee893499	History: fix failed and pending tx statuses	2020-10-15 10:23:06 +00:00
xiphon	1b2d940850	Makefile: add 'release-linux-armv8' target	2020-10-14 15:51:29 +00:00
xiphon	db4273ee82	NetworkStatusItem: 'starting/stopping the node' status (no splash)	2020-10-14 02:26:56 +00:00
luigi1111	cb1f3ad0ce	Merge pull request #3153 `701f063` build: prepare v0.17.1.0 (selsta)	2020-10-13 12:41:38 -05:00
luigi1111	c81a842b6e	Merge pull request #3150 `6ed5369` cmake: set CMAKE_SKIP_RPATH on Linux to fix empty RPATH token issue (xiphon)	2020-10-13 12:40:39 -05:00
luigi1111	26ad7b78b5	Merge pull request #3147 `4661167` onTransactionCommitted: don't show informationPopup on success (xiphon)	2020-10-13 12:39:34 -05:00
luigi1111	381442a138	Merge pull request #3145 `39d9d7d` Wallet: rework wallet refreshing (xiphon)	2020-10-13 12:38:40 -05:00
luigi1111	7cb24f50b8	Merge pull request #3143 `8ad5fd4` main: wizard: console.log fixes (selsta)	2020-10-13 12:37:55 -05:00
luigi1111	8c5891e28a	Merge pull request #3141 `3c28ece` Logger: runtime log config, no logs till a user selects wallet mode (xiphon)	2020-10-13 12:36:49 -05:00
luigi1111	61c0e15404	Merge pull request #3138 `b76b43d` README: minor sponsorships fixes (selsta)	2020-10-13 12:35:58 -05:00
luigi1111	b03714ec45	Merge pull request #3131 `21d8c09` cmake: remove unused code (xiphon)	2020-10-13 12:35:12 -05:00
selsta	701f063797	build: prepare v0.17.1.0	2020-10-13 18:28:23 +02:00
xiphon	6ed5369829	cmake: set CMAKE_SKIP_RPATH on Linux to fix empty RPATH token issue	2020-10-11 19:51:05 +00:00
xiphon	4661167734	onTransactionCommitted: don't show informationPopup on success	2020-10-10 14:26:20 +00:00
xiphon	39d9d7d071	Wallet: rework wallet refreshing	2020-10-09 14:11:05 +00:00
selsta	8ad5fd4c76	main: wizard: console.log fixes	2020-10-08 21:24:55 +02:00
xiphon	3c28ecef93	Logger: runtime log config, no logs till a user selects wallet mode	2020-10-08 18:28:07 +00:00
luigi1111	d3943ca2a9	Merge pull request #3130 `13ca3ee` KeysFiles: QDirIterator is initially located before the first entry (xiphon)	2020-10-08 10:34:53 -05:00
luigi1111	73f76cec99	Merge pull request #3129 `4cea7e1` docker: Linux - update freetype2 git source (xiphon)	2020-10-08 10:32:37 -05:00
selsta	b76b43da6c	README: minor sponsorships fixes	2020-10-08 01:46:06 +02:00
selsta	05733c14b7	Transfer: fix help text (white theme)	2020-10-07 12:59:33 +02:00
xiphon	21d8c096ff	cmake: remove unused code	2020-10-06 13:21:37 +00:00
xiphon	13ca3eeb84	KeysFiles: QDirIterator is initially located before the first entry	2020-10-05 12:36:00 +00:00
xiphon	4cea7e1647	docker: Linux - update freetype2 git source	2020-10-04 23:48:33 +00:00