Merge branch 'BIR-develop' of https://github.com/decenomy/DSW

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build and Extract Files from Docker Container
 on:
   push:
     branches:
-      - master
+      - '*'
 
 jobs:
   build-files-linux-x64:
@@ -16,29 +16,31 @@ jobs:
 
       - name: Build and Extract Files from Docker Container
         run: |
+          # Extract the name of the repository and use it as the ticker value
+          REPO_NAME="${GITHUB_REPOSITORY##*/}"
           # Build the Docker image from the Dockerfile in the repository
           docker build \
             --build-arg CPU_CORES=$(nproc) \
-            --build-arg TICKER=BIR \
-            --build-arg NAME=Birake \
+            --build-arg TICKER=$REPO_NAME \
+            --build-arg NAME=BIR \
             --build-arg BASE_NAME=birake \
-            --build-arg TARGET=master \
-            -t birake-linux-x64-build \
+            --build-arg TARGET=${{ github.ref }} \
+            -t linux-x64-build-img \
             -f contrib/docker/Dockerfile.dsw-linux-x64-wallet .
 
           # Start the container (if it's not already running)
-          docker run -d --name birake-linux-x64-build-container birake-linux-x64-build
+          docker run -d --name linux-x64-build-ctn linux-x64-build-img
 
           # Create a temporary directory to hold the extracted files
           mkdir release_files
 
           # Copy files from the Docker container to the local filesystem
-          docker cp birake-linux-x64-build-container:/BIR/deploy/linux-x64 release_files/
+          docker cp linux-x64-build-ctn:/$REPO_NAME/deploy/linux-x64 release_files/
 
       - name: Archive and Upload Extracted Files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-linux-x64
           path: release_files
   build-files-linux-arm64:
     runs-on: ubuntu-22.04
@@ -50,29 +52,31 @@ jobs:
 
       - name: Build and Extract Files from Docker Container
         run: |
+          # Extract the name of the repository and use it as the ticker value
+          REPO_NAME="${GITHUB_REPOSITORY##*/}"
           # Build the Docker image from the Dockerfile in the repository
           docker build \
             --build-arg CPU_CORES=$(nproc) \
-            --build-arg TICKER=BIR \
-            --build-arg NAME=Birake \
-            --build-arg BASE_NAME=birake \
-            --build-arg TARGET=master \
-            -t birake-linux-arm64-build \
+            --build-arg TICKER=$REPO_NAME \
+            --build-arg NAME=__Decenomy__ \
+            --build-arg BASE_NAME=__decenomy__ \
+            --build-arg TARGET=${{ github.ref }} \
+            -t linux-arm64-build-img \
             -f contrib/docker/Dockerfile.dsw-linux-arm64-wallet .
 
           # Start the container (if it's not already running)
-          docker run -d --name birake-linux-arm64-build-container birake-linux-arm64-build
+          docker run -d --name linux-arm64-build-ctn linux-arm64-build-img
 
           # Create a temporary directory to hold the extracted files
           mkdir release_files
 
           # Copy files from the Docker container to the local filesystem
-          docker cp birake-linux-arm64-build-container:/BIR/deploy/linux-arm64 release_files/
+          docker cp linux-arm64-build-ctn:/$REPO_NAME/deploy/linux-arm64 release_files/
 
       - name: Archive and Upload Extracted Files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-linux-arm64
           path: release_files
   build-windows-x64:
     runs-on: ubuntu-22.04
@@ -84,29 +88,31 @@ jobs:
 
       - name: Build and Extract Files from Docker Container
         run: |
+          # Extract the name of the repository and use it as the ticker value
+          REPO_NAME="${GITHUB_REPOSITORY##*/}"
           # Build the Docker image from the Dockerfile in the repository
           docker build \
             --build-arg CPU_CORES=$(nproc) \
-            --build-arg TICKER=BIR \
+            --build-arg TICKER=$REPO_NAME \
             --build-arg NAME=Birake \
             --build-arg BASE_NAME=birake \
-            --build-arg TARGET=master \
-            -t birake-windows-x64-build \
+            --build-arg TARGET=${{ github.ref }} \
+            -t windows-x64-build-img \
             -f contrib/docker/Dockerfile.dsw-windows-x64-wallet .
 
           # Start the container (if it's not already running)
