Skip to content

Commit 2642821

Browse files
committed
Merge commit 'f751613e6203770fa94143b9aba1d116512f0ce7' as 'depend/bitcoin'
2 parents d67852c + f751613 commit 2642821

File tree

1,762 files changed

+490021
-0
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,762 files changed

+490021
-0
lines changed

depend/bitcoin/.appveyor.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
version: '{branch}.{build}'
2+
skip_tags: true
3+
image: Visual Studio 2019
4+
configuration: Release
5+
platform: x64
6+
clone_depth: 5
7+
environment:
8+
PATH: 'C:\Python37-x64;C:\Python37-x64\Scripts;%PATH%'
9+
PYTHONUTF8: 1
10+
QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/v1.6/Qt5.9.8_x64_static_vs2019.zip'
11+
QT_DOWNLOAD_HASH: '9a8c6eb20967873785057fdcd329a657c7f922b0af08c5fde105cc597dd37e21'
12+
QT_LOCAL_PATH: 'C:\Qt5.9.8_x64_static_vs2019'
13+
VCPKG_INSTALL_PATH: 'C:\tools\vcpkg\installed'
14+
VCPKG_COMMIT_ID: '40230b8e3f6368dcb398d649331be878ca1e9007'
15+
install:
16+
# Disable zmq test for now since python zmq library on Windows would cause Access violation sometimes.
17+
# - cmd: pip install zmq
18+
# Powershell block below is to install the c++ dependencies via vcpkg. The pseudo code is:
19+
# a. Checkout the vcpkg source (including port files) for the specific checkout and build the vcpkg binary,
20+
# b. Install the missing packages.
21+
- ps: |
22+
$env:PACKAGES = Get-Content -Path build_msvc\vcpkg-packages.txt
23+
Write-Host "vcpkg installing packages: $env:PACKAGES"
24+
cd c:\tools\vcpkg
25+
$env:GIT_REDIRECT_STDERR = '2>&1' # git is writing non-errors to STDERR when doing git pull. Send to STDOUT instead.
26+
git pull origin master > $null
27+
git checkout $env:VCPKG_COMMIT_ID
28+
git -c advice.detachedHead=false checkout $env:VCPKG_COMMIT_ID
29+
.\bootstrap-vcpkg.bat > $null
30+
Add-Content "C:\tools\vcpkg\triplets\$env:PLATFORM-windows-static.cmake" "set(VCPKG_BUILD_TYPE release)"
31+
.\vcpkg install --triplet $env:PLATFORM-windows-static $env:PACKAGES.split() > $null
32+
Write-Host "vcpkg packages installed successfully."
33+
.\vcpkg integrate install
34+
cd "$env:APPVEYOR_BUILD_FOLDER"
35+
before_build:
36+
# Powershell block below is to download and extract the Qt static libraries. The pseudo code is:
37+
# a. Download the zip file with the prebuilt Qt static libraries.
38+
# b. Check that the downloaded file matches the expected hash.
39+
# c. Extract the zip file to the specific destination path expected by the msbuild projects.
40+
- ps: |
41+
Write-Host "Downloading Qt binaries.";
42+
Invoke-WebRequest -Uri $env:QT_DOWNLOAD_URL -Out qtdownload.zip;
43+
Write-Host "Qt binaries successfully downloaded, checking hash against $env:QT_DOWNLOAD_HASH...";
44+
if((Get-FileHash qtdownload.zip).Hash -eq $env:QT_DOWNLOAD_HASH) {
45+
Expand-Archive qtdownload.zip -DestinationPath $env:QT_LOCAL_PATH;
46+
Write-Host "Qt binary download matched the expected hash.";
47+
}
48+
else {
49+
Write-Host "ERROR: Qt binary download did not match the expected hash.";
50+
Exit-AppveyorBuild;
51+
}
52+
- cmd: python build_msvc\msvc-autogen.py
53+
build_script:
54+
- cmd: msbuild /p:TrackFileAccess=false build_msvc\bitcoin.sln /m /v:q /nologo
55+
after_build:
56+
#- 7z a bitcoin-%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\build_msvc\%platform%\%configuration%\*.exe
57+
test_script:
58+
- cmd: src\test_bitcoin.exe -k stdout -e stdout 2> NUL
59+
- cmd: src\bench_bitcoin.exe -evals=1 -scaling=0 > NUL
60+
- ps: python test\util\bitcoin-util-test.py
61+
- cmd: python test\util\rpcauth-test.py
62+
# Fee estimation test failing on appveyor with: WinError 10048] Only one usage of each socket address (protocol/network address/port) is normally permitted.
63+
- cmd: python test\functional\test_runner.py --ci --quiet --combinedlogslen=4000 --failfast --exclude feature_fee_estimation
64+
artifacts:
65+
#- path: bitcoin-%APPVEYOR_BUILD_VERSION%.zip
66+
deploy: off

