Merge #6993: depends: update 'src/dashbls' to dashpay/bls-signatures@6169ee9c as 83d0727

0ff505c build: stop tracking cmake dependency relic_conf.h.in (Kittywhiskers Van Gogh)
83d0727 Squashed 'src/dashbls/' changes from dd683653c6..6169ee9c91 (Kittywhiskers Van Gogh)
61a1f72 revert: stop tracking cmake dependency relic_conf.h.in (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Expected subtree hash `fd3a6b99a590fadd699fe9bad2336679d351ca5604938996da4e211f77d962af` (see [instructions](#6323 (review)) to calculate)

  * Includes the following changes
    * dashpay/bls-signatures#117
    * dashpay/bls-signatures#118
    * dashpay/bls-signatures#116
    * dashpay/bls-signatures#119

  ## Breaking Changes

  None expected.

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)**
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 0ff505c
  PastaPastaPasta:
    utACK 0ff505c

Tree-SHA512: 8430e6ee36990344cac49a112dfd0cc76083b0b4991a9213872f54982f4c106e544b065bedee47ab9f928f8650787de83d55c232a32050c07b2100f428963424

Author: PastaPastaPasta

src/dashbls/.github/workflows/build-binds.yml

@@ -17,14 +17,15 @@ concurrency:
 
 jobs:
   build:
-    name: ${{ matrix.os }}, Python ${{ matrix.python }}, Go ${{ matrix.golang }}
+    name: ${{ matrix.os }}, Python ${{ matrix.python }}, Go ${{ matrix.golang }}, Rust ${{ matrix.rust }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-latest]
-        golang: [ '1.22' ]
-        python: ['3.9', '3.10', '3.11', '3.12']
+        golang: [ '1.24' ]
+        python: ['3.10', '3.11', '3.12', '3.13']
+        rust: [ '1.91.0' ]
 
     steps:
     - name: Checkout code
@@ -73,12 +74,23 @@ jobs:
     - name: Build library using CMake
       run: |
         mkdir -p build && cd build
-        cmake ..
+        cmake .. -DCMAKE_BUILD_TYPE=Debug
         cmake --build . -- -j 6
 
     - name: Build Go bindings
-      # TODO: macos build is broken. Whoever needs this - please fix it and remove `if` below.
-      if: startsWith(matrix.os, 'ubuntu')
       run: |
         cd go-bindings
+        make config
         make
+
+    - name: Install Rust
+      run: |
+        rustup toolchain install ${{ matrix.rust }}
+        rustup default ${{ matrix.rust }}
+        rustc --version
+        cargo --version
+
+    - name: Build and test Rust bindings
+      run: |
+        cd rust-bindings/bls-dash-sys
+        cargo test

src/dashbls/.github/workflows/build-test.yaml

@@ -53,7 +53,7 @@ jobs:
       if: startsWith(matrix.builder, 'cmake')
       run: |
         mkdir -p build && cd build
-        CC=${{ matrix.compiler.cc }} CXX=${{ matrix.compiler.cxx }} cmake .. -DBUILD_BLS_PYTHON_BINDINGS=0 -DARITH=${{ matrix.backend }}
+        CC=${{ matrix.compiler.cc }} CXX=${{ matrix.compiler.cxx }} cmake .. -DARITH=${{ matrix.backend }} -DBUILD_BLS_PYTHON_BINDINGS=0 -DCMAKE_BUILD_TYPE=Debug
         cmake --build . -- -j 6
         mv src/runtest ..
 

src/dashbls/Makefile.mimalloc.include

@@ -1,10 +1,10 @@
-# Copyright (c) 2022 The Dash Core developers
+# Copyright (c) 2022-2025 The Dash Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING.MIT or http://www.opensource.org/licenses/mit-license.php.
 
 LIBMIMALLOC = libmimalloc-secure.la
 
-MIMALLOC_CFLAGS = \
+MIMALLOC_CPPFLAGS = \
 	-DMI_SECURE=4 \
     -DNDEBUG
 
@@ -13,32 +13,34 @@ MIMALLOC_INCLUDES = \
 	-I$(top_srcdir)/depends/mimalloc/src
 
 MIMALLOC_H = \
-	depends/mimalloc/include/mimalloc.h \
-	depends/mimalloc/include/mimalloc-atomic.h \
-	depends/mimalloc/include/mimalloc-internal.h \
-	depends/mimalloc/include/mimalloc-new-delete.h \
-	depends/mimalloc/include/mimalloc-override.h \
-	depends/mimalloc/include/mimalloc-track.h \
-	depends/mimalloc/include/mimalloc-types.h \
+    depends/mimalloc/include/mimalloc-new-delete.h \
+    depends/mimalloc/include/mimalloc-override.h \
+    depends/mimalloc/include/mimalloc-stats.h \
+    depends/mimalloc/include/mimalloc.h \
 	depends/mimalloc/src/bitmap.h
 
 libmimalloc_secure_la_SOURCES = \
 	$(MIMALLOC_H) \
-    depends/mimalloc/src/stats.c \
-    depends/mimalloc/src/random.c \
-    depends/mimalloc/src/os.c \
-    depends/mimalloc/src/bitmap.c \
-    depends/mimalloc/src/arena.c \
-    depends/mimalloc/src/segment-cache.c \
-    depends/mimalloc/src/segment.c \
-    depends/mimalloc/src/page.c \
-    depends/mimalloc/src/alloc.c \
     depends/mimalloc/src/alloc-aligned.c \
     depends/mimalloc/src/alloc-posix.c \
+    depends/mimalloc/src/alloc.c \
+    depends/mimalloc/src/arena-meta.c \
+    depends/mimalloc/src/arena.c \
+    depends/mimalloc/src/bitmap.c \
     depends/mimalloc/src/heap.c \
+    depends/mimalloc/src/init.c \
+    depends/mimalloc/src/libc.c \
     depends/mimalloc/src/options.c \
-    depends/mimalloc/src/init.c
+    depends/mimalloc/src/os.c \
+    depends/mimalloc/src/page-map.c \
+    depends/mimalloc/src/page.c \
+    depends/mimalloc/src/random.c \
+    depends/mimalloc/src/stats.c \
+    depends/mimalloc/src/prim/prim.c
 
-libmimalloc_secure_la_CFLAGS = $(AM_CFLAGS) $(MIMALLOC_INCLUDES) $(MIMALLOC_CFLAGS)
+libmimalloc_secure_la_CPPFLAGS = $(AM_CPPFLAGS) $(MIMALLOC_CPPFLAGS) $(MIMALLOC_INCLUDES)
+libmimalloc_secure_la_CXXFLAGS = $(AM_CXXFLAGS)
+libmimalloc_secure_la_CFLAGS   = $(AM_CFLAGS)
+libmimalloc_secure_la_LDFLAGS  = $(AM_LDFLAGS)
 
 noinst_LTLIBRARIES += $(LIBMIMALLOC)

src/dashbls/configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([libdashbls],[1.3.6])
+AC_INIT([libdashbls],[2.0])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([build-aux/m4])
 

src/dashbls/depends/mimalloc/.gitignore

@@ -1,9 +1,13 @@
+build
 ide/vs20??/*.db
 ide/vs20??/*.opendb
 ide/vs20??/*.user
-ide/vs20??/*.vcxproj.filters
 ide/vs20??/.vs
 ide/vs20??/VTune*
 out/
 docs/
 *.zip
+*.tar
+*.gz
+.vscode
+.DS_STore