Skip to content
Permalink
Browse files

update from 2.0.2

  • Loading branch information...
bitzec committed Nov 30, 2018
1 parent 8875e7a commit 4f723356716a6151ad28c2cf4b38edc20918f882
Showing with 3,073 additions and 847 deletions.
  1. +3 −3 configure.ac
  2. +12 −0 contrib/debian/changelog
  3. +1 −1 contrib/gitian-descriptors/gitian-linux.yml
  4. +2 −2 depends/packages/crate_aesni.mk
  5. +2 −2 depends/packages/crate_stream_cipher.mk
  6. +7 −5 depends/packages/librustzcash.mk
  7. +1 −5 depends/packages/packages.mk
  8. +42 −0 depends/patches/librustzcash/0001-Start-using-cargo-clippy-for-CI.patch
  9. +630 −0 depends/patches/librustzcash/remove-dev-dependencies.diff
  10. +1 −1 doc/payment-api.md
  11. +0 −1 doc/release-notes.md
  12. +110 −0 doc/release-notes/release-notes-2.0.2.md
  13. +4 −1 qa/pull-tester/rpc-tests.sh
  14. +150 −0 qa/rpc-tests/finalsaplingroot.py
  15. +16 −5 qa/rpc-tests/mempool_nu_activation.py
  16. +80 −15 qa/rpc-tests/mempool_tx_expiry.py
  17. +1 −1 qa/rpc-tests/mempool_tx_input_limit.py
  18. +366 −0 qa/rpc-tests/mergetoaddress_helper.py
  19. +29 −0 qa/rpc-tests/mergetoaddress_sapling.py
  20. +24 −0 qa/rpc-tests/mergetoaddress_sprout.py
  21. +308 −0 qa/rpc-tests/p2p_txexpiringsoon.py
  22. +2 −2 qa/rpc-tests/paymentdisclosure.py
  23. +1 −1 qa/rpc-tests/regtest_signrawtransaction.py
  24. +16 −0 qa/rpc-tests/test_framework/mininode.py
  25. +5 −5 qa/rpc-tests/wallet.py
  26. +2 −2 qa/rpc-tests/wallet_1941.py
  27. +10 −10 qa/rpc-tests/wallet_addresses.py
  28. +1 −1 qa/rpc-tests/wallet_anchorfork.py
  29. +2 −2 qa/rpc-tests/wallet_changeindicator.py
  30. +4 −4 qa/rpc-tests/wallet_listnotes.py
  31. +11 −9 qa/rpc-tests/wallet_listreceived.py
  32. +2 −2 qa/rpc-tests/wallet_mergetoaddress.py
  33. +3 −3 qa/rpc-tests/wallet_nullifiers.py
  34. +7 −2 qa/rpc-tests/wallet_overwintertx.py
  35. +10 −0 qa/rpc-tests/wallet_persistence.py
  36. +2 −2 qa/rpc-tests/wallet_protectcoinbase.py
  37. +5 −2 qa/rpc-tests/wallet_sapling.py
  38. +4 −4 qa/rpc-tests/wallet_treestate.py
  39. +2 −2 qa/rpc-tests/zkey_import_export.py
  40. +3 −0 src/chain.h
  41. +2 −2 src/clientversion.h
  42. +1 −1 src/coins.cpp
  43. +2 −2 src/coins.h
  44. +1 −1 src/deprecation.h
  45. +19 −13 src/gtest/main.cpp
  46. +2 −2 src/gtest/test_checkblock.cpp
  47. +32 −0 src/gtest/test_mempool.cpp
  48. +35 −0 src/gtest/test_transaction_builder.cpp
  49. +71 −27 src/main.cpp
  50. +8 −0 src/main.h
  51. +20 −1 src/rpc/rawtransaction.cpp
  52. +6 −4 src/sendalert.cpp
  53. +5 −5 src/test/coins_tests.cpp
  54. +11 −11 src/test/data/merkle_commitments_sapling.json
  55. +117 −117 src/test/data/merkle_path_sapling.json
  56. +11 −11 src/test/data/merkle_roots_sapling.json
  57. +15 −15 src/test/data/merkle_serialization_sapling.json
  58. +135 −135 src/test/data/merkle_witness_serialization_sapling.json
  59. +112 −71 src/test/rpc_wallet_tests.cpp
  60. +21 −6 src/test/test_bitcoin.cpp
  61. +1 −0 src/test/test_bitcoin.h
  62. +10 −0 src/transaction_builder.cpp
  63. +1 −0 src/txdb.cpp
  64. +1 −1 src/util.cpp
  65. +1 −1 src/version.h
  66. +176 −34 src/wallet/asyncrpcoperation_mergetoaddress.cpp
  67. +14 −6 src/wallet/asyncrpcoperation_mergetoaddress.h
  68. +3 −2 src/wallet/asyncrpcoperation_sendmany.cpp
  69. +6 −12 src/wallet/gtest/test_wallet_zkeys.cpp
  70. +149 −105 src/wallet/rpcwallet.cpp
  71. +22 −131 src/wallet/wallet.cpp
  72. +13 −33 src/wallet/wallet.h
  73. +158 −0 src/zcbenchmarks.cpp
  74. +4 −0 src/zcbenchmarks.h
  75. +5 −3 zcutil/fetch-params.sh
  76. +2 −0 zcutil/release-notes.py