depend/bitcoin/.cirrus.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
task:
2+
name: "x86_64 Linux [GOAL: install] [bionic] [Using ./ci/ system]"
3+
container:
4+
image: ubuntu:18.04
5+
cpu: 8
6+
memory: 8G
7+
timeout_in: 60m
8+
env:
9+
MAKEJOBS: "-j9"
10+
RUN_CI_ON_HOST: "1"
11+
TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache
12+
CCACHE_SIZE: "200M"
13+
CCACHE_DIR: "/tmp/ccache_dir"
14+
ccache_cache:
15+
folder: "/tmp/ccache_dir"
16+
depends_built_cache:
17+
folder: "/tmp/cirrus-ci-build/depends/built"
18+
depends_sdk_cache:
19+
folder: "/tmp/cirrus-ci-build/depends/sdk-sources"
20+
install_script:
21+
- apt-get update
22+
- apt-get -y install git bash ccache
23+
- ccache --max-size=${CCACHE_SIZE}
24+
ci_script:
25+
- ./ci/test_run_all.sh

depend/bitcoin/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src/clientversion.cpp export-subst
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!-- This issue tracker is only for technical issues related to Bitcoin Core.
2+
3+
General bitcoin questions and/or support requests are best directed to the Bitcoin StackExchange at https://bitcoin.stackexchange.com.
4+
5+
For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.
6+
7+
If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running memtest and observe CPU temperature with a load-test tool such as linpack before creating an issue! -->
8+
9+
<!-- Describe the issue -->
10+
<!--- What behavior did you expect? -->
11+
12+
<!--- What was the actual behavior (provide screenshots if the issue is GUI-related)? -->
13+
14+
<!--- How reliably can you reproduce the issue, what are the steps to do so? -->
15+
16+
<!-- What version of Bitcoin Core are you using, where did you get it (website, self-compiled, etc)? -->
17+
18+
<!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->
19+
20+
<!-- GUI-related issue? What is your operating system and its version? If Linux, what is your desktop environment and graphical shell? -->
21+
22+
<!-- Any extra information that might be useful in the debugging process. -->
23+
<!--- This is normally the contents of a `debug.log` or `config.log` file. Raw text or a link to a pastebin type site are preferred. -->
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: Bug
6+
assignees: ''
7+
8+
---
9+
10+
<!-- This issue tracker is only for technical issues related to Bitcoin Core.
11+
12+
General bitcoin questions and/or support requests are best directed to the Bitcoin StackExchange at https://bitcoin.stackexchange.com.
13+
14+
For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.
15+
16+
If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running memtest and observe CPU temperature with a load-test tool such as linpack before creating an issue! -->
17+
18+
<!-- Describe the issue -->
19+
20+
**Expected behavior**
21+
22+
<!--- What behavior did you expect? -->
23+
24+
**Actual behavior**
25+
26+
<!--- What was the actual behavior (provide screenshots if the issue is GUI-related)? -->
27+
28+
**To reproduce**
29+
30+
<!--- How reliably can you reproduce the issue, what are the steps to do so? -->
31+
32+
**System information**
33+
34+
<!-- What version of Bitcoin Core are you using, where did you get it (website, self-compiled, etc)? -->
35+
36+
<!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->
37+
38+
<!-- GUI-related issue? What is your operating system and its version? If Linux, what is your desktop environment and graphical shell? -->
39+
40+
<!-- Any extra information that might be useful in the debugging process. -->
41+
<!--- This is normally the contents of a `debug.log` or `config.log` file. Raw text or a link to a pastebin type site are preferred. -->
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: Feature
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
12+
13+
**Describe the solution you'd like**
14+
<!-- A clear and concise description of what you want to happen. -->
15+
16+
**Describe alternatives you've considered**
17+
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
18+
19+
**Additional context**
20+
<!-- Add any other context or screenshots about the feature request here. -->
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!--
2+
*** Please remove the following help text before submitting: ***
3+
4+
Pull requests without a rationale and clear improvement may be closed
5+
immediately.
6+
-->
7+
8+
<!--
9+
Please provide clear motivation for your patch and explain how it improves
10+
Bitcoin Core user experience or Bitcoin Core developer experience
11+
significantly:
12+
13+
* Any test improvements or new tests that improve coverage are always welcome.
14+
* All other changes should have accompanying unit tests (see `src/test/`) or
15+
functional tests (see `test/`). Contributors should note which tests cover
16+
modified code. If no tests exist for a region of modified code, new tests
17+
should accompany the change.
18+
* Bug fixes are most welcome when they come with steps to reproduce or an
19+
explanation of the potential issue as well as reasoning for the way the bug
20+
was fixed.
21+
* Features are welcome, but might be rejected due to design or scope issues.
22+
If a feature is based on a lot of dependencies, contributors should first
23+
consider building the system outside of Bitcoin Core, if possible.
24+
* Refactoring changes are only accepted if they are required for a feature or
25+
bug fix or otherwise improve developer experience significantly. For example,
26+
most "code style" refactoring changes require a thorough explanation why they
27+
are useful, what downsides they have and why they *significantly* improve
28+
developer experience or avoid serious programming bugs. Note that code style
29+
is often a subjective matter. Unless they are explicitly mentioned to be
30+
preferred in the [developer notes](/doc/developer-notes.md), stylistic code
31+
changes are usually rejected.
32+
-->
33+
34+
<!--
35+
Bitcoin Core has a thorough review process and even the most trivial change
36+
needs to pass a lot of eyes and requires non-zero or even substantial time
37+
effort to review. There is a huge lack of active reviewers on the project, so
38+
patches often sit for a long time.
39+
-->