-          docker run -d --name birake-windows-x64-build-container birake-windows-x64-build
+          docker run -d --name windows-x64-build-ctn windows-x64-build-img
 
           # Create a temporary directory to hold the extracted files
           mkdir release_files
 
           # Copy files from the Docker container to the local filesystem
-          docker cp birake-windows-x64-build-container:/BIR/deploy/windows-x64 release_files/
+          docker cp windows-x64-build-ctn:/$REPO_NAME/deploy/windows-x64 release_files/
 
       - name: Archive and Upload Extracted Files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-windows-x64
           path: release_files
   build-macos-x64:
     runs-on: ubuntu-22.04
@@ -118,27 +124,29 @@ jobs:
 
       - name: Build and Extract Files from Docker Container
         run: |
+          # Extract the name of the repository and use it as the ticker value
+          REPO_NAME="${GITHUB_REPOSITORY##*/}"
           # Build the Docker image from the Dockerfile in the repository
           docker build \
             --build-arg CPU_CORES=$(nproc) \
-            --build-arg TICKER=BIR \
+            --build-arg TICKER=$REPO_NAME \
             --build-arg NAME=Birake \
             --build-arg BASE_NAME=birake \
-            --build-arg TARGET=master \
-            -t birake-macos-x64-build \
+            --build-arg TARGET=${{ github.ref }} \
+            -t macos-x64-build-img \
             -f contrib/docker/Dockerfile.dsw-macos-x64-wallet .
 
           # Start the container (if it's not already running)
-          docker run -d --name birake-macos-x64-build-container birake-macos-x64-build
+          docker run -d --name macos-x64-build-ctn macos-x64-build-img
 
           # Create a temporary directory to hold the extracted files
           mkdir release_files
 
           # Copy files from the Docker container to the local filesystem
-          docker cp birake-macos-x64-build-container:/BIR/deploy/macos-x64 release_files/
+          docker cp macos-x64-build-ctn:/$REPO_NAME/deploy/macos-x64 release_files/
 
       - name: Archive and Upload Extracted Files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-macos-x64
           path: release_files

CMakeLists.txt

@@ -285,6 +285,7 @@ set(WALLET_SOURCES
         ./src/zpiv/zpivmodule.cpp
         ./src/zpiv/zpos.cpp
         ./src/stakeinput.cpp
+        ./src/sqlite3/sqlite3.c
         )
 add_library(WALLET_A STATIC ${BitcoinHeaders} ${WALLET_SOURCES})
 target_include_directories(WALLET_A PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src

configure.ac

@@ -1078,7 +1078,20 @@ if test x$use_pkgconfig = xyes; then
       PKG_CHECK_MODULES([SSL], [libssl],, [AC_MSG_ERROR(openssl  not found.)])
       PKG_CHECK_MODULES([CRYPTO], [libcrypto],,[AC_MSG_ERROR(libcrypto  not found.)])
       BITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])])
-      PKG_CHECK_MODULES([CURL], [libcurl],, [AC_MSG_ERROR(curl  not found.)])
+
+      echo $prefix
+      # Check for curl-config
+      AC_PATH_PROG([CURL_CONFIG], [curl-config], none, [$prefix/bin])
+      if test x$CURL_CONFIG = xnone; then
+        AC_MSG_ERROR("curl-config not found")
+      fi
+
+      PKG_CONFIG_PATH={$prefix}/lib/pkgconfig:$PKG_CONFIG_PATH
+      PKG_CHECK_MODULES([CURL], [libcurl],, [AC_MSG_ERROR(curl not found.)])
+      
+      CURL_VERSION=$($CURL_CONFIG --version)
+      AC_MSG_RESULT([curl version: $CURL_VERSION])
+
       PKG_CHECK_MODULES([ZLIB], [zlib],, [AC_MSG_ERROR(zlib  not found.)])
       BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode],,[BITCOIN_QT_FAIL(libqrencode not found)])])
       if test x$use_qtcharts != xno; then

contrib/docker/Dockerfile.dsw-develop-builder

@@ -89,6 +89,8 @@ RUN for host in $HOSTS; \
         done \
     done
 
+RUN ln -s ${WRAP_DIR}/x86_64-w64-mingw32-windres ${WRAP_DIR}/windres
+
 # Clone the repository
 RUN git clone https://github.com/decenomy/DSW.git
 

contrib/docker/Dockerfile.dsw-linux-arm64-wallet

@@ -1,5 +1,5 @@
 # FROM decenomy/dsw-linux-arm64-builder:latest
