Update zkp crate dependency address

Cargo.lock

@@ -404,7 +404,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
- "digest 0.10.7",
+ "digest",
  "fiat-crypto",
  "platforms",
  "rand_core 0.6.4",
@@ -425,20 +425,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "curve25519-dalek-ng"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b8dfd4d479156d9ad3fe6d1562f78ff31a9ba8831d3575126061541c7294e48"
-dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
- "serde",
- "subtle-ng",
- "zeroize",
-]
-
 [[package]]
 name = "darling"
 version = "0.20.3"
@@ -494,15 +480,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -823,12 +800,6 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
-[[package]]
-name = "hex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1086,7 +1057,7 @@ dependencies = [
  "sled",
  "time",
  "tokio",
- "zkp 0.7.0",
+ "zkp",
 ]
 
 [[package]]
@@ -1109,7 +1080,7 @@ dependencies = [
  "subtle",
  "thiserror",
  "time",
- "zkp 0.7.0",
+ "zkp",
 ]
 
 [[package]]
@@ -1127,7 +1098,7 @@ dependencies = [
  "serde_json",
  "time",
  "wasm-bindgen",
- "zkp 0.8.0",
+ "zkp",
 ]
 
 [[package]]
@@ -1155,18 +1126,6 @@ dependencies = [
  "autocfg 1.1.0",
 ]
 
-[[package]]
-name = "merlin"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42"
-dependencies = [
- "byteorder",
- "keccak",
- "rand_core 0.5.1",
- "zeroize",
-]
-
 [[package]]
 name = "merlin"
 version = "3.0.0"
@@ -1174,7 +1133,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
 dependencies = [
  "byteorder",
- "hex 0.3.2",
  "keccak",
  "rand_core 0.6.4",
  "zeroize",
@@ -1701,7 +1659,7 @@ dependencies = [
  "crc64",
  "futures",
  "futures-util",
- "hex 0.4.3",
+ "hex",
  "reqwest",
  "serde",
  "serde_json",
@@ -1897,7 +1855,7 @@ checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
 dependencies = [
  "base64",
  "chrono",
- "hex 0.4.3",
+ "hex",
  "indexmap 1.9.3",
  "indexmap 2.0.0",
  "serde",
@@ -1926,7 +1884,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -1937,7 +1895,7 @@ checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -2028,12 +1986,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
-[[package]]
-name = "subtle-ng"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
-
 [[package]]
 name = "syn"
 version = "2.0.29"
@@ -2525,26 +2477,12 @@ dependencies = [
 [[package]]
 name = "zkp"
 version = "0.7.0"
-source = "git+https://git@gitlab.torproject.org/onyinyang/lox-zkp.git?rev=a174be65#a174be6503d09514e9102091547308e9e94648b0"
+source = "git+https://gitlab.torproject.org/onyinyang/lox-zkp#0210f272211bd9a4000e3ee9dd9358316b0a8d0c"
 dependencies = [
  "curve25519-dalek",
- "merlin 3.0.0",
+ "merlin",
  "rand 0.8.5",
  "serde",
  "serde_derive",
  "thiserror",
 ]
-
-[[package]]
-name = "zkp"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cf6dceea8522c0ade5abe68c1ca747e80b88adce2cd6a070e95f102037f331f"
-dependencies = [
- "curve25519-dalek-ng",
- "merlin 2.0.1",
- "rand 0.7.3",
- "serde",
- "serde_derive",
- "thiserror",
-]

crates/lox-distributor/Cargo.toml

@@ -22,8 +22,7 @@ rand = "0.8.5"
 reqwest = { version = "0.11", features = ["json", "stream"]}
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_with = "3.4.0"
-zkp = { git = "https://git@gitlab.torproject.org/onyinyang/lox-zkp.git", rev = "a174be65"}
+zkp = { git = "https://gitlab.torproject.org/onyinyang/lox-zkp" }
-
 lox-library = { path = "../lox-library", version = "0.1.0"}
 lox_utils = { path = "../lox-utils", version = "0.1.0"}
 rdsys_backend = { path = "../rdsys-backend-api", version = "0.2"}

crates/lox-library/Cargo.toml

@@ -11,8 +11,6 @@ keywords = ["tor", "lox", "bridges"]
 [dependencies]
 curve25519-dalek = { version = "4", default-features = false, features = ["serde", "rand_core", "digest"] }
 ed25519-dalek = { version = "2", features = ["serde", "rand_core"] }
-# zkp = { version = "0.8", features = ["debug-transcript"] }
-#zkp = "0.8"
 bincode = "1"
 chrono = "0.4"
 rand = { version = "0.8", features = ["std_rng"]}
@@ -27,7 +25,7 @@ base64 = "0.21"
 time = "0.3.30"
 subtle = "2.5"
 thiserror = "1.0.49"
-zkp = { git = "https://git@gitlab.torproject.org/onyinyang/lox-zkp.git", rev = "a174be65", features = ["debug-transcript"]}
+zkp = { git = "https://gitlab.torproject.org/onyinyang/lox-zkp" }
 
 [features]
 #default = ["u64_backend"]

crates/lox-wasm/Cargo.toml

@@ -21,7 +21,7 @@ serde_json = "1.0.107"
 console_error_panic_hook = "0.1.7"
 js-sys = "0.3.64"
 rand = { version = "0.7", features = ["wasm-bindgen"] }
-zkp = "0.8.0"
+zkp = { git = "https://gitlab.torproject.org/onyinyang/lox-zkp" }
 
 [dependencies.chrono]
 version = "0.4.31"