Merge remote-tracking branch 'upstream/master' into develop

Makefile.am

@@ -298,7 +298,10 @@ dist_bin_SCRIPTS = zcutil/fetch-params.sh
 dist_noinst_SCRIPTS = autogen.sh zcutil/build-debian-package.sh zcutil/build.sh zcutil/build-win.sh
 
 CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
-EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/rpc-tests qa/zcash $(DIST_SHARE) $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
+
+RUST_DIST = $(top_srcdir)/.cargo $(top_srcdir)/Cargo.toml $(top_srcdir)/Cargo.lock rust-toolchain
+
+EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/rpc-tests qa/zcash $(DIST_SHARE) $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS) $(RUST_DIST)
 
 install-exec-hook:
 	mv $(DESTDIR)$(bindir)/fetch-params.sh $(DESTDIR)$(bindir)/koto-fetch-params

README.md

@@ -1,4 +1,4 @@
-Koto 2.1.1-1
+Koto 2.1.2
 <img align="right" width="120" height="120" src="doc/imgs/logo.png">
 ===========
 

configure.ac

@@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 51)
+define(_CLIENT_VERSION_REVISION, 2)
+define(_CLIENT_VERSION_BUILD, 50)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
 define(_CLIENT_VERSION_IS_RELEASE, true)

contrib/debian/changelog

@@ -1,3 +1,15 @@
+zcash (2.1.2) stable; urgency=medium
+
+  * 2.1.2 release.
+
+ -- Electric Coin Company <[email protected]>  Wed, 22 Apr 2020 10:46:06 -0600
+
+zcash (2.1.2~rc1) stable; urgency=medium
+
+  * 2.1.2-rc1 release.
+
+ -- Electric Coin Company <[email protected]>  Wed, 15 Apr 2020 17:47:45 -0600
+
 zcash (2.1.1+1) stable; urgency=critical
 
   * 2.1.1-1 release.

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "koto-2.1.1-1"
+name: "koto-2.1.2"
 enable_cache: true
 suites:
 - "bionic"

contrib/gitian-descriptors/gitian-osx.yml

@@ -1,5 +1,5 @@
 ---
-name: "koto-osx-2.1.1-1"
+name: "koto-osx-2.1.2"
 enable_cache: true
 suites:
 - "bionic"

contrib/gitian-descriptors/gitian-win.yml

@@ -1,5 +1,5 @@
 ---
-name: "koto-win-2.1.1-1"
+name: "koto-win-2.1.2"
 enable_cache: true
 suites:
 - "bionic"

doc/authors.md

@@ -1,63 +1,70 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (925)
+Jack Grigg (1020)
 Simon Liu (460)
-Sean Bowe (291)
-Eirik Ogilvie-Wigley (212)
-Daira Hopwood (155)
-Wladimir J. van der Laan (89)
+Sean Bowe (306)
+Eirik Ogilvie-Wigley (214)
+Daira Hopwood (180)
+Taylor Hornby (99)
+Marshall Gaucher (99)
+Wladimir J. van der Laan (96)
 Jay Graber (89)
-Taylor Hornby (84)
 Jonas Schnelli (71)
-Pieter Wuille (63)
+Pieter Wuille (66)
+Alfredo Garcia (59)
 Nathan Wilcox (56)
-Larry Ruane (41)
+Larry Ruane (43)
+Cory Fields (41)
 Kevin Gallagher (38)
-Cory Fields (38)
 Marco Falke (31)
-Marshall Gaucher (25)
-Matt Corallo (23)
-Alfredo Garcia (19)
+Matt Corallo (25)
+Dimitris Apostolou (21)
 Jonathan "Duke" Leto (17)
 Luke Dashjr (16)
 syd (15)
+avnish (14)
 Jorge Timón (14)
-Dimitris Apostolou (13)
+Gregory Maxwell (12)
 Paige Peterson (11)
 Ariel Gabizon (11)
