Skip to content

Commit 0158436

Browse files
committed
Merge branch 'auxpow'
Updated Namecoin code with name-specific script verify flags for the upstream refactoring to the script_verify_flags class.
2 parents c2f9e4d + a124ae5 commit 0158436

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+828
-315
lines changed

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ body:
7878
id: os
7979
attributes:
8080
label: Operating system and version
81-
placeholder: e.g. "MacOS Ventura 13.2" or "Ubuntu 22.04 LTS"
81+
placeholder: e.g. "MacOS 26.0" or "Ubuntu 26.04 LTS"
8282
validations:
8383
required: true
8484
- type: textarea
@@ -90,4 +90,3 @@ body:
9090
e.g. OS/CPU and disk type, network connectivity
9191
validations:
9292
required: false
93-

.github/actions/configure-environment/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717
- name: Set cache hashes
1818
shell: bash
1919
run: |
20-
echo "DEPENDS_HASH=$(git ls-tree HEAD depends "ci/test/$FILE_ENV" | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
20+
echo "DEPENDS_HASH=$(git ls-tree HEAD depends "$FILE_ENV" | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
2121
echo "PREVIOUS_RELEASES_HASH=$(git ls-tree HEAD test/get_previous_releases.py | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
2222
2323
- name: Get container name

.github/workflows/ci.yml

Lines changed: 50 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
name: ${{ matrix.job-name }}
106106
# Use any image to support the xcode-select below, but hardcode version to avoid silent upgrades (and breaks).
107107
# See: https://github.com/actions/runner-images#available-images.
108-
runs-on: macos-14
108+
runs-on: macos-15
109109

110110
# When a contributor maintains a fork of the repo, any pull request they make
111111
# to their own fork, or to the main repository, will trigger two CI runs:
@@ -123,10 +123,10 @@ jobs:
123123
include:
124124
- job-type: standard
125125
file-env: './ci/test/00_setup_env_mac_native.sh'
126-
job-name: 'macOS 14 native, arm64, no depends, sqlite only, gui'
126+
job-name: 'macOS native, no depends, sqlite only, gui'
127127
- job-type: fuzz
128128
file-env: './ci/test/00_setup_env_mac_native_fuzz.sh'
129-
job-name: 'macOS 14 native, arm64, fuzz'
129+
job-name: 'macOS native, fuzz'
130130

131131
env:
132132
DANGER_RUN_CI_ON_HOST: 1
@@ -145,8 +145,8 @@ jobs:
145145
# Use the earliest Xcode supported by the version of macOS denoted in
146146
# doc/release-notes-empty-template.md and providing at least the
147147
# minimum clang version denoted in doc/dependencies.md.
148-
# See: https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes
149-
sudo xcode-select --switch /Applications/Xcode_15.0.app
148+
# See: https://developer.apple.com/documentation/xcode-release-notes/xcode-16-release-notes
149+
sudo xcode-select --switch /Applications/Xcode_16.0.app
150150
clang --version
151151
152152
- name: Install Homebrew packages
@@ -211,11 +211,16 @@ jobs:
211211
steps:
212212
- *CHECKOUT
213213

214-
- name: Configure Developer Command Prompt for Microsoft Visual C++
215-
# Using microsoft/setup-msbuild is not enough.
216-
uses: ilammy/msvc-dev-cmd@v1
217-
with:
218-
arch: x64
214+
- &SET_UP_VS
215+
name: Set up VS Developer Prompt
216+
shell: pwsh -Command "$PSVersionTable; $PSNativeCommandUseErrorActionPreference = $true; $ErrorActionPreference = 'Stop'; & '{0}'"
217+
run: |
218+
$vswherePath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
219+
$installationPath = & $vswherePath -latest -property installationPath
220+
& "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -arch=x64 -no_logo && set" | foreach-object {
221+
$name, $value = $_ -split '=', 2
222+
echo "$name=$value" >> $env:GITHUB_ENV
223+
}
219224
220225
- name: Get tool information
221226
shell: pwsh
@@ -263,14 +268,26 @@ jobs:
263268
run: |
264269
cmake --build . -j $NUMBER_OF_PROCESSORS --config Release
265270
266-
- name: Get bitcoind manifest
271+
- name: Check executable manifests
267272
if: matrix.job-type == 'standard'
268273
working-directory: build
274+
shell: pwsh -Command "$PSVersionTable; $PSNativeCommandUseErrorActionPreference = $true; $ErrorActionPreference = 'Stop'; & '{0}'"
269275
run: |
270-
mt.exe -nologo -inputresource:bin/Release/bitcoind.exe -out:bitcoind.manifest
271-
cat bitcoind.manifest
272-
echo
273-
mt.exe -nologo -inputresource:bin/Release/bitcoind.exe -validate_manifest
276+
mt.exe -nologo -inputresource:bin\Release\bitcoind.exe -out:bitcoind.manifest
277+
Get-Content bitcoind.manifest
278+
279+
Get-ChildItem -Filter "bin\Release\*.exe" | ForEach-Object {
280+
$exeName = $_.Name
281+
282+
# Skip as they currently do not have manifests
283+
if ($exeName -eq "fuzz.exe" -or $exeName -eq "bench_bitcoin.exe" -or $exeName -eq "test_bitcoin-qt.exe") {
284+
Write-Host "Skipping $exeName (no manifest present)"
285+
return
286+
}
287+
288+
Write-Host "Checking $exeName"
289+
& mt.exe -nologo -inputresource:$_.FullName -validate_manifest
290+
}
274291
275292
- name: Run test suite
276293
if: matrix.job-type == 'standard'
@@ -363,26 +380,33 @@ jobs:
363380
- *CHECKOUT
364381

