Merge pull request #277 from dalek-cryptography/merge-main-into-develop

Merge main into develop

Author: hdevalence

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 Entries are listed in reverse chronological order.
 
+## 1.0.2
+
+* Updates the library to use the renamed functions in Merlin 1.1.
+* Adds additional validation checks to prevent identity points being used as
+  part of a proof.  This does not appear to have security content, but is
+  intended as a defense-in-depth mechanism.  
+  See [this comment][identity_comment] for more motivation.
+* Documentation tweaks.
+
 ## 1.0.1
 
 * Tweaks to crate metadata.
@@ -20,3 +29,4 @@ Entries are listed in reverse chronological order.
 Initial prerelease version, supporting single and aggregated range proofs, and
 multiparty proof aggregation.
 
+[identity_comment]: https://github.com/dalek-cryptography/bulletproofs/pull/248#discussion_r251916724

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bulletproofs"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Cathie Yun <[email protected]>", 
            "Henry de Valence <[email protected]>",
            "Oleg Andreev <[email protected]>"]
@@ -12,7 +12,7 @@ keywords = ["cryptography", "ristretto", "zero-knowledge", "bulletproofs"]
 description = "A pure-Rust implementation of Bulletproofs using Ristretto"
 
 [dependencies]
-curve25519-dalek = { version = "1", features = ["serde"] }
+curve25519-dalek = { version = "1.0.3", features = ["serde"] }
 subtle = "2"
 sha3 = "0.8"
 digest = "0.8"
@@ -21,7 +21,7 @@ byteorder = "1"
 serde = "1"
 serde_derive = "1"
 failure = "0.1"
-merlin = "1"
+merlin = "1.1"
 clear_on_drop = "0.2"
 
 [dev-dependencies]

README.md

@@ -2,7 +2,7 @@
 
 <img
  width="100%"
- src="https://user-images.githubusercontent.com/698/46373713-9cc40280-c643-11e8-9bfe-2b0586e40369.png"
+ src="https://doc.dalek.rs/assets/bulletproofs-rangeproof.png"
 />
 
 The fastest [Bulletproofs][bp_website] implementation ever, featuring
@@ -145,6 +145,15 @@ assert!(
 );
 # }
 ```
+## Building
+
+To compile successfully, you will need to have nightly Rust installed, rather than stable.
+
+You can install nightly Rust with rustup:
+
+```text
+rustup default nightly
+```
 
 ## Tests and Benchmarks