@@ -1,9 +1,9 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_REVISION, 2)
define(_CLIENT_VERSION_BUILD, 2)
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)
@@ -1,3 +1,15 @@
zcash (2.0.2) stable; urgency=medium

* 2.0.2 release.

-- Zcash Company <team@z.cash> Wed, 28 Nov 2018 11:09:08 -0800

zcash (2.0.2~rc1) stable; urgency=medium

* 2.0.2-rc1 release.

-- Zcash Company <team@z.cash> Sun, 18 Nov 2018 10:19:49 -0800

zcash (2.0.1) stable; urgency=medium

* 2.0.1 release.
@@ -1,5 +1,5 @@
---
name: "bitzec-1.0.1"
name: "bitzec-1.1.2"
enable_cache: true
distro: "debian"
suites:
@@ -1,9 +1,9 @@
package=crate_aesni
$(package)_crate_name=aesni
$(package)_version=0.4.0
$(package)_version=0.4.1
$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
$(package)_sha256_hash=f2838c142db62c0c6aea0a24054c46d35488532fdaea0f51dbeba430f0985df5
$(package)_sha256_hash=6810b7fb9f2bb4f76f05ac1c170b8dde285b6308955dc3afd89710268c958d9e
$(package)_crate_versioned_name=$($(package)_crate_name)

