Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/dashbls/.github/workflows/build-binds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/dashbls/.github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..

Expand Down
42 changes: 22 additions & 20 deletions src/dashbls/Makefile.mimalloc.include
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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)
2 changes: 1 addition & 1 deletion src/dashbls/configure.ac
Original file line number Diff line number Diff line change
@@ -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])

Expand Down
6 changes: 5 additions & 1 deletion src/dashbls/depends/mimalloc/.gitignore
Original file line number Diff line number Diff line change
@@ -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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Fix typo in macOS gitignore pattern.

Line 13 has a capitalization error: .DS_STore should be .DS_Store (lowercase 't' and 'ore'). The current pattern will not catch macOS-generated .DS_Store files.

-.DS_STore
+.DS_Store
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
.DS_STore
.DS_Store
🤖 Prompt for AI Agents
In src/dashbls/depends/mimalloc/.gitignore around line 13, the macOS ignore
pattern is misspelled as `.DS_STore`; replace it with the correct `.DS_Store`
(capital D and S, lowercase 'Store') so the .gitignore will match
macOS-generated .DS_Store files.

Loading
Loading