Merge pull request #11 from ElectraProtocol/dev

Release v1.0.4.0

Author: Jenova7

.cirrus.yml

@@ -107,6 +107,7 @@ task:
 
 task:
   name: 'x86_64 Linux  [GOAL: install]  [focal]  [no depends, only system libs, sanitizers: fuzzer,address,undefined]'
+  only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH || $CIRRUS_BASE_BRANCH == $CIRRUS_DEFAULT_BRANCH
   << : *GLOBAL_TASK_TEMPLATE
   container:
     image: ubuntu:focal
@@ -131,8 +132,9 @@ task:
 
 task:
   name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
-  macos_brew_addon_script:
-    - brew install boost libevent berkeley-db4 qt miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
+  brew_install_script:
+    - brew update
+    - brew install boost libevent berkeley-db4 qt@5 miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
   << : *GLOBAL_TASK_TEMPLATE
   osx_instance:
     # Use latest image, but hardcode version to avoid silent upgrades (and breaks)

COPYING

@@ -4,7 +4,7 @@ Copyright (c) 2009-2020 The Bitcoin Core developers
 Copyright (c) 2009-2020 Bitcoin Developers
 Copyright (c) 2011-2020 The Peercoin developers
 Copyright (c) 2018-2020 John "ComputerCraftr" Studnicka
-Copyright (c) 2018-2020 The Simplicity developers
+Copyright (c) 2020-2021 The Electra Protocol developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

ci/test/00_setup_env_arm.sh

@@ -25,4 +25,4 @@ export RUN_FUNCTIONAL_TESTS=false
 export GOAL="install"
 # -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
 # This could be removed once the ABI change warning does not show up by default
-export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi --enable-werror --with-boost-process"
+export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi --with-boost-process"

ci/test/00_setup_env_mac.sh

@@ -15,4 +15,4 @@ export XCODE_BUILD_ID=11C505
 export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
 export GOAL="deploy"
-export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --enable-werror --with-boost-process"
+export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --with-boost-process"

ci/test/00_setup_env_mac_host.sh

@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
 export HOST=x86_64-apple-darwin16
 export PIP_PACKAGES="zmq"
 export GOAL="install"
-export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --enable-werror --with-boost-process"
+export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --with-boost-process"
 export CI_OS_NAME="macos"
 export NO_DEPENDS=1
 export OSX_SDK=""

ci/test/00_setup_env_win64.sh

@@ -14,3 +14,7 @@ export RUN_FUNCTIONAL_TESTS=false
 export RUN_SECURITY_TESTS="true"
 export GOAL="deploy"
 export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests --without-boost-process"
+
+# Compiler for MinGW-w64 causes false -Wreturn-type warning.
+# See https://sourceforge.net/p/mingw-w64/bugs/306/
+export NO_WERROR=1

ci/test/06_script_a.sh

@@ -6,7 +6,10 @@
 
 export LC_ALL=C.UTF-8
 
-BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
+BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
+if [ -z "$NO_WERROR" ]; then
+  BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror"
+fi
 DOCKER_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
 
 BEGIN_FOLD autogen

configure.ac

@@ -1,11 +1,11 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 3)
+define(_CLIENT_VERSION_REVISION, 4)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2021)
+define(_COPYRIGHT_YEAR, 2022)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Electra Protocol]])
 AC_INIT([XEP Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/ElectraProtocol/XEP-Core/issues],[xep],[https://www.electraprotocol.com/])

src/Makefile.qt.include

@@ -216,6 +216,7 @@ RES_ICONS = \
   qt/res/icons/warning.png
 
 BITCOIN_QT_BASE_CPP = \
+  qt/applocker.cpp \
   qt/bantablemodel.cpp \
   qt/xep.cpp \
   qt/xepaddressvalidator.cpp \
@@ -245,7 +246,6 @@ BITCOIN_QT_WINDOWS_CPP = qt/winshutdownmonitor.cpp
 BITCOIN_QT_WALLET_CPP = \
   qt/addressbookpage.cpp \
   qt/addresstablemodel.cpp \
-  qt/applocker.cpp \
   qt/askpassphrasedialog.cpp \
   qt/coincontroldialog.cpp \
   qt/coincontroltreewidget.cpp \

src/Makefile.qt_locale.include

@@ -2,6 +2,7 @@ QT_TS = \
   qt/locale/xep_af.ts \
   qt/locale/xep_am.ts \
   qt/locale/xep_ar.ts \
+  qt/locale/xep_az.ts \
   qt/locale/xep_be.ts \
   qt/locale/xep_bg.ts \
   qt/locale/xep_bn.ts \
@@ -27,7 +28,10 @@ QT_TS = \
   qt/locale/xep_fi.ts \
   qt/locale/xep_fil.ts \
   qt/locale/xep_fr.ts \
+  qt/locale/xep_ga.ts \
+  qt/locale/xep_gl.ts \
   qt/locale/xep_gl_ES.ts \
+  qt/locale/xep_gu.ts \
   qt/locale/xep_he.ts \
   qt/locale/xep_hi.ts \
   qt/locale/xep_hr.ts \
@@ -38,6 +42,7 @@ QT_TS = \
   qt/locale/xep_ja.ts \
   qt/locale/xep_ka.ts \
   qt/locale/xep_kk.ts \
+  qt/locale/xep_kl.ts \
   qt/locale/xep_km.ts \
   qt/locale/xep_ko.ts \
   qt/locale/xep_ku_IQ.ts \
@@ -49,10 +54,12 @@ QT_TS = \
   qt/locale/xep_ml.ts \
   qt/locale/xep_mn.ts \
   qt/locale/xep_mr_IN.ts \
+  qt/locale/xep_ms.ts \
   qt/locale/xep_my.ts \
   qt/locale/xep_nb.ts \
   qt/locale/xep_ne.ts \
   qt/locale/xep_nl.ts \
+  qt/locale/xep_no.ts \
   qt/locale/xep_pam.ts \
   qt/locale/xep_pl.ts \
   qt/locale/xep_pt.ts \
@@ -72,6 +79,7 @@ QT_TS = \
   qt/locale/xep_te.ts \
   qt/locale/xep_th.ts \
   qt/locale/xep_tr.ts \
+  qt/locale/xep_ug.ts \
   qt/locale/xep_uk.ts \
   qt/locale/xep_ur.ts \
   qt/locale/[email protected] \