Merge #51: Move to using git subtree with --squash

aeabad8 Cut over to using the bitcoin core subtree (Tobin C. Harding)
f751613 Squashed 'depend/bitcoin/' content from commit 204cc0f (Tobin C. Harding)
d67852c Move bitcoin submodule to tmp/bitcoin (Tobin C. Harding)

Pull request description:

  Same as #49 but uses `--squash`. Done to see if its better, obviously we do not want to merge both, one should be closed in favour of the other.

  Add a git subtree, I could not get the git subtree add command to use a commit hash so I used a tag - this led me to using v0.19.2 instead of the commit hash we are currently on (six commits after tag v0.19.0).

  Includes docs in the README and a version bump so this can be merged and release directly if so desired.

Top commit has no ACKs.

Tree-SHA512: f93caf6a13cd50c528c4d34371b79ef0706358c2fd479ffbbcd1a9bcd62bcf12e9abb956d22d3578c145be18da99398528be7b4d2ae07e97a482a9bf5482735a

Author: tcharding

.gitmodules

@@ -1,7 +1,7 @@
 [package]
 name = "bitcoinconsensus"
 # The first part is the Bitcoin Core version, the second part is the version of this lib.
-version = "0.19.0-0.4.0"
+version = "0.19.2-0.4.1"
 authors = ["Tamas Blummer <tamas.blummer@gmail.com>"]
 license = "Apache-2.0"
 homepage = "https://github.com/rust-bitcoin/rust-bitcoinconsensus/"

Cargo.toml

