Skip to content

Commit c8eb5b8

Browse files
delta1delta1
committed
Merge bd551ad into merged_master (Elements PR ElementsProject#1393)
2 parents a22aa1b + bd551ad commit c8eb5b8

File tree

11 files changed

+62
-20
lines changed

11 files changed

+62
-20
lines changed

‎.cirrus.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@ task:
209209
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
210210

211211
task:
212-
name: '32-bit + dash [gui] [CentOS 8]'
212+
name: '32-bit + dash [gui] [Rocky 8]'
213213
<< : *GLOBAL_TASK_TEMPLATE
214214
container:
215-
image: quay.io/centos/centos:stream8
215+
image: quay.io/rockylinux/rockylinux:8
216216
env:
217217
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
218218
PACKAGE_MANAGER_INSTALL: "yum install -y"
@@ -229,10 +229,10 @@ task:
229229
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
230230

231231
task:
232-
name: '[TSan, depends, gui] [jammy]'
232+
name: '[TSan, depends, gui] [2404]'
233233
<< : *GLOBAL_TASK_TEMPLATE
234234
container:
235-
image: ubuntu:jammy
235+
image: ubuntu:24.04
236236
cpu: 6 # Increase CPU and Memory to avoid timeout
237237
memory: 24G
238238
env:

‎build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj.in

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,40 @@
99
</PropertyGroup>
1010
<ItemGroup>
1111
<ClCompile Include="..\..\src\asset.cpp" />
12+
<ClCompile Include="..\..\src\blockfilter.cpp" />
1213
<ClCompile Include="..\..\src\chain.cpp" />
1314
<ClCompile Include="..\..\src\confidential_validation.cpp" />
15+
<ClCompile Include="..\..\src\consensus/tx_verify.cpp" />
16+
<ClCompile Include="..\..\src\dbwrapper.cpp" />
1417
<ClCompile Include="..\..\src\deploymentstatus.cpp" />
1518
<ClCompile Include="..\..\src\dynafed.cpp" />
19+
<ClCompile Include="..\..\src\flatfile.cpp" />
20+
<ClCompile Include="..\..\src\index/base.cpp" />
21+
<ClCompile Include="..\..\src\index/blockfilterindex.cpp" />
22+
<ClCompile Include="..\..\src\index/coinstatsindex.cpp" />
1623
<ClCompile Include="..\..\src\mainchainrpc.cpp" />
24+
<ClCompile Include="..\..\src\node\blockstorage.cpp" />
25+
<ClCompile Include="..\..\src\node\coinstats.cpp" />
1726
<ClCompile Include="..\..\src\node\interfaces.cpp" />
1827
<ClCompile Include="..\..\src\node\ui_interface.cpp" />
1928
<ClCompile Include="..\..\src\pegins.cpp" />
2029
<ClCompile Include="..\..\src\pow.cpp" />
30+
<ClCompile Include="..\..\src\policy/fees.cpp" />
31+
<ClCompile Include="..\..\src\policy/packages.cpp" />
32+
<ClCompile Include="..\..\src\policy/rbf.cpp" />
33+
<ClCompile Include="..\..\src\policy/settings.cpp" />
2134
<ClCompile Include="..\..\src\primitives\bitcoin\transaction.cpp" />
2235
<ClCompile Include="..\..\src\primitives\pak.cpp" />
2336
<ClCompile Include="..\..\src\rpc\server.cpp" />
2437
<ClCompile Include="..\..\src\script\sigcache.cpp" />
2538
<ClCompile Include="..\..\src\shutdown.cpp" />
39+
<ClCompile Include="..\..\src\signet.cpp" />
2640
<ClCompile Include="..\..\src\sync.cpp" />
41+
<ClCompile Include="..\..\src\timedata.cpp" />
42+
<ClCompile Include="..\..\src\txdb.cpp" />
43+
<ClCompile Include="..\..\src\txmempool.cpp" />
2744
<ClCompile Include="..\..\src\validation.cpp" />
45+
<ClCompile Include="..\..\src\validationinterface.cpp" />
2846
<ClCompile Include="..\..\src\versionbits.cpp" />
2947
<ClCompile Include="..\..\src\wallet\bdb.cpp" />
3048
<ClCompile Include="..\..\src\wallet\rpc\elements.cpp" />
@@ -36,6 +54,12 @@
3654
<ProjectReference Include="..\libsecp256k1\libsecp256k1.vcxproj">
3755
<Project>{bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6}</Project>
3856
</ProjectReference>
57+
<ProjectReference Include="..\libleveldb\libleveldb.vcxproj">
58+
<Project>{18430fef-6b61-4c53-b396-718e02850f1b}</Project>
59+
</ProjectReference>
60+
<ProjectReference Include="..\libelementssimplicity\libelementssimplicity.vcxproj">
61+
<Project>{abae25f0-d700-46e1-9ef6-5d6ddfcf8b26}</Project>
62+
</ProjectReference>
3963
</ItemGroup>
4064
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4165
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
<ClCompile Include="..\..\src\uint256.cpp" />
3535
<ClCompile Include="..\..\src\util\strencodings.cpp" />
3636
</ItemGroup>
37+
<ItemGroup>
38+
<ProjectReference Include="..\libelementssimplicity\libelementssimplicity.vcxproj">
39+
<Project>{abae25f0-d700-46e1-9ef6-5d6ddfcf8b26}</Project>
40+
</ProjectReference>
41+
</ItemGroup>
3742
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3843
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
3944
<Import Project="..\common.vcxproj" />

‎build_msvc/test_bitcoin/test_bitcoin.vcxproj

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,18 @@
1515
<ClCompile Include="..\..\src\test\main.cpp" />
1616
<ClCompile Include="..\..\src\test\util\*.cpp" />
1717
<ClCompile Include="..\..\src\wallet\test\*_fixture.cpp" />
18-
<ClCompile Include="..\..\src\wallet\test\*_tests.cpp" />
18+
<ClCompile Include="..\..\src\wallet\test\coinselector_tests.cpp" />
19+
<ClCompile Include="..\..\src\wallet\test\db_tests.cpp" />
20+
<ClCompile Include="..\..\src\wallet\test\init_tests.cpp" />
21+
<ClCompile Include="..\..\src\wallet\test\ismine_tests.cpp" />
22+
<!-- Exclude psbt_wallet_tests.cpp from the build -->
23+
<!-- <ClCompile Include="..\..\src\wallet\test\psbt_wallet_tests.cpp" /> -->
24+
<ClCompile Include="..\..\src\wallet\test\scriptpubkeyman_tests.cpp" />
25+
<ClCompile Include="..\..\src\wallet\test\spend_tests.cpp" />
26+
<ClCompile Include="..\..\src\wallet\test\wallet_crypto_tests.cpp" />
27+
<ClCompile Include="..\..\src\wallet\test\walletdb_tests.cpp" />
28+
<ClCompile Include="..\..\src\wallet\test\wallet_tests.cpp" />
29+
<ClCompile Include="..\..\src\wallet\test\wallet_transaction_tests.cpp" />
1930
<ClCompile Include="..\..\src\wallet\test\util.cpp" />
2031
<ClCompile Include="..\..\src\primitives\bitcoin\transaction.cpp" />
2132
</ItemGroup>

‎ci/test/00_setup_env_i686_centos.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ export LC_ALL=C.UTF-8
88

99
export HOST=i686-pc-linux-gnu
1010
export CONTAINER_NAME=ci_i686_centos
11-
export DOCKER_NAME_TAG=quay.io/centos/centos:stream8
11+
export DOCKER_NAME_TAG=quay.io/rockylinux/rockylinux:8
1212
export DOCKER_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison"
13-
export PIP_PACKAGES="pyzmq"
1413
export GOAL="install"
1514
export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports"
1615
export CONFIG_SHELL="/bin/dash"

‎ci/test/00_setup_env_native_tsan.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_tsan
10-
export DOCKER_NAME_TAG=ubuntu:22.04
11-
export PACKAGES="clang-13 llvm-13 libc++abi-13-dev libc++-13-dev python3-zmq"
12-
export DEP_OPTS="CC=clang-13 CXX='clang++-13 -stdlib=libc++'"
10+
export DOCKER_NAME_TAG="docker.io/ubuntu:24.04"
11+
export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libc++abi-18-dev libc++-18-dev python3-zmq"
12+
export DEP_OPTS="CC=clang-18 CXX='clang++-18 -stdlib=libc++'"
1313
export GOAL="install"
14-
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread CC=clang-13 CXX='clang++-13 -stdlib=libc++'"
14+
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread"

‎ci/test/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
5858
CI_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH"
5959
fi
6060

61-
if [[ $DOCKER_NAME_TAG == *centos* ]]; then
61+
if [[ $DOCKER_NAME_TAG == *centos* ]] || [[ $DOCKER_NAME_TAG == *rocky* ]]; then
6262
${CI_RETRY_EXE} CI_EXEC dnf -y install epel-release
6363
${CI_RETRY_EXE} CI_EXEC dnf -y --allowerasing install "$DOCKER_PACKAGES" "$PACKAGES"
6464
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then

‎ci/test/05_before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if [ -n "$ANDROID_HOME" ] && [ ! -d "$ANDROID_HOME" ]; then
3737
fi
3838

3939
if [ -z "$NO_DEPENDS" ]; then
40-
if [[ $DOCKER_NAME_TAG == *centos* ]]; then
40+
if [[ $DOCKER_NAME_TAG == *centos* ]] || [[ $DOCKER_NAME_TAG == *rocky* ]]; then
4141
# CentOS has problems building the depends if the config shell is not explicitly set
4242
# (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to
4343
# an error as the first command is executed)

‎depends/packages/boost.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package=boost
2-
$(package)_version=1.80.0
3-
$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/
4-
$(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2
5-
$(package)_sha256_hash=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
2+
$(package)_version=1.81.0
3+
$(package)_download_path=https://archives.boost.io/release/$($(package)_version)/source/
4+
$(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.gz
5+
$(package)_sha256_hash=205666dea9f6a7cfed87c7a6dfbeb52a2c1b9de55712c9c1a87735d7181452b6
66

77
define $(package)_stage_cmds
88
mkdir -p $($(package)_staging_prefix_dir)/include && \

‎depends/packages/xcb_proto.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package=xcb_proto
2-
$(package)_version=1.14.1
2+
$(package)_version=1.15.2
33
$(package)_download_path=https://xorg.freedesktop.org/archive/individual/proto
44
$(package)_file_name=xcb-proto-$($(package)_version).tar.xz
5-
$(package)_sha256_hash=f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3
5+
$(package)_sha256_hash=7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed
66

77
define $(package)_config_cmds
88
$($(package)_autoconf)

‎src/mapport.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,11 @@ static bool ProcessUpnp()
168168
struct UPNPUrls urls;
169169
struct IGDdatas data;
170170
int r;
171-
171+
#if MINIUPNPC_API_VERSION <= 17
172172
r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
173+
#else
174+
r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), nullptr, 0);
175+
#endif
173176
if (r == 1)
174177
{
175178
if (fDiscover) {

0 commit comments

Comments
 (0)