depend/bitcoin/.gitignore

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
*.tar.gz
2+
3+
*.exe
4+
*.pdb
5+
src/bitcoin
6+
src/bitcoind
7+
src/bitcoin-cli
8+
src/bitcoin-tx
9+
src/bitcoin-wallet
10+
src/test/test_bitcoin
11+
src/test/test_bitcoin_fuzzy
12+
src/qt/test/test_bitcoin-qt
13+
14+
# autoreconf
15+
Makefile.in
16+
aclocal.m4
17+
autom4te.cache/
18+
build-aux/config.guess
19+
build-aux/config.sub
20+
build-aux/depcomp
21+
build-aux/install-sh
22+
build-aux/ltmain.sh
23+
build-aux/m4/libtool.m4
24+
build-aux/m4/lt~obsolete.m4
25+
build-aux/m4/ltoptions.m4
26+
build-aux/m4/ltsugar.m4
27+
build-aux/m4/ltversion.m4
28+
build-aux/missing
29+
build-aux/compile
30+
build-aux/test-driver
31+
config.log
32+
config.status
33+
configure
34+
libtool
35+
src/config/bitcoin-config.h
36+
src/config/bitcoin-config.h.in
37+
src/config/stamp-h1
38+
src/obj
39+
share/setup.nsi
40+
share/qt/Info.plist
41+
42+
src/univalue/gen
43+
44+
src/qt/*.moc
45+
src/qt/moc_*.cpp
46+
src/qt/forms/ui_*.h
47+
48+
src/qt/test/moc*.cpp
49+
50+
src/qt/bitcoin-qt.config
51+
src/qt/bitcoin-qt.creator
52+
src/qt/bitcoin-qt.creator.user
53+
src/qt/bitcoin-qt.files
54+
src/qt/bitcoin-qt.includes
55+
56+
.deps
57+
.dirstamp
58+
.libs
59+
.*.swp
60+
*.*~*
61+
*.bak
62+
*.rej
63+
*.orig
64+
*.pyc
65+
*.o
66+
*.o-*
67+
*.a
68+
*.pb.cc
69+
*.pb.h
70+
*.dat
71+
72+
*.log
73+
*.trs
74+
*.dmg
75+
76+
*.json.h
77+
*.raw.h
78+
79+
# Only ignore unexpected patches
80+
*.patch
81+
!depends/patches/**/*.patch
82+
83+
#libtool object files
84+
*.lo
85+
*.la
86+
87+
# Compilation and Qt preprocessor part
88+
*.qm
89+
Makefile
90+
!depends/Makefile
91+
bitcoin-qt
92+
Bitcoin-Qt.app
93+
background.tiff*
94+
95+
# Qt Creator
96+
Makefile.am.user
97+
98+
# Unit-tests
99+
Makefile.test
100+
bitcoin-qt_test
101+
102+
# Resources cpp
103+
qrc_*.cpp
104+
105+
# Mac specific
106+
.DS_Store
107+
build
108+
109+
#lcov
110+
*.gcno
111+
*.gcda
112+
/*.info
113+
test_bitcoin.coverage/
114+
total.coverage/
115+
coverage_percent.txt
116+
117+
#build tests
118+
linux-coverage-build
119+
linux-build
120+
win32-build
121+
test/config.ini
122+
test/cache/*
123+
124+
!src/leveldb*/Makefile
125+
126+
/doc/doxygen/
127+
128+
libbitcoinconsensus.pc
129+
contrib/devtools/split-debug.sh
130+
131+
# Output from running db4 installation
132+
db4/
133+
134+
# clang-check
135+
*.plist
136+
137+
osx_volname
138+
dist/
139+
*.background.tiff

depend/bitcoin/.python-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.5.6

0 commit comments

Comments
 (0)