From 5ce231b84ea26ca68603f738fb2f891274e5cb85 Mon Sep 17 00:00:00 2001 From: MRain Date: Fri, 10 May 2024 12:44:47 +0800 Subject: [PATCH] update jf/hotshot deps --- Cargo.lock | 426 +++++++++---------------- Cargo.toml | 13 +- src/availability/query_data.rs | 2 +- src/data_source.rs | 2 +- src/data_source/extension.rs | 2 +- src/data_source/fetching.rs | 2 +- src/data_source/sql.rs | 2 +- src/data_source/storage/sql.rs | 6 +- src/data_source/update.rs | 2 +- src/fetching/provider/query_service.rs | 2 +- src/merklized_state/data_source.rs | 2 +- src/testing/mocks.rs | 2 +- 12 files changed, 174 insertions(+), 289 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d93bd666c..fd3315034 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -391,17 +391,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-pallas" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760ecac12a00211188c9101b63bd284b80da5abcc5d97d9d2b3803bca1f63a52" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-std", -] - [[package]] name = "ark-poly" version = "0.4.2" @@ -1107,12 +1096,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - [[package]] name = "base64" version = "0.13.1" @@ -1354,7 +1337,7 @@ dependencies = [ [[package]] name = "cdn-broker" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.2#c41604361b634830b5ba874e06b997993055c25c" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.6#569d6a6ec3ccbbd41c041a4c80bd260bc5c928ff" dependencies = [ "async-std", "cdn-proto", @@ -1362,7 +1345,7 @@ dependencies = [ "console-subscriber", "dashmap", "derivative", - "jf-primitives 0.4.0-pre.0", + "jf-signature", "lazy_static", "local-ip-address", "parking_lot", @@ -1378,12 +1361,12 @@ dependencies = [ [[package]] name = "cdn-client" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.2#c41604361b634830b5ba874e06b997993055c25c" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.6#569d6a6ec3ccbbd41c041a4c80bd260bc5c928ff" dependencies = [ "async-std", "cdn-proto", "clap", - "jf-primitives 0.4.0-pre.0", + "jf-signature", "rand 0.8.5", "tokio", "tracing", @@ -1393,12 +1376,12 @@ dependencies = [ [[package]] name = "cdn-marshal" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.2#c41604361b634830b5ba874e06b997993055c25c" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.6#569d6a6ec3ccbbd41c041a4c80bd260bc5c928ff" dependencies = [ "async-std", "cdn-proto", "clap", - "jf-primitives 0.4.0-pre.0", + "jf-signature", "tokio", "tracing", "tracing-subscriber 0.3.18", @@ -1407,7 +1390,7 @@ dependencies = [ [[package]] name = "cdn-proto" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.2#c41604361b634830b5ba874e06b997993055c25c" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.6#569d6a6ec3ccbbd41c041a4c80bd260bc5c928ff" dependencies = [ "anyhow", "ark-serialize", @@ -1415,11 +1398,11 @@ dependencies = [ "capnp", "capnpc", "derivative", - "jf-primitives 0.4.0-pre.0", + "jf-signature", "kanal", "lazy_static", "mnemonic", - "mockall", + "num_enum", "pem", "prometheus", "quinn", @@ -1603,7 +1586,7 @@ dependencies = [ "hex", "serde", "sha3", - "tagged-base64 0.4.0", + "tagged-base64", ] [[package]] @@ -1892,18 +1875,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "crypto_kx" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704722d1d929489c8528bb1882805700f1ba20f54325704973e786352320b1ed" -dependencies = [ - "blake2", - "curve25519-dalek", - "rand_core 0.6.4", - "serdect", -] - [[package]] name = "csv" version = "1.3.0" @@ -2289,12 +2260,6 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" -[[package]] -name = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" - [[package]] name = "downcast-rs" version = "1.2.0" @@ -2420,11 +2385,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "espresso-systems-common" -version = "0.4.0" -source = "git+https://github.com/espressosystems/espresso-systems-common?tag=0.4.0#5abd890f79014a86db31286e1f3a529f161e69de" - [[package]] name = "espresso-systems-common" version = "0.4.1" @@ -2634,12 +2594,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - [[package]] name = "funty" version = "2.0.0" @@ -3170,7 +3124,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "async-broadcast", @@ -3195,10 +3149,11 @@ dependencies = [ "hotshot-task", "hotshot-task-impls", "hotshot-types", - "jf-primitives 0.4.4", + "jf-signature", "libp2p-identity", "libp2p-networking", "lru 0.12.3", + "num_enum", "portpicker", "rand 0.8.5", "serde", @@ -3214,7 +3169,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "async-trait", "clap", @@ -3224,7 +3179,7 @@ dependencies = [ "hotshot-types", "serde", "snafu 0.8.2", - "tagged-base64 0.4.0", + "tagged-base64", "tide-disco", "toml", "vbs", @@ -3233,7 +3188,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "async-broadcast", @@ -3263,7 +3218,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "derive_builder", "proc-macro2", @@ -3274,7 +3229,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3329,7 +3284,8 @@ dependencies = [ "hotshot-types", "include_dir", "itertools 0.12.1", - "jf-primitives 0.4.4", + "jf-merkle-tree", + "jf-vid", "native-tls", "portpicker", "postgres-native-tls", @@ -3342,7 +3298,7 @@ dependencies = [ "snafu 0.8.2", "spin_sleep", "surf-disco", - "tagged-base64 0.4.0", + "tagged-base64", "tempfile", "tide-disco", "time 0.3.36", @@ -3358,7 +3314,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -3371,7 +3327,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "async-broadcast", @@ -3381,6 +3337,7 @@ dependencies = [ "async-trait", "bincode", "bitvec", + "cdn-proto", "chrono", "committable", "either", @@ -3388,13 +3345,14 @@ dependencies = [ "hotshot-builder-api", "hotshot-task", "hotshot-types", - "jf-primitives 0.4.4", + "jf-signature", + "jf-vid", "rand 0.8.5", "serde", "sha2 0.10.8", "snafu 0.8.2", "surf-disco", - "tagged-base64 0.4.0", + "tagged-base64", "time 0.3.36", "tokio", "tracing", @@ -3404,7 +3362,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -3425,7 +3383,8 @@ dependencies = [ "hotshot-task", "hotshot-task-impls", "hotshot-types", - "jf-primitives 0.4.4", + "jf-signature", + "jf-vid", "lru 0.12.3", "portpicker", "rand 0.8.5", @@ -3433,7 +3392,7 @@ dependencies = [ "sha2 0.10.8", "sha3", "snafu 0.8.2", - "tagged-base64 0.4.0", + "tagged-base64", "tide-disco", "tokio", "tracing", @@ -3443,7 +3402,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "ark-bls12-381", @@ -3469,13 +3428,14 @@ dependencies = [ "displaydoc", "dyn-clone 1.0.17", "either", - "espresso-systems-common 0.4.1", + "espresso-systems-common", "ethereum-types", "futures", "generic-array", - "jf-plonk", - "jf-primitives 0.4.4", - "jf-utils 0.4.4", + "jf-pcs", + "jf-signature", + "jf-utils", + "jf-vid", "lazy_static", "memoize", "rand 0.8.5", @@ -3483,7 +3443,7 @@ dependencies = [ "serde", "sha2 0.10.8", "snafu 0.8.2", - "tagged-base64 0.4.0", + "tagged-base64", "time 0.3.36", "tokio", "tracing", @@ -3971,126 +3931,80 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] -name = "jf-plonk" -version = "0.4.4" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.4#8f48813ca52d964090dbf0de62f07f5e0c7e22c6" +name = "jf-commitment" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" +dependencies = [ + "ark-std", +] + +[[package]] +name = "jf-crhf" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ - "ark-ec", - "ark-ff", - "ark-poly", "ark-serialize", "ark-std", - "derivative", - "displaydoc", - "downcast-rs", - "dyn-clone 1.0.16", - "espresso-systems-common 0.4.0", - "hashbrown 0.14.3", - "itertools 0.12.1", - "jf-primitives 0.4.4", - "jf-relation 0.4.4", - "jf-utils 0.4.4", - "merlin", - "num-bigint", - "rand_chacha 0.3.1", - "rayon", - "serde", - "sha3", - "tagged-base64 0.4.0", ] [[package]] -name = "jf-primitives" -version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2#f85f9024ef42ab8be95b2c81bd15fd6cbadeafbf" +name = "jf-merkle-tree" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ - "anyhow", "ark-bls12-377", "ark-bls12-381", "ark-bn254", - "ark-bw6-761", - "ark-crypto-primitives", "ark-ec", - "ark-ed-on-bls12-377", - "ark-ed-on-bls12-381", - "ark-ed-on-bn254", "ark-ff", - "ark-pallas", - "ark-poly", "ark-serialize", "ark-std", - "blst", - "chacha20poly1305", - "crypto_kx", "derivative", "digest 0.10.7", "displaydoc", - "espresso-systems-common 0.4.0", - "generic-array", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-relation 0.4.0-pre.0", - "jf-utils 0.4.0-pre.0", - "merlin", + "jf-relation", + "jf-rescue", + "jf-utils", "num-bigint", "num-traits", - "rand_chacha 0.3.1", "serde", - "sha2 0.10.8", "sha3", - "tagged-base64 0.3.4", - "typenum", - "zeroize", + "tagged-base64", ] [[package]] -name = "jf-primitives" -version = "0.4.4" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.4#8f48813ca52d964090dbf0de62f07f5e0c7e22c6" +name = "jf-pcs" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ - "anyhow", - "ark-bls12-377", - "ark-bls12-381", - "ark-bn254", - "ark-bw6-761", - "ark-crypto-primitives", "ark-ec", - "ark-ed-on-bls12-377", - "ark-ed-on-bls12-381", - "ark-ed-on-bn254", "ark-ff", - "ark-pallas", "ark-poly", "ark-serialize", "ark-std", - "blst", - "chacha20poly1305", - "crypto_kx", "derivative", - "digest 0.10.7", "displaydoc", - "espresso-systems-common 0.4.0", - "generic-array", - "hashbrown 0.14.3", "itertools 0.12.1", - "jf-relation 0.4.4", - "jf-utils 0.4.4", + "jf-utils", "merlin", - "num-bigint", - "num-traits", - "rand_chacha 0.3.1", "rayon", - "serde", - "sha2 0.10.8", - "sha3", - "tagged-base64 0.4.0", - "zeroize", +] + +[[package]] +name = "jf-prf" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" +dependencies = [ + "ark-serialize", + "ark-std", ] [[package]] name = "jf-relation" -version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2#f85f9024ef42ab8be95b2c81bd15fd6cbadeafbf" +version = "0.4.4" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ "ark-bls12-377", "ark-bls12-381", @@ -4107,66 +4021,108 @@ dependencies = [ "dyn-clone 1.0.16", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-utils 0.4.0-pre.0", + "jf-utils", "num-bigint", "rand_chacha 0.3.1", + "rayon", ] [[package]] -name = "jf-relation" -version = "0.4.4" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.4#8f48813ca52d964090dbf0de62f07f5e0c7e22c6" +name = "jf-rescue" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ "ark-bls12-377", "ark-bls12-381", "ark-bn254", "ark-bw6-761", + "ark-crypto-primitives", + "ark-ed-on-bls12-377", + "ark-ed-on-bls12-381", + "ark-ed-on-bn254", + "ark-ff", + "ark-std", + "displaydoc", + "itertools 0.12.1", + "jf-commitment", + "jf-crhf", + "jf-prf", + "jf-relation", + "jf-utils", +] + +[[package]] +name = "jf-signature" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" +dependencies = [ + "ark-bls12-381", + "ark-bn254", "ark-ec", "ark-ff", - "ark-poly", "ark-serialize", "ark-std", + "blst", "derivative", + "digest 0.10.7", "displaydoc", - "downcast-rs", - "dyn-clone 1.0.16", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-utils 0.4.4", + "jf-crhf", + "jf-relation", + "jf-rescue", + "jf-utils", "num-bigint", - "rand_chacha 0.3.1", - "rayon", + "num-traits", + "serde", + "sha3", + "tagged-base64", + "zeroize", ] [[package]] name = "jf-utils" -version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.2#f85f9024ef42ab8be95b2c81bd15fd6cbadeafbf" +version = "0.4.4" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ "ark-ec", + "ark-ed-on-bls12-377", + "ark-ed-on-bls12-381", "ark-ff", + "ark-poly", "ark-serialize", "ark-std", "digest 0.10.7", + "displaydoc", + "rand_chacha 0.3.1", + "rayon", "serde", "sha2 0.10.8", - "tagged-base64 0.3.4", + "tagged-base64", ] [[package]] -name = "jf-utils" -version = "0.4.4" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.4#8f48813ca52d964090dbf0de62f07f5e0c7e22c6" +name = "jf-vid" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ + "anyhow", "ark-ec", "ark-ff", + "ark-poly", "ark-serialize", "ark-std", + "derivative", "digest 0.10.7", + "displaydoc", + "generic-array", + "itertools 0.12.1", + "jf-merkle-tree", + "jf-pcs", + "jf-utils", "rayon", "serde", - "sha2 0.10.8", - "tagged-base64 0.4.0", + "tagged-base64", ] [[package]] @@ -4547,7 +4503,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "async-compatibility-layer", @@ -5190,33 +5146,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b8f3a258db515d5e91a904ce4ae3f73e091149b90cadbdb93d210bee07f63b" -[[package]] -name = "mockall" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" -dependencies = [ - "cfg-if", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "multiaddr" version = "0.18.1" @@ -5527,6 +5456,27 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "object" version = "0.32.2" @@ -6003,32 +5953,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "predicates" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" -dependencies = [ - "anstyle", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - [[package]] name = "primitive-types" version = "0.12.2" @@ -7152,16 +7076,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "serdect" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177" -dependencies = [ - "base16ct", - "serde", -] - [[package]] name = "sha-1" version = "0.9.8" @@ -7984,21 +7898,6 @@ dependencies = [ "libc", ] -[[package]] -name = "tagged-base64" -version = "0.3.4" -source = "git+https://github.com/EspressoSystems/tagged-base64?tag=0.3.4#93be6f0f5c0ec8458f13dede3d2b68dcce12a608" -dependencies = [ - "ark-serialize", - "ark-std", - "base64 0.21.7", - "crc-any", - "serde", - "snafu 0.7.5", - "tagged-base64-macros 0.3.3", - "wasm-bindgen", -] - [[package]] name = "tagged-base64" version = "0.4.0" @@ -8011,19 +7910,10 @@ dependencies = [ "crc-any", "serde", "snafu 0.8.2", - "tagged-base64-macros 0.4.0", + "tagged-base64-macros", "wasm-bindgen", ] -[[package]] -name = "tagged-base64-macros" -version = "0.3.3" -source = "git+https://github.com/EspressoSystems/tagged-base64?tag=0.3.4#93be6f0f5c0ec8458f13dede3d2b68dcce12a608" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "tagged-base64-macros" version = "0.4.0" @@ -8052,12 +7942,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - [[package]] name = "thiserror" version = "1.0.56" @@ -8158,7 +8042,7 @@ dependencies = [ "snafu 0.8.2", "strum", "strum_macros", - "tagged-base64 0.4.0", + "tagged-base64", "tide", "tide-websockets", "toml", diff --git a/Cargo.toml b/Cargo.toml index 440333010..218469ddc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,11 +74,12 @@ derivative = "2.2" derive_more = "0.99" either = "1.11" futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" } -hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" } +hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" } itertools = "0.12.1" -jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.4" } +jf-merkle-tree = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = ["std"] } +jf-vid = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = ["std", "parallel"] } prometheus = "0.13" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" @@ -110,7 +111,7 @@ tokio-postgres = { version = "0.7", optional = true, default-features = false, f # Dependencies enabled by feature "testing". espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0", optional = true } -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50", optional = true } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51", optional = true } portpicker = { version = "0.1", optional = true } rand = { version = "0.8", optional = true } spin_sleep = { version = "1.2", optional = true } @@ -131,7 +132,7 @@ backtrace-on-stack-overflow = { version = "0.3", optional = true } clap = { version = "4.5", features = ["derive", "env"] } espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0" } generic-array = "0.14" -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" } portpicker = "0.1" rand = "0.8" reqwest = "0.12.3" diff --git a/src/availability/query_data.rs b/src/availability/query_data.rs index 953263d51..5520bb239 100644 --- a/src/availability/query_data.rs +++ b/src/availability/query_data.rs @@ -22,7 +22,7 @@ use hotshot_types::{ }, vid::{vid_scheme, VidCommitment}, }; -use jf_primitives::vid::VidScheme; +use jf_vid::VidScheme; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use snafu::{ensure, Snafu}; use std::fmt::Debug; diff --git a/src/data_source.rs b/src/data_source.rs index dc6cb2d96..9ace6fb59 100644 --- a/src/data_source.rs +++ b/src/data_source.rs @@ -572,7 +572,7 @@ pub mod node_tests { traits::block_contents::{vid_commitment, BlockPayload}, vid::{vid_scheme, VidSchemeType}, }; - use jf_primitives::vid::VidScheme; + use jf_vid::VidScheme; #[async_std::test] pub async fn test_sync_status() { diff --git a/src/data_source/extension.rs b/src/data_source/extension.rs index 6a2969adc..20b1de2c1 100644 --- a/src/data_source/extension.rs +++ b/src/data_source/extension.rs @@ -29,7 +29,7 @@ use crate::{ }; use async_trait::async_trait; use hotshot_types::traits::node_implementation::NodeType; -use jf_primitives::merkle_tree::prelude::MerkleProof; +use jf_merkle_tree::prelude::MerkleProof; use std::ops::RangeBounds; /// Wrapper to add extensibility to an existing data source. diff --git a/src/data_source/fetching.rs b/src/data_source/fetching.rs index ce464f236..faf3fc2eb 100644 --- a/src/data_source/fetching.rs +++ b/src/data_source/fetching.rs @@ -110,7 +110,7 @@ use futures::{ stream::{self, BoxStream, Stream, StreamExt}, }; use hotshot_types::traits::node_implementation::NodeType; -use jf_primitives::merkle_tree::{prelude::MerkleProof, MerkleTreeScheme}; +use jf_merkle_tree::{prelude::MerkleProof, MerkleTreeScheme}; use std::{ cmp::min, diff --git a/src/data_source/sql.rs b/src/data_source/sql.rs index aefd1ebe1..366ee3c71 100644 --- a/src/data_source/sql.rs +++ b/src/data_source/sql.rs @@ -428,7 +428,7 @@ mod test { }; use hotshot_example_types::state_types::TestInstanceState; use hotshot_types::vid::vid_scheme; - use jf_primitives::vid::VidScheme; + use jf_vid::VidScheme; type D = SqlDataSource; diff --git a/src/data_source/storage/sql.rs b/src/data_source/storage/sql.rs index 27b9c9ced..61d13b9c6 100644 --- a/src/data_source/storage/sql.rs +++ b/src/data_source/storage/sql.rs @@ -63,7 +63,7 @@ use hotshot_types::{ }, }; use itertools::{izip, Itertools}; -use jf_primitives::merkle_tree::{ +use jf_merkle_tree::{ prelude::{MerkleNode, MerkleProof}, DigestAlgorithm, MerkleCommitment, ToTraversalPath, }; @@ -3207,7 +3207,7 @@ pub mod testing { mod test { use hotshot_example_types::state_types::TestInstanceState; - use jf_primitives::merkle_tree::{ + use jf_merkle_tree::{ universal_merkle_tree::UniversalMerkleTree, LookupResult, UniversalMerkleTreeScheme, }; use rand::{seq::IteratorRandom, RngCore}; @@ -3454,7 +3454,7 @@ mod test { use crate::data_source::VersionedDataSource; - use jf_primitives::merkle_tree::MerkleTreeScheme; + use jf_merkle_tree::MerkleTreeScheme; #[async_std::test] async fn test_merklized_state_storage() { diff --git a/src/data_source/update.rs b/src/data_source/update.rs index 8f4f501cc..5f238d865 100644 --- a/src/data_source/update.rs +++ b/src/data_source/update.rs @@ -28,7 +28,7 @@ use hotshot_types::{ }, vid::vid_scheme, }; -use jf_primitives::vid::VidScheme; +use jf_vid::VidScheme; use std::{error::Error, fmt::Debug, iter::once}; /// An extension trait for types which implement the update trait for each API module. diff --git a/src/fetching/provider/query_service.rs b/src/fetching/provider/query_service.rs index adace77a7..e918f10e9 100644 --- a/src/fetching/provider/query_service.rs +++ b/src/fetching/provider/query_service.rs @@ -23,7 +23,7 @@ use hotshot_types::{ traits::{node_implementation::NodeType, BlockPayload}, vid::{vid_scheme, VidSchemeType}, }; -use jf_primitives::vid::VidScheme; +use jf_vid::VidScheme; use surf_disco::{Client, Url}; use vbs::version::StaticVersionType; diff --git a/src/merklized_state/data_source.rs b/src/merklized_state/data_source.rs index 96c9aa9e7..d9a1998d7 100644 --- a/src/merklized_state/data_source.rs +++ b/src/merklized_state/data_source.rs @@ -22,7 +22,7 @@ use derivative::Derivative; use derive_more::Display; use hotshot_types::traits::node_implementation::NodeType; -use jf_primitives::merkle_tree::{ +use jf_merkle_tree::{ prelude::MerkleProof, DigestAlgorithm, Element, ForgetableMerkleTreeScheme, Index, MerkleCommitment, NodeValue, ToTraversalPath, }; diff --git a/src/testing/mocks.rs b/src/testing/mocks.rs index 847360bce..ed5bbcd15 100644 --- a/src/testing/mocks.rs +++ b/src/testing/mocks.rs @@ -32,7 +32,7 @@ use hotshot_types::{ traits::node_implementation::NodeType, }; -use jf_primitives::merkle_tree::{ +use jf_merkle_tree::{ prelude::{MerkleProof, Sha3Digest, Sha3Node}, universal_merkle_tree::UniversalMerkleTree, ForgetableMerkleTreeScheme, ForgetableUniversalMerkleTreeScheme,