-FROM decenomy/dsw-linux-arm64-builder@sha256:e687b911b160c600716dbd1d481f82e3d22c1fbe9cb035097552fe0504d1b78d
+FROM decenomy/dsw-linux-arm64-builder@sha256:ff64795ac415846c3576ba98526266ec0cf8c9810c695e2644f460f6070de678
 
 # ARG for specifying the number of cores
 ARG CPU_CORES=1

contrib/docker/Dockerfile.dsw-linux-x64-wallet

@@ -1,5 +1,5 @@
 # FROM decenomy/dsw-linux-x64-builder:latest
-FROM decenomy/dsw-linux-x64-builder@sha256:c1d14e04ce8f0ab32ed23d4c961faf0b7f3c3059d17fad895bccc6ce571d82e4
+FROM decenomy/dsw-linux-x64-builder@sha256:49894f78ac27318ed1c018c80e674f99e6b45ac382c9b98a2aa0c94d8bd755a4
 
 
 # ARG for specifying the number of cores

contrib/docker/Dockerfile.dsw-macos-x64-wallet

@@ -1,5 +1,5 @@
 #FROM decenomy/dsw-macos-x64-builder:latest
-FROM decenomy/dsw-macos-x64-builder@sha256:bdef2e446c09c7f601cc490841711e8f4ca47e4f81ba4306a8d2ace0b58012db
+FROM decenomy/dsw-macos-x64-builder@sha256:395f7c9cc2ec9767674c0a226ca86855253f8558f94e367d02cfff45fa909f94
 
 # ARG for specifying the number of cores
 ARG CPU_CORES=1

contrib/docker/Dockerfile.dsw-windows-x64-builder

@@ -69,6 +69,8 @@ RUN for host in $HOSTS; \
         done \
     done
 
+RUN ln -s ${WRAP_DIR}/x86_64-w64-mingw32-windres ${WRAP_DIR}/windres
+
 # Clone the repository
 RUN git clone https://github.com/decenomy/DSW.git
 

contrib/docker/Dockerfile.dsw-windows-x64-wallet

@@ -1,5 +1,5 @@
 #FROM decenomy/dsw-windows-x64-builder:latest
-FROM decenomy/dsw-windows-x64-builder@sha256:6ff1eeff59b4bd279cb056163a573294241616f4c91923b0c494cb3511125333
+FROM decenomy/dsw-windows-x64-builder@sha256:c5102edf92fba810de6596cc9593729b79ab00ca8d88656d4613a3cfa1fecf78
 
 # ARG for specifying the number of cores
 ARG CPU_CORES=1

contrib/pivx-qt.pro

@@ -112,6 +112,7 @@ HEADERS += src/activemasternode.h \
            src/rpcserver.h \
            src/serialize.h \
            src/spork.h \
+           src/sqlite3/sqlite3.h \
            src/streams.h \
            src/sync.h \
            src/threadsafety.h \
@@ -418,6 +419,7 @@ SOURCES += src/activemasternode.cpp \
            src/rpcserver.cpp \
            src/rpcwallet.cpp \
            src/spork.cpp \
+           src/sqlite3/sqlite3.c \
            src/sync.cpp \
            src/timedata.cpp \
            src/txdb.cpp \
@@ -485,7 +487,6 @@ SOURCES += src/activemasternode.cpp \
            src/qt/optionsmodel.cpp \
            src/qt/overviewpage.cpp \
            src/qt/paymentrequest.pb.cc \
-           src/qt/paymentrequestplus.cpp \
            src/qt/paymentserver.cpp \
            src/qt/peertablemodel.cpp \
            src/qt/qvalidatedlineedit.cpp \

depends/packages/curl.mk

@@ -7,7 +7,7 @@ $(package)_sha256_hash=816e41809c043ff285e8c0f06a75a1fa250211bbfb2dc0a037eeef39f
 $(package)_dependencies=openssl
 
 define $(package)_set_vars
-  $(package)_config_opts=--with-openssl --disable-shared --enable-static
+  $(package)_config_opts=--with-openssl=$(host_prefix) --disable-shared --enable-static
 endef
 
 define $(package)_config_cmds

depends/packages/openssl.mk

@@ -1,43 +1,44 @@
 package=openssl
-$(package)_version=1.0.1k
-# $(package)_download_path=https://www.openssl.org/source/old/1.0.1
+$(package)_version=1.1.1w
+#$(package)_download_path=https://www.openssl.org/source/old/1.1.1/
 $(package)_download_path=https://github.com/decenomy/depends/raw/main/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c
