Skip to content
Draft
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ not checks at all: return an error, `AbortNode()`, or `InitError()`.

Vendored or subtree-style code should normally be left alone:

- `src/{crc32c,dashbls,gsl,immer,leveldb,minisketch,secp256k1,univalue}`
- `src/{crc32c,gsl,immer,leveldb,mimalloc,minisketch,secp256k1,univalue}`
- `src/crypto/{ctaes,x11}`

`test/util/data/non-backported.txt` lists Dash-specific files used by Dash
Expand Down
2 changes: 1 addition & 1 deletion CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ not checks at all: return an error, `AbortNode()`, or `InitError()`.

Vendored or subtree-style code should normally be left alone:

- `src/{crc32c,dashbls,gsl,immer,leveldb,minisketch,secp256k1,univalue}`
- `src/{crc32c,gsl,immer,leveldb,mimalloc,minisketch,secp256k1,univalue}`
- `src/crypto/{ctaes,x11}`

`test/util/data/non-backported.txt` lists Dash-specific files used by Dash
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ LCOV_FILTER_PATTERN = \
-p "/usr/include/" \
-p "/usr/lib/" \
-p "/usr/lib64/" \
-p "src/dashbls/" \
-p "src/mimalloc/" \
-p "src/immer/" \
-p "src/leveldb/" \
-p "src/crc32c/" \
Expand Down
28 changes: 5 additions & 23 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -883,18 +883,6 @@ case $host in
export PKG_CONFIG_PATH="$($BREW --prefix qt@5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
fi

gmp_prefix=$($BREW --prefix gmp 2>/dev/null)
if test "$gmp_prefix" != ""; then
if test "$suppress_external_warnings" != "no"; then
GMP_CPPFLAGS="-isystem $gmp_prefix/include"
else
GMP_CPPFLAGS="-I$gmp_prefix/include"
fi
GMP_LDFLAGS="-L$gmp_prefix/lib"
CORE_CPPFLAGS="$CORE_CPPFLAGS $GMP_CPPFLAGS"
CORE_LDFLAGS="$CORE_LDFLAGS $GMP_LDFLAGS"
fi

case $host in
*aarch64*)
dnl The preferred Homebrew prefix for Apple Silicon is /opt/homebrew.
Expand Down Expand Up @@ -1695,15 +1683,9 @@ if test "$use_zmq" = "yes"; then
esac
fi

dnl check if libgmp is present
TEMP_CPPFLAGS="$CPPFLAGS"
TEMP_LDFLAGS="$LDFLAGS"
CPPFLAGS="$CPPFLAGS $GMP_CPPFLAGS"
LDFLAGS="$LDFLAGS $GMP_LDFLAGS"
AC_CHECK_HEADER([gmp.h],, AC_MSG_ERROR(libgmp headers missing))
AC_CHECK_LIB([gmp], [__gmpz_init],GMP_LIBS=-lgmp, AC_MSG_ERROR(libgmp missing))
CPPFLAGS="$TEMP_CPPFLAGS"
LDFLAGS="$TEMP_LDFLAGS"
dnl blst (BLS12-381 backend of src/bls), provided by depends or the system
AC_CHECK_HEADER([blst.h],, AC_MSG_ERROR([blst headers missing]))
AC_CHECK_LIB([blst], [blst_p1_compress], [BLST_LIBS=-lblst], AC_MSG_ERROR([libblst missing]))

AM_CONDITIONAL([ENABLE_ZMQ], [test "$use_zmq" = "yes"])

Expand Down Expand Up @@ -2040,7 +2022,7 @@ AC_SUBST(MINIUPNPC_LIBS)
AC_SUBST(BACKTRACE_FLAGS)
AC_SUBST(BACKTRACE_LDFLAGS)
AC_SUBST(BACKTRACE_LIBS)
AC_SUBST(GMP_LIBS)
AC_SUBST(BLST_LIBS)
AC_SUBST(NATPMP_CPPFLAGS)
AC_SUBST(NATPMP_LIBS)
AC_SUBST(DSYMUTIL_FLAT)
Expand Down Expand Up @@ -2081,7 +2063,7 @@ fi
dnl The ECDH module is required by the wallet's Platform key provider
dnl (DashPay contact request encryption, wallet/platformkeys.cpp).
ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --enable-module-ecdh --disable-openssl-tests"
AC_CONFIG_SUBDIRS([src/dashbls src/secp256k1])
AC_CONFIG_SUBDIRS([src/secp256k1])

AC_OUTPUT

Expand Down
5 changes: 5 additions & 0 deletions contrib/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ Files: src/qt/res/fonts/RobotoMono-Bold.ttf
License: Apache-2.0
Comment: Site: https://fonts.google.com/specimen/Roboto+Mono

Files: src/mimalloc/*
Copyright: 2018-2025 Microsoft Corporation, Daan Leijen
License: Expat
Comment: Site: https://github.com/microsoft/mimalloc


License: Expat
Permission is hereby granted, free of charge, to any person obtaining a
Expand Down
2 changes: 1 addition & 1 deletion contrib/devtools/copyright_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
# git subtrees
"src/crc32c/",
"src/crypto/ctaes/",
"src/dashbls/",
"src/mimalloc/",
"src/gsl/",
"src/immer/",
"src/leveldb/",
Expand Down
2 changes: 1 addition & 1 deletion contrib/guix/libexec/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ mkdir -p "$DISTSRC"
${HOST_CXXFLAGS:+CXXFLAGS="${HOST_CXXFLAGS}"} \
${HOST_LDFLAGS:+LDFLAGS="${HOST_LDFLAGS}"}

sed -i.old 's/-lstdc++ //g' {./,src/dashbls/,src/secp256k1/}{config.status,libtool}
sed -i.old 's/-lstdc++ //g' {./,src/secp256k1/}{config.status,libtool}


# Build Dash Core
Expand Down
24 changes: 24 additions & 0 deletions depends/packages/blst.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package=blst
$(package)_version=0.3.17
$(package)_download_path=https://github.com/supranational/blst/archive/refs/tags
$(package)_download_file=v$($(package)_version).tar.gz
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=c3fef37b566b67419703b2bbb648e15176276af9a880c22aa8f5f2e8cecc2e4d

# build.sh takes CC/AR/RANLIB/CFLAGS from the environment. __BLST_PORTABLE__
# selects runtime CPU dispatch instead of letting build.sh probe the builder's
# /proc/cpuinfo for ADX, which keeps the build reproducible; build.sh itself
# adds -D__BLST_NO_ASM__ on hosts other than x86_64/aarch64.
define $(package)_set_vars
$(package)_build_env=CC="$($(package)_cc)" AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fno-builtin -fPIC -D__BLST_PORTABLE__"
endef

define $(package)_build_cmds
./build.sh
endef

define $(package)_stage_cmds
mkdir -p $($(package)_staging_prefix_dir)/include $($(package)_staging_prefix_dir)/lib && \
install -m 644 bindings/blst.h bindings/blst_aux.h $($(package)_staging_prefix_dir)/include && \
install -m 644 libblst.a $($(package)_staging_prefix_dir)/lib
endef
33 changes: 0 additions & 33 deletions depends/packages/gmp.mk

This file was deleted.

2 changes: 1 addition & 1 deletion depends/packages/packages.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packages:=gmp backtrace
packages:=backtrace blst

boost_packages = boost

Expand Down
Loading
Loading