Cut over to using the bitcoin core subtree

We now have a git subtree for the Bitcoin Core code at `depend/bitcoin`.
Cut over from the `tmp/bitcoin` submodule to the `depend/bitcoin`
subtree.

Please note, this moves the bitcoin repository tip to the tagged release of
the 0.19.2 version instead of the tip used in the current submodule (0.19.0
with a few extra patches). We update the library version appropriately
to 0.19.2-0.4.1

Author: tcharding

.gitmodules

@@ -1,15 +1,15 @@
 [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/"
 repository = "https://github.com/rust-bitcoin/rust-bitcoinconsensus/"
 description = "Bitcoin's libbitcoinconsensus with Rust binding."
 keywords = [ "bitcoin", "bitcoinconsensus", "libbitcoinconsensus" ]
 readme = "README.md"
-exclude = ["/tmp/bitcoin/.github/**", "/tmp/bitcoin/.tx/**", "/tmp/bitcoin/build-aux/**", "/tmp/bitcoin/contrib/**", "/tmp/bitcoin/tmps/**", "/tmp/bitcoin/doc/**", "/tmp/bitcoin/share/**", "/tmp/bitcoin/test/**", "/tmp/bitcoin/src/bench/**", "/tmp/bitcoin/src/config/**", "/tmp/bitcoin/src/consensus/**", "/tmp/bitcoin/src/leveldb/**", "/tmp/bitcoin/src/policy/**", "/tmp/bitcoin/src/qt/**", "/tmp/bitcoin/src/rpc/**", "/tmp/bitcoin/src/support/**", "/tmp/bitcoin/src/test/**", "/tmp/bitcoin/src/univalue/**", "/tmp/bitcoin/src/wallet/**", "/tmp/bitcoin/src/zmq/**"]
+exclude = ["/depend/bitcoin/.github/**", "/depend/bitcoin/.tx/**", "/depend/bitcoin/build-aux/**", "/depend/bitcoin/contrib/**", "/depend/bitcoin/depends/**", "/depend/bitcoin/doc/**", "/depend/bitcoin/share/**", "/depend/bitcoin/test/**", "/depend/bitcoin/src/bench/**", "/depend/bitcoin/src/config/**", "/depend/bitcoin/src/consensus/**", "/depend/bitcoin/src/leveldb/**", "/depend/bitcoin/src/policy/**", "/depend/bitcoin/src/qt/**", "/depend/bitcoin/src/rpc/**", "/depend/bitcoin/src/support/**", "/depend/bitcoin/src/test/**", "/depend/bitcoin/src/univalue/**", "/depend/bitcoin/src/wallet/**", "/depend/bitcoin/src/zmq/**"]
 build = "build.rs"
 edition = "2018"
 

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

@@ -22,14 +22,14 @@ fn main() {
     let mut base_config = cc::Build::new();
     base_config
         .cpp(true)
-        .include("tmp/bitcoin/src")
-        .include("tmp/bitcoin/src/secp256k1/include")
+        .include("depend/bitcoin/src")
+        .include("depend/bitcoin/src/secp256k1/include")
         .define("__STDC_FORMAT_MACROS", None);
 
     // **Secp256k1**
     if !cfg!(feature = "external-secp") {
         base_config
-            .include("tmp/bitcoin/src/secp256k1")
+            .include("depend/bitcoin/src/secp256k1")
             .flag_if_supported("-Wno-unused-function") // some ecmult stuff is defined but not used upstream
             .define("SECP256K1_BUILD", "1")
             // Bitcoin core defines libsecp to *not* use libgmp.
@@ -39,7 +39,7 @@ fn main() {
             // Technically libconsensus doesn't require the recovery feautre, but `pubkey.cpp` does.
             .define("ENABLE_MODULE_RECOVERY", "1")
             // The actual libsecp256k1 C code.
-            .file("tmp/bitcoin/src/secp256k1/src/secp256k1.c");
+            .file("depend/bitcoin/src/secp256k1/src/secp256k1.c");
 
         if is_big_endian {
             base_config.define("WORDS_BIGENDIAN", "1");
@@ -68,19 +68,19 @@ fn main() {
         base_config.define("WIN32", "1");
     }
     base_config
-        .file("tmp/bitcoin/src/util/strencodings.cpp")
-        .file("tmp/bitcoin/src/uint256.cpp")
-        .file("tmp/bitcoin/src/pubkey.cpp")
-        .file("tmp/bitcoin/src/hash.cpp")
-        .file("tmp/bitcoin/src/primitives/transaction.cpp")
-        .file("tmp/bitcoin/src/crypto/ripemd160.cpp")
-        .file("tmp/bitcoin/src/crypto/sha1.cpp")
-        .file("tmp/bitcoin/src/crypto/sha256.cpp")
-        .file("tmp/bitcoin/src/crypto/sha512.cpp")
-        .file("tmp/bitcoin/src/crypto/hmac_sha512.cpp")
-        .file("tmp/bitcoin/src/script/bitcoinconsensus.cpp")
-        .file("tmp/bitcoin/src/script/interpreter.cpp")
-        .file("tmp/bitcoin/src/script/script.cpp")
-        .file("tmp/bitcoin/src/script/script_error.cpp")
+        .file("depend/bitcoin/src/util/strencodings.cpp")
+        .file("depend/bitcoin/src/uint256.cpp")
+        .file("depend/bitcoin/src/pubkey.cpp")
+        .file("depend/bitcoin/src/hash.cpp")
+        .file("depend/bitcoin/src/primitives/transaction.cpp")
+        .file("depend/bitcoin/src/crypto/ripemd160.cpp")
+        .file("depend/bitcoin/src/crypto/sha1.cpp")
+        .file("depend/bitcoin/src/crypto/sha256.cpp")
+        .file("depend/bitcoin/src/crypto/sha512.cpp")
+        .file("depend/bitcoin/src/crypto/hmac_sha512.cpp")
+        .file("depend/bitcoin/src/script/bitcoinconsensus.cpp")
+        .file("depend/bitcoin/src/script/interpreter.cpp")
+        .file("depend/bitcoin/src/script/script.cpp")
+        .file("depend/bitcoin/src/script/script_error.cpp")
         .compile("libbitcoinconsensus.a");
 }