all: update merlin and curve25519 to 2.0 (stellar#391)

accounts/Cargo.toml

@@ -7,10 +7,10 @@ edition = "2018"
 [dependencies]
 failure = "0.1"
 byteorder = "1"
-merlin = "1.0.1"
-rand = "0.6"
+merlin = "2"
+rand = "0.7"
 subtle = "2"
-curve25519-dalek = { version = "1.0.1", features = ["serde"] }
+curve25519-dalek = { version = "2", features = ["serde"] }
 serde = { version = "1.0", features=["derive"] }
 
 [dependencies.bulletproofs]
@@ -28,5 +28,5 @@ path = "../musig"
 path = "../zkvm"
 
 [dev-dependencies]
-rand_chacha = "0.1"
+rand_chacha = "0.2"
 hex = "^0.3"

demo/Cargo.toml

@@ -5,17 +5,18 @@ authors = ["Oleg Andreev <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-rand = "0.6"
+rand = "0.7"
 rocket = "0.4.2"
 diesel = { version = "1.0.0", features = ["postgres"] }
 dotenv = "0.9.0"
-merlin = "1.0.1"
+merlin = "2"
 time = "^0.1"
-curve25519-dalek = { version = "1.0.1", features = ["serde"] }
+curve25519-dalek = { version = "2", features = ["serde"] }
 serde = { version = "1.0", features=["derive"] }
-rand_chacha = "0.1"
+rand_chacha = "0.2"
 hex = "^0.3"
 
+
 [dependencies.bulletproofs]
 git = "https://github.com/dalek-cryptography/bulletproofs"
 branch = "develop"

keytree/Cargo.toml

@@ -5,14 +5,14 @@ authors = ["Tess Rinearson <[email protected]>", "Oleg Andreev <oleganza@
 edition = "2018"
 
 [dependencies]
-curve25519-dalek = { version = "1.0.1", features = ["serde"] }
+curve25519-dalek = { version = "2", features = ["serde"] }
 serde = { version = "1.0", features=["derive"] }
-merlin = "1.0.1"
-rand = "0.6"
+merlin = "2"
+rand = "0.7"
 
 [dependencies.starsig]
 path = "../starsig"
 
 [dev-dependencies]
-rand_chacha = "0.1"
+rand_chacha = "0.2"
 hex = "^0.3"

musig/Cargo.toml

@@ -6,10 +6,10 @@ edition = "2018"
 
 [dependencies]
 failure = "0.1"
-merlin = "1.0.1"
-rand = "0.6"
+merlin = "2"
+rand = "0.7"
 subtle = "2"
-curve25519-dalek = { version = "1.0.1", features = ["serde"] }
+curve25519-dalek = { version = "2", features = ["serde"] }
 serde = { version = "1.0", features=["derive"] }
 
 [dependencies.starsig]

spacesuit/Cargo.toml

@@ -5,10 +5,10 @@ authors = ["Henry de Valence <[email protected]>", "Cathie Yun <cathieyun
 
 [dependencies]
 failure = "0.1"
-merlin = "1.0.1"
-rand = "0.6"
+merlin = "2"
+rand = "0.7"
 subtle = "2"
-curve25519-dalek = { version = "1.0.1", features = ["serde"] }
+curve25519-dalek = { version = "2", features = ["serde"] }
 
 [dependencies.bulletproofs]
 git = "https://github.com/dalek-cryptography/bulletproofs"

starsig/Cargo.toml

@@ -12,8 +12,8 @@ description = "A pure-Rust implementation of Schnorr signatures using Ristretto"
 
 [dependencies]
 failure = "0.1"
-merlin = "1.0.1"
-rand_core = { version = "0.3.0", default-features = false }
-rand = "0.6"
-curve25519-dalek = { version = "1.0.1", features = ["serde"] }
+merlin = "2"
+rand_core = { version = "0.5", default-features = false }
+rand = "0.7"
+curve25519-dalek = { version = "2", features = ["serde"] }
 serde = { version = "1.0", features=["derive"] }

token/Cargo.toml

@@ -7,11 +7,11 @@ edition = "2018"
 [dependencies]
 failure = "0.1"
 byteorder = "1"
-merlin = "1.0.1"
+merlin = "2"
 postgres = "0.15"
-rand = "0.6"
+rand = "0.7"
 subtle = "2"
-curve25519-dalek = { version = "1.0.1", features = ["serde"] }
+curve25519-dalek = { version = "2", features = ["serde"] }
 
 [dependencies.bulletproofs]
 git = "https://github.com/dalek-cryptography/bulletproofs"

zkvm/Cargo.toml

@@ -13,10 +13,10 @@ description = "A blockchain VM with cloaked transactions and zero-knowledge smar
 [dependencies]
 failure = "0.1"
 byteorder = "1"
-merlin = "1.0.1"
-rand = "0.6"
+merlin = "2"
+rand = "0.7"
 subtle = "2"
-curve25519-dalek = { version = "1.0.1", features = ["serde"] }
+curve25519-dalek = { version = "2", features = ["serde"] }
 serde = { version = "1.0", features=["derive"] }
 subtle-encoding = "0.3"
 hex = "^0.3"