Merge 525a6f6 into 895bb43

tower-batch/Cargo.toml

@@ -6,19 +6,19 @@ license = "MIT"
 edition = "2018"
 
 [dependencies]
-tokio = { version = "0.3.6", features = ["time", "sync", "stream", "tracing", "macros"] }
-tower = { version = "0.4", features = ["util", "buffer"] }
+futures = "0.3.13"
 futures-core = "0.3.13"
 pin-project = "0.4.27"
+tokio = { version = "0.3.6", features = ["time", "sync", "stream", "tracing", "macros"] }
+tower = { version = "0.4", features = ["util", "buffer"] }
 tracing = "0.1.25"
 tracing-futures = "0.2.5"
-futures = "0.3.13"
 
 [dev-dependencies]
+color-eyre = "0.5.10"
 ed25519-zebra = "2.1.0"
 rand = "0.7"
 tokio = { version = "0.3.6", features = ["full"]}
+tower-fallback = { path = "../tower-fallback/" }
 tracing = "0.1.25"
 zebra-test = { path = "../zebra-test/" }
-tower-fallback = { path = "../tower-fallback/" }
-color-eyre = "0.5.10"

zebra-chain/Cargo.toml

@@ -25,7 +25,7 @@ hex = "0.4"
 jubjub = "0.6.0"
 lazy_static = "1.4.0"
 primitive-types = "0.9.0"
-rand_core = "0.5.1"
+rand_core = "0.6"
 ripemd160 = "0.8.0"
 secp256k1 = { version = "0.20.1", features = ["serde"] }
 serde = { version = "1", features = ["serde_derive", "rc"] }
@@ -41,7 +41,8 @@ proptest-derive = { version = "0.3.0", optional = true }
 displaydoc = "0.1.7"
 ed25519-zebra = "1"
 equihash = "0.1"
-redjubjub = "0.2"
+#redjubjub = "0.2"
+redjubjub = {git = "https://github.com/ZcashFoundation/redjubjub", rev = "8101eaff1cb2fca45334f77a65caa4c46e3d545b"}
 bitflags = "1.2.1"
 
 [dev-dependencies]