project-bitmark · bitmarkcc · Feb 23, 2021 · Feb 23, 2021 · Mar 16, 2021 · Mar 19, 2021
diff --git a/.gitignore b/.gitignore
@@ -50,6 +50,7 @@ src/qt/moc_*.cpp
 src/qt/forms/ui_*.h
 
 src/qt/test/moc*.cpp
+src/qt/test/test_bitmark-qt
 
 .deps
 .dirstamp

diff --git a/README.md b/README.md
@@ -9,8 +9,7 @@ This repository contains the Bitmark cryptograpic currency software, and a wiki
 
 # Bitmark
 
-[![Join the chat at https://gitter.im/project-bitmark/bitmark](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/project-bitmark/bitmark?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
+[![Join the chat at https://gitter.im/project-bitmark/bitmark](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/project-bitmark/bitmark?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) 
 Bitmark aims to be a relatively stable, user focused crypto currency, which refines and implements maturing innovations from the crypto currency sector.
 
 ### Overview
@@ -35,8 +34,12 @@ Bitmark aims to be a relatively stable, user focused crypto currency, which refi
 
 All Bitmark software releases are published through the github release process, you can download the [latest release](https://github.com/project-bitmark/bitmark/releases) from the releases tab above.
 
-## v0.9.7.4 Works with newer TLS / SSL libraries in Ubuntu 18-20 and Debian 10
-This release branches off Master's tag v0.9.7.2 to use the latest TLS/SSL libraries.
+## v0.9.7.6 is a "wrapper" around v0.9.7.5 Compatible with all post-fork (0.9.7.x) versions. See the [release notes](doc/releases/v0.9.7.6.md) for more information.
+
+## v0.9.7.5 works with Ubuntu 22, Debian 12, has enhanced building/testing for Windows, as well as other improvements. Compatible with all previous 0.9.7.x versions. See the [release notes](doc/releases/v0.9.7.5.md) for more information about this release.
+
+## v0.9.7.4 works with newer TLS / SSL libraries in Ubuntu 18-20 and Debian 10
+This release uses the latest TLS/SSL libraries.
 v0.9.7.4, is compatible with all previous 0.9.7.x series versions.
 
 ## Eight Algortihm mPoW Hard Fork (v0.9.7)

diff --git a/configure.ac b/configure.ac
@@ -1,11 +1,13 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
+# Even number: Stable Release    Odd number: Development Version
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 9)
 define(_CLIENT_VERSION_REVISION, 7)
-define(_CLIENT_VERSION_BUILD, 4)
-define(_CLIENT_VERSION_IS_RELEASE, false)
-define(_COPYRIGHT_YEAR, 2021)
+define(_CLIENT_VERSION_BUILD, 6)
+define(_CLIENT_VERSION_IS_RELEASE, true)
+
+define(_COPYRIGHT_YEAR, 2024)
 AC_INIT([Bitmark Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitmark.org],[bitmark])
 AC_CONFIG_AUX_DIR([src/build-aux])
 AC_CONFIG_MACRO_DIR([src/m4])
@@ -123,7 +125,6 @@ AC_ARG_WITH([homebrew],
   [use_homebrew=$withval],
   [use_homebrew=auto])
 
-
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADERS([src/bitmark-config.h])
 
@@ -178,14 +179,14 @@ CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_
 
 AC_LANG_PUSH([C++])
 
-AX_CHECK_COMPILE_FLAG([-std=c++11], [CXXFLAGS="$CXXFLAGS -std=c++11"])
+AX_CHECK_COMPILE_FLAG([-std=c++14], [CXXFLAGS="$CXXFLAGS -std=c++14"])
 AX_CHECK_COMPILE_FLAG([-fPIC], [CXXFLAGS="$CXXFLAGS -fPIC"])
 CFLAGS="$CFLAGS -fPIC"
 
 ## CPU-specific flags
 case $host in
        i?86-*)
-	  CFLAGS="$CFLAGS -msse -msse2"
+	  CFLAGS="$CFLAGS -msse -msse2 -DFORCE_USE_HEAP"
 	  CXXFLAGS="$CXXFLAGS -msse -msse2"
        ;;
        x86_64-*)
@@ -196,11 +197,12 @@ esac
 AM_CONDITIONAL([BUILD_ARGON2_OPTIMIZED], [ @<:@@<:@ x$host_cpu == x*"86"* @:>@@:>@ ])
 
 use_pkgconfig=yes
+use_pkg_config_qt=yes
 case $host in
   *mingw*)
 
      #pkgconfig does more harm than good with MinGW
-     use_pkgconfig=yes
+     use_pkgconfig_qt=no
 
      TARGET_OS=windows
      AC_CHECK_LIB([mingwthrd],      [main],, AC_MSG_ERROR(lib missing))
@@ -461,7 +463,6 @@ if test x$use_tests = xyes; then
     AC_MSG_ERROR(hexdump is required for tests)
   fi
 
-
   AX_BOOST_UNIT_TEST_FRAMEWORK
 
   dnl Determine if -DBOOST_TEST_DYN_LINK is needed
@@ -602,7 +603,7 @@ AM_CONDITIONAL([BUILD_BITMARK_CLI], [test x$build_bitmark_cli = xyes])
 AC_MSG_RESULT($build_bitmark_cli)
 
 dnl sets $bitmark_enable_qt, $bitmark_enable_qt_test, $bitmark_enable_qt_dbus
-BITMARK_QT_CONFIGURE([$use_pkgconfig], [qt5])
+BITMARK_QT_CONFIGURE([$use_pkgconfig_qt], [qt5])
 
 AC_LANG_POP
 
@@ -659,6 +660,8 @@ else
   fi
 fi
 
+CPPFLAGS="$CPPFLAGS -DNO_DLL_EXPORT -DSECP256K1_STATIC"
+
 dnl these are only used when qt is enabled
 if test x$bitmark_enable_qt != xno; then
   BUILD_QT=qt
@@ -707,6 +710,8 @@ else
   AC_MSG_RESULT([no])
 fi
 
+BUILD_SECP="secp256k1"
+
 if test "x$use_tests$build_bitmarkd$use_qt" = "xnonono"; then
   AC_MSG_ERROR([No targets! Please specify at least one of: --enable-cli --enable-daemon --enable-gui or --enable-tests])
 fi
@@ -744,7 +749,11 @@ AC_SUBST(LEVELDB_TARGET_FLAGS)
 AC_SUBST(BUILD_TEST)
 AC_SUBST(BUILD_QT)
 AC_SUBST(BUILD_TEST_QT)
+AC_SUBST(BUILD_SECP)
 AC_CONFIG_FILES([Makefile src/Makefile src/test/Makefile src/qt/Makefile src/qt/test/Makefile share/setup.nsi share/qt/Info.plist])
 AC_CONFIG_FILES([qa/pull-tester/run-bitmarkd-for-test.sh],[chmod +x qa/pull-tester/run-bitmarkd-for-test.sh])
 AC_CONFIG_FILES([qa/pull-tester/build-tests.sh],[chmod +x qa/pull-tester/build-tests.sh])
+
+AC_CONFIG_SUBDIRS([src/secp256k1])
+
 AC_OUTPUT
diff --git a/debian/changelog b/debian/changelog
@@ -0,0 +1,15 @@
+bitmark-qt (0.9.7.6-1) UNRELEASED; urgency=medium
+
+  * Fix header attributes needed for headers-first sync.
+ -- AK <ak@xmark.cc>  Sat, 24 Aug 2024 15:55:43 +0000
+
+bitmark-qt (0.9.7.5-2) UNRELEASED; urgency=medium
+
+  * Use specific versions of boost for the runtime dependencies.
+ -- AK <ak@xmark.cc>  Mon, 22 Jul 2024 08:39:16 +0000
+
+bitmark-qt (0.9.7.5-1) UNRELEASED; urgency=medium
+
+  * First release for 0.9.7.5 series.
+
+ -- AK <ak@xmark.cc>  Thu, 11 Jul 2024 10:28:24 +0000
diff --git a/debian/control b/debian/control
@@ -0,0 +1,30 @@
+Source: bitmark-qt
+Maintainer: AK <ak@xmark.cc>
+Section: net
+Priority: optional
+Standards-Version: 4.6.2
+Build-Depends: debhelper-compat (= 13),
+	       libssl-dev,
+	       libboost-all-dev,
+	       libminiupnpc-dev,
+	       libsodium-dev,
+	       libqrencode-dev,
+	       libqt5gui5,
+	       libqt5dbus5,
+	       qttools5-dev,
+	       qttools5-dev-tools
+
+Package: bitmark-qt
+Architecture: any
+Depends: libssl3,
+	 libboost-filesystem1.74.0,
+	 libboost-program-options1.74.0,
+	 libboost-thread1.74.0,
+	 libboost-chrono1.74.0 | libboost-chrono1.74.0t64,
+	 libboost-test1.74.0,
+	 libminiupnpc-dev,
+	 libsodium-dev,
+	 libqt5gui5,
+	 libqt5dbus5,
+	 libqrencode-dev	 
+Description: P2P cryptocurrency
diff --git a/debian/copyright b/debian/copyright
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org>
diff --git a/debian/rules b/debian/rules
@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+%:
+	dh $@
diff --git a/debian/source/format b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
@@ -1,7 +1,7 @@
-Bitmark 0.9.8.3.1 BETA
+Bitmark 0.9.7.5 BETA
 
 Copyright (c) 2009-2015 Bitcoin Core Developers
-Copyright (c) 2014-2018 Bitmark Core Developers
+Copyright (c) 2014-2021 Bitmark Core Developers
 
 Distributed under the MIT/X11 software license, see the accompanying
 file COPYING or http://www.opensource.org/licenses/mit-license.php.

diff --git a/doc/build-msw.md b/doc/build-msw.md
@@ -81,3 +81,41 @@ MSYS shell:
 	sh configure
 	mingw32-make
 	strip bitmarkd.exe
+
+Version 0.9.7.5 Building Instructions
+-------------------------------------
+Cross-compiling on Ubuntu with mxe:
+
+	git clone https://github.com/mxe/mxe
+	cd mxe
+	git checkout be62fd6d3703f2136c812500fb828506b8bc488b
+	export PATH="$PWD/usr/bin:$PATH"
+	export PREFIX="$PWD/usr/x86_64-w64-mingw32.static"
+	make MXE_TARGETS='x86_64-w64-mingw32.static' cc qtbase openssl libqrencode miniupnpc libsodium qttools
+
+	wget https://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
+	(sha256sum should be e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f96147ab46141e0045db72a)
+	tar -xzf ~/db-4.8.30.tar.gz
+	cd db-4.8.30/
+	cd build_unix/
+	../dist/configure --enable-mingw --enable-cxx --prefix=$PREFIX --host=x86_64-w64-mingw32.static --disable-pthread_api --disable-replication --disable-shared --enable-static
+	make
+	make install
+
+	git clone https://github.com/google/protobuf
+	cd protobuf
+	git checkout v3.9.0
+	./autogen.sh
+	./configure --prefix=/usr/local --enable-shared=no
+	make
+	sudo make install
+
+	git clone https://github.com/akrmn2021/bitmark
+	cd bitmark
+	git checkout v0.9.7.5 (or latest version)
+	./autogen.sh
+	./configure --prefix=/usr/local --host=x86_64-w64-mingw32.static --with-gui=qt5 --with-boost-system=boost_system-mt --with-boost-filesystem=boost_filesystem-mt --with-boost-program-options=boost_program_options-mt --with-boost-thread=boost_thread_win32-mt --with-boost-chrono=boost_chrono-mt --with-boost-unit-test-framework=boost_unit_test_framework-mt --with-qt-incdir=$PREFIX/qt5/include --with-qt-libdir=$PREFIX/qt5/lib --with-qt-plugindir=$PREFIX/qt5/plugins --with-qt-bindir=$PREFIX/qt5/bin
+	make
+	sudo make install
+
+	(replace x86_64 with i686 if building as a 32 bit Windows application)
diff --git a/doc/build-unix.md b/doc/build-unix.md
@@ -9,7 +9,18 @@ To Build
 	./configure
 	make
 
-This will build bitmark-qt as well if the dependencies are met.
+This will build bitmark-qt as well if the dependencies are met. The binaries (bitmarkd and bitmark-cli)
+are placed in src/. For ./configure options, run:
+./configure --help
+--prefix is a useful option if you want to install the binaries (make install) to a non default location
+that doesn't require root access.
+
+Note: gcc version greater than or equal to 9 is recommended (such as the default on Ubuntu 20).
+For lower versions of gcc, configure may fail and you can try:
+CFLAGS="-g -O2 -fPIC" ./configure
+Boost greater than or equal to 1.71 is recommended (such as the default on Ubuntu 20).
+Lower versions of boost may not compile Bitmark, and thus you may need to obtain boost from
+https://www.boost.org
 
 Dependencies
 ---------------------
@@ -99,16 +110,17 @@ Dependencies for the GUI: Ubuntu & Debian
 
 If you want to build Bitmark-Qt, make sure that the required packages for Qt development
 are installed. Either Qt 4 or Qt 5 are necessary to build the GUI.
-If both Qt 4 and Qt 5 are installed, Qt 4 will be used. Pass `--with-gui=qt5` to configure to choose Qt5.
+You also need protobuf (see below). If both Qt 4 and Qt 5 are installed, Qt 5 will be used.
+Pass `--with-gui=qt4` to configure to choose Qt4.
 To build without GUI pass `--without-gui`.
 
 To build with Qt 4 you need the following:
 
-    sudo apt-get install libqt4-dev libprotobuf-dev protobuf-compiler
+    sudo apt-get install libqt4-dev
 
 For Qt 5 you need the following:
 
-    sudo apt-get install libqt5gui5 libqt5core5 libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev
+    sudo apt-get install libqt5gui5 libqt5core5 libqt5dbus5 qttools5-dev qttools5-dev-tools
 
 libqrencode (optional) can be installed with:
 
@@ -149,6 +161,11 @@ echo '12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.3
 # -> db-4.8.30.NC.tar.gz: OK
 tar -xzvf db-4.8.30.NC.tar.gz
 
+# Patch for new compilers (Debian 12 / Ubuntu 24)
+cd db-4.8.30.NC/dbinc
+chmod u+w atomic.h
+sed -i 's/__atomic_compare_exchange/__atomic_compare_exchange_db/g' atomic.h
+
 # Build the library and install to our prefix
 cd db-4.8.30.NC/build_unix/
 #  Note: Do a static build so that it can be embedded into the exectuable, instead of having to find a .so at runtime
@@ -170,6 +187,18 @@ If you need to build Boost yourself:
 	./bootstrap.sh
 	./bjam install
 
+Protobuf
+--------
+For the GUI, you need libprotobuf and the protobuf compiler.
+You can set it up as follows:
+	git clone https://github.com/google/protobuf
+	cd protobuf
+	git checkout v3.9.0
+	./autogen.sh
+	./configure --prefix=/usr/local --enable-shared=no
+	make
+	sudo make install
+
 
 Security
 --------

diff --git a/doc/releases/v0.9.7.5.md b/doc/releases/v0.9.7.5.md
@@ -0,0 +1,31 @@
+# Release Notes for v0.9.7.5
+
+v0.9.7.5 is the newest "release" after v0.9.7.2. v0.9.7.3 and v0.9.7.4 occured as version numbers in some commits in the master branch, but were never "tagged" or "released". The following is a list of changes introduced in v0.9.7.5 that do not appear (or were just partially implemented) in v0.9.7.4 (commit ffd840ecada67cee66876159dd4c0ef7ccc894ff):
+
+- Compatibility with newer versions of openssl (as used in Ubuntu 20-24)
+- Shell script to edit all files pertinent to setting version number (with vim)
+- Compatibility with newer versions of boost, including the proper use of boost::placeholders
+- Use heap for i?86-* (32 bit) hosts for the cryptonight hash
+- Fix and optimize some rpc commands
+- Fix version number in Windows README
+- Add more info to the unix/linux build doc
+- Change BMW hash implementation for Lyra2REv2. For newer versions of gcc the original code gives incorrect hash values. We replace the affected part with the implementation in the SUPERCOP repository (bench.cr.yp.to/supercop.html).
+- Update blake hash code with the latest official implementation (blake2.net)
+- Allow for miningAlgo (global variable) to be set in conf file for all used cases in the RPC interface.
+- Add secp256k1 as the ECDSA implementation for signature verification (used for Bitcoin Core).
+- Clean up LogPrintf output and set some of it to be conditional on debug=1
+- Use miningAlgo as default algo for getdifficulty and getnetworkhashps
+- Set default average interval for getblockspacing (RPC call) to 25 to be consistent with GetBlockSpacing (function)
+- Replace first help line for chaindynamics with "chaindynamics" instead of "chain dyanamics"
+- Add mediantime to RPC block info
+- Add algo parameter to getblocktemplate and getauxblock. This allows for setting the needed algo without affecting the global miningAlgo variable.
+- Fix building/testing for Windows. Fully static binaries can now be easily built
+- Add more info to the Windows building documentation
+- Fix Qt incompatibility with newer versions of Qt 5
+- Add debian packaging files (to build DEB packages that auto install Bitmark Qt and its dependencies), desktop file (to show app in the menu of the desktop environment)
+- Update the documentation
+- Update version numbers and years
+- Important fix for the "getheaders" feature of the headers-first sync. This type of sync will soon be implemented in an upcoming release (27.x/28.x). 27.x+ nodes will need to connect to nodes with this fix in order to properly sync
+- Add more info to the debug log for the scaling factor and the coinbase value when it pays less than the max
+- Add option to disable gigahash conversion for the current and peak hashrate calculations in the RPC
+- Use boost's cpp_int instead of openssl's BIGNUM for SSF calculations
diff --git a/doc/releases/v0.9.7.6.md b/doc/releases/v0.9.7.6.md
@@ -0,0 +1,3 @@
+# Release Notes for v0.9.7.6
+
+This is release is basically a "wrapper" around v0.9.7.5. We use the 0.9.7.6 version number to signal that a node supports the headers-first-sync that will be required for 27.x+ nodes to sync.
diff --git a/share/bitmark-qt.desktop b/share/bitmark-qt.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Bitmark
+Exec=bitmark-qt
+Icon=bitmark256
+Terminal=false
+Type=Application
+Categories=Network;
+Comment=P2P cryptocurrency
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Release Notes for v0.9.7.6

		This is release is basically a "wrapper" around v0.9.7.5. We use the 0.9.7.6 version number to signal that a node supports the headers-first-sync that will be required for 27.x+ nodes to sync.