+$(package)_sha256_hash=cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8
 
 define $(package)_set_vars
 $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
-$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl
+#$(package)_config_opts=--static
+$(package)_config_opts=--prefix=$(host_prefix)
 $(package)_config_opts+=no-camellia
 $(package)_config_opts+=no-capieng
 $(package)_config_opts+=no-cast
 $(package)_config_opts+=no-comp
-$(package)_config_opts+=no-dso
+#$(package)_config_opts+=no-dsosim
 $(package)_config_opts+=no-dtls1
 $(package)_config_opts+=no-ec_nistp_64_gcc_128
 $(package)_config_opts+=no-gost
-$(package)_config_opts+=no-gmp
-$(package)_config_opts+=no-heartbeats
+#$(package)_config_opts+=no-gmp
+#$(package)_config_opts+=no-heartbeats
 $(package)_config_opts+=no-idea
-$(package)_config_opts+=no-jpake
-$(package)_config_opts+=no-krb5
-$(package)_config_opts+=no-libunbound
+#$(package)_config_opts+=no-jpake
+#$(package)_config_opts+=no-krb5
+#$(package)_config_opts+=no-libunbound
 $(package)_config_opts+=no-md2
 $(package)_config_opts+=no-mdc2
 $(package)_config_opts+=no-rc4
 $(package)_config_opts+=no-rc5
 $(package)_config_opts+=no-rdrand
 $(package)_config_opts+=no-rfc3779
-$(package)_config_opts+=no-rsax
+#$(package)_config_opts+=no-rsax
 $(package)_config_opts+=no-sctp
 $(package)_config_opts+=no-seed
-$(package)_config_opts+=no-sha0
+#$(package)_config_opts+=no-sha0
 $(package)_config_opts+=no-shared
 $(package)_config_opts+=no-ssl-trace
-$(package)_config_opts+=no-ssl2
+#$(package)_config_opts+=no-ssl2
 $(package)_config_opts+=no-ssl3
-$(package)_config_opts+=no-static_engine
-$(package)_config_opts+=no-store
+#$(package)_config_opts+=no-static_engine
+#$(package)_config_opts+=no-store
 $(package)_config_opts+=no-unit-test
 $(package)_config_opts+=no-weak-ssl-ciphers
 $(package)_config_opts+=no-whirlpool
@@ -66,8 +67,9 @@ $(package)_config_opts_i686_mingw32=mingw
 endef
 
 define $(package)_preprocess_cmds
-  sed -i.old "/define DATE/d" util/mkbuildinf.pl && \
-  sed -i.old "s|engines apps test|engines|" Makefile.org
+  sed -i.old 's/^#define DATE.*/#define DATE 0/' util/mkbuildinf.pl
+  #sed -i.old "/define DATE/d" util/mkbuildinf.pl && \
+  #sed -i.old "s|engines apps test|engines|" Makefile.org
 endef
 
 define $(package)_config_cmds
@@ -79,7 +81,7 @@ define $(package)_build_cmds
 endef
 
 define $(package)_stage_cmds
-  $(MAKE) INSTALL_PREFIX=$($(package)_staging_dir) -j1 install_sw
+  $(MAKE) DESTDIR=$($(package)_staging_dir) -j1 install_sw
 endef
 
 define $(package)_postprocess_cmds

depends/packages/qt.mk

@@ -5,7 +5,7 @@ $(package)_download_path=https://github.com/decenomy/depends/raw/main/
 $(package)_suffix=opensource-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=d5a97381b9339c0fbaf13f0c05d599a5c999dcf94145044058198987183fed65
-$(package)_dependencies=openssl zlib
+$(package)_dependencies=zlib
 $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
 $(package)_build_subdir=qtbase
 $(package)_qt_libs=corelib network widgets gui plugins testlib concurrent
@@ -65,7 +65,7 @@ $(package)_config_opts += -no-xinput2
 $(package)_config_opts += -nomake examples
 $(package)_config_opts += -nomake tests
 $(package)_config_opts += -opensource
-$(package)_config_opts += -openssl-linked
+$(package)_config_opts += -no-openssl
 $(package)_config_opts += -optimized-qmake
 $(package)_config_opts += -pkg-config
 $(package)_config_opts += -prefix $(host_prefix)