diff --git a/Cargo.lock b/Cargo.lock index b1d1bbdf3..ef731fbbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -608,9 +608,9 @@ dependencies = [ [[package]] name = "async-compatibility-layer" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c928880329566b45c159fca61fbc2a1d301a7e5fd2a0e94c17476bb1a3ea526" +checksum = "32dd1dfd4a05a197583e51036d9615f04a4d851089dc119ee965d440d0bcaa39" dependencies = [ "async-lock 3.4.0", "async-std", @@ -1330,13 +1330,13 @@ checksum = "066fce287b1d4eafef758e89e09d724a24808a9196fe9756b8ca90e86d0719a2" [[package]] name = "cdn-broker" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2#09389360284c51dd44a3dae1f1c3b395125abe82" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4#398b77fb2f461218a611294e1484b7e0bd571d64" dependencies = [ "async-std", "cdn-proto", "clap", "console-subscriber 0.3.0", - "dashmap 5.5.3", + "dashmap", "derivative", "jf-signature", "lazy_static", @@ -1354,7 +1354,7 @@ dependencies = [ [[package]] name = "cdn-client" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2#09389360284c51dd44a3dae1f1c3b395125abe82" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4#398b77fb2f461218a611294e1484b7e0bd571d64" dependencies = [ "async-std", "cdn-proto", @@ -1369,7 +1369,7 @@ dependencies = [ [[package]] name = "cdn-marshal" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2#09389360284c51dd44a3dae1f1c3b395125abe82" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4#398b77fb2f461218a611294e1484b7e0bd571d64" dependencies = [ "async-std", "cdn-proto", @@ -1383,7 +1383,7 @@ dependencies = [ [[package]] name = "cdn-proto" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2#09389360284c51dd44a3dae1f1c3b395125abe82" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4#398b77fb2f461218a611294e1484b7e0bd571d64" dependencies = [ "anyhow", "ark-serialize", @@ -2063,19 +2063,6 @@ dependencies = [ "syn 2.0.69", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - [[package]] name = "dashmap" version = "6.0.1" @@ -3160,8 +3147,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-broadcast", @@ -3178,7 +3165,7 @@ dependencies = [ "chrono", "committable", "custom_debug 0.5.1", - "dashmap 6.0.1", + "dashmap", "derive_more", "either", "ethereum-types", @@ -3207,7 +3194,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "async-trait", "clap", @@ -3225,8 +3212,8 @@ dependencies = [ [[package]] name = "hotshot-example-types" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-broadcast", @@ -3244,6 +3231,7 @@ dependencies = [ "hotshot-task-impls", "hotshot-types", "rand 0.8.5", + "reqwest", "serde", "sha2 0.10.8", "sha3", @@ -3255,10 +3243,29 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-fakeapi" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" +dependencies = [ + "anyhow", + "async-lock 2.8.0", + "async-trait", + "futures", + "hotshot-example-types", + "hotshot-types", + "rand 0.8.5", + "serde", + "tide-disco", + "toml", + "tracing", + "vbs", +] + [[package]] name = "hotshot-macros" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "derive_builder", "proc-macro2", @@ -3268,8 +3275,8 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3298,7 +3305,7 @@ dependencies = [ [[package]] name = "hotshot-query-service" -version = "0.1.39" +version = "0.1.45" dependencies = [ "anyhow", "ark-serialize", @@ -3357,8 +3364,8 @@ dependencies = [ [[package]] name = "hotshot-task" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-broadcast", @@ -3372,8 +3379,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-broadcast", @@ -3408,8 +3415,8 @@ dependencies = [ [[package]] name = "hotshot-testing" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-broadcast", @@ -3426,6 +3433,7 @@ dependencies = [ "hotshot", "hotshot-builder-api", "hotshot-example-types", + "hotshot-fakeapi", "hotshot-macros", "hotshot-orchestrator", "hotshot-task", @@ -3436,6 +3444,7 @@ dependencies = [ "lru 0.12.3", "portpicker", "rand 0.8.5", + "reqwest", "serde", "sha2 0.10.8", "sha3", @@ -3444,6 +3453,7 @@ dependencies = [ "tide-disco", "tokio", "tracing", + "url", "vbs", "vec1", ] @@ -3451,7 +3461,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "ark-bls12-381", @@ -4575,8 +4585,8 @@ dependencies = [ [[package]] name = "libp2p-networking" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-compatibility-layer", diff --git a/Cargo.toml b/Cargo.toml index 92c312fe5..bd8ba6b48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ [package] name = "hotshot-query-service" -version = "0.1.39" +version = "0.1.45" authors = ["Espresso Systems "] edition = "2021" license = "GPL-3.0-or-later" @@ -75,9 +75,9 @@ derivative = "2.2" derive_more = "0.99" either = "1.12" futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.61" } -hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.61" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.61" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.63" } +hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.63" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.63" } itertools = "0.12.1" jf-merkle-tree = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [ "std", @@ -119,7 +119,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 = "rc-0.5.61", optional = true } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.63", optional = true } portpicker = { version = "0.1", optional = true } rand = { version = "0.8", optional = true } spin_sleep = { version = "1.2", optional = true } @@ -140,7 +140,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 = "rc-0.5.61" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.63" } portpicker = "0.1" rand = "0.8" reqwest = "0.12.3"