Merge pull request #100 from aayanl/zcl-v1.0.10-1

Merge v1.0.10-1 from zcash

README.md

@@ -1,5 +1,4 @@
-Zclassic v1.0.9
-===========
+Zclassic v1.0.10-1
 
 NOTICE, the default ports have changed! The p2p port is now 8033 and rpcport is 8023
 
@@ -54,7 +53,7 @@ xcode-select --install
 /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 brew install cmake autoconf libtool automake coreutils pkgconfig gmp wget
 
-brew install gcc5 --without-multilib 
+brew install gcc5 --without-multilib
 ```
 
 Install

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 9)
+define(_CLIENT_VERSION_REVISION, 10)
 define(_CLIENT_VERSION_BUILD, 51)
 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)))
@@ -993,7 +993,7 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
 unset PKG_CONFIG_LIBDIR
 PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
 
-ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no"
+ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery"
 AC_CONFIG_SUBDIRS([src/secp256k1 src/univalue])
 
 AC_OUTPUT

contrib/debian/changelog

@@ -1,3 +1,15 @@
+zcash (1.0.10+1) stable; urgency=medium
+
+  * 1.0.10-1 release.
+
+ -- Zcash Company <team@z.cash>  Fri, 23 Jun 2017 19:50:41 -0700
+
+zcash (1.0.10) stable; urgency=medium
+
+  * 1.0.10 release.
+
+ -- Zcash Company <team@z.cash>  Thu, 22 Jun 2017 15:13:04 +1200
+
 zcash (1.0.9) stable; urgency=medium
 
   * 1.0.9 release.

contrib/debian/copyright

@@ -63,6 +63,14 @@ Files: depends/sources/qpid-proton-*.tar.gz
 Copyright: 2012-2017 The Apache Software Foundation
 License: Apache-Qpid-Proton-with-BSD-Subcomponents
 
+Files: src/secp256k1/build-aux/m4/ax_jni_include_dir.m4
+Copyright: 2008 Don Anderson <dda@sleepycat.com>
+License: GNU-All-permissive-License
+
+Files: src/secp256k1/build-aux/m4/ax_prog_cc_for_build.m4
+Copyright: 2008 Paolo Bonzini <bonzini@gnu.org>
+License: GNU-All-permissive-License
+
 License: Boost-Software-License-1.0
  Permission is hereby granted, free of charge, to any person or organization
  obtaining a copy of the software and accompanying documentation covered by
@@ -1312,3 +1320,9 @@ License: Apache-Qpid-Proton-with-BSD-Subcomponents
  conditions in the license:
  proton-c/bindings/python/setuputils/PYZMQ_LICENSE.BSD.
 
+License: GNU-All-permissive-License
+ Copying and distribution of this file, with or without modification, are
+ permitted in any medium without royalty provided the copyright notice
+ and this notice are preserved. This file is offered as-is, without any
+ warranty.
+

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "zcash-1.0.9"
+name: "zcash-1.0.10-1"
 enable_cache: true
 distro: "debian"
 suites:
@@ -85,7 +85,7 @@ script: |
   BASEPREFIX=`pwd`/depends
   # Build dependencies for each host
   for i in $HOSTS; do
-    make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
+    NO_PROTON="x" make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
   done
 
   # Faketime for binaries

depends/Makefile

@@ -5,7 +5,7 @@ BASE_CACHE ?= $(BASEDIR)/built
 SDK_PATH ?= $(BASEDIR)/SDKs
 NO_WALLET ?=
 NO_UPNP ?=
-FALLBACK_DOWNLOAD_PATH ?= https://z.cash/depends-sources
+PRIORITY_DOWNLOAD_PATH ?= https://z.cash/depends-sources
 
 BUILD ?= $(shell ./config.guess)
 HOST ?= $(BUILD)

depends/README.md

@@ -33,7 +33,7 @@ The following can be set when running make: make FOO=bar
     SOURCES_PATH: downloaded sources will be placed here
     BASE_CACHE: built packages will be placed here
     SDK_PATH: Path where sdk's can be found (used by OSX)
-    FALLBACK_DOWNLOAD_PATH: If a source file can't be fetched, try here before giving up
+    PRIORITY_DOWNLOAD_PATH: Try fetching source files from here before using their own URLs
     NO_WALLET: Don't download/build/cache libs needed to enable the wallet
     NO_UPNP: Don't download/build/cache packages needed for enabling upnp
     DEBUG: disable some optimizations and enable more runtime checking

depends/funcs.mk

@@ -22,7 +22,7 @@ endef
 define fetch_file
 (test -f $$($(1)_source_dir)/$(4) || \
   ( mkdir -p $$($(1)_download_dir) && echo Fetching $(1)... && \
-  ( $(build_DOWNLOAD) "$$($(1)_download_dir)/$(4).temp" "$(FALLBACK_DOWNLOAD_PATH)/$(4)" || \
+  ( $(build_DOWNLOAD) "$$($(1)_download_dir)/$(4).temp" "$(PRIORITY_DOWNLOAD_PATH)/$(4)" || \
     $(build_DOWNLOAD) "$$($(1)_download_dir)/$(4).temp" "$(2)/$(3)" ) && \
     echo "$(5)  $$($(1)_download_dir)/$(4).temp" > $$($(1)_download_dir)/.$(4).hash && \
     $(build_SHA256SUM) -c $$($(1)_download_dir)/.$(4).hash && \
@@ -43,6 +43,10 @@ $(eval $(1)_build_id_long:=$(1)-$($(1)_version)-$($(1)_recipe_hash)-$(release_ty
 $(eval $(1)_build_id:=$(shell echo -n "$($(1)_build_id_long)" | $(build_SHA256SUM) | cut -c-$(HASH_LENGTH)))
 final_build_id_long+=$($(package)_build_id_long)
 
+#override platform specific files and hashes
+$(eval $(1)_file_name=$(if $($(1)_file_name_$(host_os)),$($(1)_file_name_$(host_os)),$($(1)_file_name)))
+$(eval $(1)_sha256_hash=$(if $($(1)_sha256_hash_$(host_os)),$($(1)_sha256_hash_$(host_os)),$($(1)_sha256_hash)))
+
 #compute package-specific paths
 $(1)_build_subdir?=.
 $(1)_download_file?=$($(1)_file_name)

depends/packages/rust.mk

@@ -1,8 +1,10 @@
 package=rust
 $(package)_version=1.16.0
 $(package)_download_path=https://static.rust-lang.org/dist
-$(package)_file_name=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
+$(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
+$(package)_sha256_hash_linux=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
+$(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
+$(package)_sha256_hash_darwin=2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926
 
 define $(package)_stage_cmds
   ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig

doc/authors.md

@@ -1,18 +1,18 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (407)
-Simon Liu (259)
-Sean Bowe (186)
-Daira Hopwood (87)
+Jack Grigg (428)
+Simon Liu (266)
+Sean Bowe (188)
+Daira Hopwood (95)
 Taylor Hornby (65)
-Wladimir J. van der Laan (58)
+Wladimir J. van der Laan (60)
 Nathan Wilcox (51)
 Jay Graber (49)
 Jonas Schnelli (48)
 Kevin Gallagher (38)
+Pieter Wuille (16)
 Cory Fields (15)
-Pieter Wuille (14)
 nomnombtc (9)
 Paige Peterson (9)
 fanquake (5)
@@ -28,6 +28,7 @@ Jeff Garzik (4)
 David Mercer (4)
 Daniel Cousens (4)
 lpescher (3)
+kozyilmaz (3)
 Pavel Janík (3)
 Alfie John (3)
 str4d (2)
@@ -65,6 +66,7 @@ Matt Quinn (1)
 Louis Nyffenegger (1)
 Leo Arias (1)
 Lars-Magnus Skog (1)
+Kevin Pan (1)
 Jorge Timón (1)
 Jeffrey Walton (1)
 Ian Kelling (1)
@@ -79,6 +81,7 @@ Chirag Davé (1)
 Casey Rodarmor (1)
 Cameron Boehmer (1)
 Bryan Stitt (1)
+Boris Hajduk (1)
 Bob McElrath (1)
 Bitcoin Error Log (1)
 Allan Niemerg (1)

doc/man/zcash-cli.1

@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH ZCASH-CLI "1" "May 2017" "zcash-cli v1.0.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.TH ZCASH-CLI "1" "June 2017" "zcash-cli v1.0.10-1" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v1.0.9
+zcash-cli \- manual page for zcash-cli v1.0.10-1
 .SH DESCRIPTION
-Zcash RPC client version v1.0.9
+Zcash RPC client version v1.0.10\-1
 .PP
 In order to ensure you are adequately protecting your privacy when using Zclassic,
 please see <https://z.cash/support/security/index.html>.

doc/man/zcash-tx.1

@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH ZCASH-TX "1" "May 2017" "zcash-tx v1.0.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.TH ZCASH-TX "1" "June 2017" "zcash-tx v1.0.10-1" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v1.0.9
+zcash-tx \- manual page for zcash-tx v1.0.10-1
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v1.0.9
+Zcash zcash\-tx utility version v1.0.10\-1
 .SS "Usage:"
 .TP
 zcash\-tx [options] <hex\-tx> [commands]

doc/man/zcashd.1

@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH ZCASHD "1" "May 2017" "zcashd v1.0.9" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.TH ZCASHD "1" "June 2017" "zcashd v1.0.10-1" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v1.0.9
+zcashd \- manual page for zcashd v1.0.10-1
 .SH DESCRIPTION
-Zcash Daemon version v1.0.9
+Zcash Daemon version v1.0.10\-1
 .PP
 In order to ensure you are adequately protecting your privacy when using Zclassic,
 please see <https://z.cash/support/security/index.html>.
@@ -54,7 +54,7 @@ Specify data directory
 \fB\-disabledeprecation=\fR<version>
 .IP
 Disable block\-height node deprecation and automatic shutdown (example:
-\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.9)
+\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.10\-1)
 .HP
 \fB\-exportdir=\fR<dir>
 .IP
@@ -72,6 +72,11 @@ Imports blocks from external blk000??.dat file on startup
 .IP
 Keep at most <n> unconnectable transactions in memory (default: 100)
 .HP
+\fB\-mempooltxinputlimit=\fR<n>
+.IP
+Set the maximum number of transparent inputs in a transaction that the
+mempool will accept (default: 0 = no limit applied)
+.HP
 \fB\-par=\fR<n>
 .IP
 Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =

doc/payment-api.md

@@ -55,7 +55,7 @@ Command | Parameters | Description
 --- | --- | ---
 z_getnewaddress | | Return a new zaddr for sending and receiving payments. The spending key for this zaddr will be added to the node’s wallet.<br><br>Output:<br>zN68D8hSs3...
 z_listaddresses | | Returns a list of all the zaddrs in this node’s wallet for which you have a spending key.<br><br>Output:<br>{ [“z123…”, “z456...”, “z789...”] }
-z_validateaddress | | Return information about a given zaddr.<br><br>Output:<br>{"isvalid" : true,<br>"address" : "zcWsmq...",<br>"payingkey" : "f5bb3c...",<br>"transmissionkey" : "7a58c7...",<br>"ismine" : true}
+z_validateaddress | zaddr | Return information about a given zaddr.<br><br>Output:<br>{"isvalid" : true,<br>"address" : "zcWsmq...",<br>"payingkey" : "f5bb3c...",<br>"transmissionkey" : "7a58c7...",<br>"ismine" : true}
 
 ### Key Management
 

doc/release-notes.md

@@ -0,0 +1,6 @@
+(note: this is a temporary file, to be added-to by anybody, and moved to
+release-notes at release time)
+
+Notable changes
+===============
+

doc/release-notes/release-notes-1.0.10-1.md

@@ -0,0 +1,11 @@
+Jack Grigg (1):
+      Disable building Proton in Gitian
+
+Sean Bowe (2):
+      Revert "Remove an unneeded version workaround as per @str4d's review comment."
+      Revert "Delete old protocol version constants and simplify code that used them."
+
+Simon Liu (2):
+      make-release.py: Versioning changes for 1.0.10-1.
+      make-release.py: Updated manpages for 1.0.10-1.
+

doc/release-notes/release-notes-1.0.10.md

@@ -0,0 +1,79 @@
+Notable changes
+===============
+
+Signature validation using libsecp256k1
+---------------------------------------
+
+ECDSA signatures inside Zcash transactions now use validation using
+[https://github.com/bitcoin/secp256k1](libsecp256k1) instead of OpenSSL.
+
+Depending on the platform, this means a significant speedup for raw signature
+validation speed. The advantage is largest on x86_64, where validation is over
+five times faster. In practice, this translates to a raw reindexing and new
+block validation times that are less than half of what it was before.
+
+Libsecp256k1 has undergone very extensive testing and validation upstream.
+
+A side effect of this change is that libconsensus no longer depends on OpenSSL.
+
+Changelog
+=========
+
+Boris Hajduk (1):
+      documentatin z_validateaddress was missing param
+
+Daira Hopwood (8):
+      Delete old protocol version constants and simplify code that used them.     fixes #2244
+      Remove an unneeded version workaround as per @str4d's review comment.
+      Remove unneeded lax ECDSA signature verification.
+      Strict DER signatures are always enforced; remove the flag and code that used it.
+      Repair tests for strict DER signatures.     While we're at it, repair a similar test for CLTV, and make the repaired RPC tests run by default.
+      Make transaction test failures print the comments preceding the test JSON.
+      Fix a comment that was made stale before launch by #1016 (commit 542da61).
+      Delete test that is redundant and inapplicable to Zcash.
+
+Jack Grigg (20):
+      Fix incorrect locking in CCryptoKeyStore
+      Use AtomicTimer for metrics screen thread count
+      Revert "Fix secp256k1 test compilation"
+      Squashed 'src/secp256k1/' changes from 22f60a6..84973d3
+      Fix potential overflows in ECDSA DER parsers
+      Rename FALLBACK_DOWNLOAD_PATH to PRIORITY_DOWNLOAD_PATH
+      Add test for incorrect consensus logic
+      Correct consensus logic in ContextualCheckInputs
+      Add comments
+      Update Debian copyright list
+      Specify ECDSA constant sizes as constants
+      Remove redundant `= 0` initialisations
+      Ensure that ECDSA constant sizes are correctly-sized
+      Add test for -mempooltxinputlimit
+      Hold an ECCVerifyHandle in zcash-gtest
+      Additional testing of -mempooltxinputlimit
+      Fix comment
+      Use sendfrom for both t-addr calls
+      make-release.py: Versioning changes for 1.0.10.
+      make-release.py: Updated manpages for 1.0.10.
+
+Kevin Pan (1):
+      "getblocktemplate" could work without wallet
+
+Pieter Wuille (2):
+      Update key.cpp to new secp256k1 API
+      Switch to libsecp256k1-based validation for ECDSA
+
+Simon Liu (5):
+      Fix intermediate vpub_new leakage in multi joinsplit tx (#1360)
+      Add option 'mempooltxinputlimit' so the mempool can reject a transaction     based on the number of transparent inputs.
+      Check mempooltxinputlimit when creating a transaction to avoid local     mempool rejection.
+      Partial revert & fix for commit 9e84b5a ; code block in wrong location.
+      Fix #b1eb4f2 so test checks sendfrom as originally intended.
+
+Wladimir J. van der Laan (2):
+      Use real number of cores for default -par, ignore virtual cores
+      Remove ChainParams::DefaultMinerThreads
+
+kozyilmaz (3):
+      [macOS] system linker does not support “--version” option but only “-v”
+      option to disable building libraries (zcutil/build.sh)
+      support per platform filename and hash setting for dependencies
+

qa/pull-tester/rpc-tests.sh

@@ -26,6 +26,7 @@ testScripts=(
     'rest.py'
     'mempool_spendcoinbase.py'
     'mempool_coinbase_spends.py'
+    'mempool_tx_input_limit.py'
     'httpbasics.py'
     'zapwallettxes.py'
     'proxy_test.py'
@@ -40,10 +41,10 @@ testScripts=(
     'zcjoinsplit.py'
     'zcjoinsplitdoublespend.py'
     'getblocktemplate.py'
+    'bip65-cltv-p2p.py'
+    'bipdersig-p2p.py'
 );
 testScriptsExt=(
-    'bipdersig-p2p.py'
-    'bipdersig.py'
     'getblocktemplate_longpoll.py'
     'getblocktemplate_proposals.py'
     'pruning.py'