forked from hush/hush3
miketout
6 years ago
33 changed files with 1424 additions and 308 deletions
@ -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 |
|||
|
|||
@ -0,0 +1,630 @@ |
|||
diff --git a/Cargo.lock b/Cargo.lock
|
|||
index bc740bb..3c6c94b 100644
|
|||
--- a/Cargo.lock
|
|||
+++ b/Cargo.lock
|
|||
@@ -28,22 +28,6 @@ dependencies = [
|
|||
"stream-cipher 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
] |
|||
|
|||
-[[package]]
|
|||
-name = "aho-corasick"
|
|||
-version = "0.6.8"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "memchr 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "ansi_term"
|
|||
-version = "0.11.0"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
[[package]] |
|||
name = "arrayvec" |
|||
version = "0.4.7" |
|||
@@ -52,27 +36,6 @@ dependencies = [
|
|||
"nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
] |
|||
|
|||
-[[package]]
|
|||
-name = "backtrace"
|
|||
-version = "0.3.9"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "backtrace-sys"
|
|||
-version = "0.1.24"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
[[package]] |
|||
name = "bellman" |
|||
version = "0.1.0" |
|||
@@ -92,11 +55,6 @@ name = "bit-vec"
|
|||
version = "0.4.4" |
|||
source = "registry+https://github.com/rust-lang/crates.io-index" |
|||
|
|||
-[[package]]
|
|||
-name = "bitflags"
|
|||
-version = "0.9.1"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
[[package]] |
|||
name = "bitflags" |
|||
version = "1.0.1" |
|||
@@ -130,61 +88,6 @@ name = "byteorder"
|
|||
version = "1.2.2" |
|||
source = "registry+https://github.com/rust-lang/crates.io-index" |
|||
|
|||
-[[package]]
|
|||
-name = "cargo_metadata"
|
|||
-version = "0.5.8"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "cc"
|
|||
-version = "1.0.22"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "cfg-if"
|
|||
-version = "0.1.5"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "clippy"
|
|||
-version = "0.0.200"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "clippy_lints 0.0.200 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "clippy_lints"
|
|||
-version = "0.0.200"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "if_chain 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
[[package]] |
|||
name = "constant_time_eq" |
|||
version = "0.1.3" |
|||
@@ -203,19 +106,6 @@ dependencies = [
|
|||
"generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
] |
|||
|
|||
-[[package]]
|
|||
-name = "either"
|
|||
-version = "1.5.0"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "error-chain"
|
|||
-version = "0.11.0"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
[[package]] |
|||
name = "fpe" |
|||
version = "0.1.0" |
|||
@@ -256,11 +146,6 @@ dependencies = [
|
|||
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
] |
|||
|
|||
-[[package]]
|
|||
-name = "gcc"
|
|||
-version = "0.3.54"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
[[package]] |
|||
name = "generic-array" |
|||
version = "0.9.0" |
|||
@@ -269,59 +154,6 @@ dependencies = [
|
|||
"typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
] |
|||
|
|||
-[[package]]
|
|||
-name = "getopts"
|
|||
-version = "0.2.18"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "hex-literal"
|
|||
-version = "0.1.1"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "hex-literal-impl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "proc-macro-hack 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "hex-literal-impl"
|
|||
-version = "0.1.1"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "proc-macro-hack 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "idna"
|
|||
-version = "0.1.5"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "if_chain"
|
|||
-version = "0.1.3"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "itertools"
|
|||
-version = "0.7.8"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "itoa"
|
|||
-version = "0.4.2"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
[[package]] |
|||
name = "lazy_static" |
|||
version = "1.0.0" |
|||
@@ -347,19 +179,6 @@ dependencies = [
|
|||
"zip32 0.0.0", |
|||
] |
|||
|
|||
-[[package]]
|
|||
-name = "matches"
|
|||
-version = "0.1.8"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "memchr"
|
|||
-version = "2.0.2"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
[[package]] |
|||
name = "nodrop" |
|||
version = "0.1.12" |
|||
@@ -405,65 +224,6 @@ name = "pairing"
|
|||
version = "0.14.2" |
|||
dependencies = [ |
|||
"byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
- "clippy 0.0.200 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "percent-encoding"
|
|||
-version = "1.0.1"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "proc-macro-hack"
|
|||
-version = "0.4.0"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "proc-macro-hack-impl 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "proc-macro-hack-impl"
|
|||
-version = "0.4.0"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "proc-macro2"
|
|||
-version = "0.4.14"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "pulldown-cmark"
|
|||
-version = "0.1.2"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "quine-mc_cluskey"
|
|||
-version = "0.2.4"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "quote"
|
|||
-version = "0.6.8"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "rand"
|
|||
-version = "0.3.22"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
"rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
] |
|||
|
|||
@@ -477,66 +237,6 @@ dependencies = [
|
|||
"winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
] |
|||
|
|||
-[[package]]
|
|||
-name = "redox_syscall"
|
|||
-version = "0.1.40"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "regex"
|
|||
-version = "1.0.4"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "aho-corasick 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "memchr 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "regex-syntax"
|
|||
-version = "0.6.2"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "rust-crypto"
|
|||
-version = "0.2.36"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "rustc-demangle"
|
|||
-version = "0.1.9"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "rustc-serialize"
|
|||
-version = "0.3.24"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "rustc_version"
|
|||
-version = "0.2.3"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "ryu"
|
|||
-version = "0.2.6"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
[[package]] |
|||
name = "sapling-crypto" |
|||
version = "0.0.1" |
|||
@@ -545,49 +245,8 @@ dependencies = [
|
|||
"blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)", |
|||
"byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
"digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
- "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
"pairing 0.14.2", |
|||
"rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
- "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "semver"
|
|||
-version = "0.9.0"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "semver-parser"
|
|||
-version = "0.7.0"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "serde"
|
|||
-version = "1.0.75"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "serde_derive"
|
|||
-version = "1.0.75"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "serde_json"
|
|||
-version = "1.0.26"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
] |
|||
|
|||
[[package]] |
|||
@@ -598,90 +257,11 @@ dependencies = [
|
|||
"generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", |
|||
] |
|||
|
|||
-[[package]]
|
|||
-name = "syn"
|
|||
-version = "0.14.9"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "thread_local"
|
|||
-version = "0.3.6"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "time"
|
|||
-version = "0.1.40"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "toml"
|
|||
-version = "0.4.6"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
[[package]] |
|||
name = "typenum" |
|||
version = "1.10.0" |
|||
source = "registry+https://github.com/rust-lang/crates.io-index" |
|||
|
|||
-[[package]]
|
|||
-name = "ucd-util"
|
|||
-version = "0.1.1"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "unicode-bidi"
|
|||
-version = "0.3.4"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "unicode-normalization"
|
|||
-version = "0.1.7"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "unicode-width"
|
|||
-version = "0.1.5"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "unicode-xid"
|
|||
-version = "0.1.0"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
-[[package]]
|
|||
-name = "url"
|
|||
-version = "1.7.1"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-dependencies = [
|
|||
- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|||
-]
|
|||
-
|
|||
-[[package]]
|
|||
-name = "utf8-ranges"
|
|||
-version = "1.0.1"
|
|||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
-
|
|||
[[package]] |
|||
name = "winapi" |
|||
version = "0.3.4" |
|||
@@ -730,87 +310,33 @@ dependencies = [
|
|||
"checksum aes 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e6fb1737cdc8da3db76e90ca817a194249a38fcb500c2e6ecec39b29448aa873" |
|||
"checksum aes-soft 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67cc03b0a090a05cb01e96998a01905d7ceedce1bc23b756c0bb7faa0682ccb1" |
|||
"checksum aesni 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6810b7fb9f2bb4f76f05ac1c170b8dde285b6308955dc3afd89710268c958d9e" |
|||
-"checksum aho-corasick 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "68f56c7353e5a9547cbd76ed90f7bb5ffc3ba09d4ea9bd1d8c06c8b1142eeb5a"
|
|||
-"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
|
|||
"checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef" |
|||
-"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"
|
|||
-"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
|
|||
"checksum bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f" |
|||
-"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
|
|||
"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf" |
|||
"checksum blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)" = "<none>" |
|||
"checksum block-cipher-trait 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "370424437b9459f3dfd68428ed9376ddfe03d8b70ede29cc533b3557df186ab4" |
|||
"checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" |
|||
"checksum byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "73b5bdfe7ee3ad0b99c9801d58807a9dbc9e09196365b0203853b99889ab3c87" |
|||
-"checksum cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1efca0b863ca03ed4c109fb1c55e0bc4bbeb221d3e103d86251046b06a526bd0"
|
|||
-"checksum cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "4a6007c146fdd28d4512a794b07ffe9d8e89e6bf86e2e0c4ddff2e1fb54a0007"
|
|||
-"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
|
|||
-"checksum clippy 0.0.200 (registry+https://github.com/rust-lang/crates.io-index)" = "927a1f79af10deb103df108347f23c6b7fa1731c953d6fb24d68be1748a0993f"
|
|||
-"checksum clippy_lints 0.0.200 (registry+https://github.com/rust-lang/crates.io-index)" = "d2432663f6bdb90255dcf9df5ca504f99b575bb471281591138f62f9d31f863b"
|
|||
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" |
|||
"checksum crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19" |
|||
"checksum digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "00a49051fef47a72c9623101b19bd71924a45cca838826caae3eaa4d00772603" |
|||
-"checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
|
|||
-"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
|
|||
"checksum fpe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce3371c82bfbd984f624cab093f55e7336f5a6e589f8518e1258f54f011b89ad" |
|||
"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" |
|||
"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" |
|||
"checksum futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "1a70b146671de62ec8c8ed572219ca5d594d9b06c0b364d5e67b722fc559b48c" |
|||
"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" |
|||
-"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
|
|||
"checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" |
|||
-"checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797"
|
|||
-"checksum hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4da5f0e01bd8a71a224a4eedecaacfcabda388dbb7a80faf04d3514287572d95"
|
|||
-"checksum hex-literal-impl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d340b6514f232f6db1bd16db65302a5278a04fef9ce867cb932e7e5fa21130a"
|
|||
-"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
|
|||
-"checksum if_chain 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4bac95d9aa0624e7b78187d6fb8ab012b41d9f6f54b1bcb61e61c4845f8357ec"
|
|||
-"checksum itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "f58856976b776fedd95533137617a02fb25719f40e7d9b01c7043cd65474f450"
|
|||
-"checksum itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5adb58558dcd1d786b5f0bd15f3226ee23486e24b7b58304b60f64dc68e62606"
|
|||
"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d" |
|||
"checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b" |
|||
-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
|
|||
-"checksum memchr 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a3b4142ab8738a78c51896f704f83c11df047ff1bda9a92a661aa6361552d93d"
|
|||
"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" |
|||
"checksum num-bigint 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3eceac7784c5dc97c2d6edf30259b4e153e6e2b42b3c85e9a6e9f45d06caef6e" |
|||
"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" |
|||
"checksum num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe" |
|||
"checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30" |
|||
"checksum opaque-debug 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d620c9c26834b34f039489ac0dfdb12c7ac15ccaf818350a64c9b5334a452ad7" |
|||
-"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
|
|||
-"checksum proc-macro-hack 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ba8d4f9257b85eb6cdf13f055cea3190520aab1409ca2ab43493ea4820c25f0"
|
|||
-"checksum proc-macro-hack-impl 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5cb6f960ad471404618e9817c0e5d10b1ae74cfdf01fab89ea0641fe7fb2892"
|
|||
-"checksum proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b331c6ad3411474cd55540398dc7ad89fc41488e64ec71fdecc9c9b86de96fb0"
|
|||
-"checksum pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d6fdf85cda6cadfae5428a54661d431330b312bc767ddbc57adbedc24da66e32"
|
|||
-"checksum quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45"
|
|||
-"checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5"
|
|||
-"checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
|
|||
"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" |
|||
-"checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1"
|
|||
-"checksum regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "67d0301b0c6804eca7e3c275119d0b01ff3b7ab9258a65709e608a66312a1025"
|
|||
-"checksum regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "747ba3b235651f6e2f67dfa8bcdcd073ddb7c243cb21c442fc12395dfcac212d"
|
|||
-"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
|
|||
-"checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
|
|||
-"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
|
|||
-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
|
|||
-"checksum ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7153dd96dade874ab973e098cb62fcdbb89a03682e46b144fd09550998d4a4a7"
|
|||
-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
|
|||
-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
|||
-"checksum serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)" = "22d340507cea0b7e6632900a176101fea959c7065d93ba555072da90aaaafc87"
|
|||
-"checksum serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)" = "234fc8b737737b148ccd625175fc6390f5e4dacfdaa543cb93a3430d984a9119"
|
|||
-"checksum serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "44dd2cfde475037451fa99b7e5df77aa3cfd1536575fa8e7a538ab36dcde49ae"
|
|||
"checksum stream-cipher 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "30dc6118470d69ce0fdcf7e6f95e95853f7f4f72f80d835d4519577c323814ab" |
|||
-"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
|
|||
-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
|
|||
-"checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b"
|
|||
-"checksum toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a0263c6c02c4db6c8f7681f9fd35e90de799ebd4cfdeab77a38f4ff6b3d8c0d9"
|
|||
"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" |
|||
-"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
|
|||
-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
|
|||
-"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
|
|||
-"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
|
|||
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
|
|||
-"checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6"
|
|||
-"checksum utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd70f467df6810094968e2fce0ee1bd0e87157aceb026a8c083bcf5e25b9efe4"
|
|||
"checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3" |
|||
"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" |
|||
"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" |
|||
diff --git a/pairing/Cargo.toml b/pairing/Cargo.toml
|
|||
index 98725aa..dedce80 100644
|
|||
--- a/pairing/Cargo.toml
|
|||
+++ b/pairing/Cargo.toml
|
|||
@@ -14,7 +14,6 @@ repository = "https://github.com/ebfull/pairing"
|
|||
[dependencies] |
|||
rand = "0.4" |
|||
byteorder = "1" |
|||
-clippy = { version = "0.0.200", optional = true }
|
|||
|
|||
[features] |
|||
unstable-features = ["expose-arith"] |
|||
diff --git a/sapling-crypto/Cargo.toml b/sapling-crypto/Cargo.toml
|
|||
index 6e802f2..33e21bf 100644
|
|||
--- a/sapling-crypto/Cargo.toml
|
|||
+++ b/sapling-crypto/Cargo.toml
|
|||
@@ -22,10 +22,6 @@ byteorder = "1"
|
|||
git = "https://github.com/gtank/blake2-rfc" |
|||
rev = "7a5b5fc99ae483a0043db7547fb79a6fa44b88a9" |
|||
|
|||
-[dev-dependencies]
|
|||
-hex-literal = "0.1"
|
|||
-rust-crypto = "0.2"
|
|||
-
|
|||
[features] |
|||
default = ["u128-support"] |
|||
u128-support = ["pairing/u128-support"] |
|||
@ -0,0 +1,276 @@ |
|||
Notable changes |
|||
=============== |
|||
|
|||
Enabled Sapling features for mainnet |
|||
------------------------------------ |
|||
This release adds significant support for Sapling to the wallet and RPC interface. Sapling will activate at block 419200, which is expected to be mined on the 28th of October 2018. Users running v2.0.0 nodes (which are consensus-compatible with Sapling) will follow the network upgrade, but must upgrade to v2.0.1 in order to send or receive Sapling shielded transactions. |
|||
|
|||
Minimum Difficulty Blocks allowed on testnet |
|||
-------------------------------------------- |
|||
Sapling activated on testnet at block 280000. Users running v2.0.0 nodes should upgrade to v2.0.1 which introduces a consensus rule change to allow minimum difficulty blocks to be mined from block 299188, thereby splitting the chain. In addition, users running v2.0.1 nodes no longer need to specify `-experimentalfeatures` and `-developersapling` to use Sapling functionality on testnet. |
|||
|
|||
[Pull request](https://github.com/zcash/zcash/pull/3559) |
|||
|
|||
Hierarchical Deterministic Key Generation for Sapling |
|||
----------------------------------------------------- |
|||
All Sapling addresses will use hierarchical deterministic key generation |
|||
according to ZIP 32 (keypath m/32'/133'/k' on mainnet). Transparent and |
|||
Sprout addresses will still use traditional key generation. |
|||
|
|||
Backups of HD wallets, regardless of when they have been created, can |
|||
therefore be used to re-generate all possible Sapling private keys, even the |
|||
ones which haven't already been generated during the time of the backup. |
|||
Regular backups are still necessary, however, in order to ensure that |
|||
transparent and Sprout addresses are not lost. |
|||
|
|||
[Pull request](https://github.com/zcash/zcash/pull/3492), [ZIP 32](https://github.com/zcash/zips/blob/master/zip-0032.mediawiki) |
|||
|
|||
Fix Signing Raw Transactions with Unsynced Offline Nodes |
|||
-------------------------------------------------------- |
|||
With v2.0.0, in `signrawtransaction` the consensus branch ID (which is used to construct the transaction) was estimated using the chain height. With v2.0.1 this has been improved by also considering the `APPROX_RELEASE_HEIGHT` of the release, and a new parameter to allow the caller to manually override the consensus branch ID that zcashd will use. |
|||
|
|||
[Pull request](https://github.com/zcash/zcash/pull/3520) |
|||
|
|||
|
|||
Changelog |
|||
========= |
|||
|
|||
David Mercer (2): |
|||
libsnark: convert long long and unsigned long to C++11 fixed-width types |
|||
libsnark: convert 0ul to UINT64_C(0) |
|||
|
|||
Eirik Ogilvie-Wigley (24): |
|||
Rename map to include sprout |
|||
Add sapling spending keys to z_exportwallet |
|||
Rename AddZKey to include sprout |
|||
Move AddSpendingKeyToWallet |
|||
Return more information when adding a spending key |
|||
Add sapling support to z_importwallet |
|||
Export comment on HDSeed and fingerprint with wallet |
|||
Export zip32 metadata with sapling keys |
|||
Don't export empty zip32 metadata |
|||
Allow more information to be returned when an async rpc fails |
|||
Use utility method to wait for async operations |
|||
Remove unneeded semicolons |
|||
Remove unused imports |
|||
Allow passing timeout parameter to wait_and_assert_operationid_status |
|||
Add test for signing raw transactions offline |
|||
Incorporate APPROX_RELEASE_HEIGHT when determining what consensus branch to sign with |
|||
Allow passing branchId when calling signrawtransaction |
|||
Remove unused import |
|||
Address need not be optional when adding sapling keys |
|||
Use max priority for all shielded transfers |
|||
Move FIXME comment to where the fix should happen |
|||
Add newly discovered sapling addresses to the wallet |
|||
Fix HDSeed comment |
|||
Better error message when sending to both sprout and sapling |
|||
|
|||
George Tankersley (2): |
|||
Refactor ContextualCheckBlock tests (#3187) |
|||
Refactor ContextualCheckBlock tests |
|||
|
|||
Jack Grigg (83): |
|||
[ci-workers] Install Python modules in a virtualenv |
|||
[ci-workers] Handle user home directories outside /home |
|||
[ci-workers] Handle ansible_processor being either a string or a list |
|||
[ci-workers] Add support for MacOSX |
|||
[ci-workers] Add a tag for updating dependencies |
|||
[ci-workers] Add curl and cmake to dependencies |
|||
[ci-workers] README cleanups |
|||
[ci-workers] Add pkg-config to general dependencies |
|||
depends: Correctly configure Rust when cross-compiling |
|||
depends: Configure librustzcash for cross-compiling |
|||
depends: Fix BDB naming issue when cross-compiling |
|||
zcutil/build.sh: Use $HOST to specify the depends prefix |
|||
configure: Don't require RELRO and BIND_NOW when cross-compiling |
|||
Measure Windows console size for metrics UI |
|||
Use -O1 for darwin and mingw32 release builds |
|||
Clean up libzcash CPPFLAGS, CXXFLAGS, and LDFLAGS |
|||
zcutil/build.sh: Use config.site to set default ./configure settings |
|||
zcutil/build.sh: Remove --enable-werror from default configuration |
|||
Pass correct compiler, linker, and flags into libsnark |
|||
Use boost::filesystem::path::string() instead of path::native() |
|||
Metrics UI: Enable virtual terminal sequence processing on Windows |
|||
Metrics UI: Tell Windows users how to stop zcashd |
|||
depends: Pass correct compiler, linker, and flags into googletest |
|||
configure: Don't add -ldl to RUST_LIBS for mingw32 |
|||
test: Fix comment in WalletTests.FindMySaplingNotes |
|||
Add Sapling support to GetFilteredNotes() and GetUnspentFilteredNotes() |
|||
Add Sapling support to z_getbalance and z_gettotalbalance |
|||
Metrics UI: Fall back to 80 cols if GetConsoleScreenBufferInfo() fails |
|||
libsnark: Adjust SHA256 K value type to match the constant |
|||
libsnark: Use mp_limb_t cast instead of uint64_t when masking bigint.data |
|||
libsnark: Fix stale comment |
|||
rpc: Clarify Sprout shielded addresses in help text |
|||
rpc: Clarify ivk balance issues in help text |
|||
Move GetSpendingKeyForPaymentAddress visitor into wallet.h |
|||
wallet: Add HaveSpendingKeyForPaymentAddress visitor |
|||
rpcwallet: Add TransactionBuilder argument to AsyncRPCOperation_sendmany |
|||
rpcwallet: Prevent use of both Sprout and Sapling addresses in z_sendmany |
|||
rpcwallet: Add Sapling support to z_sendmany |
|||
Define additional booleans for readability |
|||
Ensure SCOPED_TRACE falls out of scope when necessary |
|||
Revert NU activation heights in reverse order |
|||
Fix test after refactor to check bacd-cb-height rule on a genesis block |
|||
Rename GetFirstBlockTransaction() to GetFirstBlockCoinbaseTx() |
|||
libsnark: Force constants used in test comparisons to be unsigned |
|||
libsnark: Use format macro constants for printing fixed-width values |
|||
Rename z_inputs_ to z_sprout_inputs_ |
|||
Minor cleanups |
|||
Fix RPC test that checks exact wording of cleaned-up error message |
|||
Fix file permissions of wallet_sapling RPC test |
|||
Update librustzcash with ZIP 32 APIs |
|||
ZIP 32 Sapling structs |
|||
Store HDSeed in CBasicKeyStore |
|||
Store HDSeed in CCryptoKeyStore |
|||
wallet: Store HDSeed and chain data |
|||
wallet: Store Sapling key metadata indexed by ivk |
|||
wallet: Switch from SaplingSpendingKey to SaplingExtendedSpendingKey |
|||
init: Generate a new HD seed on startup |
|||
wallet: Comment out HDSeed and CHDChain persistence to disk |
|||
Add ZIP 32 usage to release notes |
|||
wallet: Don't allow an HDSeed to be overwritten |
|||
Bugfix: Use time instead of block height for Sapling key metadata |
|||
net: Check against the current epoch's version when rejecting nodes |
|||
Extract a helper method for finding the next epoch |
|||
net: Check against the next epoch's version when evicting peers |
|||
net: Check against the current epoch's version when disconnecting peers |
|||
qa: Test both Overwinter and Sapling peer management |
|||
Use ovk directly in the TransactionBuilder API instead of fvk |
|||
Generate an ovk to encrypt outCiphertext for t-addr senders |
|||
Revert "Disable Sapling features on mainnet" |
|||
Use the correct empty memo for Sapling outputs |
|||
Add Sapling support to z_shieldcoinbase |
|||
Revert "Get rid of consensus.fPowAllowMinDifficultyBlocks." |
|||
Revert "Remove testnet-only difficulty rules" |
|||
Allow minimum-difficulty blocks on testnet and regtest |
|||
Only enable min-difficulty blocks on testnet from a particular height |
|||
Update wallet_listreceived test for now-correct empty Sapling memos |
|||
Rename min-difficulty flag to remove off-by-one in the name |
|||
Explicitly check the min-difficulty flag against boost::none |
|||
Position PoW.MinDifficultyRules test after rule activates |
|||
Fix pyflakes warnings |
|||
Store ExtFVK with encrypted Sapling spending key instead of FVK |
|||
Persist Sapling payment address to IVK map |
|||
Ignore decoding errors during -zapwallettxes |
|||
|
|||
Jay Graber (5): |
|||
s/jsoutindex/outindex for sapling outputs |
|||
z_listunspent sapling support - needs refactor |
|||
Add rpc test for sprout txs z_listunspent |
|||
Modify comments |
|||
Modify GetNullifiersForAddresses for Sapling |
|||
|
|||
Jonas Schnelli (3): |
|||
[Wallet] extend CKeyMetadata with HD keypath Zcash: modified for zip32 |
|||
[Wallet] print hd masterkeyid in getwalletinfo Zcash: modified for zip32 |
|||
[Wallet] ensure CKeyMetadata.hdMasterKeyID will be cleared during SetNull() Zcash: modified for zip32 |
|||
|
|||
Jonathan "Duke" Leto (1): |
|||
Fix some typos in rpc-tests readme |
|||
|
|||
Larry Ruane (5): |
|||
generalize mininode.py protocol versioning |
|||
Test peer banning logic in both pre- and post-initial block download states |
|||
Sapling support for z_listreceivedbyaddress |
|||
z_listunspent rpc unit test: add testing for Sapling |
|||
fix z_listunspent includeWatchonly logic |
|||
|
|||
Marius Kjærstad (3): |
|||
Fix for license not being valid |
|||
Update debian package copyright license |
|||
Missing comma in debian package copyright license |
|||
|
|||
Sean Bowe (1): |
|||
Check commitment validity within the decryption API for Sapling note plaintexts. |
|||
|
|||
Simon Liu (68): |
|||
Rename FindMyNotes to FindMySproutNotes. |
|||
Rename GetNoteNullifier to GetSproutNoteNullifier. |
|||
Rename mapNullifiersToNotes to mapSproutNullifiersToNotes. |
|||
Rename CWallet::AddToSpends methods for clarity. |
|||
Rename mapTxNullifiers to mapTxSproutNullifiers. |
|||
Add ivk member variable and equality comparators to SaplingNoteData class. |
|||
Update CWallet::MarkAffectedTransactionsDirty() for Sapling. |
|||
Update CWallet::UpdatedNoteData() for Sapling. |
|||
Create CWallet::AddToSaplingSpends() to track Sapling nullifiers. |
|||
Update test to pass in required cm to SaplingNotePlaintext::decrypt(). |
|||
Create CWallet::FindMySaplingNotes() |
|||
Rename IsFromMe(nullifier) to IsSproutNullifierFromMe(nullifier). |
|||
Create CWallet::IsSaplingNullifierFromMe() |
|||
Remove dead code in CWalletTx::GetAmounts() as filed in issue #3434. |
|||
Cleanup CWalletTx::GetAmounts() for clarity. No-op. |
|||
Update CWalletTx::GetAmounts() to return COutputEntry for Sapling valueBalance. |
|||
Add caching and updating of Sapling note nullifier. |
|||
Update CWallet::IsSpent() to check Sapling nullifiers. |
|||
Clean up names of unit tests in gtest/test_wallet.cpp. |
|||
Add test for CWalletTx::SetSaplingNoteData() |
|||
Iterate over mapSaplingFullViewingKeys with ivk->fvk mapping (1:1). |
|||
Refactor IsSpent(nullifier) for Sprout and Sapling domain separation. |
|||
Fix code review nits. |
|||
Add two new wallet tests: FindMySaplingNotes, SaplingNullifierIsSpent. |
|||
Add new wallet test: NavigateFromSaplingNullifierToNote |
|||
Add new wallet test: UpdatedSaplingNoteData. |
|||
Add new wallet tests: SpentSaplingNoteIsFromMe. |
|||
Rename wallet tests for clarity between Sprout and Sapling. |
|||
Fix typo in variable name in test. |
|||
Fix inaccurate comments in test. |
|||
Fix typo in parameter name. |
|||
Update CWallet::GetConflicts for Sapling. |
|||
Add new wallet test: SetSaplingNoteAddrsInCWalletTx. |
|||
Add new wallet test: GetConflictedSaplingNotes |
|||
Add new wallet test: MarkAffectedSaplingTransactionsDirty |
|||
Update wallet unit tests to revert upgraded network parameters. |
|||
Clean up wallet unit tests: replace .value() with .get() for clarity. |
|||
Fix comment in CWallet::SyncMetaData. |
|||
Refactor: rename setLockedNotes -> setLockedSproutNotes |
|||
Refactor: rename UnlockAllNotes -> UnlockAllSproutNotes |
|||
Refactor: rename ListLockedNotes -> ListLockedSproutNotes |
|||
Add methods to store SaplingOutPoint in setLockedSaplingNotes |
|||
Add unit test SaplingNoteLocking |
|||
Update comment for test ContextualCheckBlockTest.BlockSproutRulesRejectOtherTx |
|||
Add Sapling fields to JSON RPC output using TxToJSON. |
|||
Update qa test to check for Sapling related JSON fields. |
|||
Closes #3534. Do not use APPROX_RELEASE_HEIGHT to get consensus branch id when in regtest mode. |
|||
For #3533. Replace asserts with JSON errors. |
|||
Update qa test as offline regtest nodes need branch id passed in. |
|||
Fix rebasing of CWallet::GetNullifiersForAddresses |
|||
Cleanup to address review comments. |
|||
Add test that Sapling shielded transactions have MAX_PRIORITY |
|||
Closes #3560. Update Sapling note data correctly when importing a key. |
|||
For #3546. Shielded tx with missing inputs are not treated as orphans. |
|||
For #3546. Improve estimated tx size for Sapling outputs. |
|||
Fix deadlock from calling CWallet::AddSaplingIncomingViewingKey instead of CBasicKeyStore::AddSaplingIncomingViewingKey |
|||
Fix file permissions of QA test wallet_persistence.py |
|||
Update wallet_persistence test to verify wallet txs are persisted across restarts. |
|||
Update wallet_persistence test to verify spending notes after restart. |
|||
Resolves Sapling nullifier persistence issue when importing a key. |
|||
Update test to verify Sapling nullifiers and witnesses persist correctly. |
|||
For #3359. RPCs transferring funds return error if Sapling addresses are used before Sapling activation. |
|||
For #3359. Return error if Sapling addresses passed to RPC z_mergetoaddress. |
|||
Update mainnet checkpoint for block 410100. |
|||
Update release notes for v2.0.1 |
|||
Update release-notes.md for clarity. |
|||
make-release.py: Versioning changes for 2.0.1. |
|||
make-release.py: Updated manpages for 2.0.1. |
|||
|
|||
WO (4): |
|||
Fix a bug of Windows binary |
|||
Add an assert for num_bits function |
|||
long -> int64_t |
|||
The long data type is replaced with int64_t |
|||
|
|||
Za Wilcox (1): |
|||
Revise help output for z_sendmany |
|||
|
|||
mdr0id (9): |
|||
Resolve final edits for README |
|||
Revert "wallet: Comment out HDSeed and CHDChain persistence to disk" |
|||
Persist Sapling key material in the wallet to disk |
|||
Serialize Sapling data in CWalletTx |
|||
Adding in rpc wallet sap for test_bitcoin |
|||
Add gtest coverage of Sapling wallet persistence |
|||
make-release.py: Versioning changes for 2.0.1-rc1. |
|||
make-release.py: Updated manpages for 2.0.1-rc1. |
|||
make-release.py: Updated release notes and changelog for 2.0.1-rc1. |
|||
|
|||
@ -0,0 +1,150 @@ |
|||
#!/usr/bin/env python2 |
|||
# Copyright (c) 2018 The Zcash developers |
|||
# Distributed under the MIT software license, see the accompanying |
|||
# file COPYING or http://www.opensource.org/licenses/mit-license.php. |
|||
|
|||
from test_framework.test_framework import BitcoinTestFramework |
|||
from test_framework.util import ( |
|||
assert_equal, |
|||
connect_nodes_bi, |
|||
initialize_chain_clean, |
|||
start_nodes, |
|||
wait_and_assert_operationid_status, |
|||
) |
|||
|
|||
from decimal import Decimal |
|||
|
|||
SAPLING_TREE_EMPTY_ROOT = "3e49b5f954aa9d3545bc6c37744661eea48d7c34e3000d82b7f0010c30f4c2fb" |
|||
NULL_FIELD = "0000000000000000000000000000000000000000000000000000000000000000" |
|||
|
|||
# Verify block header field 'hashFinalSaplingRoot' (returned in rpc as 'finalsaplingroot') |
|||
# is updated when Sapling transactions with outputs (commitments) are mined into a block. |
|||
class FinalSaplingRootTest(BitcoinTestFramework): |
|||
|
|||
def setup_chain(self): |
|||
print("Initializing test directory "+self.options.tmpdir) |
|||
initialize_chain_clean(self.options.tmpdir, 4) |
|||
|
|||
def setup_network(self, split=False): |
|||
self.nodes = start_nodes(4, self.options.tmpdir, extra_args=[[ |
|||
'-nuparams=5ba81b19:100', # Overwinter |
|||
'-nuparams=76b809bb:200', # Sapling |
|||
'-txindex' # Avoid JSONRPC error: No information available about transaction |
|||
]] * 4 ) |
|||
connect_nodes_bi(self.nodes,0,1) |
|||
connect_nodes_bi(self.nodes,1,2) |
|||
connect_nodes_bi(self.nodes,0,2) |
|||
connect_nodes_bi(self.nodes,0,3) |
|||
self.is_network_split=False |
|||
self.sync_all() |
|||
|
|||
def run_test(self): |
|||
# Activate Overwinter and Sapling |
|||
self.nodes[0].generate(200) |
|||
self.sync_all() |
|||
|
|||
# Verfify genesis block contains null field for what is now called the final sapling root field. |
|||
blk = self.nodes[0].getblock("0") |
|||
assert_equal(blk["finalsaplingroot"], NULL_FIELD) |
|||
|
|||
# Verify all generated blocks contain the empty root of the Sapling tree. |
|||
blockcount = self.nodes[0].getblockcount() |
|||
for height in xrange(1, blockcount + 1): |
|||
blk = self.nodes[0].getblock(str(height)) |
|||
assert_equal(blk["finalsaplingroot"], SAPLING_TREE_EMPTY_ROOT) |
|||
|
|||
# Node 0 shields some funds |
|||
taddr0 = self.nodes[0].getnewaddress() |
|||
saplingAddr0 = self.nodes[0].z_getnewaddress('sapling') |
|||
recipients = [] |
|||
recipients.append({"address": saplingAddr0, "amount": Decimal('20')}) |
|||
myopid = self.nodes[0].z_sendmany(taddr0, recipients, 1, 0) |
|||
mytxid = wait_and_assert_operationid_status(self.nodes[0], myopid) |
|||
|
|||
self.sync_all() |
|||
self.nodes[0].generate(1) |
|||
self.sync_all() |
|||
|
|||
# Verify the final Sapling root has changed |
|||
blk = self.nodes[0].getblock("201") |
|||
root = blk["finalsaplingroot"] |
|||
assert(root is not SAPLING_TREE_EMPTY_ROOT) |
|||
assert(root is not NULL_FIELD) |
|||
|
|||
# Verify there is a Sapling output description (its commitment was added to tree) |
|||
result = self.nodes[0].getrawtransaction(mytxid, 1) |
|||
assert_equal(len(result["vShieldedOutput"]), 1) |
|||
|
|||
# Mine an empty block and verify the final Sapling root does not change |
|||
self.sync_all() |
|||
self.nodes[0].generate(1) |
|||
self.sync_all() |
|||
assert_equal(root, self.nodes[0].getblock("202")["finalsaplingroot"]) |
|||
|
|||
# Mine a block with a transparent tx and verify the final Sapling root does not change |
|||
taddr1 = self.nodes[1].getnewaddress() |
|||
self.nodes[0].sendtoaddress(taddr1, Decimal("1.23")) |
|||
|
|||
self.sync_all() |
|||
self.nodes[0].generate(1) |
|||
self.sync_all() |
|||
|
|||
assert_equal(len(self.nodes[0].getblock("203")["tx"]), 2) |
|||
assert_equal(self.nodes[1].z_getbalance(taddr1), Decimal("1.23")) |
|||
assert_equal(root, self.nodes[0].getblock("203")["finalsaplingroot"]) |
|||
|
|||
# Mine a block with a Sprout shielded tx and verify the final Sapling root does not change |
|||
zaddr1 = self.nodes[1].z_getnewaddress() |
|||
recipients = [] |
|||
recipients.append({"address": zaddr1, "amount": Decimal('10')}) |
|||
myopid = self.nodes[0].z_sendmany(taddr0, recipients, 1, 0) |
|||
wait_and_assert_operationid_status(self.nodes[0], myopid) |
|||
|
|||
self.sync_all() |
|||
self.nodes[0].generate(1) |
|||
self.sync_all() |
|||
|
|||
assert_equal(len(self.nodes[0].getblock("204")["tx"]), 2) |
|||
assert_equal(self.nodes[1].z_getbalance(zaddr1), Decimal("10")) |
|||
assert_equal(root, self.nodes[0].getblock("204")["finalsaplingroot"]) |
|||
|
|||
# Mine a block with a Sapling shielded recipient and verify the final Sapling root changes |
|||
saplingAddr1 = self.nodes[1].z_getnewaddress("sapling") |
|||
recipients = [] |
|||
recipients.append({"address": saplingAddr1, "amount": Decimal('12.34')}) |
|||
myopid = self.nodes[0].z_sendmany(saplingAddr0, recipients, 1, 0) |
|||
mytxid = wait_and_assert_operationid_status(self.nodes[0], myopid) |
|||
|
|||
self.sync_all() |
|||
self.nodes[0].generate(1) |
|||
self.sync_all() |
|||
|
|||
assert_equal(len(self.nodes[0].getblock("205")["tx"]), 2) |
|||
assert_equal(self.nodes[1].z_getbalance(saplingAddr1), Decimal("12.34")) |
|||
assert(root is not self.nodes[0].getblock("205")["finalsaplingroot"]) |
|||
|
|||
# Verify there is a Sapling output description (its commitment was added to tree) |
|||
result = self.nodes[0].getrawtransaction(mytxid, 1) |
|||
assert_equal(len(result["vShieldedOutput"]), 2) # there is Sapling shielded change |
|||
|
|||
# Mine a block with a Sapling shielded sender and transparent recipient and verify the final Sapling root doesn't change |
|||
taddr2 = self.nodes[0].getnewaddress() |
|||
recipients = [] |
|||
recipients.append({"address": taddr2, "amount": Decimal('12.34')}) |
|||
myopid = self.nodes[1].z_sendmany(saplingAddr1, recipients, 1, 0) |
|||
mytxid = wait_and_assert_operationid_status(self.nodes[1], myopid) |
|||
|
|||
self.sync_all() |
|||
self.nodes[0].generate(1) |
|||
self.sync_all() |
|||
|
|||
assert_equal(len(self.nodes[0].getblock("206")["tx"]), 2) |
|||
assert_equal(self.nodes[0].z_getbalance(taddr2), Decimal("12.34")) |
|||
|
|||
blk = self.nodes[0].getblock("206") |
|||
root = blk["finalsaplingroot"] |
|||
assert_equal(root, self.nodes[0].getblock("205")["finalsaplingroot"]) |
|||
|
|||
|
|||
if __name__ == '__main__': |
|||
FinalSaplingRootTest().main() |
|||
Loading…
Reference in new issue