define $(package)_preprocess_cmds
@@ -1,9 +1,9 @@
package=crate_stream_cipher
$(package)_crate_name=stream-cipher
$(package)_version=0.1.0
$(package)_version=0.1.1
$(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
$(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
$(package)_sha256_hash=ac49bc6cb2847200d18bfb738ce89448570f4aa1c34ac0348db6205ee69a0777
$(package)_sha256_hash=30dc6118470d69ce0fdcf7e6f95e95853f7f4f72f80d835d4519577c323814ab
$(package)_crate_versioned_name=$($(package)_crate_name)

define $(package)_preprocess_cmds
@@ -3,10 +3,10 @@ $(package)_version=0.1
$(package)_download_path=https://github.com/zcash/$(package)/archive/
$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
$(package)_download_file=$($(package)_git_commit).tar.gz
$(package)_sha256_hash=e9a488a8bbecf7fb237a32dadd65133211ef61616d44cf55609e029837a41004
$(package)_git_commit=f5e5cb24e1bd756a02fc4a3fd2b824238ccd15ad
$(package)_sha256_hash=9909ec59fa7a411c2071d6237b3363a0bc6e5e42358505cf64b7da0f58a7ff5a
$(package)_git_commit=06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5
$(package)_dependencies=rust $(rust_crates)
$(package)_patches=cargo.config
$(package)_patches=cargo.config 0001-Start-using-cargo-clippy-for-CI.patch remove-dev-dependencies.diff

ifeq ($(host_os),mingw32)
$(package)_library_file=target/x86_64-pc-windows-gnu/release/rustzcash.lib
@@ -20,17 +20,19 @@ $(package)_build_opts_mingw32=--target=x86_64-pc-windows-gnu
endef

define $(package)_preprocess_cmds
patch -p1 -d pairing < $($(package)_patch_dir)/0001-Start-using-cargo-clippy-for-CI.patch && \
patch -p1 < $($(package)_patch_dir)/remove-dev-dependencies.diff && \
mkdir .cargo && \
cat $($(package)_patch_dir)/cargo.config | sed 's|CRATE_REGISTRY|$(host_prefix)/$(CRATE_REGISTRY)|' > .cargo/config
endef

define $(package)_build_cmds
cargo build $($(package)_build_opts)
cargo build --package librustzcash $($(package)_build_opts)
endef

define $(package)_stage_cmds
mkdir $($(package)_staging_dir)$(host_prefix)/lib/ && \
mkdir $($(package)_staging_dir)$(host_prefix)/include/ && \
cp $($(package)_library_file) $($(package)_staging_dir)$(host_prefix)/lib/ && \
cp include/librustzcash.h $($(package)_staging_dir)$(host_prefix)/include/
cp librustzcash/include/librustzcash.h $($(package)_staging_dir)$(host_prefix)/include/
endef
@@ -3,7 +3,6 @@ rust_crates := \
crate_aesni \
crate_aes_soft \
crate_arrayvec \
crate_bellman \
crate_bitflags \
crate_bit_vec \
crate_blake2_rfc \
@@ -27,15 +26,12 @@ rust_crates := \
crate_num_integer \
crate_num_traits \
crate_opaque_debug \
crate_pairing \
crate_rand \
crate_sapling_crypto \
crate_stream_cipher \
crate_typenum \
crate_winapi_i686_pc_windows_gnu \
crate_winapi \
crate_winapi_x86_64_pc_windows_gnu \
crate_zip32
crate_winapi_x86_64_pc_windows_gnu
rust_packages := rust $(rust_crates) librustzcash
proton_packages := proton
zcash_packages := libgmp libsodium
@@ -0,0 +1,42 @@
From cc5b83510277632852af67d896a27e0cb40f342b Mon Sep 17 00:00:00 2001
From: Sean Bowe <ewillbefull@gmail.com>
Date: Wed, 4 Jul 2018 12:45:08 -0600
Subject: [PATCH 1/2] Start using cargo-clippy for CI.

---
src/lib.rs | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index fefdae3..c3640c4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,15 +1,14 @@
// `clippy` is a code linting tool for improving code quality by catching
-// common mistakes or strange code patterns. If the `clippy` feature is
-// provided, it is enabled and all compiler warnings are prohibited.
-#![cfg_attr(feature = "clippy", deny(warnings))]
-#![cfg_attr(feature = "clippy", feature(plugin))]
-#![cfg_attr(feature = "clippy", plugin(clippy))]
-#![cfg_attr(feature = "clippy", allow(inline_always))]
-#![cfg_attr(feature = "clippy", allow(too_many_arguments))]
-#![cfg_attr(feature = "clippy", allow(unreadable_literal))]
-#![cfg_attr(feature = "clippy", allow(many_single_char_names))]
-#![cfg_attr(feature = "clippy", allow(new_without_default_derive))]
-#![cfg_attr(feature = "clippy", allow(write_literal))]
+// common mistakes or strange code patterns. If the `cargo-clippy` feature
+// is provided, all compiler warnings are prohibited.
+#![cfg_attr(feature = "cargo-clippy", deny(warnings))]
+#![cfg_attr(feature = "cargo-clippy", allow(inline_always))]
+#![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
+#![cfg_attr(feature = "cargo-clippy", allow(unreadable_literal))]
+#![cfg_attr(feature = "cargo-clippy", allow(many_single_char_names))]
+#![cfg_attr(feature = "cargo-clippy", allow(new_without_default_derive))]
+#![cfg_attr(feature = "cargo-clippy", allow(write_literal))]
+
// Force public structures to implement Debug
#![deny(missing_debug_implementations)]

--
2.17.1

Oops, something went wrong.

0 comments on commit 4f72335

Please sign in to comment.
You can’t perform that action at this time.