+practicalswift (9)
 nomnombtc (9)
 Benjamin Winston (9)
 kozyilmaz (8)
 fanquake (8)
 Peter Todd (8)
-Gregory Maxwell (8)
+Pavel Janík (7)
 Jeff Garzik (7)
 Charlie O'Keefe (7)
 Marius Kjærstad (6)
+Karl-Johan Alm (6)
 David Mercer (6)
 Daniel Cousens (6)
+ca333 (5)
 Suhas Daftuar (5)
-Karl-Johan Alm (5)
+Philip Kaufmann (5)
+Patrick Strateman (5)
 Johnathan Corgan (5)
+Gavin Andresen (5)
 Gareth Davies (5)
 Alex Morcos (5)
 sandakersmann (4)
+gladcow (4)
 WO (4)
-Philip Kaufmann (4)
-Pavel Janík (4)
-Patrick Strateman (4)
 João Barbosa (4)
+Jeremy Rubin (4)
+James O'Beirne (4)
 George Tankersley (4)
 Daniel Kraft (4)
+zancas (3)
 lpescher (3)
-ca333 (3)
 Per Grön (3)
 Patick Strateman (3)
+NikVolf (3)
+MeshCollider (3)
 Jim Posen (3)
 Jason Davies (3)
-James O'Beirne (3)
-Gavin Andresen (3)
 Alfie John (3)
 rofl0r (2)
 mruddy (2)
@@ -76,7 +83,10 @@ Kaz Wesley (2)
 Joe Turgeon (2)
 Jack Gavigan (2)
 ITH4Coinomia (2)
+Evan Klitzke (2)
+Dagur Valberg Johannsson (2)
 Casey Rodarmor (2)
+Carl Dong (2)
 Bryant Eisenbach (2)
 Brad Miller (2)
 Bjorn Hjortsberg (2)
@@ -85,7 +95,8 @@ Alex Tsankov (2)
 zathras-crypto (1)
 unsystemizer (1)
 tpantin (1)
-practicalswift (1)
+ptschip (1)
+murrayn (1)
 mrbandrews (1)
 kazcw (1)
 jeff-liang (1)
@@ -98,7 +109,9 @@ daniel (1)
 codetriage-readme-bot (1)
 calebogden (1)
 ayleph (1)
+avnish98 (1)
 Za Wilcox (1)
+Yuri Zhykin (1)
 William M Peaster (1)
 Ulrich Kempken (1)
 Tom Ritter (1)
@@ -114,6 +127,7 @@ Peter Pratscher (1)
 Pedro Branco (1)
 Paul Georgiou (1)
 Paragon Initiative Enterprises, LLC (1)
+NicolasDorier (1)
 Nicolas DORIER (1)
 Nathaniel Mahieu (1)
 Murilo Santana (1)
@@ -122,12 +136,12 @@ Maxwell Gubler (1)
 Matt Quinn (1)
 Mark Friedenbach (1)
 Louis Nyffenegger (1)
+LitecoinZ (1)
 Leo Arias (1)
 Lauda (1)
 Lars-Magnus Skog (1)
 Kevin Pan (1)
 Jonas Nick (1)
-Jeremy Rubin (1)
 Jeffrey Walton (1)
 Jainan-Tandel (1)
 Ian T (1)
@@ -141,10 +155,9 @@ Ethan Heilman (1)
 Eran Tromer (1)
 Denis Lukianov (1)
 David Llop (1)
-Dagur Valberg Johannsson (1)
+Chun Kuan Lee (1)
 Christian von Roques (1)
 Chirag Davé (1)
-Carl Dong (1)
 Cameron Boehmer (1)
 Bryan Stitt (1)
 Bruno Arueira (1)

doc/man/koto-cli.1

@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.11.
-.TH KOTO-CLI "1" "February 2020" "koto-cli v2.1.1-1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
+.TH KOTO-CLI "1" "April 2020" "koto-cli v2.1.2" "User Commands"
 .SH NAME
