diff --git a/Makefile b/Makefile index 25463de..df0ef85 100644 --- a/Makefile +++ b/Makefile @@ -277,15 +277,15 @@ distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} /home/qbase/Qbase/build-aux/missing aclocal-1.15 +ACLOCAL = ${SHELL} /home/mr/qbase/build-aux/missing aclocal-1.15 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 0 AR = /usr/bin/ar ARFLAGS = cr -AUTOCONF = ${SHELL} /home/qbase/Qbase/build-aux/missing autoconf -AUTOHEADER = ${SHELL} /home/qbase/Qbase/build-aux/missing autoheader -AUTOMAKE = ${SHELL} /home/qbase/Qbase/build-aux/missing automake-1.15 -AWK = gawk +AUTOCONF = ${SHELL} /home/mr/qbase/build-aux/missing autoconf +AUTOHEADER = ${SHELL} /home/mr/qbase/build-aux/missing autoheader +AUTOMAKE = ${SHELL} /home/mr/qbase/build-aux/missing automake-1.15 +AWK = mawk BDB_CFLAGS = BDB_CPPFLAGS = BDB_LIBS = -ldb_cxx-4.8 @@ -307,11 +307,11 @@ CC = gcc CCACHE = CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 -CLIENT_VERSION_BUILD = 1 +CLIENT_VERSION_BUILD = 0 CLIENT_VERSION_IS_RELEASE = true -CLIENT_VERSION_MAJOR = 1 +CLIENT_VERSION_MAJOR = 2 CLIENT_VERSION_MINOR = 0 -CLIENT_VERSION_REVISION = 2 +CLIENT_VERSION_REVISION = 0 COPYRIGHT_HOLDERS = The %s developers COPYRIGHT_HOLDERS_FINAL = The Qbase Core developers COPYRIGHT_HOLDERS_SUBSTITUTION = Qbase Core @@ -381,7 +381,7 @@ LTLIBOBJS = LT_SYS_LIBRARY_PATH = LUPDATE = /usr/lib/x86_64-linux-gnu/qt5/bin/lupdate MAINT = -MAKEINFO = ${SHELL} /home/qbase/Qbase/build-aux/missing makeinfo +MAKEINFO = ${SHELL} /home/mr/qbase/build-aux/missing makeinfo MAKENSIS = MANIFEST_TOOL = : MINIUPNPC_CPPFLAGS = @@ -402,10 +402,10 @@ OTOOL64 = PACKAGE = qbasecore PACKAGE_BUGREPORT = https://github.com/NicholasAdmin/Qbase/issues PACKAGE_NAME = Qbase Core -PACKAGE_STRING = Qbase Core 1.0.2 +PACKAGE_STRING = Qbase Core 2.0.0 PACKAGE_TARNAME = qbasecore PACKAGE_URL = -PACKAGE_VERSION = 1.0.2 +PACKAGE_VERSION = 2.0.0 PATH_SEPARATOR = : PIC_FLAGS = -fPIC PIE_FLAGS = -fPIE @@ -464,7 +464,7 @@ UNIVALUE_CFLAGS = -I$(srcdir)/univalue/include UNIVALUE_LIBS = univalue/libunivalue.la USE_QRCODE = USE_UPNP = -VERSION = 1.0.2 +VERSION = 2.0.0 WINDOWS_BITS = WINDRES = X11XCB_CFLAGS = @@ -472,10 +472,10 @@ X11XCB_LIBS = XGETTEXT = /usr/bin/xgettext ZMQ_CFLAGS = ZMQ_LIBS = -lzmq -abs_builddir = /home/qbase/Qbase -abs_srcdir = /home/qbase/Qbase -abs_top_builddir = /home/qbase/Qbase -abs_top_srcdir = /home/qbase/Qbase +abs_builddir = /home/mr/qbase +abs_srcdir = /home/mr/qbase +abs_top_builddir = /home/mr/qbase +abs_top_srcdir = /home/mr/qbase ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ @@ -507,7 +507,7 @@ host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/qbase/Qbase/build-aux/install-sh +install_sh = ${SHELL} /home/mr/qbase/build-aux/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/about.png b/about.png index acede4a..2eab1ea 100644 Binary files a/about.png and b/about.png differ diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index 1180a5a..413bc62 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for Qbase Core 1.0.2. +@%:@ Generated by GNU Autoconf 2.69 for Qbase Core 2.0.0. @%:@ @%:@ Report bugs to . @%:@ @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Qbase Core' PACKAGE_TARNAME='qbasecore' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='Qbase Core 1.0.2' +PACKAGE_VERSION='2.0.0' +PACKAGE_STRING='Qbase Core 2.0.0' PACKAGE_BUGREPORT='https://github.com/NicholasAdmin/Qbase/issues' PACKAGE_URL='' @@ -1597,7 +1597,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Qbase Core 1.0.2 to adapt to many kinds of systems. +\`configure' configures Qbase Core 2.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1668,7 +1668,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Qbase Core 1.0.2:";; + short | recursive ) echo "Configuration of Qbase Core 2.0.0:";; esac cat <<\_ACEOF @@ -1935,7 +1935,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Qbase Core configure 1.0.2 +Qbase Core configure 2.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2618,7 +2618,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Qbase Core $as_me 1.0.2, which was +It was created by Qbase Core $as_me 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3574,7 +3574,7 @@ fi # Define the identity of the package. PACKAGE='qbasecore' - VERSION='1.0.2' + VERSION='2.0.0' # Some tools Automake needs. @@ -30844,16 +30844,16 @@ fi -$as_echo "@%:@define CLIENT_VERSION_MAJOR 1" >>confdefs.h +$as_echo "@%:@define CLIENT_VERSION_MAJOR 2" >>confdefs.h $as_echo "@%:@define CLIENT_VERSION_MINOR 0" >>confdefs.h -$as_echo "@%:@define CLIENT_VERSION_REVISION 2" >>confdefs.h +$as_echo "@%:@define CLIENT_VERSION_REVISION 0" >>confdefs.h -$as_echo "@%:@define CLIENT_VERSION_BUILD 1" >>confdefs.h +$as_echo "@%:@define CLIENT_VERSION_BUILD 0" >>confdefs.h $as_echo "@%:@define CLIENT_VERSION_IS_RELEASE true" >>confdefs.h @@ -30871,13 +30871,13 @@ $as_echo "@%:@define COPYRIGHT_HOLDERS_SUBSTITUTION \"Qbase Core\"" >>confdefs.h $as_echo "@%:@define COPYRIGHT_HOLDERS_FINAL \"The Qbase Core developers\"" >>confdefs.h -CLIENT_VERSION_MAJOR=1 +CLIENT_VERSION_MAJOR=2 CLIENT_VERSION_MINOR=0 -CLIENT_VERSION_REVISION=2 +CLIENT_VERSION_REVISION=0 -CLIENT_VERSION_BUILD=1 +CLIENT_VERSION_BUILD=0 CLIENT_VERSION_IS_RELEASE=true @@ -31584,7 +31584,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Qbase Core $as_me 1.0.2, which was +This file was extended by Qbase Core $as_me 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31650,7 +31650,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Qbase Core config.status 1.0.2 +Qbase Core config.status 2.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 index 1180a5a..413bc62 100644 --- a/autom4te.cache/output.1 +++ b/autom4te.cache/output.1 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for Qbase Core 1.0.2. +@%:@ Generated by GNU Autoconf 2.69 for Qbase Core 2.0.0. @%:@ @%:@ Report bugs to . @%:@ @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Qbase Core' PACKAGE_TARNAME='qbasecore' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='Qbase Core 1.0.2' +PACKAGE_VERSION='2.0.0' +PACKAGE_STRING='Qbase Core 2.0.0' PACKAGE_BUGREPORT='https://github.com/NicholasAdmin/Qbase/issues' PACKAGE_URL='' @@ -1597,7 +1597,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Qbase Core 1.0.2 to adapt to many kinds of systems. +\`configure' configures Qbase Core 2.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1668,7 +1668,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Qbase Core 1.0.2:";; + short | recursive ) echo "Configuration of Qbase Core 2.0.0:";; esac cat <<\_ACEOF @@ -1935,7 +1935,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Qbase Core configure 1.0.2 +Qbase Core configure 2.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2618,7 +2618,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Qbase Core $as_me 1.0.2, which was +It was created by Qbase Core $as_me 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3574,7 +3574,7 @@ fi # Define the identity of the package. PACKAGE='qbasecore' - VERSION='1.0.2' + VERSION='2.0.0' # Some tools Automake needs. @@ -30844,16 +30844,16 @@ fi -$as_echo "@%:@define CLIENT_VERSION_MAJOR 1" >>confdefs.h +$as_echo "@%:@define CLIENT_VERSION_MAJOR 2" >>confdefs.h $as_echo "@%:@define CLIENT_VERSION_MINOR 0" >>confdefs.h -$as_echo "@%:@define CLIENT_VERSION_REVISION 2" >>confdefs.h +$as_echo "@%:@define CLIENT_VERSION_REVISION 0" >>confdefs.h -$as_echo "@%:@define CLIENT_VERSION_BUILD 1" >>confdefs.h +$as_echo "@%:@define CLIENT_VERSION_BUILD 0" >>confdefs.h $as_echo "@%:@define CLIENT_VERSION_IS_RELEASE true" >>confdefs.h @@ -30871,13 +30871,13 @@ $as_echo "@%:@define COPYRIGHT_HOLDERS_SUBSTITUTION \"Qbase Core\"" >>confdefs.h $as_echo "@%:@define COPYRIGHT_HOLDERS_FINAL \"The Qbase Core developers\"" >>confdefs.h -CLIENT_VERSION_MAJOR=1 +CLIENT_VERSION_MAJOR=2 CLIENT_VERSION_MINOR=0 -CLIENT_VERSION_REVISION=2 +CLIENT_VERSION_REVISION=0 -CLIENT_VERSION_BUILD=1 +CLIENT_VERSION_BUILD=0 CLIENT_VERSION_IS_RELEASE=true @@ -31584,7 +31584,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Qbase Core $as_me 1.0.2, which was +This file was extended by Qbase Core $as_me 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31650,7 +31650,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Qbase Core config.status 1.0.2 +Qbase Core config.status 2.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 4c54b4c..b5cd50a 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -60,222 +60,222 @@ 'configure.ac' ], { - 'AX_CHECK_PREPROC_FLAG' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - '_LTDL_SETUP' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, + 'm4_pattern_forbid' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'LTVERSION_VERSION' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + 'LTOPTIONS_VERSION' => 1, + 'AC_LTDL_OBJDIR' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + '_LT_PROG_LTMAIN' => 1, + 'LT_AC_PROG_RC' => 1, + 'BITCOIN_FIND_BDB48' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'AC_LTDL_SHLIBPATH' => 1, '_LT_DLL_DEF_P' => 1, - 'LT_PROG_GO' => 1, - '_LT_AC_LOCK' => 1, '_AM_SUBST_NOTMAKE' => 1, - 'AM_DEP_TRACK' => 1, - '_LT_PROG_F77' => 1, - 'BITCOIN_FIND_BDB48' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, - 'AC_DEFUN_ONCE' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - 'LT_PATH_LD' => 1, - 'PKG_PROG_PKG_CONFIG' => 1, - 'AM_SILENT_RULES' => 1, - '_LT_PROG_ECHO_BACKSLASH' => 1, - 'AM_PROG_LIBTOOL' => 1, - '_AM_MANGLE_OPTION' => 1, - 'LT_AC_PROG_SED' => 1, - '_PKG_SHORT_ERRORS_SUPPORTED' => 1, - 'AC_LIB_LTDL' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'LTSUGAR_VERSION' => 1, + 'AC_LIBTOOL_RC' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + '_LT_AC_SYS_COMPILER' => 1, + 'LT_CMD_MAX_LEN' => 1, + 'AM_MISSING_PROG' => 1, + 'm4_include' => 1, + '_LT_AC_SHELL_INIT' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + 'LTOBSOLETE_VERSION' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_MAINTAINER_MODE' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'AX_CXX_COMPILE_STDCXX' => 1, '_LT_COMPILER_BOILERPLATE' => 1, - 'AC_PROG_LD' => 1, - 'AC_LTDL_PREOPEN' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - 'AM_SANITY_CHECK' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, '_AC_AM_CONFIG_HEADER_HOOK' => 1, - 'AM_PROG_CC_C_O' => 1, - '_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG' => 1, - 'PKG_CHECK_VAR' => 1, + '_LT_PROG_CXX' => 1, + 'AX_BOOST_FILESYSTEM' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AM_INIT_AUTOMAKE' => 1, 'AC_DISABLE_STATIC' => 1, - 'AC_LIBTOOL_RC' => 1, - '_LT_PROG_LTMAIN' => 1, - 'AC_LTDL_DLLIB' => 1, - '_LT_AC_TAGVAR' => 1, + 'BITCOIN_QT_CHECK' => 1, 'AM_ENABLE_STATIC' => 1, - 'PKG_NOARCH_INSTALLDIR' => 1, - 'AC_LIBTOOL_F77' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - '_AM_SET_OPTIONS' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'PKG_CHECK_MODULES' => 1, - 'AX_BOOST_PROGRAM_OPTIONS' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, - 'AM_ENABLE_SHARED' => 1, - '_LT_AC_SYS_COMPILER' => 1, - '_m4_warn' => 1, - 'BITCOIN_SUBDIR_TO_INCLUDE' => 1, - 'AC_LTDL_DLSYM_USCORE' => 1, + 'AX_BOOST_CHRONO' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, 'LT_FUNC_ARGZ' => 1, - 'AC_PROG_EGREP' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'PKG_INSTALLDIR' => 1, - 'AX_CXX_COMPILE_STDCXX' => 1, - '_BITCOIN_QT_FIND_STATIC_PLUGINS' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, - 'LT_AC_PROG_GCJ' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, - '_LT_LINKER_OPTION' => 1, - 'PKG_CHECK_MODULES_STATIC' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'AC_PROG_NM' => 1, - 'LT_SYS_SYMBOL_USCORE' => 1, - 'BITCOIN_QT_CONFIGURE' => 1, - 'LT_SUPPORTED_TAG' => 1, + 'BITCOIN_QT_PATH_PROGS' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AX_GCC_FUNC_ATTRIBUTE' => 1, + 'AC_CHECK_LIBM' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, 'AX_BOOST_BASE' => 1, + 'BITCOIN_QT_CONFIGURE' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + '_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, + '_AM_PROG_CC_C_O' => 1, + 'LT_LANG' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AM_PROG_NM' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + '_AM_MANGLE_OPTION' => 1, 'AC_LIBTOOL_FC' => 1, - '_LT_AC_TAGCONFIG' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'AM_DISABLE_STATIC' => 1, + '_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG' => 1, + 'PKG_CHECK_VAR' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AX_CHECK_COMPILE_FLAG' => 1, + 'AC_PROG_NM' => 1, + '_LT_CC_BASENAME' => 1, + 'LT_AC_PROG_GCJ' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AM_SANITY_CHECK' => 1, 'AC_DISABLE_SHARED' => 1, - 'LT_FUNC_DLSYM_USCORE' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - 'LTDL_CONVENIENCE' => 1, + 'AM_SET_DEPDIR' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + 'AX_BOOST_PROGRAM_OPTIONS' => 1, + '_LT_AC_TAGCONFIG' => 1, + '_BITCOIN_QT_IS_STATIC' => 1, + '_LT_AC_LANG_GCJ' => 1, + '_AM_PROG_TAR' => 1, + 'AX_BOOST_SYSTEM' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + 'AM_MISSING_HAS_RUN' => 1, 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - 'LT_SYS_MODULE_EXT' => 1, - 'LT_PATH_NM' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - 'LT_CMD_MAX_LEN' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - '_BITCOIN_QT_CHECK_QT5' => 1, - '_AM_PROG_CC_C_O' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + '_BITCOIN_QT_CHECK_STATIC_PLUGINS' => 1, + 'AM_SILENT_RULES' => 1, + 'AX_BOOST_UNIT_TEST_FRAMEWORK' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_LIBTOOL_SETUP' => 1, + '_LT_AC_LANG_F77' => 1, + 'LT_LIB_DLLOAD' => 1, + 'LT_FUNC_DLSYM_USCORE' => 1, + 'AC_PROG_EGREP' => 1, 'AC_LTDL_ENABLE_INSTALL' => 1, - 'AX_BOOST_SYSTEM' => 1, - 'AC_LTDL_SHLIBEXT' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, + '_LT_LINKER_OPTION' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, 'LT_SYS_DLSEARCH_PATH' => 1, - 'LT_SYS_MODULE_PATH' => 1, - 'AX_BOOST_CHRONO' => 1, - '_LT_WITH_SYSROOT' => 1, - '_LT_AC_LANG_CXX' => 1, - '_AM_SET_OPTION' => 1, + '_AM_AUTOCONF_VERSION' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, + '_LT_AC_TAGVAR' => 1, + 'LT_LIB_M' => 1, + 'AM_DISABLE_SHARED' => 1, + 'AM_DEP_TRACK' => 1, + 'AM_ENABLE_SHARED' => 1, + 'AX_CHECK_LINK_FLAG' => 1, + 'BITCOIN_QT_FAIL' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, + 'LT_OUTPUT' => 1, + 'LT_WITH_LTDL' => 1, + '_AM_IF_OPTION' => 1, + 'CHECK_ATOMIC' => 1, + 'AX_BOOST_THREAD' => 1, + 'include' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, 'LT_INIT' => 1, - 'AM_DISABLE_STATIC' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - '_LT_LIBOBJ' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + 'AC_PROG_LD' => 1, + '_LT_AC_LOCK' => 1, + 'PKG_INSTALLDIR' => 1, + 'LT_SYS_SYMBOL_USCORE' => 1, + 'LT_AC_PROG_SED' => 1, + 'AM_PROG_CC_C_O' => 1, + 'LTSUGAR_VERSION' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, 'AM_MAKE_INCLUDE' => 1, - 'AM_RUN_LOG' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + '_m4_warn' => 1, + 'AC_LTDL_DLLIB' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + 'PKG_CHECK_MODULES' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'AC_DEFUN' => 1, - '_AM_IF_OPTION' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'LTOBSOLETE_VERSION' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'AC_PATH_MAGIC' => 1, - '_LT_AC_LANG_GCJ' => 1, - '_LT_AC_LANG_F77' => 1, - 'LTDL_INSTALLABLE' => 1, - 'BITCOIN_QT_FAIL' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, - 'LT_LANG' => 1, - 'm4_include' => 1, - 'AC_LTDL_SYSSEARCHPATH' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, + 'LT_PROG_GCJ' => 1, + '_AC_PROG_LIBTOOL' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'm4_pattern_allow' => 1, 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - 'ACX_PTHREAD' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + 'AC_LTDL_DLSYM_USCORE' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'LT_PATH_NM' => 1, + 'AM_PROG_LD' => 1, + '_AM_SET_OPTIONS' => 1, + '_LT_LIBOBJ' => 1, + 'AC_LIBTOOL_PICMODE' => 1, 'AM_PROG_INSTALL_SH' => 1, - 'AM_MISSING_PROG' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AX_GCC_FUNC_ATTRIBUTE' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'BITCOIN_QT_PATH_PROGS' => 1, - 'AM_SET_DEPDIR' => 1, - 'AX_CHECK_COMPILE_FLAG' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, - 'AM_PROG_NM' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'm4_pattern_allow' => 1, - '_LT_AC_PROG_CXXCPP' => 1, + '_LT_COMPILER_OPTION' => 1, + 'AC_LTDL_SYMBOL_USCORE' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + '_BITCOIN_QT_CHECK_QT5' => 1, + 'ACX_PTHREAD' => 1, + '_LT_PROG_F77' => 1, + 'AC_LIBTOOL_F77' => 1, + 'PKG_NOARCH_INSTALLDIR' => 1, 'AU_DEFUN' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'CHECK_ATOMIC' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - '_LT_CC_BASENAME' => 1, 'AC_WITH_LTDL' => 1, - '_LT_COMPILER_OPTION' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - 'AC_LTDL_SHLIBPATH' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AM_DISABLE_SHARED' => 1, - 'AM_PROG_LD' => 1, + 'BITCOIN_QT_INIT' => 1, + 'AC_PATH_MAGIC' => 1, + 'AM_RUN_LOG' => 1, 'LTDL_INIT' => 1, - 'AC_LIBTOOL_CXX' => 1, - '_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'LT_PROG_RC' => 1, + 'AC_LTDL_PREOPEN' => 1, + 'AC_ENABLE_SHARED' => 1, + '_LT_PROG_FC' => 1, + 'AC_DEFUN_ONCE' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'LT_PATH_LD' => 1, + 'AC_LTDL_SHLIBEXT' => 1, + 'LT_PROG_GO' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, '_AM_DEPENDENCIES' => 1, - '_LT_PROG_CXX' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'BITCOIN_SUBDIR_TO_INCLUDE' => 1, + 'AC_LIBLTDL_CONVENIENCE' => 1, + 'AX_CHECK_PREPROC_FLAG' => 1, + 'AC_LIBTOOL_GCJ' => 1, 'AX_PTHREAD' => 1, - 'AC_ENABLE_SHARED' => 1, - 'LTVERSION_VERSION' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'LTDL_CONVENIENCE' => 1, 'LT_AC_PROG_EGREP' => 1, - 'AC_LIBTOOL_GCJ' => 1, - '_LT_AC_SHELL_INIT' => 1, - 'LT_WITH_LTDL' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - '_BITCOIN_QT_IS_STATIC' => 1, - 'AC_ENABLE_STATIC' => 1, + 'AC_PROG_LD_GNU' => 1, + 'AC_LIB_LTDL' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + 'AM_SUBST_NOTMAKE' => 1, + '_LT_WITH_SYSROOT' => 1, + 'LT_SYS_MODULE_EXT' => 1, + '_LT_AC_LANG_CXX' => 1, + '_AM_SET_OPTION' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, + 'AC_LTDL_SYSSEARCHPATH' => 1, 'AC_LIBTOOL_WIN32_DLL' => 1, - 'AC_LTDL_OBJDIR' => 1, - 'AX_BOOST_FILESYSTEM' => 1, - 'LT_PROG_GCJ' => 1, - 'LT_AC_PROG_RC' => 1, - 'include' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'LT_LIB_M' => 1, - 'm4_pattern_forbid' => 1, - 'LTOPTIONS_VERSION' => 1, - 'AX_BOOST_THREAD' => 1, + '_PKG_SHORT_ERRORS_SUPPORTED' => 1, 'PKG_CHECK_EXISTS' => 1, - '_LT_PROG_FC' => 1, - '_AM_PROG_TAR' => 1, - '_BITCOIN_QT_CHECK_STATIC_PLUGINS' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - '_AC_PROG_LIBTOOL' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - 'LT_OUTPUT' => 1, - '_AM_AUTOCONF_VERSION' => 1, - 'LT_LIB_DLLOAD' => 1, - 'AX_BOOST_UNIT_TEST_FRAMEWORK' => 1, - 'AX_CHECK_LINK_FLAG' => 1, - 'AC_PROG_LD_GNU' => 1, - 'AM_CONDITIONAL' => 1, - 'BITCOIN_QT_INIT' => 1, - 'AC_CHECK_LIBM' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_LTDL_SYMBOL_USCORE' => 1, - 'AC_LIBLTDL_CONVENIENCE' => 1, - 'AC_LIBTOOL_SETUP' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'BITCOIN_QT_CHECK' => 1, - 'LT_PROG_RC' => 1 + 'LT_SYS_MODULE_PATH' => 1, + 'PKG_PROG_PKG_CONFIG' => 1, + '_LT_PROG_ECHO_BACKSLASH' => 1, + 'AC_ENABLE_STATIC' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + 'PKG_CHECK_MODULES_STATIC' => 1, + '_BITCOIN_QT_FIND_STATIC_PLUGINS' => 1, + '_LTDL_SETUP' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + 'AC_LIBTOOL_CXX' => 1, + 'AC_DEFUN' => 1, + 'LTDL_INSTALLABLE' => 1, + '_LT_AC_FILE_LTDLL_C' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -290,66 +290,66 @@ 'configure.ac' ], { - 'AM_PROG_CXX_C_O' => 1, - 'm4_pattern_forbid' => 1, - 'AC_FC_FREEFORM' => 1, - 'm4_include' => 1, - 'AM_SILENT_RULES' => 1, - 'AC_CONFIG_FILES' => 1, - 'include' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AC_SUBST_TRACE' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - 'AC_FC_PP_SRCEXT' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, - 'AM_GNU_GETTEXT' => 1, 'AC_CONFIG_LINKS' => 1, - 'AM_ENABLE_MULTILIB' => 1, - '_AM_COND_ELSE' => 1, - 'AM_POT_TOOLS' => 1, - 'LT_INIT' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AC_FC_SRCEXT' => 1, - 'AM_PROG_MOC' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AM_PATH_GUILE' => 1, - '_m4_warn' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + '_AM_COND_ENDIF' => 1, + 'AC_CANONICAL_BUILD' => 1, + 'AM_PROG_FC_C_O' => 1, 'AM_INIT_AUTOMAKE' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'm4_sinclude' => 1, + 'm4_pattern_allow' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + '_AM_COND_ELSE' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'AC_CANONICAL_HOST' => 1, 'AC_FC_PP_DEFINE' => 1, - 'AM_CONDITIONAL' => 1, - 'AM_PROG_F77_C_O' => 1, - 'sinclude' => 1, - 'AC_LIBSOURCE' => 1, - 'AH_OUTPUT' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AM_MAINTAINER_MODE' => 1, + 'AM_PROG_MOC' => 1, 'AM_NLS' => 1, - '_AM_COND_ENDIF' => 1, - '_AM_COND_IF' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AM_PROG_AR' => 1, + 'AH_OUTPUT' => 1, + 'AM_PROG_CXX_C_O' => 1, 'AC_SUBST' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AC_CONFIG_HEADERS' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AC_INIT' => 1, - 'm4_pattern_allow' => 1, + 'AM_PROG_AR' => 1, + 'AM_PROG_MKDIR_P' => 1, + 'AC_SUBST_TRACE' => 1, + 'sinclude' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'include' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'LT_INIT' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AM_PATH_GUILE' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'AC_CONFIG_HEADERS' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'm4_pattern_forbid' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + 'AC_CONFIG_FILES' => 1, + '_AM_COND_IF' => 1, + 'AC_FC_SRCEXT' => 1, + 'AC_INIT' => 1, + 'AM_POT_TOOLS' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AC_LIBSOURCE' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'm4_sinclude' => 1, 'AM_PROG_CC_C_O' => 1, - 'AM_PROG_MKDIR_P' => 1 + '_m4_warn' => 1, + 'AC_FC_FREEFORM' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AM_PROG_F77_C_O' => 1, + 'm4_include' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_GNU_GETTEXT' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'AM_SILENT_RULES' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_MAINTAINER_MODE' => 1 } ], 'Autom4te::Request' ) ); diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1 index 041dcc5..3811555 100644 --- a/autom4te.cache/traces.1 +++ b/autom4te.cache/traces.1 @@ -1724,16 +1724,16 @@ m4trace:configure.ac:1217: -1- AC_DEFINE_TRACE_LITERAL([COPYRIGHT_HOLDERS_FINAL] m4trace:configure.ac:1217: -1- m4_pattern_allow([^COPYRIGHT_HOLDERS_FINAL$]) m4trace:configure.ac:1217: -1- AH_OUTPUT([COPYRIGHT_HOLDERS_FINAL], [/* Copyright holder(s) */ @%:@undef COPYRIGHT_HOLDERS_FINAL]) -m4trace:configure.ac:1218: -1- AC_SUBST([CLIENT_VERSION_MAJOR], [1]) +m4trace:configure.ac:1218: -1- AC_SUBST([CLIENT_VERSION_MAJOR], [2]) m4trace:configure.ac:1218: -1- AC_SUBST_TRACE([CLIENT_VERSION_MAJOR]) m4trace:configure.ac:1218: -1- m4_pattern_allow([^CLIENT_VERSION_MAJOR$]) m4trace:configure.ac:1219: -1- AC_SUBST([CLIENT_VERSION_MINOR], [0]) m4trace:configure.ac:1219: -1- AC_SUBST_TRACE([CLIENT_VERSION_MINOR]) m4trace:configure.ac:1219: -1- m4_pattern_allow([^CLIENT_VERSION_MINOR$]) -m4trace:configure.ac:1220: -1- AC_SUBST([CLIENT_VERSION_REVISION], [2]) +m4trace:configure.ac:1220: -1- AC_SUBST([CLIENT_VERSION_REVISION], [0]) m4trace:configure.ac:1220: -1- AC_SUBST_TRACE([CLIENT_VERSION_REVISION]) m4trace:configure.ac:1220: -1- m4_pattern_allow([^CLIENT_VERSION_REVISION$]) -m4trace:configure.ac:1221: -1- AC_SUBST([CLIENT_VERSION_BUILD], [1]) +m4trace:configure.ac:1221: -1- AC_SUBST([CLIENT_VERSION_BUILD], [0]) m4trace:configure.ac:1221: -1- AC_SUBST_TRACE([CLIENT_VERSION_BUILD]) m4trace:configure.ac:1221: -1- m4_pattern_allow([^CLIENT_VERSION_BUILD$]) m4trace:configure.ac:1222: -1- AC_SUBST([CLIENT_VERSION_IS_RELEASE], [true]) diff --git a/config.log b/config.log index 6cb951e..d5637b0 100644 --- a/config.log +++ b/config.log @@ -1,7 +1,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Qbase Core configure 1.0.2, which was +It was created by Qbase Core configure 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ ./configure @@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69. Invocation command line was ## Platform. ## ## --------- ## -hostname = qbase-VirtualBox +hostname = mr-VirtualBox uname -m = x86_64 -uname -r = 4.13.0-36-generic +uname -r = 4.15.0-36-generic uname -s = Linux -uname -v = #40~16.04.1-Ubuntu SMP Fri Feb 16 23:25:58 UTC 2018 +uname -v = #39~16.04.1-Ubuntu SMP Tue Sep 25 08:59:23 UTC 2018 /usr/bin/uname -p = unknown /bin/uname -X = unknown @@ -27,8 +27,8 @@ uname -v = #40~16.04.1-Ubuntu SMP Fri Feb 16 23:25:58 UTC 2018 /usr/bin/oslevel = unknown /bin/universe = unknown -PATH: /home/qbase/bin -PATH: /home/qbase/.local/bin +PATH: /home/mr/bin +PATH: /home/mr/.local/bin PATH: /usr/local/sbin PATH: /usr/local/bin PATH: /usr/sbin @@ -55,8 +55,10 @@ configure:3241: result: yes configure:3392: checking for a thread-safe mkdir -p configure:3431: result: /bin/mkdir -p configure:3438: checking for gawk -configure:3454: found /usr/bin/gawk -configure:3465: result: gawk +configure:3468: result: no +configure:3438: checking for mawk +configure:3454: found /usr/bin/mawk +configure:3465: result: mawk configure:3476: checking whether make sets $(MAKE) configure:3498: result: yes configure:3527: checking whether make supports nested variables @@ -170,8 +172,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -196,8 +198,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -217,8 +219,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -238,8 +240,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -399,8 +401,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -417,8 +419,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -526,8 +528,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -556,8 +558,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -685,8 +687,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -721,8 +723,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -757,8 +759,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -793,8 +795,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -843,8 +845,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -879,8 +881,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -956,8 +958,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1041,8 +1043,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1085,8 +1087,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1129,8 +1131,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1198,8 +1200,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1268,8 +1270,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1350,16 +1352,16 @@ configure:23064: checking for sys/prctl.h configure:23064: result: yes configure:23074: checking for library containing getaddrinfo_a configure:23105: g++ -std=c++11 -o conftest -g -O2 -Wall -Wextra -Wformat -Wvla -Wformat-security -Wno-unused-parameter -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS conftest.cpp >&5 -/tmp/ccYpx07L.o: In function `main': -/home/qbase/Qbase/conftest.cpp:50: undefined reference to `getaddrinfo_a' +/tmp/cc8PqUSr.o: In function `main': +/home/mr/qbase/conftest.cpp:50: undefined reference to `getaddrinfo_a' collect2: error: ld returned 1 exit status configure:23105: $? = 1 configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1542,8 +1544,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1623,8 +1625,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1714,8 +1716,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1801,8 +1803,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1886,8 +1888,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -1971,8 +1973,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2056,8 +2058,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2141,8 +2143,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2226,8 +2228,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2311,8 +2313,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2396,8 +2398,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2481,8 +2483,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2566,8 +2568,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2651,8 +2653,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2736,8 +2738,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2821,8 +2823,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2906,8 +2908,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -2991,8 +2993,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -3076,8 +3078,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -3161,8 +3163,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -3246,8 +3248,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -3411,8 +3413,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -3511,8 +3513,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -3688,8 +3690,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -3840,8 +3842,8 @@ configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "Qbase Core" | #define PACKAGE_TARNAME "qbasecore" -| #define PACKAGE_VERSION "1.0.2" -| #define PACKAGE_STRING "Qbase Core 1.0.2" +| #define PACKAGE_VERSION "2.0.0" +| #define PACKAGE_STRING "Qbase Core 2.0.0" | #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" | #define PACKAGE_URL "" | #define HAVE_CXX11 1 @@ -4001,7 +4003,7 @@ configure:31195: creating ./config.status ## Running config.status. ## ## ---------------------- ## -This file was extended by Qbase Core config.status 1.0.2, which was +This file was extended by Qbase Core config.status 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = @@ -4010,7 +4012,7 @@ generated by GNU Autoconf 2.69. Invocation command line was CONFIG_COMMANDS = $ ./config.status -on qbase-VirtualBox +on mr-VirtualBox config.status:1410: creating libbitcoinconsensus.pc config.status:1410: creating Makefile @@ -4024,9 +4026,9 @@ config.status:1410: creating src/config/qbase-config.h config.status:1591: src/config/qbase-config.h is unchanged config.status:1639: executing depfiles commands config.status:1639: executing libtool commands -configure:33678: === configuring in src/univalue (/home/qbase/Qbase/src/univalue) +configure:33678: === configuring in src/univalue (/home/mr/qbase/src/univalue) configure:33741: running /bin/bash ./configure --disable-option-checking '--prefix=/usr/local' '--disable-shared' '--with-pic' '--with-bignum=no' '--enable-module-recovery' '--disable-jni' --cache-file=/dev/null --srcdir=. -configure:33678: === configuring in src/secp256k1 (/home/qbase/Qbase/src/secp256k1) +configure:33678: === configuring in src/secp256k1 (/home/mr/qbase/src/secp256k1) configure:33741: running /bin/bash ./configure --disable-option-checking '--prefix=/usr/local' '--disable-shared' '--with-pic' '--with-bignum=no' '--enable-module-recovery' '--disable-jni' --cache-file=/dev/null --srcdir=. configure:33760: result: Fixing libtool for -rpath problems. @@ -4228,7 +4230,7 @@ ac_cv_path_ac_pt_STRIP=/usr/bin/strip ac_cv_path_install='/usr/bin/install -c' ac_cv_path_lt_DD=/bin/dd ac_cv_path_mkdir=/bin/mkdir -ac_cv_prog_AWK=gawk +ac_cv_prog_AWK=mawk ac_cv_prog_CPP='gcc -E' ac_cv_prog_CXXCPP='g++ -std=c++11 -E' ac_cv_prog_ac_ct_AR=ar @@ -4351,7 +4353,7 @@ pkg_cv_ZMQ_LIBS=-lzmq ## Output variables. ## ## ----------------- ## -ACLOCAL='${SHELL} /home/qbase/Qbase/build-aux/missing aclocal-1.15' +ACLOCAL='${SHELL} /home/mr/qbase/build-aux/missing aclocal-1.15' AMDEPBACKSLASH='\' AMDEP_FALSE='#' AMDEP_TRUE='' @@ -4362,10 +4364,10 @@ AM_DEFAULT_VERBOSITY='0' AM_V='$(V)' AR='/usr/bin/ar' ARFLAGS='cr' -AUTOCONF='${SHELL} /home/qbase/Qbase/build-aux/missing autoconf' -AUTOHEADER='${SHELL} /home/qbase/Qbase/build-aux/missing autoheader' -AUTOMAKE='${SHELL} /home/qbase/Qbase/build-aux/missing automake-1.15' -AWK='gawk' +AUTOCONF='${SHELL} /home/mr/qbase/build-aux/missing autoconf' +AUTOHEADER='${SHELL} /home/mr/qbase/build-aux/missing autoheader' +AUTOMAKE='${SHELL} /home/mr/qbase/build-aux/missing automake-1.15' +AWK='mawk' BDB_CFLAGS='' BDB_CPPFLAGS='' BDB_LIBS='-ldb_cxx-4.8' @@ -4395,11 +4397,11 @@ CC='gcc' CCACHE='' CCDEPMODE='depmode=gcc3' CFLAGS='-g -O2' -CLIENT_VERSION_BUILD='1' +CLIENT_VERSION_BUILD='0' CLIENT_VERSION_IS_RELEASE='true' -CLIENT_VERSION_MAJOR='1' +CLIENT_VERSION_MAJOR='2' CLIENT_VERSION_MINOR='0' -CLIENT_VERSION_REVISION='2' +CLIENT_VERSION_REVISION='0' COPYRIGHT_HOLDERS='The %s developers' COPYRIGHT_HOLDERS_FINAL='The Qbase Core developers' COPYRIGHT_HOLDERS_SUBSTITUTION='Qbase Core' @@ -4494,7 +4496,7 @@ LUPDATE='/usr/lib/x86_64-linux-gnu/qt5/bin/lupdate' MAINT='' MAINTAINER_MODE_FALSE='#' MAINTAINER_MODE_TRUE='' -MAKEINFO='${SHELL} /home/qbase/Qbase/build-aux/missing makeinfo' +MAKEINFO='${SHELL} /home/mr/qbase/build-aux/missing makeinfo' MAKENSIS='' MANIFEST_TOOL=':' MINIUPNPC_CPPFLAGS='' @@ -4515,10 +4517,10 @@ OTOOL='' PACKAGE='qbasecore' PACKAGE_BUGREPORT='https://github.com/NicholasAdmin/Qbase/issues' PACKAGE_NAME='Qbase Core' -PACKAGE_STRING='Qbase Core 1.0.2' +PACKAGE_STRING='Qbase Core 2.0.0' PACKAGE_TARNAME='qbasecore' PACKAGE_URL='' -PACKAGE_VERSION='1.0.2' +PACKAGE_VERSION='2.0.0' PATH_SEPARATOR=':' PIC_FLAGS='-fPIC' PIE_FLAGS='-fPIE' @@ -4587,7 +4589,7 @@ USE_QRCODE='' USE_QRCODE_FALSE='#' USE_QRCODE_TRUE='' USE_UPNP='' -VERSION='1.0.2' +VERSION='2.0.0' WINDOWS_BITS='' WINDRES='' X11XCB_CFLAGS='' @@ -4635,7 +4637,7 @@ host_vendor='pc' htmldir='${docdir}' includedir='${prefix}/include' infodir='${datarootdir}/info' -install_sh='${SHELL} /home/qbase/Qbase/build-aux/install-sh' +install_sh='${SHELL} /home/mr/qbase/build-aux/install-sh' libdir='${exec_prefix}/lib' libexecdir='${exec_prefix}/libexec' localedir='${datarootdir}/locale' @@ -4661,8 +4663,8 @@ target_alias='' /* confdefs.h */ #define PACKAGE_NAME "Qbase Core" #define PACKAGE_TARNAME "qbasecore" -#define PACKAGE_VERSION "1.0.2" -#define PACKAGE_STRING "Qbase Core 1.0.2" +#define PACKAGE_VERSION "2.0.0" +#define PACKAGE_STRING "Qbase Core 2.0.0" #define PACKAGE_BUGREPORT "https://github.com/NicholasAdmin/Qbase/issues" #define PACKAGE_URL "" #define HAVE_CXX11 1 @@ -4741,10 +4743,10 @@ target_alias='' #define USE_UPNP 0 #define USE_DBUS 1 #define USE_QRCODE 1 -#define CLIENT_VERSION_MAJOR 1 +#define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 2 -#define CLIENT_VERSION_BUILD 1 +#define CLIENT_VERSION_REVISION 0 +#define CLIENT_VERSION_BUILD 0 #define CLIENT_VERSION_IS_RELEASE true #define COPYRIGHT_YEAR 2018 #define COPYRIGHT_HOLDERS "The %s developers" diff --git a/config.status b/config.status index 5e39a47..36891bd 100644 --- a/config.status +++ b/config.status @@ -380,7 +380,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Qbase Core $as_me 1.0.2, which was +This file was extended by Qbase Core $as_me 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -429,7 +429,7 @@ Report bugs to ." ac_cs_config="--disable-shared --with-pic --with-bignum=no --enable-module-recovery --disable-jni" ac_cs_version="\ -Qbase Core config.status 1.0.2 +Qbase Core config.status 2.0.0 configured by ./configure, generated by GNU Autoconf 2.69, with options \"$ac_cs_config\" @@ -437,11 +437,11 @@ Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/home/qbase/Qbase' +ac_pwd='/home/mr/qbase' srcdir='.' INSTALL='/usr/bin/install -c' MKDIR_P='/bin/mkdir -p' -AWK='gawk' +AWK='mawk' test -n "$AWK" || AWK=awk # The default lists apply if the user does not specify any file. ac_need_defaults=: @@ -788,7 +788,7 @@ fi PACKAGE='qbasecore' - VERSION='1.0.2' + VERSION='2.0.0' RM='rm -f' ofile='libtool' @@ -910,10 +910,10 @@ S["COPYRIGHT_HOLDERS_SUBSTITUTION"]="Qbase Core" S["COPYRIGHT_HOLDERS"]="The %s developers" S["COPYRIGHT_YEAR"]="2018" S["CLIENT_VERSION_IS_RELEASE"]="true" -S["CLIENT_VERSION_BUILD"]="1" -S["CLIENT_VERSION_REVISION"]="2" +S["CLIENT_VERSION_BUILD"]="0" +S["CLIENT_VERSION_REVISION"]="0" S["CLIENT_VERSION_MINOR"]="0" -S["CLIENT_VERSION_MAJOR"]="1" +S["CLIENT_VERSION_MAJOR"]="2" S["USE_ASM_FALSE"]="#" S["USE_ASM_TRUE"]="" S["ENABLE_HWCRC32_FALSE"]="#" @@ -1122,18 +1122,18 @@ S["am__tar"]="$${TAR-tar} chof - \"$$tardir\"" S["AMTAR"]="$${TAR-tar}" S["am__leading_dot"]="." S["SET_MAKE"]="" -S["AWK"]="gawk" +S["AWK"]="mawk" S["mkdir_p"]="$(MKDIR_P)" S["MKDIR_P"]="/bin/mkdir -p" S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s" S["STRIP"]="/usr/bin/strip" -S["install_sh"]="${SHELL} /home/qbase/Qbase/build-aux/install-sh" -S["MAKEINFO"]="${SHELL} /home/qbase/Qbase/build-aux/missing makeinfo" -S["AUTOHEADER"]="${SHELL} /home/qbase/Qbase/build-aux/missing autoheader" -S["AUTOMAKE"]="${SHELL} /home/qbase/Qbase/build-aux/missing automake-1.15" -S["AUTOCONF"]="${SHELL} /home/qbase/Qbase/build-aux/missing autoconf" -S["ACLOCAL"]="${SHELL} /home/qbase/Qbase/build-aux/missing aclocal-1.15" -S["VERSION"]="1.0.2" +S["install_sh"]="${SHELL} /home/mr/qbase/build-aux/install-sh" +S["MAKEINFO"]="${SHELL} /home/mr/qbase/build-aux/missing makeinfo" +S["AUTOHEADER"]="${SHELL} /home/mr/qbase/build-aux/missing autoheader" +S["AUTOMAKE"]="${SHELL} /home/mr/qbase/build-aux/missing automake-1.15" +S["AUTOCONF"]="${SHELL} /home/mr/qbase/build-aux/missing autoconf" +S["ACLOCAL"]="${SHELL} /home/mr/qbase/build-aux/missing aclocal-1.15" +S["VERSION"]="2.0.0" S["PACKAGE"]="qbasecore" S["CYGPATH_W"]="echo" S["am__isrc"]="" @@ -1182,8 +1182,8 @@ S["prefix"]="/usr/local" S["exec_prefix"]="${prefix}" S["PACKAGE_URL"]="" S["PACKAGE_BUGREPORT"]="https://github.com/NicholasAdmin/Qbase/issues" -S["PACKAGE_STRING"]="Qbase Core 1.0.2" -S["PACKAGE_VERSION"]="1.0.2" +S["PACKAGE_STRING"]="Qbase Core 2.0.0" +S["PACKAGE_VERSION"]="2.0.0" S["PACKAGE_TARNAME"]="qbasecore" S["PACKAGE_NAME"]="Qbase Core" S["PATH_SEPARATOR"]=":" @@ -1231,8 +1231,8 @@ cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { D["PACKAGE_NAME"]=" \"Qbase Core\"" D["PACKAGE_TARNAME"]=" \"qbasecore\"" -D["PACKAGE_VERSION"]=" \"1.0.2\"" -D["PACKAGE_STRING"]=" \"Qbase Core 1.0.2\"" +D["PACKAGE_VERSION"]=" \"2.0.0\"" +D["PACKAGE_STRING"]=" \"Qbase Core 2.0.0\"" D["PACKAGE_BUGREPORT"]=" \"https://github.com/NicholasAdmin/Qbase/issues\"" D["PACKAGE_URL"]=" \"\"" D["HAVE_CXX11"]=" 1" @@ -1311,10 +1311,10 @@ D["ENABLE_WALLET"]=" 1" D["USE_UPNP"]=" 0" D["USE_DBUS"]=" 1" D["USE_QRCODE"]=" 1" -D["CLIENT_VERSION_MAJOR"]=" 1" +D["CLIENT_VERSION_MAJOR"]=" 2" D["CLIENT_VERSION_MINOR"]=" 0" -D["CLIENT_VERSION_REVISION"]=" 2" -D["CLIENT_VERSION_BUILD"]=" 1" +D["CLIENT_VERSION_REVISION"]=" 0" +D["CLIENT_VERSION_BUILD"]=" 0" D["CLIENT_VERSION_IS_RELEASE"]=" true" D["COPYRIGHT_YEAR"]=" 2018" D["COPYRIGHT_HOLDERS"]=" \"The %s developers\"" diff --git a/configure b/configure index c4f3747..4a3730d 100644 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Qbase Core 1.0.2. +# Generated by GNU Autoconf 2.69 for Qbase Core 2.0.0. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Qbase Core' PACKAGE_TARNAME='qbasecore' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='Qbase Core 1.0.2' +PACKAGE_VERSION='2.0.0' +PACKAGE_STRING='Qbase Core 2.0.0' PACKAGE_BUGREPORT='https://github.com/NicholasAdmin/Qbase/issues' PACKAGE_URL='' @@ -1597,7 +1597,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Qbase Core 1.0.2 to adapt to many kinds of systems. +\`configure' configures Qbase Core 2.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1668,7 +1668,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Qbase Core 1.0.2:";; + short | recursive ) echo "Configuration of Qbase Core 2.0.0:";; esac cat <<\_ACEOF @@ -1935,7 +1935,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Qbase Core configure 1.0.2 +Qbase Core configure 2.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2618,7 +2618,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Qbase Core $as_me 1.0.2, which was +It was created by Qbase Core $as_me 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3574,7 +3574,7 @@ fi # Define the identity of the package. PACKAGE='qbasecore' - VERSION='1.0.2' + VERSION='2.0.0' # Some tools Automake needs. @@ -30844,16 +30844,16 @@ fi -$as_echo "#define CLIENT_VERSION_MAJOR 1" >>confdefs.h +$as_echo "#define CLIENT_VERSION_MAJOR 2" >>confdefs.h $as_echo "#define CLIENT_VERSION_MINOR 0" >>confdefs.h -$as_echo "#define CLIENT_VERSION_REVISION 2" >>confdefs.h +$as_echo "#define CLIENT_VERSION_REVISION 0" >>confdefs.h -$as_echo "#define CLIENT_VERSION_BUILD 1" >>confdefs.h +$as_echo "#define CLIENT_VERSION_BUILD 0" >>confdefs.h $as_echo "#define CLIENT_VERSION_IS_RELEASE true" >>confdefs.h @@ -30871,13 +30871,13 @@ $as_echo "#define COPYRIGHT_HOLDERS_SUBSTITUTION \"Qbase Core\"" >>confdefs.h $as_echo "#define COPYRIGHT_HOLDERS_FINAL \"The Qbase Core developers\"" >>confdefs.h -CLIENT_VERSION_MAJOR=1 +CLIENT_VERSION_MAJOR=2 CLIENT_VERSION_MINOR=0 -CLIENT_VERSION_REVISION=2 +CLIENT_VERSION_REVISION=0 -CLIENT_VERSION_BUILD=1 +CLIENT_VERSION_BUILD=0 CLIENT_VERSION_IS_RELEASE=true @@ -31584,7 +31584,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Qbase Core $as_me 1.0.2, which was +This file was extended by Qbase Core $as_me 2.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31650,7 +31650,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Qbase Core config.status 1.0.2 +Qbase Core config.status 2.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 640af1e..41c4351 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) -define(_CLIENT_VERSION_MAJOR, 1) +define(_CLIENT_VERSION_MAJOR, 2) define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 2) -define(_CLIENT_VERSION_BUILD, 1) +define(_CLIENT_VERSION_REVISION, 0) +define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2018) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md index ce6c41c..4330a4d 100644 --- a/contrib/linearize/README.md +++ b/contrib/linearize/README.md @@ -1,9 +1,9 @@ # Linearize Construct a linear, no-fork, best version of the blockchain. -## Step 0: Install reden_hash +## Step 0: Install qbase_hash -https://github.com/redencoin/reden_hash +https://github.com/qbasecoin/qbase_hash ## Step 1: Download hash list diff --git a/contrib/linearize/example-linearize-testnet.cfg b/contrib/linearize/example-linearize-testnet.cfg index e90f825..66826ea 100644 --- a/contrib/linearize/example-linearize-testnet.cfg +++ b/contrib/linearize/example-linearize-testnet.cfg @@ -10,7 +10,7 @@ max_height=3130000 # bootstrap.dat input/output settings (linearize-data) netmagic=cee2caff -input=/home/example/.redencore/testnet3/blocks +input=/home/example/.qbasecore/testnet3/blocks output_file=/home/example/Downloads/bootstrap.dat hashlist=hashlist.txt split_year=1 diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg index 903e070..dc10132 100644 --- a/contrib/linearize/example-linearize.cfg +++ b/contrib/linearize/example-linearize.cfg @@ -10,7 +10,7 @@ max_height=3130000 # bootstrap.dat input/output settings (linearize-data) netmagic=bf0c6bbd -input=/home/example/.redencore/blocks +input=/home/example/.qbasecore/blocks output_file=/home/example/Downloads/bootstrap.dat hashlist=hashlist.txt split_year=1 diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py index 8ca6315..6a9f500 100644 --- a/contrib/linearize/linearize-data.py +++ b/contrib/linearize/linearize-data.py @@ -17,7 +17,7 @@ import httplib import sys import hashlib -import reden_hash +import qbase_hash import datetime import time from collections import namedtuple @@ -55,7 +55,7 @@ def calc_hdr_hash(blk_hdr): #hash2_o = hash2.digest() #return hash2_o - pow_hash = reden_hash.getPoWHash(blk_hdr) + pow_hash = qbase_hash.getPoWHash(blk_hdr) return pow_hash def calc_hash_str(blk_hdr): diff --git a/contrib/macdeploy/Base.lproj/InfoPlist.strings b/contrib/macdeploy/Base.lproj/InfoPlist.strings index 338f969..935baea 100644 --- a/contrib/macdeploy/Base.lproj/InfoPlist.strings +++ b/contrib/macdeploy/Base.lproj/InfoPlist.strings @@ -1 +1 @@ -{ CFBundleDisplayName = "Reden Core"; CFBundleName = "Reden Core"; } +{ CFBundleDisplayName = "Qbase Core"; CFBundleName = "Qbase Core"; } diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index 7d38704..cc30c9e 100644 --- a/contrib/macdeploy/README.md +++ b/contrib/macdeploy/README.md @@ -11,5 +11,5 @@ This script should not be run manually, instead, after building as usual: During the process, the disk image window will pop up briefly where the fancy settings are applied. This is normal, please do not interfere. -When finished, it will produce `Reden-Core.dmg`. +When finished, it will produce `Qbase-Core.dmg`. diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh index 0631961..5e9cf5f 100644 --- a/contrib/macdeploy/detached-sig-create.sh +++ b/contrib/macdeploy/detached-sig-create.sh @@ -2,7 +2,7 @@ set -e ROOTDIR=dist -BUNDLE="${ROOTDIR}/Reden-Qt.app" +BUNDLE="${ROOTDIR}/Qbase-Qt.app" CODESIGN=codesign TEMPDIR=sign.temp TEMPLIST=${TEMPDIR}/signatures.txt diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist index 6e503fa..6aea444 100644 --- a/contrib/macdeploy/fancy.plist +++ b/contrib/macdeploy/fancy.plist @@ -22,7 +22,7 @@ 370 156 - Reden-Qt.app + Qbase-Qt.app 128 156 diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index c3bb7ae..6c8cb38 100644 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -155,7 +155,7 @@ class FrameworkInfo(object): class ApplicationBundleInfo(object): def __init__(self, path): self.path = path - appName = "Reden-Qt" + appName = "Qbase-Qt" self.binaryPath = os.path.join(path, "Contents", "MacOS", appName) if not os.path.exists(self.binaryPath): raise RuntimeError("Could not find bundle binary for " + path) @@ -596,7 +596,7 @@ if os.path.exists("dist"): # ------------------------------------------------ -target = os.path.join("dist", "Reden-Qt.app") +target = os.path.join("dist", "Qbase-Qt.app") if verbose >= 2: print "+ Copying source bundle +" @@ -757,7 +757,7 @@ if config.dmg is not None: if fancy is None: try: - runHDIUtil("create", dmg_name, srcfolder="dist", format="UDBZ", volname="Reden-Core", ov=True) + runHDIUtil("create", dmg_name, srcfolder="dist", format="UDBZ", volname="Qbase-Core", ov=True) except subprocess.CalledProcessError as e: sys.exit(e.returncode) else: @@ -772,7 +772,7 @@ if config.dmg is not None: if verbose >= 3: print "Creating temp image for modification..." try: - runHDIUtil("create", dmg_name + ".temp", srcfolder="dist", format="UDRW", size=size, volname="Reden-Core", ov=True) + runHDIUtil("create", dmg_name + ".temp", srcfolder="dist", format="UDRW", size=size, volname="Qbase-Core", ov=True) except subprocess.CalledProcessError as e: sys.exit(e.returncode) @@ -837,7 +837,7 @@ if config.dmg is not None: items_positions.append(itemscript.substitute(params)) params = { - "disk" : "Reden-Core", + "disk" : "Qbase-Core", "window_bounds" : "300,300,800,620", "icon_size" : "96", "background_commands" : "", diff --git a/contrib/qbase-qt.pro b/contrib/qbase-qt.pro index 792611a..85f915c 100644 --- a/contrib/qbase-qt.pro +++ b/contrib/qbase-qt.pro @@ -19,4 +19,4 @@ FORMS += \ ../src/qt/forms/transactiondescdialog.ui RESOURCES += \ - ../src/qt/reden.qrc + ../src/qt/qbase.qrc diff --git a/contrib/qbased.bash-completion b/contrib/qbased.bash-completion index 2cfa081..dcae658 100644 --- a/contrib/qbased.bash-completion +++ b/contrib/qbased.bash-completion @@ -1,12 +1,12 @@ -# bash programmable completion for redend(1) and reden-cli(1) +# bash programmable completion for qbased(1) and qbase-cli(1) # Copyright (c) 2012,2014 Christian von Roques # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -have redend && { +have qbased && { -# call $redend for RPC -_reden_rpc() { +# call $qbased for RPC +_qbase_rpc() { # determine already specified args necessary for RPC local rpcargs=() for i in ${COMP_LINE}; do @@ -16,23 +16,23 @@ _reden_rpc() { ;; esac done - $redend "${rpcargs[@]}" "$@" + $qbased "${rpcargs[@]}" "$@" } -# Add reden accounts to COMPREPLY -_reden_accounts() { +# Add qbase accounts to COMPREPLY +_qbase_accounts() { local accounts - accounts=$(_reden_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}') + accounts=$(_qbase_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}') COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) ) } -_redend() { +_qbased() { local cur prev words=() cword - local redend + local qbased - # save and use original argument to invoke redend - # redend might not be in $PATH - redend="$1" + # save and use original argument to invoke qbased + # qbased might not be in $PATH + qbased="$1" COMPREPLY=() _get_comp_words_by_ref -n = cur prev words cword @@ -53,7 +53,7 @@ _redend() { if ((cword > 3)); then case ${words[cword-3]} in addmultisigaddress) - _reden_accounts + _qbase_accounts return 0 ;; getbalance|gettxout|importaddress|importprivkey|listreceivedbyaccount|listreceivedbyaddress|listsinceblock) @@ -74,7 +74,7 @@ _redend() { return 0 ;; move|setaccount) - _reden_accounts + _qbase_accounts return 0 ;; esac @@ -90,7 +90,7 @@ _redend() { return 0 ;; getaccountaddress|getaddressesbyaccount|getbalance|getnewaddress|getreceivedbyaccount|listtransactions|move|sendfrom|sendmany) - _reden_accounts + _qbase_accounts return 0 ;; esac @@ -114,12 +114,12 @@ _redend() { # only parse --help if senseful if [[ -z "$cur" || "$cur" =~ ^- ]]; then - helpopts=$($redend --help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) + helpopts=$($qbased --help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) fi # only parse help if senseful if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then - commands=$(_reden_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }') + commands=$(_qbase_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }') fi COMPREPLY=( $( compgen -W "$helpopts $commands" -- "$cur" ) ) @@ -133,7 +133,7 @@ _redend() { esac } -complete -F _redend redend reden-cli +complete -F _qbased qbased qbase-cli } # Local variables: diff --git a/contrib/qos/README.md b/contrib/qos/README.md index 1c25792..d6acb0a 100644 --- a/contrib/qos/README.md +++ b/contrib/qos/README.md @@ -1,5 +1,5 @@ ### Qos ### -This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Reden network. It limits outbound TCP traffic with a source or destination port of 9999, but not if the destination IP is within a LAN (defined as 192.168.x.x). +This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Qbase network. It limits outbound TCP traffic with a source or destination port of 9999, but not if the destination IP is within a LAN (defined as 192.168.x.x). This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index bb34ce8..a20e08d 100644 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -2,7 +2,7 @@ IF="eth0" #limit of the network interface in question LINKCEIL="1gbit" -#limit outbound Reden protocol traffic to this rate +#limit outbound Qbase protocol traffic to this rate LIMIT="160kbit" #defines the address space for which you wish to disable rate limiting LOCALNET="192.168.0.0/16" diff --git a/contrib/qt_translations.py b/contrib/qt_translations.py index 687c9c9..dfb2bea 100644 --- a/contrib/qt_translations.py +++ b/contrib/qt_translations.py @@ -2,7 +2,7 @@ # Helpful little script that spits out a comma-separated list of # language codes for Qt icons that should be included -# in binary Reden Core distributions +# in binary Qbase Core distributions import glob import os @@ -16,7 +16,7 @@ d2 = sys.argv[2] l1 = set([ re.search(r'qt_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d1, 'qt_*.qm')) ]) -l2 = set([ re.search(r'reden_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d2, 'reden_*.qm')) ]) +l2 = set([ re.search(r'qbase_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d2, 'qbase_*.qm')) ]) print ",".join(sorted(l1.intersection(l2))) diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py index 9d73e2d..24c0b02 100644 --- a/contrib/seeds/generate-seeds.py +++ b/contrib/seeds/generate-seeds.py @@ -120,7 +120,7 @@ def main(): g.write('#ifndef REDEN_CHAINPARAMSSEEDS_H\n') g.write('#define REDEN_CHAINPARAMSSEEDS_H\n') g.write('/**\n') - g.write(' * List of fixed seed nodes for the reden network\n') + g.write(' * List of fixed seed nodes for the qbase network\n') g.write(' * AUTOGENERATED by contrib/seeds/generate-seeds.py\n') g.write(' *\n') g.write(' * Each line contains a 16-byte IPv6 address and a port.\n') diff --git a/contrib/spendfrom/README.md b/contrib/spendfrom/README.md index bc76421..b0b598c 100644 --- a/contrib/spendfrom/README.md +++ b/contrib/spendfrom/README.md @@ -7,7 +7,7 @@ address (or addresses). Depends on [jsonrpc](http://json-rpc.org/). spendfrom.py --from=FROMADDRESS1[,FROMADDRESS2] --to=TOADDRESS --amount=amount \ - --fee=fee --datadir=/path/to/.redencore --testnet --dry_run + --fee=fee --datadir=/path/to/.qbasecore --testnet --dry_run With no arguments, outputs a list of amounts associated with addresses. @@ -16,7 +16,7 @@ With arguments, sends coins received by the `FROMADDRESS` addresses to the `TOAD ### Notes ### - You may explicitly specify how much fee to pay (a fee more than 1% of the amount -will fail, though, to prevent reden-losing accidents). Spendfrom may fail if +will fail, though, to prevent qbase-losing accidents). Spendfrom may fail if it thinks the transaction would never be confirmed (if the amount being sent is too small, or if the transaction is too many bytes for the fee). diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index a471444..136d30a 100644 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -1,13 +1,13 @@ #!/usr/bin/env python # -# Use the raw transactions API to spend redens received on particular addresses, +# Use the raw transactions API to spend qbases received on particular addresses, # and send any change back to that same address. # # Example usage: # spendfrom.py # Lists available funds # spendfrom.py --from=ADDRESS --to=ADDRESS --amount=11.00 # -# Assumes it will talk to a redend or Reden-Qt running +# Assumes it will talk to a qbased or Qbase-Qt running # on localhost. # # Depends on jsonrpc @@ -33,15 +33,15 @@ def check_json_precision(): raise RuntimeError("JSON encode/decode loses precision") def determine_db_dir(): - """Return the default location of the Reden Core data directory""" + """Return the default location of the Qbase Core data directory""" if platform.system() == "Darwin": - return os.path.expanduser("~/Library/Application Support/RedenCore/") + return os.path.expanduser("~/Library/Application Support/QbaseCore/") elif platform.system() == "Windows": - return os.path.join(os.environ['APPDATA'], "RedenCore") - return os.path.expanduser("~/.redencore") + return os.path.join(os.environ['APPDATA'], "QbaseCore") + return os.path.expanduser("~/.qbasecore") def read_bitcoin_config(dbdir): - """Read the reden.conf file from dbdir, returns dictionary of settings""" + """Read the qbase.conf file from dbdir, returns dictionary of settings""" from ConfigParser import SafeConfigParser class FakeSecHead(object): @@ -59,11 +59,11 @@ def readline(self): return s config_parser = SafeConfigParser() - config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "reden.conf")))) + config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "qbase.conf")))) return dict(config_parser.items("all")) def connect_JSON(config): - """Connect to a Reden Core JSON-RPC server""" + """Connect to a Qbase Core JSON-RPC server""" testnet = config.get('testnet', '0') testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False if not 'rpcport' in config: @@ -72,7 +72,7 @@ def connect_JSON(config): try: result = ServiceProxy(connect) # ServiceProxy is lazy-connect, so send an RPC command mostly to catch connection errors, - # but also make sure the redend we're talking to is/isn't testnet: + # but also make sure the qbased we're talking to is/isn't testnet: if result.getmininginfo()['testnet'] != testnet: sys.stderr.write("RPC server at "+connect+" testnet setting mismatch\n") sys.exit(1) @@ -81,36 +81,36 @@ def connect_JSON(config): sys.stderr.write("Error connecting to RPC server at "+connect+"\n") sys.exit(1) -def unlock_wallet(redend): - info = redend.getinfo() +def unlock_wallet(qbased): + info = qbased.getinfo() if 'unlocked_until' not in info: return True # wallet is not encrypted t = int(info['unlocked_until']) if t <= time.time(): try: passphrase = getpass.getpass("Wallet is locked; enter passphrase: ") - redend.walletpassphrase(passphrase, 5) + qbased.walletpassphrase(passphrase, 5) except: sys.stderr.write("Wrong passphrase\n") - info = redend.getinfo() + info = qbased.getinfo() return int(info['unlocked_until']) > time.time() -def list_available(redend): +def list_available(qbased): address_summary = dict() address_to_account = dict() - for info in redend.listreceivedbyaddress(0): + for info in qbased.listreceivedbyaddress(0): address_to_account[info["address"]] = info["account"] - unspent = redend.listunspent(0) + unspent = qbased.listunspent(0) for output in unspent: # listunspent doesn't give addresses, so: - rawtx = redend.getrawtransaction(output['txid'], 1) + rawtx = qbased.getrawtransaction(output['txid'], 1) vout = rawtx["vout"][output['vout']] pk = vout["scriptPubKey"] - # This code only deals with ordinary pay-to-reden-address + # This code only deals with ordinary pay-to-qbase-address # or pay-to-script-hash outputs right now; anything exotic is ignored. if pk["type"] != "pubkeyhash" and pk["type"] != "scripthash": continue @@ -139,8 +139,8 @@ def select_coins(needed, inputs): n += 1 return (outputs, have-needed) -def create_tx(redend, fromaddresses, toaddress, amount, fee): - all_coins = list_available(redend) +def create_tx(qbased, fromaddresses, toaddress, amount, fee): + all_coins = list_available(qbased) total_available = Decimal("0.0") needed = amount+fee @@ -159,7 +159,7 @@ def create_tx(redend, fromaddresses, toaddress, amount, fee): # Note: # Python's json/jsonrpc modules have inconsistent support for Decimal numbers. # Instead of wrestling with getting json.dumps() (used by jsonrpc) to encode - # Decimals, I'm casting amounts to float before sending them to redend. + # Decimals, I'm casting amounts to float before sending them to qbased. # outputs = { toaddress : float(amount) } (inputs, change_amount) = select_coins(needed, potential_inputs) @@ -170,8 +170,8 @@ def create_tx(redend, fromaddresses, toaddress, amount, fee): else: outputs[change_address] = float(change_amount) - rawtx = redend.createrawtransaction(inputs, outputs) - signed_rawtx = redend.signrawtransaction(rawtx) + rawtx = qbased.createrawtransaction(inputs, outputs) + signed_rawtx = qbased.signrawtransaction(rawtx) if not signed_rawtx["complete"]: sys.stderr.write("signrawtransaction failed\n") sys.exit(1) @@ -179,10 +179,10 @@ def create_tx(redend, fromaddresses, toaddress, amount, fee): return txdata -def compute_amount_in(redend, txinfo): +def compute_amount_in(qbased, txinfo): result = Decimal("0.0") for vin in txinfo['vin']: - in_info = redend.getrawtransaction(vin['txid'], 1) + in_info = qbased.getrawtransaction(vin['txid'], 1) vout = in_info['vout'][vin['vout']] result = result + vout['value'] return result @@ -193,12 +193,12 @@ def compute_amount_out(txinfo): result = result + vout['value'] return result -def sanity_test_fee(redend, txdata_hex, max_fee): +def sanity_test_fee(qbased, txdata_hex, max_fee): class FeeError(RuntimeError): pass try: - txinfo = redend.decoderawtransaction(txdata_hex) - total_in = compute_amount_in(redend, txinfo) + txinfo = qbased.decoderawtransaction(txdata_hex) + total_in = compute_amount_in(qbased, txinfo) total_out = compute_amount_out(txinfo) if total_in-total_out > max_fee: raise FeeError("Rejecting transaction, unreasonable fee of "+str(total_in-total_out)) @@ -221,15 +221,15 @@ def main(): parser = optparse.OptionParser(usage="%prog [options]") parser.add_option("--from", dest="fromaddresses", default=None, - help="addresses to get redens from") + help="addresses to get qbases from") parser.add_option("--to", dest="to", default=None, - help="address to get send redens to") + help="address to get send qbases to") parser.add_option("--amount", dest="amount", default=None, help="amount to send") parser.add_option("--fee", dest="fee", default="0.0", help="fee to include") parser.add_option("--datadir", dest="datadir", default=determine_db_dir(), - help="location of reden.conf file with RPC username/password (default: %default)") + help="location of qbase.conf file with RPC username/password (default: %default)") parser.add_option("--testnet", dest="testnet", default=False, action="store_true", help="Use the test network") parser.add_option("--dry_run", dest="dry_run", default=False, action="store_true", @@ -240,10 +240,10 @@ def main(): check_json_precision() config = read_bitcoin_config(options.datadir) if options.testnet: config['testnet'] = True - redend = connect_JSON(config) + qbased = connect_JSON(config) if options.amount is None: - address_summary = list_available(redend) + address_summary = list_available(qbased) for address,info in address_summary.iteritems(): n_transactions = len(info['outputs']) if n_transactions > 1: @@ -253,14 +253,14 @@ def main(): else: fee = Decimal(options.fee) amount = Decimal(options.amount) - while unlock_wallet(redend) == False: + while unlock_wallet(qbased) == False: pass # Keep asking for passphrase until they get it right - txdata = create_tx(redend, options.fromaddresses.split(","), options.to, amount, fee) - sanity_test_fee(redend, txdata, amount*Decimal("0.01")) + txdata = create_tx(qbased, options.fromaddresses.split(","), options.to, amount, fee) + sanity_test_fee(qbased, txdata, amount*Decimal("0.01")) if options.dry_run: print(txdata) else: - txid = redend.sendrawtransaction(txdata) + txid = qbased.sendrawtransaction(txdata) print(txid) if __name__ == '__main__': diff --git a/contrib/testgen/README.md b/contrib/testgen/README.md index bf2afaa..32f6b04 100644 --- a/contrib/testgen/README.md +++ b/contrib/testgen/README.md @@ -1,6 +1,6 @@ ### TestGen ### -Utilities to generate test vectors for the data-driven Reden tests. +Utilities to generate test vectors for the data-driven Qbase tests. Usage: diff --git a/contrib/tidy_datadir.sh b/contrib/tidy_datadir.sh index aad271a..98d5bf5 100644 --- a/contrib/tidy_datadir.sh +++ b/contrib/tidy_datadir.sh @@ -4,7 +4,7 @@ if [ -d "$1" ]; then cd "$1" else echo "Usage: $0 " >&2 - echo "Removes obsolete Reden database files" >&2 + echo "Removes obsolete Qbase database files" >&2 exit 1 fi @@ -16,22 +16,22 @@ if [ -f wallet.dat -a -f peers.dat -a -f chainstate/CURRENT -a -f blocks/index/C case $LEVEL in 0) - echo "Error: no Reden datadir detected." + echo "Error: no Qbase datadir detected." exit 1 ;; 1) - echo "Detected old Reden datadir (before 0.7)." + echo "Detected old Qbase datadir (before 0.7)." echo "Nothing to do." exit 0 ;; 2) - echo "Detected Reden 0.7 datadir." + echo "Detected Qbase 0.7 datadir." ;; 3) - echo "Detected Reden pre-0.8 datadir." + echo "Detected Qbase pre-0.8 datadir." ;; 4) - echo "Detected Reden 0.8 datadir." + echo "Detected Qbase 0.8 datadir." ;; esac diff --git a/depends/README.md b/depends/README.md index ab0d71b..28777b2 100644 --- a/depends/README.md +++ b/depends/README.md @@ -12,9 +12,9 @@ For example: make HOST=x86_64-w64-mingw32 -j4 -A prefix will be generated that's suitable for plugging into Reden's +A prefix will be generated that's suitable for plugging into Qbase's configure. In the above example, a dir named x86_64-w64-mingw32 will be -created. To use it for Reden: +created. To use it for Qbase: ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32 @@ -40,7 +40,7 @@ The following can be set when running make: make FOO=bar DEBUG: disable some optimizations and enable more runtime checking If some packages are not built, for example `make NO_WALLET=1`, the appropriate -options will be passed to Reden Core's configure. In this case, `--disable-wallet`. +options will be passed to Qbase Core's configure. In this case, `--disable-wallet`. Additional targets: diff --git a/depends/config.guess b/depends/config.guess old mode 100755 new mode 100644 diff --git a/depends/config.site.in b/depends/config.site.in old mode 100644 new mode 100755 diff --git a/libbitcoinconsensus.pc b/libbitcoinconsensus.pc index 1c53f8f..34d206a 100644 --- a/libbitcoinconsensus.pc +++ b/libbitcoinconsensus.pc @@ -5,7 +5,7 @@ includedir=${prefix}/include Name: Bitcoin Core consensus library Description: Library for the Bitcoin consensus protocol. -Version: 1.0.2 +Version: 2.0.0 Libs: -L${libdir} -lbitcoinconsensus Cflags: -I${includedir} Requires.private: libcrypto diff --git a/libtool b/libtool index f3b772b..ea985e7 100644 --- a/libtool +++ b/libtool @@ -1,6 +1,6 @@ #! /bin/bash -# Generated automatically by config.status (qbasecore) 1.0.2 -# Libtool was configured on host qbase-VirtualBox: +# Generated automatically by config.status (qbasecore) 2.0.0 +# Libtool was configured on host mr-VirtualBox: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. diff --git a/qa/pull-tester/run-bitcoind-for-test.sh b/qa/pull-tester/run-bitcoind-for-test.sh index abb829f..ede3913 100644 --- a/qa/pull-tester/run-bitcoind-for-test.sh +++ b/qa/pull-tester/run-bitcoind-for-test.sh @@ -3,14 +3,14 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # -DATADIR="/home/qbase/Qbase/.qbasecore" +DATADIR="/home/mr/qbase/.qbasecore" rm -rf "$DATADIR" mkdir -p "$DATADIR"/regtest touch "$DATADIR/regtest/debug.log" tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & WAITER=$! PORT=`expr 10000 + $$ % 55536` -"/home/qbase/Qbase/src/qbased" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & +"/home/mr/qbase/src/qbased" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & BITCOIND=$! #Install a watchdog. diff --git a/qa/pull-tester/tests_config.py b/qa/pull-tester/tests_config.py index 6e25e8f..412a565 100644 --- a/qa/pull-tester/tests_config.py +++ b/qa/pull-tester/tests_config.py @@ -3,7 +3,7 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -BUILDDIR="/home/qbase/Qbase" +BUILDDIR="/home/mr/qbase" EXEEXT="" # These will turn into comments if they were disabled when configuring. diff --git a/qbase_logo_horizontal.png b/qbase_logo_horizontal.png index e67bf58..c358f69 100644 Binary files a/qbase_logo_horizontal.png and b/qbase_logo_horizontal.png differ diff --git a/share/qt/Info.plist b/share/qt/Info.plist index 0e3ac2d..3b98244 100644 --- a/share/qt/Info.plist +++ b/share/qt/Info.plist @@ -17,13 +17,13 @@ APPL CFBundleGetInfoString - 1.0.2, Copyright © 2009-2018 The Bitcoin Core developers, 2014-2018 The Proton Core developers, 2018 The Qbase Core developers + 2.0.0, Copyright © 2009-2018 The Bitcoin Core developers, 2014-2018 The Proton Core developers, 2018 The Qbase Core developers CFBundleShortVersionString - 1.0.2 + 2.0.0 CFBundleVersion - 1.0.2 + 2.0.0 CFBundleSignature ???? diff --git a/share/setup.nsi b/share/setup.nsi index d3c1336..99dab82 100644 --- a/share/setup.nsi +++ b/share/setup.nsi @@ -5,16 +5,16 @@ SetCompressor /SOLID lzma # General Symbol Definitions !define REGKEY "SOFTWARE\$(^Name)" -!define VERSION 1.0.2 +!define VERSION 2.0.0 !define COMPANY "Qbase Core project" !define URL https://qbase.io/ # MUI Symbol Definitions -!define MUI_ICON "/home/qbase/Qbase/share/pixmaps/bitcoin.ico" -!define MUI_WELCOMEFINISHPAGE_BITMAP "/home/qbase/Qbase/share/pixmaps/nsis-wizard.bmp" +!define MUI_ICON "/home/mr/qbase/share/pixmaps/bitcoin.ico" +!define MUI_WELCOMEFINISHPAGE_BITMAP "/home/mr/qbase/share/pixmaps/nsis-wizard.bmp" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_RIGHT -!define MUI_HEADERIMAGE_BITMAP "/home/qbase/Qbase/share/pixmaps/nsis-header.bmp" +!define MUI_HEADERIMAGE_BITMAP "/home/mr/qbase/share/pixmaps/nsis-header.bmp" !define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM !define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY} @@ -22,7 +22,7 @@ SetCompressor /SOLID lzma !define MUI_STARTMENUPAGE_DEFAULTFOLDER "Qbase Core" !define MUI_FINISHPAGE_RUN $INSTDIR\qbase-qt.exe !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "/home/qbase/Qbase/share/pixmaps/nsis-wizard.bmp" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "/home/mr/qbase/share/pixmaps/nsis-wizard.bmp" !define MUI_UNFINISHPAGE_NOAUTOCLOSE # Included files @@ -48,7 +48,7 @@ Var StartMenuGroup !insertmacro MUI_LANGUAGE English # Installer attributes -OutFile /home/qbase/Qbase/qbasecore-${VERSION}-win-setup.exe +OutFile /home/mr/qbase/qbasecore-${VERSION}-win-setup.exe !if "" == "64" InstallDir $PROGRAMFILES64\QbaseCore !else @@ -58,7 +58,7 @@ CRCCheck on XPStyle on BrandingText " " ShowInstDetails show -VIProductVersion ${VERSION}.1 +VIProductVersion ${VERSION}.0 VIAddVersionKey ProductName "Qbase Core" VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey CompanyName "${COMPANY}" @@ -73,14 +73,14 @@ ShowUninstDetails show Section -Main SEC0000 SetOutPath $INSTDIR SetOverwrite on - File /home/qbase/Qbase/release/qbase-qt.exe - File /oname=COPYING.txt /home/qbase/Qbase/COPYING - File /oname=readme.txt /home/qbase/Qbase/doc/README_windows.txt + File /home/mr/qbase/release/qbase-qt.exe + File /oname=COPYING.txt /home/mr/qbase/COPYING + File /oname=readme.txt /home/mr/qbase/doc/README_windows.txt SetOutPath $INSTDIR\daemon - File /home/qbase/Qbase/release/qbased.exe - File /home/qbase/Qbase/release/qbase-cli.exe + File /home/mr/qbase/release/qbased.exe + File /home/mr/qbase/release/qbase-cli.exe SetOutPath $INSTDIR\doc - File /r /home/qbase/Qbase/doc\*.* + File /r /home/mr/qbase/doc\*.* SetOutPath $INSTDIR WriteRegStr HKCU "${REGKEY}\Components" Main 1 diff --git a/splash.png b/splash.png index 09c34e1..0fe847b 100644 Binary files a/splash.png and b/splash.png differ diff --git a/splash_testnet.png b/splash_testnet.png index 09c34e1..0fe847b 100644 Binary files a/splash_testnet.png and b/splash_testnet.png differ diff --git a/src/Makefile b/src/Makefile index e771319..f8c251d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1568,15 +1568,15 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -ACLOCAL = ${SHELL} /home/qbase/Qbase/build-aux/missing aclocal-1.15 +ACLOCAL = ${SHELL} /home/mr/qbase/build-aux/missing aclocal-1.15 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 0 AR = /usr/bin/ar ARFLAGS = cr -AUTOCONF = ${SHELL} /home/qbase/Qbase/build-aux/missing autoconf -AUTOHEADER = ${SHELL} /home/qbase/Qbase/build-aux/missing autoheader -AUTOMAKE = ${SHELL} /home/qbase/Qbase/build-aux/missing automake-1.15 -AWK = gawk +AUTOCONF = ${SHELL} /home/mr/qbase/build-aux/missing autoconf +AUTOHEADER = ${SHELL} /home/mr/qbase/build-aux/missing autoheader +AUTOMAKE = ${SHELL} /home/mr/qbase/build-aux/missing automake-1.15 +AWK = mawk BDB_CFLAGS = BDB_CPPFLAGS = BDB_LIBS = -ldb_cxx-4.8 @@ -1598,11 +1598,11 @@ CC = gcc CCACHE = CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 -CLIENT_VERSION_BUILD = 1 +CLIENT_VERSION_BUILD = 0 CLIENT_VERSION_IS_RELEASE = true -CLIENT_VERSION_MAJOR = 1 +CLIENT_VERSION_MAJOR = 2 CLIENT_VERSION_MINOR = 0 -CLIENT_VERSION_REVISION = 2 +CLIENT_VERSION_REVISION = 0 COPYRIGHT_HOLDERS = The %s developers COPYRIGHT_HOLDERS_FINAL = The Qbase Core developers COPYRIGHT_HOLDERS_SUBSTITUTION = Qbase Core @@ -1672,7 +1672,7 @@ LTLIBOBJS = LT_SYS_LIBRARY_PATH = LUPDATE = /usr/lib/x86_64-linux-gnu/qt5/bin/lupdate MAINT = -MAKEINFO = ${SHELL} /home/qbase/Qbase/build-aux/missing makeinfo +MAKEINFO = ${SHELL} /home/mr/qbase/build-aux/missing makeinfo MAKENSIS = MANIFEST_TOOL = : MINIUPNPC_CPPFLAGS = @@ -1693,10 +1693,10 @@ OTOOL64 = PACKAGE = qbasecore PACKAGE_BUGREPORT = https://github.com/NicholasAdmin/Qbase/issues PACKAGE_NAME = Qbase Core -PACKAGE_STRING = Qbase Core 1.0.2 +PACKAGE_STRING = Qbase Core 2.0.0 PACKAGE_TARNAME = qbasecore PACKAGE_URL = -PACKAGE_VERSION = 1.0.2 +PACKAGE_VERSION = 2.0.0 PATH_SEPARATOR = : PIC_FLAGS = -fPIC PIE_FLAGS = -fPIE @@ -1755,7 +1755,7 @@ UNIVALUE_CFLAGS = -I$(srcdir)/univalue/include UNIVALUE_LIBS = univalue/libunivalue.la USE_QRCODE = USE_UPNP = -VERSION = 1.0.2 +VERSION = 2.0.0 WINDOWS_BITS = WINDRES = X11XCB_CFLAGS = @@ -1763,10 +1763,10 @@ X11XCB_LIBS = XGETTEXT = /usr/bin/xgettext ZMQ_CFLAGS = ZMQ_LIBS = -lzmq -abs_builddir = /home/qbase/Qbase/src -abs_srcdir = /home/qbase/Qbase/src -abs_top_builddir = /home/qbase/Qbase -abs_top_srcdir = /home/qbase/Qbase +abs_builddir = /home/mr/qbase/src +abs_srcdir = /home/mr/qbase/src +abs_top_builddir = /home/mr/qbase +abs_top_srcdir = /home/mr/qbase ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ @@ -1798,7 +1798,7 @@ host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/qbase/Qbase/build-aux/install-sh +install_sh = ${SHELL} /home/mr/qbase/build-aux/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 7f558a5..14d6266 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -164,9 +164,12 @@ class CMainParams : public CChainParams { assert(genesis.hashMerkleRoot == uint256S("0x41c18eeb46067c819d6199db3dbb87680ab4295a9e2d55f58dfda83e0d56b820")); vFixedSeeds.clear(); vSeeds.clear(); - vSeeds.push_back(CDNSSeedData("Seed1", "seed1.seednode.site")); - vSeeds.push_back(CDNSSeedData("Seed2", "seed2.seednode.site")); - vSeeds.push_back(CDNSSeedData("explorer", "explorer.explorerbase.info")); + vSeeds.push_back(CDNSSeedData("Seed1", "seed1.qbs.signal2noi.se")); + vSeeds.push_back(CDNSSeedData("Seed2", "seed2.qbs.signal2noi.se")); + vSeeds.push_back(CDNSSeedData("Seed3", "seed3.qbs.signal2noi.se")); + vSeeds.push_back(CDNSSeedData("Seed4", "seed4.qbs.signal2noi.se")); + vSeeds.push_back(CDNSSeedData("Seed5", "seed5.qbs.signal2noi.se")); + // Qbase addresses start with 'B' base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,25); diff --git a/src/clientversion.h b/src/clientversion.h index cfc1dde..d1d519f 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -14,10 +14,10 @@ */ //! These need to be macros, as clientversion.cpp's and qbase*-res.rc's voodoo requires it -#define CLIENT_VERSION_MAJOR 1 +#define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 2 -#define CLIENT_VERSION_BUILD 1 +#define CLIENT_VERSION_REVISION 0 +#define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/config/qbase-config.h b/src/config/qbase-config.h index 09b3681..1791e9c 100644 --- a/src/config/qbase-config.h +++ b/src/config/qbase-config.h @@ -9,19 +9,19 @@ /* #undef AC_APPLE_UNIVERSAL_BUILD */ /* Version Build */ -#define CLIENT_VERSION_BUILD 1 +#define CLIENT_VERSION_BUILD 0 /* Version is release */ #define CLIENT_VERSION_IS_RELEASE true /* Major version */ -#define CLIENT_VERSION_MAJOR 1 +#define CLIENT_VERSION_MAJOR 2 /* Minor version */ #define CLIENT_VERSION_MINOR 0 /* Build revision */ -#define CLIENT_VERSION_REVISION 2 +#define CLIENT_VERSION_REVISION 0 /* Copyright holder(s) before %s replacement */ #define COPYRIGHT_HOLDERS "The %s developers" @@ -356,7 +356,7 @@ #define PACKAGE_NAME "Qbase Core" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Qbase Core 1.0.2" +#define PACKAGE_STRING "Qbase Core 2.0.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "qbasecore" @@ -365,7 +365,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0.2" +#define PACKAGE_VERSION "2.0.0" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp index d687dfa..b90ed1d 100644 --- a/src/crypto/aes.cpp +++ b/src/crypto/aes.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2016 The Bitcoin Core developers // Copyright (c) 2017-2018 The Proton Core developers -// Copyright (c) 2018 The Reden Core developers +// Copyright (c) 2018 The Qbase Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/aes.h b/src/crypto/aes.h index 0fde62b..8327645 100644 --- a/src/crypto/aes.h +++ b/src/crypto/aes.h @@ -1,6 +1,6 @@ // Copyright (c) 2015-2016 The Bitcoin Core developers // Copyright (c) 2017-2018 The Proton Core developers -// Copyright (c) 2018 The Reden Core developers +// Copyright (c) 2018 The Qbase Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/crypto/chacha20.cpp b/src/crypto/chacha20.cpp index 8729198..c5655e5 100644 --- a/src/crypto/chacha20.cpp +++ b/src/crypto/chacha20.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2017 The Bitcoin Core developers // Copyright (c) 2017-2018 The Proton Core developers -// Copyright (c) 2018 The Reden Core developers +// Copyright (c) 2018 The Qbase Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/chacha20.h b/src/crypto/chacha20.h index b1a8066..07ecc20 100644 --- a/src/crypto/chacha20.h +++ b/src/crypto/chacha20.h @@ -1,6 +1,6 @@ // Copyright (c) 2017 The Bitcoin Core developers // Copyright (c) 2017-2018 The Proton Core developers -// Copyright (c) 2018 The Reden Core developers +// Copyright (c) 2018 The Qbase Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp index 0a985c5..2f83975 100644 --- a/src/crypto/sha256.cpp +++ b/src/crypto/sha256.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014 The Bitcoin Core developers // Copyright (c) 2017-2018 The Proton Core developers -// Copyright (c) 2018 The Reden Core developers +// Copyright (c) 2018 The Qbase Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256_sse4.cpp b/src/crypto/sha256_sse4.cpp index 891100c..5cdc53e 100644 --- a/src/crypto/sha256_sse4.cpp +++ b/src/crypto/sha256_sse4.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2017 The Bitcoin Core developers // Copyright (c) 2017-2018 The Proton Core developers -// Copyright (c) 2018 The Reden Core developers +// Copyright (c) 2018 The Qbase Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/main.cpp b/src/main.cpp index 624f459..5d6a22c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1768,7 +1768,11 @@ CAmount GetBlockSubsidy(int nPrevBits, int nPrevHeight, const Consensus::Params& CAmount GetMasternodePayment(int nHeight, CAmount blockValue) { - return blockValue * 0.4; + if (nHeight < 25000) { + return blockValue * 0.4; + } + + return blockValue * 0.3; } bool IsInitialBlockDownload() diff --git a/src/qt/res/icons/bitcoin.icns b/src/qt/res/icons/bitcoin.icns index fc6beef..26e96ab 100644 Binary files a/src/qt/res/icons/bitcoin.icns and b/src/qt/res/icons/bitcoin.icns differ diff --git a/src/qt/res/icons/bitcoin.ico b/src/qt/res/icons/bitcoin.ico index 97ce017..79f8698 100644 Binary files a/src/qt/res/icons/bitcoin.ico and b/src/qt/res/icons/bitcoin.ico differ diff --git a/src/qt/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png index 3b14a6f..e954c34 100644 Binary files a/src/qt/res/icons/bitcoin.png and b/src/qt/res/icons/bitcoin.png differ diff --git a/src/qt/res/icons/crownium/about.png b/src/qt/res/icons/crownium/about.png index e67bf58..c358f69 100644 Binary files a/src/qt/res/icons/crownium/about.png and b/src/qt/res/icons/crownium/about.png differ diff --git a/src/qt/res/icons/crownium/tx_inout.png b/src/qt/res/icons/crownium/tx_inout.png index ec36eb3..df21e1a 100644 Binary files a/src/qt/res/icons/crownium/tx_inout.png and b/src/qt/res/icons/crownium/tx_inout.png differ diff --git a/src/qt/res/icons/crownium/tx_input.png b/src/qt/res/icons/crownium/tx_input.png index 7c934cb..c9846f1 100644 Binary files a/src/qt/res/icons/crownium/tx_input.png and b/src/qt/res/icons/crownium/tx_input.png differ diff --git a/src/qt/res/icons/crownium/tx_mined.png b/src/qt/res/icons/crownium/tx_mined.png index c901517..765ee3f 100644 Binary files a/src/qt/res/icons/crownium/tx_mined.png and b/src/qt/res/icons/crownium/tx_mined.png differ diff --git a/src/qt/res/icons/drkblue/about.png b/src/qt/res/icons/drkblue/about.png index e67bf58..c358f69 100644 Binary files a/src/qt/res/icons/drkblue/about.png and b/src/qt/res/icons/drkblue/about.png differ diff --git a/src/qt/res/icons/drkblue/bitcoin.ico b/src/qt/res/icons/drkblue/bitcoin.ico index fb3fa8d..79f8698 100644 Binary files a/src/qt/res/icons/drkblue/bitcoin.ico and b/src/qt/res/icons/drkblue/bitcoin.ico differ diff --git a/src/qt/res/icons/drkblue/bitcoin_testnet.ico b/src/qt/res/icons/drkblue/bitcoin_testnet.ico index fb3fa8d..79f8698 100644 Binary files a/src/qt/res/icons/drkblue/bitcoin_testnet.ico and b/src/qt/res/icons/drkblue/bitcoin_testnet.ico differ diff --git a/src/qt/res/icons/drkblue/bitcoin_testnet.png b/src/qt/res/icons/drkblue/bitcoin_testnet.png index 3b14a6f..e954c34 100644 Binary files a/src/qt/res/icons/drkblue/bitcoin_testnet.png and b/src/qt/res/icons/drkblue/bitcoin_testnet.png differ diff --git a/src/qt/res/icons/drkblue/tx_inout.png b/src/qt/res/icons/drkblue/tx_inout.png index ec36eb3..df21e1a 100644 Binary files a/src/qt/res/icons/drkblue/tx_inout.png and b/src/qt/res/icons/drkblue/tx_inout.png differ diff --git a/src/qt/res/icons/drkblue/tx_input.png b/src/qt/res/icons/drkblue/tx_input.png index 7c934cb..c9846f1 100644 Binary files a/src/qt/res/icons/drkblue/tx_input.png and b/src/qt/res/icons/drkblue/tx_input.png differ diff --git a/src/qt/res/icons/drkblue/tx_mined.png b/src/qt/res/icons/drkblue/tx_mined.png index c901517..765ee3f 100644 Binary files a/src/qt/res/icons/drkblue/tx_mined.png and b/src/qt/res/icons/drkblue/tx_mined.png differ diff --git a/src/qt/res/icons/light/about.png b/src/qt/res/icons/light/about.png index e67bf58..c358f69 100644 Binary files a/src/qt/res/icons/light/about.png and b/src/qt/res/icons/light/about.png differ diff --git a/src/qt/res/icons/light/tx_inout.png b/src/qt/res/icons/light/tx_inout.png index ec36eb3..df21e1a 100644 Binary files a/src/qt/res/icons/light/tx_inout.png and b/src/qt/res/icons/light/tx_inout.png differ diff --git a/src/qt/res/icons/light/tx_input.png b/src/qt/res/icons/light/tx_input.png index 7c934cb..c9846f1 100644 Binary files a/src/qt/res/icons/light/tx_input.png and b/src/qt/res/icons/light/tx_input.png differ diff --git a/src/qt/res/icons/light/tx_mined.png b/src/qt/res/icons/light/tx_mined.png index c901517..765ee3f 100644 Binary files a/src/qt/res/icons/light/tx_mined.png and b/src/qt/res/icons/light/tx_mined.png differ diff --git a/src/qt/res/icons/trad/about.png b/src/qt/res/icons/trad/about.png index e67bf58..c358f69 100644 Binary files a/src/qt/res/icons/trad/about.png and b/src/qt/res/icons/trad/about.png differ diff --git a/src/qt/res/icons/trad/tx_inout.png b/src/qt/res/icons/trad/tx_inout.png index ec36eb3..df21e1a 100644 Binary files a/src/qt/res/icons/trad/tx_inout.png and b/src/qt/res/icons/trad/tx_inout.png differ diff --git a/src/qt/res/icons/trad/tx_input.png b/src/qt/res/icons/trad/tx_input.png index 7c934cb..c9846f1 100644 Binary files a/src/qt/res/icons/trad/tx_input.png and b/src/qt/res/icons/trad/tx_input.png differ diff --git a/src/qt/res/icons/trad/tx_mined.png b/src/qt/res/icons/trad/tx_mined.png index c901517..765ee3f 100644 Binary files a/src/qt/res/icons/trad/tx_mined.png and b/src/qt/res/icons/trad/tx_mined.png differ diff --git a/src/qt/res/images/crownium/about.png b/src/qt/res/images/crownium/about.png index acede4a..2eab1ea 100644 Binary files a/src/qt/res/images/crownium/about.png and b/src/qt/res/images/crownium/about.png differ diff --git a/src/qt/res/images/crownium/drkblue_walletFrame_bg.png b/src/qt/res/images/crownium/drkblue_walletFrame_bg.png index 1901d40..46ea89d 100644 Binary files a/src/qt/res/images/crownium/drkblue_walletFrame_bg.png and b/src/qt/res/images/crownium/drkblue_walletFrame_bg.png differ diff --git a/src/qt/res/images/crownium/qbase_logo_horizontal.png b/src/qt/res/images/crownium/qbase_logo_horizontal.png index 15d0af5..c358f69 100644 Binary files a/src/qt/res/images/crownium/qbase_logo_horizontal.png and b/src/qt/res/images/crownium/qbase_logo_horizontal.png differ diff --git a/src/qt/res/images/crownium/splash.png b/src/qt/res/images/crownium/splash.png index 09c34e1..0fe847b 100644 Binary files a/src/qt/res/images/crownium/splash.png and b/src/qt/res/images/crownium/splash.png differ diff --git a/src/qt/res/images/crownium/splash_testnet.png b/src/qt/res/images/crownium/splash_testnet.png index 09c34e1..0fe847b 100644 Binary files a/src/qt/res/images/crownium/splash_testnet.png and b/src/qt/res/images/crownium/splash_testnet.png differ diff --git a/src/qt/res/images/drkblue/about.png b/src/qt/res/images/drkblue/about.png index acede4a..2eab1ea 100644 Binary files a/src/qt/res/images/drkblue/about.png and b/src/qt/res/images/drkblue/about.png differ diff --git a/src/qt/res/images/drkblue/drkblue_walletFrame_bg.png b/src/qt/res/images/drkblue/drkblue_walletFrame_bg.png index 1901d40..46ea89d 100644 Binary files a/src/qt/res/images/drkblue/drkblue_walletFrame_bg.png and b/src/qt/res/images/drkblue/drkblue_walletFrame_bg.png differ diff --git a/src/qt/res/images/drkblue/qbase_logo_horizontal.png b/src/qt/res/images/drkblue/qbase_logo_horizontal.png index 15d0af5..c358f69 100644 Binary files a/src/qt/res/images/drkblue/qbase_logo_horizontal.png and b/src/qt/res/images/drkblue/qbase_logo_horizontal.png differ diff --git a/src/qt/res/images/drkblue/splash.png b/src/qt/res/images/drkblue/splash.png index 09c34e1..0fe847b 100644 Binary files a/src/qt/res/images/drkblue/splash.png and b/src/qt/res/images/drkblue/splash.png differ diff --git a/src/qt/res/images/drkblue/splash_testnet.png b/src/qt/res/images/drkblue/splash_testnet.png index 09c34e1..0fe847b 100644 Binary files a/src/qt/res/images/drkblue/splash_testnet.png and b/src/qt/res/images/drkblue/splash_testnet.png differ diff --git a/src/qt/res/images/light/about.png b/src/qt/res/images/light/about.png index acede4a..2eab1ea 100644 Binary files a/src/qt/res/images/light/about.png and b/src/qt/res/images/light/about.png differ diff --git a/src/qt/res/images/light/drkblue_walletFrame_bg.png b/src/qt/res/images/light/drkblue_walletFrame_bg.png index 1901d40..46ea89d 100644 Binary files a/src/qt/res/images/light/drkblue_walletFrame_bg.png and b/src/qt/res/images/light/drkblue_walletFrame_bg.png differ diff --git a/src/qt/res/images/light/qbase_logo_horizontal.png b/src/qt/res/images/light/qbase_logo_horizontal.png index 15d0af5..c358f69 100644 Binary files a/src/qt/res/images/light/qbase_logo_horizontal.png and b/src/qt/res/images/light/qbase_logo_horizontal.png differ diff --git a/src/qt/res/images/light/splash.png b/src/qt/res/images/light/splash.png index 09c34e1..0fe847b 100644 Binary files a/src/qt/res/images/light/splash.png and b/src/qt/res/images/light/splash.png differ diff --git a/src/qt/res/images/light/splash_testnet.png b/src/qt/res/images/light/splash_testnet.png index 09c34e1..0fe847b 100644 Binary files a/src/qt/res/images/light/splash_testnet.png and b/src/qt/res/images/light/splash_testnet.png differ diff --git a/src/qt/res/images/trad/about.png b/src/qt/res/images/trad/about.png index acede4a..2eab1ea 100644 Binary files a/src/qt/res/images/trad/about.png and b/src/qt/res/images/trad/about.png differ diff --git a/src/qt/res/images/trad/drkblue_walletFrame_bg.png b/src/qt/res/images/trad/drkblue_walletFrame_bg.png index 1901d40..46ea89d 100644 Binary files a/src/qt/res/images/trad/drkblue_walletFrame_bg.png and b/src/qt/res/images/trad/drkblue_walletFrame_bg.png differ diff --git a/src/qt/res/images/trad/qbase_logo_horizontal.png b/src/qt/res/images/trad/qbase_logo_horizontal.png index 15d0af5..c358f69 100644 Binary files a/src/qt/res/images/trad/qbase_logo_horizontal.png and b/src/qt/res/images/trad/qbase_logo_horizontal.png differ diff --git a/src/qt/res/images/trad/splash.png b/src/qt/res/images/trad/splash.png index 09c34e1..0fe847b 100644 Binary files a/src/qt/res/images/trad/splash.png and b/src/qt/res/images/trad/splash.png differ diff --git a/src/qt/res/images/trad/splash_testnet.png b/src/qt/res/images/trad/splash_testnet.png index 09c34e1..0fe847b 100644 Binary files a/src/qt/res/images/trad/splash_testnet.png and b/src/qt/res/images/trad/splash_testnet.png differ diff --git a/src/sedR2Py1c b/src/sedR2Py1c new file mode 100644 index 0000000..6321fb4 Binary files /dev/null and b/src/sedR2Py1c differ diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 56fb425..ad43b15 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2015 The Bitcoin Core developers // Copyright (c) 2014-2017 The Dash Core developers // Copyright (c) 2017-2018 The Proton Core developers -// Copyright (c) 2018 The Reden Core developers +// Copyright (c) 2018 The Qbase Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -234,7 +234,7 @@ UniValue importaddress(const UniValue& params, bool fHelp) std::vector data(ParseHex(params[0].get_str())); ImportScript(CScript(data.begin(), data.end()), strLabel, fP2SH); } else { - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Reden address or script"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Qbase address or script"); } if (fRescan) @@ -572,7 +572,7 @@ UniValue dumpprivkey(const UniValue& params, bool fHelp) string strAddress = params[0].get_str(); CBitcoinAddress address; if (!address.SetString(strAddress)) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Reden address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Qbase address"); CKeyID keyID; if (!address.GetKeyID(keyID)) throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key"); @@ -622,7 +622,7 @@ UniValue dumpwallet(const UniValue& params, bool fHelp) std::sort(vKeyBirth.begin(), vKeyBirth.end()); // produce output - file << strprintf("# Wallet dump created by Reden Core %s (%s)\n", CLIENT_BUILD, CLIENT_DATE); + file << strprintf("# Wallet dump created by Qbase Core %s (%s)\n", CLIENT_BUILD, CLIENT_DATE); file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime())); file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString()); file << strprintf("# mined on %s\n", EncodeDumpTime(chainActive.Tip()->GetBlockTime())); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 3410f53..2fce5d2 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2015 The Bitcoin Core developers // Copyright (c) 2014-2017 The Dash Core developers // Copyright (c) 2017-2018 The Proton Core developers -// Copyright (c) 2018 The Reden Core developers +// Copyright (c) 2018 The Qbase Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -120,7 +120,7 @@ UniValue getnewaddress(const UniValue& params, bool fHelp) if (fHelp || params.size() > 1) throw runtime_error( "getnewaddress ( \"account\" )\n" - "\nReturns a new Reden address for receiving payments.\n" + "\nReturns a new Qbase address for receiving payments.\n" "If 'account' is specified (DEPRECATED), it is added to the address book \n" "so payments received with the address will be credited to 'account'.\n" "\nArguments:\n" @@ -199,7 +199,7 @@ UniValue getaccountaddress(const UniValue& params, bool fHelp) if (fHelp || params.size() != 1) throw runtime_error( "getaccountaddress \"account\"\n" - "\nDEPRECATED. Returns the current Reden address for receiving payments to this account.\n" + "\nDEPRECATED. Returns the current Qbase address for receiving payments to this account.\n" "\nArguments:\n" "1. \"account\" (string, required) The account name for the address. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created and a new address created if there is no account by the given name.\n" "\nResult:\n" @@ -231,7 +231,7 @@ UniValue getrawchangeaddress(const UniValue& params, bool fHelp) if (fHelp || params.size() > 1) throw runtime_error( "getrawchangeaddress\n" - "\nReturns a new Reden address, for receiving change.\n" + "\nReturns a new Qbase address, for receiving change.\n" "This is for use with raw transactions, NOT normal use.\n" "\nResult:\n" "\"address\" (string) The address\n" @@ -279,7 +279,7 @@ UniValue setaccount(const UniValue& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Reden address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Qbase address"); string strAccount; if (params.size() > 1) @@ -326,7 +326,7 @@ UniValue getaccount(const UniValue& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Reden address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Qbase address"); string strAccount; map::iterator mi = pwalletMain->mapAddressBook.find(address.Get()); @@ -384,7 +384,7 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr if (nValue > curBalance) throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Insufficient funds"); - // Parse Reden address + // Parse Qbase address CScript scriptPubKey = GetScriptForDestination(address); // Create and send the transaction @@ -424,7 +424,7 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp) " to which you're sending the transaction. This is not part of the \n" " transaction, just kept in your wallet.\n" "5. subtractfeefromamount (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n" - " The recipient will receive less amount of Reden than you enter in the amount field.\n" + " The recipient will receive less amount of Qbase than you enter in the amount field.\n" "6. \"use_is\" (bool, optional) Send this transaction as InstantSend (default: false)\n" "7. \"use_ps\" (bool, optional) Use anonymized funds only (default: false)\n" "\nResult:\n" @@ -440,7 +440,7 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Reden address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Qbase address"); // Amount CAmount nAmount = AmountFromValue(params[1]); @@ -491,7 +491,7 @@ UniValue instantsendtoaddress(const UniValue& params, bool fHelp) " to which you're sending the transaction. This is not part of the \n" " transaction, just kept in your wallet.\n" "5. subtractfeefromamount (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n" - " The recipient will receive less amount of Reden than you enter in the amount field.\n" + " The recipient will receive less amount of Qbase than you enter in the amount field.\n" "\nResult:\n" "\"transactionid\" (string) The transaction id.\n" "\nExamples:\n" @@ -505,7 +505,7 @@ UniValue instantsendtoaddress(const UniValue& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Reden address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Qbase address"); // Amount CAmount nAmount = AmountFromValue(params[1]); @@ -664,10 +664,10 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp) LOCK2(cs_main, pwalletMain->cs_wallet); - // Reden address + // Qbase address CBitcoinAddress address = CBitcoinAddress(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Reden address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Qbase address"); CScript scriptPubKey = GetScriptForDestination(address.Get()); if (!IsMine(*pwalletMain,scriptPubKey)) return (double)0.0; @@ -984,7 +984,7 @@ UniValue sendfrom(const UniValue& params, bool fHelp) string strAccount = AccountFromValue(params[0]); CBitcoinAddress address(params[1].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Reden address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Qbase address"); CAmount nAmount = AmountFromValue(params[2]); if (nAmount <= 0) throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send"); @@ -1079,7 +1079,7 @@ UniValue sendmany(const UniValue& params, bool fHelp) { CBitcoinAddress address(name_); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Reden address: ")+name_); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Qbase address: ")+name_); if (setAddress.count(address)) throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+name_); @@ -1143,7 +1143,7 @@ UniValue addmultisigaddress(const UniValue& params, bool fHelp) { string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n" "\nAdd a nrequired-to-sign multisignature address to the wallet.\n" - "Each key is a Reden address or hex-encoded public key.\n" + "Each key is a Qbase address or hex-encoded public key.\n" "If 'account' is specified (DEPRECATED), assign address to that account.\n" "\nArguments:\n" @@ -2199,7 +2199,7 @@ UniValue encryptwallet(const UniValue& params, bool fHelp) // slack space in .dat files; that is bad if the old data is // unencrypted private keys. So: StartShutdown(); - return "Wallet encrypted; Reden Core server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup."; + return "Wallet encrypted; Qbase Core server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup."; } UniValue lockunspent(const UniValue& params, bool fHelp) @@ -2541,7 +2541,7 @@ UniValue listunspent(const UniValue& params, bool fHelp) const UniValue& input = inputs[idx]; CBitcoinAddress address(input.get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Reden address: ")+input.get_str()); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Qbase address: ")+input.get_str()); if (setAddress.count(address)) throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+input.get_str()); setAddress.insert(address); diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 6644ef2..8985e6f 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2015 The Bitcoin Core developers // Copyright (c) 2014-2017 The Dash Core developers // Copyright (c) 2017-2018 The Proton Core developers -// Copyright (c) 2018 The Reden Core developers +// Copyright (c) 2018 The Qbase Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php.