Merge pull request #60 from HorizenOfficial/ddb/align_w_cctp

Sync with cctp-lib v0.1.2
HorizenOfficial · Oct 14, 2022 · c4b213d · c4b213d
2 parents 40b7fd3 + f380a1d
commit c4b213d
Show file tree

Hide file tree

Showing 11 changed files with 390 additions and 227 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,14 +17,14 @@ path = "src/lib.rs"
 crate-type = ["staticlib"]
 
 [dependencies]
-algebra = { features = ["tweedle"], git = "https://github.com/HorizenOfficial/ginger-lib.git", tag = "0.3.1" }
-primitives = { features = ["tweedle", "merkle_tree"], git = "https://github.com/HorizenOfficial/ginger-lib.git", tag = "0.3.1" }
-cctp_primitives = { git = "https://github.com/HorizenOfficial/zendoo-cctp-lib.git", tag = "0.1.1" }
-proof-systems = { features = ["darlin"], git = "https://github.com/HorizenOfficial/ginger-lib.git", tag = "0.3.1", optional = true }
-r1cs-crypto = { features = ["tweedle"], git = "https://github.com/HorizenOfficial/ginger-lib.git", tag = "0.3.1", optional = true }
-r1cs-core = { git = "https://github.com/HorizenOfficial/ginger-lib.git", tag = "0.3.1", optional = true}
-r1cs-std = { features = ["tweedle"], git = "https://github.com/HorizenOfficial/ginger-lib.git", tag = "0.3.1", optional = true}
-
+algebra = { features = ["tweedle"], git = "https://github.com/HorizenOfficial/ginger-lib.git", branch = "development" }
+primitives = { features = ["tweedle", "merkle_tree"], git = "https://github.com/HorizenOfficial/ginger-lib.git", branch = "development" }
+cctp_primitives = { git = "https://github.com/HorizenOfficial/zendoo-cctp-lib.git", branch = "dev" }
+proof-systems = { features = ["darlin"], git = "https://github.com/HorizenOfficial/ginger-lib.git", branch = "development", optional = true }
+r1cs-crypto = { features = ["tweedle"], git = "https://github.com/HorizenOfficial/ginger-lib.git", branch = "development", optional = true }
+r1cs-core = { git = "https://github.com/HorizenOfficial/ginger-lib.git", branch = "development", optional = true}
+r1cs-std = { features = ["tweedle"], git = "https://github.com/HorizenOfficial/ginger-lib.git", branch = "development", optional = true}
+crossbeam-utils = "=0.8.7"
 maybe-uninit = "=2.0.0"
 rand = "0.8.4"
 winapi = "0.3.9"