365382
- name: Download built executables
366-
uses: actions/download-artifact@v4
383+
uses: actions/download-artifact@v5
367384
with:
368385
name: x86_64-w64-mingw32-executables-${{ github.run_id }}
369386

370387
- name: Run bitcoind.exe
371388
run: ./bin/bitcoind.exe -version
372389

373-
- name: Find mt.exe tool
374-
shell: pwsh
375-
run: |
376-
$sdk_dir = (Get-ItemProperty 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows Kits\Installed Roots' -Name KitsRoot10).KitsRoot10
377-
$sdk_latest = (Get-ChildItem "$sdk_dir\bin" -Directory | Where-Object { $_.Name -match '^\d+\.\d+\.\d+\.\d+$' } | Sort-Object Name -Descending | Select-Object -First 1).Name
378-
"MT_EXE=${sdk_dir}bin\${sdk_latest}\x64\mt.exe" >> $env:GITHUB_ENV
390+
- *SET_UP_VS
379391

380-
- name: Get bitcoind manifest
381-
shell: pwsh
392+
- name: Check executable manifests
393+
shell: pwsh -Command "$PSVersionTable; $PSNativeCommandUseErrorActionPreference = $true; $ErrorActionPreference = 'Stop'; & '{0}'"
382394
run: |
383-
& $env:MT_EXE -nologo -inputresource:bin\bitcoind.exe -out:bitcoind.manifest
395+
mt.exe -nologo -inputresource:bin\bitcoind.exe -out:bitcoind.manifest
384396
Get-Content bitcoind.manifest
385-
& $env:MT_EXE -nologo -inputresource:bin\bitcoind.exe -validate_manifest
397+
398+
Get-ChildItem -Filter "bin\*.exe" | ForEach-Object {
399+
$exeName = $_.Name
400+
401+
# Skip as they currently do not have manifests
402+
if ($exeName -eq "fuzz.exe" -or $exeName -eq "bench_bitcoin.exe") {
403+
Write-Host "Skipping $exeName (no manifest present)"
404+
return
405+
}
406+
407+
Write-Host "Checking $exeName"
408+
& mt.exe -nologo -inputresource:$_.FullName -validate_manifest
409+
}
386410
387411
- name: Run unit tests
388412
# Can't use ctest here like other jobs as we don't have a CMake build tree.

contrib/guix/symbol-check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def check_MACHO_libraries(binary) -> bool:
248248
return ok
249249

250250
def check_MACHO_min_os(binary) -> bool:
251-
if binary.build_version.minos == [13,0,0]:
251+
if binary.build_version.minos == [14,0,0]:
252252
return True
253253
return False
254254

depends/funcs.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ define fetch_file_inner
3636
endef
3737

3838
define fetch_file
39-
( test -f $$($(1)_source_dir)/$(4) || \
4039
( $(call fetch_file_inner,$(1),$(2),$(3),$(4),$(5)) || \
41-
$(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5))))
40+
$(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5)))
4241
endef
4342

4443
# Shell script to create a source tarball in $(1)_source from local directory
@@ -247,7 +246,6 @@ endif
247246
$($(1)_fetched):
248247
mkdir -p $$(@D) $(SOURCES_PATH)
249248
rm -f $$@
250-
touch $$@
251249
cd $$(@D); $($(1)_fetch_cmds)
252250
cd $($(1)_source_dir); $(foreach source,$($(1)_all_sources),$(build_SHA256SUM) $(source) >> $$(@);)
253251
touch $$@

depends/hosts/darwin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OSX_MIN_VERSION=13.0
1+
OSX_MIN_VERSION=14.0
22
OSX_SDK_VERSION=14.0
33
XCODE_VERSION=15.0
44
XCODE_BUILD_ID=15A240d

doc/developer-notes.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,6 +1119,19 @@ to check a subtree directory for consistency with its upstream repository.
11191119

11201120
The tool instructions also include a list of the subtrees managed by Bitcoin Core.
11211121

1122+
To fully verify or update a subtree, add it as a remote:
1123+
1124+
```sh
1125+
git remote add libmultiprocess https://github.com/bitcoin-core/libmultiprocess.git
1126+
```
1127+
1128+
To update the subtree:
1129+
1130+
```sh
1131+
git fetch libmultiprocess
1132+
git subtree pull --prefix=src/ipc/libmultiprocess libmultiprocess master --squash
1133+
```
1134+
11221135
The ultimate upstream of the few externally managed subtrees are:
11231136

11241137
- src/leveldb

doc/release-notes-empty-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Compatibility
3636
==============
3737

3838
Bitcoin Core is supported and tested on operating systems using the
39-
Linux Kernel 3.17+, macOS 13+, and Windows 10+. Bitcoin
39+
Linux Kernel 3.17+, macOS 14+, and Windows 10+. Bitcoin
4040
Core should also work on most other Unix-like systems but is not as
4141
frequently tested on them. It is not recommended to use Bitcoin Core on
4242
unsupported systems.

share/qt/Info.plist.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="0.9">
44
<dict>
55
<key>LSMinimumSystemVersion</key>
6-
<string>13</string>
6+
<string>14</string>
77

88
<key>LSArchitecturePriority</key>
99
<array>

src/bench/verify_script.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static void VerifyScriptBench(benchmark::Bench& bench)
2424
{
2525
ECC_Context ecc_context{};
2626

27-
const uint32_t flags{SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH};
27+
const script_verify_flags flags{SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH};
2828
const int witnessversion = 0;
2929

3030
// Key pair.

0 commit comments

Comments
 (0)