Skip to content

Commit 5af9417

Browse files
committed
Vendor Bitcoin Core v26.0
Run the vendoring script: `./contrib/vendor-bitcoin-core.sh v26.0`
1 parent 6b71fb6 commit 5af9417

File tree

1,161 files changed

+52998
-30647
lines changed

Some content is hidden

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

1,161 files changed

+52998
-30647
lines changed

depend/bitcoin-HEAD-revision.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file was automatically created by vendor-bitcoin-core.sh
2-
7da4ae1f78ab4f6c8b19c8ca89bd6b2a6c4836ea
2+
44d8b13c81e5276eb610c99f227a4d090cc532f6

depend/bitcoin/.cirrus.yml

Lines changed: 106 additions & 246 deletions
Large diffs are not rendered by default.

depend/bitcoin/.github/ISSUE_TEMPLATE/good_first_issue.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ body:
2929
attributes:
3030
label: Useful Skills
3131
description: For example, “`std::thread`”, “Qt5 GUI and async GUI design” or “basic understanding of Bitcoin mining and the Bitcoin Core RPC interface”.
32-
validations:
33-
required: false
32+
value: |
33+
* Compiling Bitcoin Core from source
34+
* Running the C++ unit tests and the Python functional tests
35+
* ...
3436
- type: textarea
3537
attributes:
3638
label: Guidance for new contributors

depend/bitcoin/.github/workflows/ci.yml

Lines changed: 337 additions & 0 deletions
Large diffs are not rendered by default.

depend/bitcoin/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ src/qt/bitcoin-qt.includes
7474

7575
*.log
7676
*.trs
77-
*.dmg
77+
*.zip
7878

7979
*.json.h
8080
*.raw.h

depend/bitcoin/.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.16
1+
3.8.17

depend/bitcoin/.style.yapf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ each_dict_entry_on_separate_line=True
107107
i18n_comment=
108108

109109
# The i18n function call names. The presence of this function stops
110-
# reformattting on that line, because the string it has cannot be moved
110+
# reformatting on that line, because the string it has cannot be moved
111111
# away from the i18n comment.
112112
i18n_function_call=
113113

depend/bitcoin/.tx/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[o:bitcoin:p:bitcoin:r:qt-translation-025x]
4+
[o:bitcoin:p:bitcoin:r:qt-translation-026x]
55
file_filter = src/qt/locale/bitcoin_<lang>.xlf
66
source_file = src/qt/locale/bitcoin_en.xlf
77
source_lang = en

depend/bitcoin/Makefile.am

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ space := $(empty) $(empty)
3737

3838
OSX_APP=Bitcoin-Qt.app
3939
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
40-
OSX_DMG = $(OSX_VOLNAME).dmg
40+
OSX_ZIP = $(OSX_VOLNAME).zip
4141
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
4242
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
4343
OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
@@ -124,23 +124,24 @@ osx_volname:
124124
echo $(OSX_VOLNAME) >$@
125125

126126
if BUILD_DARWIN
127-
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
128-
$(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR) -dmg
127+
$(OSX_ZIP): $(OSX_APP_BUILT) $(OSX_PACKAGING)
128+
$(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR) -zip
129129

130-
deploydir: $(OSX_DMG)
130+
deploydir: $(OSX_ZIP)
131131
else !BUILD_DARWIN
132132
APP_DIST_DIR=$(top_builddir)/dist
133133

134-
$(OSX_DMG): deploydir
135-
$(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ $(APP_DIST_DIR) -- $(if $(SOURCE_DATE_EPOCH),-volume_date all_file_dates =$(SOURCE_DATE_EPOCH))
134+
$(OSX_ZIP): deploydir
135+
if [ -n "$(SOURCE_DATE_EPOCH)" ]; then find $(APP_DIST_DIR) -exec touch -d @$(SOURCE_DATE_EPOCH) {} +; fi
136+
cd $(APP_DIST_DIR) && find . | sort | $(ZIP) -X@ $@
136137

137138
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
138139
INSTALL_NAME_TOOL=$(INSTALL_NAME_TOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR)
139140

140141
deploydir: $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
141142
endif !BUILD_DARWIN
142143

143-
deploy: $(OSX_DMG)
144+
deploy: $(OSX_ZIP)
144145
endif
145146

146147
$(BITCOIN_QT_BIN): FORCE
@@ -313,7 +314,7 @@ EXTRA_DIST += \
313314
test/util/data/txcreatesignv2.hex \
314315
test/util/rpcauth-test.py
315316

316-
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
317+
CLEANFILES = $(OSX_ZIP) $(BITCOIN_WIN_INSTALLER)
317318

318319
DISTCHECK_CONFIGURE_FLAGS = --enable-man
319320

depend/bitcoin/autogen.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,16 @@ fi
1414
command -v autoreconf >/dev/null || \
1515
(echo "configuration failed, please install autoconf first" && exit 1)
1616
autoreconf --install --force --warnings=all
17+
18+
if expr "'$(build-aux/config.guess --timestamp)" \< "'$(depends/config.guess --timestamp)" > /dev/null; then
19+
chmod ug+w build-aux/config.guess
20+
chmod ug+w src/secp256k1/build-aux/config.guess
21+
cp depends/config.guess build-aux
22+
cp depends/config.guess src/secp256k1/build-aux
23+
fi
24+
if expr "'$(build-aux/config.sub --timestamp)" \< "'$(depends/config.sub --timestamp)" > /dev/null; then
25+
chmod ug+w build-aux/config.sub
26+
chmod ug+w src/secp256k1/build-aux/config.sub
27+
cp depends/config.sub build-aux
28+
cp depends/config.sub src/secp256k1/build-aux
29+
fi

0 commit comments

Comments
 (0)