Merge pull request #103 from MarkLTZ/2.1.0

Changes for v2.1.0-rc1

.cargo/config.toml.in

@@ -0,0 +1,29 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source."https://github.com/gtank/blake2-rfc"]
+git = "https://github.com/gtank/blake2-rfc"
+rev = "7a5b5fc99ae483a0043db7547fb79a6fa44b88a9"
+replace-with = "vendored-sources"
+
+[source."https://github.com/zcash-hackworks/sapling-crypto"]
+git = "https://github.com/zcash-hackworks/sapling-crypto"
+rev = "21084bde2019c04bd34208e63c3560fe2c02fb0e"
+replace-with = "vendored-sources"
+
+[source."https://github.com/zcash-hackworks/zip32"]
+git = "https://github.com/zcash-hackworks/zip32"
+rev = "176470ef41583b5bd0bd749bd1b61d417aa8ec79"
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "@RUST_VENDORED_SOURCES@"
+
+[target.x86_64-unknown-linux-gnu]
+linker = "gcc"
+
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+
+[target.x86_64-pc-windows-gnu]
+linker = "x86_64-w64-mingw32-gcc"

.gitignore

@@ -37,6 +37,7 @@ src/config/bitcoin-config.h
 src/config/bitcoin-config.h.in
 src/config/stamp-h1
 share/setup.nsi
+share/Info.plist
 
 cache/
 venv-mnf/
@@ -55,6 +56,7 @@ src/univalue/gen
 *.o-*
 .bitcoinz
 *.a
+*.lib
 *.pb.cc
 *.pb.h
 .vscode
@@ -66,10 +68,19 @@ src/univalue/gen
 *.json.h
 *.raw.h
 
+# Only ignore unexpected patches
+*.patch
+!contrib/guix/patches/*.patch
+!depends/patches/**/*.patch
+
 #libtool object files
 *.lo
 *.la
 
+# Rust
+.cargo/config.toml
+src/rust/target/
+
 # Compilation
 src/Makefile
 doc/man/Makefile
@@ -109,7 +120,7 @@ qa/pull-tester/test.*/*
 
 /doc/doxygen/
 
-libzcashconsensus.pc
+contrib/devtools/split-debug.sh
 
 contrib/debian/files
 contrib/debian/substvars
@@ -122,3 +133,5 @@ src/fuzz.cpp
 
 src/zcash/CreateJoinSplit
 src/zcash/GenerateParams
+
+/guix-build-*