-koto-cli \- manual page for koto-cli v2.1.1-1
+koto-cli \- manual page for koto-cli v2.1.2
 .SH DESCRIPTION
-Koto RPC client version v2.1.1\-1
+Koto RPC client version v2.1.2
 .PP
 In order to ensure you are adequately protecting your privacy when using Koto,
 please see <https://z.cash/support/security/>.

doc/man/koto-qt.1

@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH KOTO-QT "1" "November 2019" "koto-qt v2.1.0-1" "User Commands"
+.TH KOTO-QT "1" "April 2020" "koto-qt v2.1.2" "User Commands"
 .SH NAME
-koto-qt \- manual page for koto-qt v2.1.0-1
+koto-qt \- manual page for koto-qt v2.1.2
 .SH DESCRIPTION
-Koto version v2.1.0\-1 (64\-bit)
+Koto version v2.1.2 (64\-bit)
 Usage:
 .IP
 koto\-qt [command\-line options]

doc/man/koto-tx.1

@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.11.
-.TH KOTO-TX "1" "February 2020" "koto-tx v2.1.1-1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
+.TH KOTO-TX "1" "April 2020" "koto-tx v2.1.2" "User Commands"
 .SH NAME
-koto-tx \- manual page for koto-tx v2.1.1-1
+koto-tx \- manual page for koto-tx v2.1.2
 .SH DESCRIPTION
-Koto koto\-tx utility version v2.1.1\-1
+Koto koto\-tx utility version v2.1.2
 .SS "Usage:"
 .TP
 koto\-tx [options] <hex\-tx> [commands]

doc/man/kotod.1

@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.11.
-.TH KOTOD "1" "February 2020" "kotod v2.1.1-1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
+.TH KOTOD "1" "April 2020" "kotod v2.1.2" "User Commands"
 .SH NAME
-kotod \- manual page for kotod v2.1.1-1
+kotod \- manual page for kotod v2.1.2
 .SH DESCRIPTION
-Koto Daemon version v2.1.1\-1
+Koto Daemon version v2.1.2
 .PP
 In order to ensure you are adequately protecting your privacy when using Koto,
 please see <https://z.cash/support/security/>.
@@ -67,12 +67,6 @@ Imports blocks from external blk000??.dat file on startup
 .IP
 Keep at most <n> unconnectable transactions in memory (default: 100)
 .HP
-\fB\-maxtimeadjustment=\fR<n>
-.IP
-Maximum allowed median peer time offset adjustment, in seconds. Local
-perspective of time may be influenced by peers forward or backward by
-this amount. (default: 0 seconds, maximum: 1500 seconds)
-.HP
 \fB\-par=\fR<n>
 .IP
 Set the number of script verification threads (\fB\-16\fR to 16, 0 = auto, <0 =
@@ -99,6 +93,11 @@ Rebuild block chain index from current blk000??.dat files on startup
 Create new files with system default permissions, instead of umask 077
 (only effective with disabled wallet functionality)
 .HP
+\fB\-txexpirynotify=\fR<cmd>
+.IP
+Execute command when transaction expires (%s in cmd is replaced by
+transaction id)
+.HP
 \fB\-txindex\fR
 .IP
 Maintain a full transaction index, used by the getrawtransaction rpc
@@ -346,7 +345,8 @@ optional). If <category> is not supplied or if <category> = 1, output
 all debugging information. <category> can be: addrman, alert, bench,
 coindb, db, estimatefee, http, libevent, lock, mempool, net,
 partitioncheck, pow, proxy, prune, rand, reindex, rpc, selectcoins, tor,
-zmq, zrpc, zrpcunsafe (implies zrpc).
+zmq, zrpc, zrpcunsafe (implies zrpc). For multiple specific categories
+use \fB\-debug=\fR<category> multiple times.
 .HP
 \fB\-experimentalfeatures\fR
 .IP