@@ -18,21 +18,18 @@ The project [rust-secp256k1](https://github.com/rust-bitcoin/rust-secp256k1) off
 This introduces a risk, since a difference between the two secp256k1 sources could break consensus with Bitcoin.
 
 
-## Build
-
-This project has a submodule (the Bitcoin Core sources), you have to clone it using:
-
-`
-git clone --recurse-submodules git@github.com:rust-bitcoin/rust-bitcoinconsensus.git
-`
-
-then build it simple with:
-
-`
-cargo build
-`
-
-I verified the build for Linux and OSX. Aleksey Sidorov contributed the windows build. PRs are welcome to extend support for other platforms.
+## Bitcoin Core subtree
+
+We use a git subtree to vendor the Bitcoin Core code. This can be seen from the following commits that were created using `git subtree add --prefix='depend/bitcoin' git@github.com:bitcoin/bitcoin.git v0.19.2 --squash`.
+```
+f751613e62 Squashed 'depend/bitcoin/' content from commit 204cc0f575
+264282188a Merge commit 'f751613e6203770fa94143b9aba1d116512f0ce7' as 'depend/bitcoin'
+```
+
+To use a later version of Bitcoin Core, for example, v0.20.2
+```
+git subtree pull --prefix='depend/bitcoin' git@github.com:bitcoin/bitcoin.git v0.20.2 --squash
+```
 
 
 ## MSRV

README.md

@@ -0,0 +1,66 @@
+version: '{branch}.{build}'
+skip_tags: true
+image: Visual Studio 2019
+configuration: Release
+platform: x64
+clone_depth: 5
+environment:
+  PATH: 'C:\Python37-x64;C:\Python37-x64\Scripts;%PATH%'
+  PYTHONUTF8: 1
+  QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/v1.6/Qt5.9.8_x64_static_vs2019.zip'
+  QT_DOWNLOAD_HASH: '9a8c6eb20967873785057fdcd329a657c7f922b0af08c5fde105cc597dd37e21'
+  QT_LOCAL_PATH: 'C:\Qt5.9.8_x64_static_vs2019'
+  VCPKG_INSTALL_PATH: 'C:\tools\vcpkg\installed'
+  VCPKG_COMMIT_ID: '40230b8e3f6368dcb398d649331be878ca1e9007'
+install:
+# Disable zmq test for now since python zmq library on Windows would cause Access violation sometimes.
+# - cmd: pip install zmq
+# Powershell block below is to install the c++ dependencies via vcpkg. The pseudo code is:
+#    a. Checkout the vcpkg source (including port files) for the specific checkout and build the vcpkg binary,
+#    b. Install the missing packages.
+- ps: |
+      $env:PACKAGES = Get-Content -Path build_msvc\vcpkg-packages.txt
+      Write-Host "vcpkg installing packages: $env:PACKAGES"
+      cd c:\tools\vcpkg
+      $env:GIT_REDIRECT_STDERR = '2>&1' # git is writing non-errors to STDERR when doing git pull. Send to STDOUT instead.
+      git pull origin master > $null
+      git checkout $env:VCPKG_COMMIT_ID
+      git -c advice.detachedHead=false checkout $env:VCPKG_COMMIT_ID
+      .\bootstrap-vcpkg.bat > $null
+      Add-Content "C:\tools\vcpkg\triplets\$env:PLATFORM-windows-static.cmake" "set(VCPKG_BUILD_TYPE release)"
+      .\vcpkg install --triplet $env:PLATFORM-windows-static $env:PACKAGES.split() > $null
+      Write-Host "vcpkg packages installed successfully."
+      .\vcpkg integrate install
+      cd "$env:APPVEYOR_BUILD_FOLDER"
+before_build:
+# Powershell block below is to download and extract the Qt static libraries. The pseudo code is:
+#    a. Download the zip file with the prebuilt Qt static libraries.
+#    b. Check that the downloaded file matches the expected hash.
+#    c. Extract the zip file to the specific destination path expected by the msbuild projects.
+- ps: |
+      Write-Host "Downloading Qt binaries.";
+      Invoke-WebRequest -Uri $env:QT_DOWNLOAD_URL -Out qtdownload.zip;
+      Write-Host "Qt binaries successfully downloaded, checking hash against $env:QT_DOWNLOAD_HASH...";
+      if((Get-FileHash qtdownload.zip).Hash -eq $env:QT_DOWNLOAD_HASH) {
+        Expand-Archive qtdownload.zip -DestinationPath $env:QT_LOCAL_PATH;
+        Write-Host "Qt binary download matched the expected hash.";
+      }
+      else {
+        Write-Host "ERROR: Qt binary download did not match the expected hash.";
+        Exit-AppveyorBuild;
+      }
+- cmd: python build_msvc\msvc-autogen.py
+build_script:
+- cmd: msbuild /p:TrackFileAccess=false build_msvc\bitcoin.sln /m /v:q /nologo
+after_build:
+#- 7z a bitcoin-%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\build_msvc\%platform%\%configuration%\*.exe
+test_script:
+- cmd: src\test_bitcoin.exe -k stdout -e stdout 2> NUL
+- cmd: src\bench_bitcoin.exe -evals=1 -scaling=0 > NUL
+- ps:  python test\util\bitcoin-util-test.py
+- cmd: python test\util\rpcauth-test.py
+# Fee estimation test failing on appveyor with: WinError 10048] Only one usage of each socket address (protocol/network address/port) is normally permitted.
+- cmd: python test\functional\test_runner.py --ci --quiet --combinedlogslen=4000 --failfast --exclude feature_fee_estimation
+artifacts:
+#- path: bitcoin-%APPVEYOR_BUILD_VERSION%.zip
+deploy: off

depend/bitcoin

@@ -0,0 +1,25 @@
+task:
+  name: "x86_64 Linux  [GOAL: install]  [bionic]  [Using ./ci/ system]"
+  container:
+    image: ubuntu:18.04
+    cpu: 8
+    memory: 8G
+  timeout_in: 60m
+  env:
+    MAKEJOBS: "-j9"
+    RUN_CI_ON_HOST: "1"
+    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
+    CCACHE_SIZE: "200M"
+    CCACHE_DIR: "/tmp/ccache_dir"
+  ccache_cache:
+    folder: "/tmp/ccache_dir"
+  depends_built_cache:
+    folder: "/tmp/cirrus-ci-build/depends/built"
+  depends_sdk_cache:
+    folder: "/tmp/cirrus-ci-build/depends/sdk-sources"
+  install_script:
+    - apt-get update
+    - apt-get -y install git bash ccache
+    - ccache --max-size=${CCACHE_SIZE}
+  ci_script:
+    - ./ci/test_run_all.sh

depend/bitcoin/.appveyor.yml

@@ -0,0 +1 @@
+src/clientversion.cpp export-subst

depend/bitcoin/.cirrus.yml

@@ -0,0 +1,23 @@
+<!-- This issue tracker is only for technical issues related to Bitcoin Core.
+
+General bitcoin questions and/or support requests are best directed to the Bitcoin StackExchange at https://bitcoin.stackexchange.com.
+
+For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.
+
+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! -->
+
+<!-- Describe the issue -->
+<!--- What behavior did you expect? -->
+
+<!--- What was the actual behavior (provide screenshots if the issue is GUI-related)? -->
+
+<!--- How reliably can you reproduce the issue, what are the steps to do so? -->
+
+<!-- What version of Bitcoin Core are you using, where did you get it (website, self-compiled, etc)? -->
+
+<!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->
+
+<!-- GUI-related issue? What is your operating system and its version? If Linux, what is your desktop environment and graphical shell? -->
+
+<!-- Any extra information that might be useful in the debugging process. -->
+<!--- 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. -->

depend/bitcoin/.gitattributes

@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
+<!-- This issue tracker is only for technical issues related to Bitcoin Core.
+
+General bitcoin questions and/or support requests are best directed to the Bitcoin StackExchange at https://bitcoin.stackexchange.com.
+
+For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.
+
+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! -->
+
+<!-- Describe the issue -->
+
+**Expected behavior**
+
+<!--- What behavior did you expect? -->
+
+**Actual behavior**
+
+<!--- What was the actual behavior (provide screenshots if the issue is GUI-related)? -->
+
+**To reproduce**
+
+<!--- How reliably can you reproduce the issue, what are the steps to do so? -->
+
+**System information**
+
+<!-- What version of Bitcoin Core are you using, where did you get it (website, self-compiled, etc)? -->
+
+<!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->
+
+<!-- GUI-related issue? What is your operating system and its version? If Linux, what is your desktop environment and graphical shell? -->
+
+<!-- Any extra information that might be useful in the debugging process. -->
+<!--- 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. -->

depend/bitcoin/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: Feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->