Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
c878b25
wallet: Show full pak entry in getwalletpakinfo
psgreco Feb 24, 2025
12152bf
syscall: whitelist network access for msghand thread
apoelstra Apr 19, 2025
9748c00
Merge pull request #1450 from apoelstra/2025-04--local-ci-fixes
delta1 Apr 22, 2025
6f47bfb
Merge bitcoin/bitcoin#26373: Update minisketch subtree to latest upst…
fanquake Nov 1, 2022
6585a84
Merge commit '1ad1651f210f2f9aad1d54131afd90ef77c9c746' into minisket…
Apr 24, 2025
1ad1651
Squashed 'src/minisketch/' changes from 7eeb778fef..a571ba20f9
Apr 24, 2025
3a1d2b0
Merge bitcoin/bitcoin#29823: minisketch: update subtree to 3472e2f5ec…
fanquake Apr 15, 2024
6e0b07d
Squashed 'src/minisketch/' changes from a571ba20f9..3472e2f5ec
Apr 24, 2025
2b5154d
Merge commit '6e0b07d281af3a41f27d1c41429d8d2bc7ad4bdf' into minisket…
Apr 24, 2025
38357ed
Merge pull request #1452 from tomt1664/minisketch_patches
delta1 Apr 25, 2025
285f81b
Merge bitcoin/bitcoin#30568: addrman: change internal id counting to …
achow101 Sep 20, 2024
7ed597f
Merge pull request #1453 from tomt1664/addrman_fix_cherrypick
delta1 May 1, 2025
10a8e36
Merge pull request #1428 from psgreco/master-showpak
delta1 Jun 10, 2025
ea75778
Use 1/0 instead of bool in args help, so it matches real parsing
psgreco Jun 18, 2025
209032c
Merge pull request #1461 from psgreco/master-fixhelp
delta1 Jun 19, 2025
c767109
liquidtestnet: Update liquidtestnet.com ipv4
psgreco Jun 20, 2025
1f598d5
MSAN: provide a copy of bdb4 config files to avoid using git.savannah…
psgreco Jun 21, 2025
e556481
Lock boost to 1.85 in macos tests
psgreco Jun 21, 2025
8057526
Reapply "Apply acc06bc91f80ddf4e015dcdf0b984bbdbfcb5ca3 fix also to p…
psgreco Jun 21, 2025
956797f
Merge pull request #1467 from psgreco/master-fix-msan-mac
tomt1664 Jun 23, 2025
cb5c59e
Merge bitcoin/bitcoin#28784: rpc: keep `.cookie` file if it was not g…
achow101 Dec 1, 2023
b8aa7eb
Merge bitcoin/bitcoin#30085: p2p: detect addnode cjdns peers in GetAd…
fanquake May 16, 2024
203ee5d
Merge bitcoin/bitcoin#30094: rpc: move UniValue in blockToJSON
ryanofsky May 13, 2024
3c73003
Merge bitcoin/bitcoin#29776: ThreadSanitizer: Fix #29767
ryanofsky Apr 4, 2024
8614ff4
Merge bitcoin/bitcoin#30435: init: change shutdown order of load bloc…
fanquake Jul 16, 2024
a356e99
CI: Win64, split native test in 2 parts
psgreco Feb 26, 2025
e7dfdfb
Merge pull request #1468 from psgreco/master-fix-win64
delta1 Jun 24, 2025
cb6ad6a
Merge pull request #1463 from psgreco/master-fixtestnetip
tomt1664 Jun 24, 2025
637fbf9
Update README.md
Olexandr88 Jul 6, 2025
87a64aa
Update README.md
Olexandr88 Jul 7, 2025
aab28aa
Merge pull request #1473 from Olexandr88/patch-1
delta1 Jul 7, 2025
288e2a9
removed duplicate solving_data for funding tx rpcs
Jun 30, 2025
2f9eab6
add solved_data to options for functional test
Jul 1, 2025
a9da179
remove unused variable
Jul 1, 2025
73760ba
Merge pull request #1471 from tomt1664/fix/duplicate_solve_data
delta1 Jul 8, 2025
67cd78d
Merge pull request #1451 from tomt1664/v25+_cherry_pick
delta1 Jul 8, 2025
8db506f
Merge bitcoin/bitcoin#30394: net: fix race condition in self-connect …
glozow Jul 16, 2024
2f6f7ce
Merge pull request #1472 from tomt1664/fix_race_condition
delta1 Jul 9, 2025
c4bc9fd
Fix position of version argument in walletcreatefundedpsbt (#1474)
tomt1664 Jul 11, 2025
38cbe92
Merge branch 'master' into elem-23.3.1-rc1
psgreco Jul 14, 2025
66835ed
Bump version to 23.3.1-rc1
psgreco Jul 14, 2025
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
29 changes: 22 additions & 7 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ macos_native_task_template: &MACOS_NATIVE_TASK_TEMPLATE
check_clang_script:
- clang --version
brew_install_script:
- brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
- brew install boost@1.85 libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
- brew link --force --overwrite boost@1.85
<< : *MAIN_TEMPLATE

compute_credits_template: &CREDITS_TEMPLATE
Expand All @@ -80,8 +81,7 @@ task:
env:
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV

task:
name: "Win64 native [msvc]"
win64_native_common: &win64_native_common
<< : *FILTER_TEMPLATE
windows_container:
cpu: 4
Expand Down Expand Up @@ -159,6 +159,22 @@ task:
- cd %CIRRUS_WORKING_DIR%
- python build_msvc\msvc-autogen.py
- msbuild build_msvc\bitcoin.sln -property:Configuration=Release -maxCpuCount -verbosity:minimal -noLogo

task:
name: "Win64 native [msvc] (Short running functional tests)"
<<: *win64_native_common
functional_tests_script:
# Increase the dynamic port range to the maximum allowed value to mitigate "OSError: [WinError 10048] Only one usage of each socket address (protocol/network address/port) is normally permitted".
# See: https://docs.microsoft.com/en-us/biztalk/technical-guides/settings-that-can-be-modified-to-improve-network-performance
- netsh int ipv4 set dynamicport tcp start=1025 num=64511
- netsh int ipv6 set dynamicport tcp start=1025 num=64511
# Heavier tests are moved to a secondary task
# Exclude feature_dbcrash and feature_fee_estimation, failing https://github.com/ElementsProject/elements/pull/1298
- python test\functional\test_runner.py --nocleanup --ci --quiet --combinedlogslen=4000 --jobs=4 --timeout-factor=8 --extended --exclude wallet_avoidreuse,feature_trim_headers,feature_dbcrash,feature_fee_estimation

task:
name: "Win64 native [msvc] (Long running functional tests + unit tests)"
<<: *win64_native_common
unit_tests_script:
- src\test_elements.exe -l test_suite
- src\bench_elements.exe > NUL
Expand All @@ -169,10 +185,9 @@ task:
# See: https://docs.microsoft.com/en-us/biztalk/technical-guides/settings-that-can-be-modified-to-improve-network-performance
- netsh int ipv4 set dynamicport tcp start=1025 num=64511
- netsh int ipv6 set dynamicport tcp start=1025 num=64511
# Exclude feature_dbcrash for now due to timeout
# Exclude also wallet_avoidreuse due to timeout
# Ignore failures for now, need to investigate but we really don't use native win64 builds
- python test\functional\test_runner.py --nocleanup --ci --quiet --combinedlogslen=4000 --jobs=4 --timeout-factor=8 --extended --exclude feature_dbcrash,wallet_avoidreuse || true
# Execute tests excluded from the main task
# Ignore failures for now until https://github.com/ElementsProject/elements/pull/1298 is merged
- python test\functional\test_runner.py --nocleanup --ci --quiet --combinedlogslen=4000 --jobs=4 --timeout-factor=8 wallet_avoidreuse feature_trim_headers feature_dbcrash feature_fee_estimation || true

task:
name: 'ARM [unit tests, no functional tests] [bullseye]'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Elements Project blockchain platform
====================================

[![Build Status](https://travis-ci.org/ElementsProject/elements.svg?branch=master)](https://travis-ci.org/ElementsProject/elements)
[![Release](https://img.shields.io/github/v/release/ElementsProject/elements?label=latest%20release&link=https%3A%2F%2Fgithub.com%2FElementsProject%2Felements%2Freleases%2Flatest)](https://github.com/ElementsProject/elements/releases)

https://elementsproject.org

Expand Down
2 changes: 1 addition & 1 deletion ci/test/04_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
fi

if [ "$CI_OS_NAME" == "macos" ]; then
sudo -H pip3 install --upgrade pip
sudo -H pip3 install --upgrade --break-system-packages pip
# shellcheck disable=SC2086
IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
fi
Expand Down
21 changes: 2 additions & 19 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 23)
define(_CLIENT_VERSION_MINOR, 3)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_RC, 1)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2025)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down Expand Up @@ -997,22 +997,6 @@ AC_CHECK_DECLS([bswap_16, bswap_32, bswap_64],,,
#include <byteswap.h>
#endif])

AC_MSG_CHECKING([for __builtin_clzl])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[
(void) __builtin_clzl(0);
]])],
[ AC_MSG_RESULT([yes]); have_clzl=yes; AC_DEFINE([HAVE_BUILTIN_CLZL], [1], [Define this symbol if you have __builtin_clzl])],
[ AC_MSG_RESULT([no]); have_clzl=no;]
)

AC_MSG_CHECKING([for __builtin_clzll])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[
(void) __builtin_clzll(0);
]])],
[ AC_MSG_RESULT([yes]); have_clzll=yes; AC_DEFINE([HAVE_BUILTIN_CLZLL], [1], [Define this symbol if you have __builtin_clzll])],
[ AC_MSG_RESULT([no]); have_clzll=no;]
)

dnl Check for malloc_info (for memory statistics information in getmemoryinfo)
AC_MSG_CHECKING([for getmemoryinfo])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <malloc.h>]],
Expand Down Expand Up @@ -1836,7 +1820,6 @@ AM_CONDITIONAL([LIQUID], [test "$liquid_build" = "yes"])

dnl for minisketch
AM_CONDITIONAL([ENABLE_CLMUL], [test "$enable_clmul" = "yes"])
AM_CONDITIONAL([HAVE_CLZ], [test "$have_clzl$have_clzll" = "yesyes"])

AC_DEFINE([CLIENT_VERSION_MAJOR], [_CLIENT_VERSION_MAJOR], [Major version])
AC_DEFINE([CLIENT_VERSION_MINOR], [_CLIENT_VERSION_MINOR], [Minor version])
Expand Down
Loading