From 269c6db5dba77b068290628f33e111daa1606dd3 Mon Sep 17 00:00:00 2001 From: bfish713 Date: Tue, 29 Oct 2024 23:44:50 -0400 Subject: [PATCH] update HS to 0.5.78-patch7 --- Cargo.lock | 86 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 20 ++++++------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c4d3e877ed..fbc9181fed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1315,11 +1315,11 @@ dependencies = [ "hotshot-orchestrator", "hotshot-stake-table", "hotshot-state-prover", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "jf-merkle-tree", "jf-signature", "libp2p", - "libp2p-networking 0.5.78 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch6)", + "libp2p-networking 0.5.78 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch7)", "marketplace-builder-shared", "portpicker", "rand 0.8.5", @@ -2976,7 +2976,7 @@ dependencies = [ "hotshot-orchestrator", "hotshot-query-service", "hotshot-testing", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "itertools 0.12.1", "jf-merkle-tree", "jf-utils", @@ -4114,7 +4114,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "anyhow", "async-broadcast", @@ -4138,10 +4138,10 @@ dependencies = [ "futures", "hotshot-task", "hotshot-task-impls", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "jf-signature", "libp2p-identity", - "libp2p-networking 0.5.78 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "libp2p-networking 0.5.78 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "lru 0.12.5", "num_enum", "parking_lot", @@ -4161,14 +4161,14 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "async-trait", "clap", "committable", "derive_more 1.0.0", "futures", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "serde", "tagged-base64", "thiserror", @@ -4197,7 +4197,7 @@ dependencies = [ "hotshot", "hotshot-builder-api", "hotshot-events-service", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "lru 0.12.5", "marketplace-builder-shared", "serde", @@ -4226,7 +4226,7 @@ dependencies = [ "contract-bindings", "diff-test-bn254", "ethers", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "jf-pcs", "jf-plonk", "jf-utils", @@ -4249,7 +4249,7 @@ dependencies = [ "derive_more 0.99.18", "either", "futures", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "rand 0.8.5", "serde", "snafu 0.8.4", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "anyhow", "async-broadcast", @@ -4279,7 +4279,7 @@ dependencies = [ "hotshot", "hotshot-task", "hotshot-task-impls", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "rand 0.8.5", "reqwest 0.12.8", "serde", @@ -4296,7 +4296,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4304,7 +4304,7 @@ dependencies = [ "async-trait", "futures", "hotshot-example-types", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "rand 0.8.5", "serde", "tide-disco", @@ -4327,7 +4327,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "derive_builder", "proc-macro2", @@ -4338,7 +4338,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4349,7 +4349,7 @@ dependencies = [ "clap", "csv", "futures", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "libp2p", "multiaddr", "serde", @@ -4388,7 +4388,7 @@ dependencies = [ "hotshot", "hotshot-example-types", "hotshot-testing", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "include_dir", "itertools 0.12.1", "jf-merkle-tree", @@ -4420,7 +4420,7 @@ dependencies = [ [[package]] name = "hotshot-stake-table" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4429,7 +4429,7 @@ dependencies = [ "ark-std", "digest 0.10.7", "ethereum-types", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "jf-crhf", "jf-rescue", "jf-signature", @@ -4458,7 +4458,7 @@ dependencies = [ "futures", "hotshot-contract-adapter", "hotshot-stake-table", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "itertools 0.12.1", "jf-crhf", "jf-pcs", @@ -4482,7 +4482,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "anyhow", "async-broadcast", @@ -4497,7 +4497,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "anyhow", "async-broadcast", @@ -4514,7 +4514,7 @@ dependencies = [ "futures", "hotshot-builder-api", "hotshot-task", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "jf-signature", "jf-vid", "rand 0.8.5", @@ -4534,7 +4534,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "anyhow", "async-broadcast", @@ -4552,11 +4552,11 @@ dependencies = [ "hotshot-builder-api", "hotshot-example-types", "hotshot-fakeapi", - "hotshot-macros 0.5.78 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-macros 0.5.78 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "itertools 0.13.0", "jf-signature", "jf-vid", @@ -4580,7 +4580,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "anyhow", "ark-bn254", @@ -4639,7 +4639,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "anyhow", "ark-bn254", @@ -5900,7 +5900,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.78" -source = "git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "anyhow", "async-compatibility-layer", @@ -5914,7 +5914,7 @@ dependencies = [ "derive_builder", "either", "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch7)", "lazy_static", "libp2p", "libp2p-identity", @@ -5935,7 +5935,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6#f0df4aab153bc03bbdf06826832a82e8e54a3fb2" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7#59fed932c1e82658183939ff2edd04b1b398b5be" dependencies = [ "anyhow", "async-compatibility-layer", @@ -5949,7 +5949,7 @@ dependencies = [ "derive_builder", "either", "futures", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "lazy_static", "libp2p", "libp2p-identity", @@ -6303,7 +6303,7 @@ dependencies = [ "hotshot-orchestrator", "hotshot-query-service", "hotshot-stake-table", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "jf-merkle-tree", "jf-signature", "marketplace-builder-core", @@ -6344,7 +6344,7 @@ dependencies = [ "hotshot-macros 0.5.78 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4)", "hotshot-task-impls", "hotshot-testing", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "lru 0.12.5", "marketplace-builder-shared", "multimap", @@ -6385,7 +6385,7 @@ dependencies = [ "hotshot-example-types", "hotshot-task-impls", "hotshot-testing", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "rand 0.8.5", "serde", "surf-disco", @@ -6413,7 +6413,7 @@ dependencies = [ "hotshot", "hotshot-events-service", "hotshot-query-service", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "jf-signature", "portpicker", "rand 0.8.5", @@ -6796,7 +6796,7 @@ dependencies = [ "hotshot", "hotshot-query-service", "hotshot-stake-table", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "prometheus-parse", "reqwest 0.12.8", "serde", @@ -7697,7 +7697,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.77", @@ -8807,7 +8807,7 @@ dependencies = [ "hotshot-stake-table", "hotshot-state-prover", "hotshot-testing", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch6)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch7)", "include_dir", "itertools 0.12.1", "jf-crhf", @@ -8816,7 +8816,7 @@ dependencies = [ "jf-signature", "jf-vid", "libp2p", - "libp2p-networking 0.5.78 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch6)", + "libp2p-networking 0.5.78 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch7)", "marketplace-builder-core", "marketplace-builder-shared", "marketplace-solver", @@ -9271,7 +9271,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38d1e02fca405f6280643174a50c942219f0bbf4dbf7d480f1dd864d6f211ae5" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.77", diff --git a/Cargo.toml b/Cargo.toml index 6c8d7eac68..d87de1e9ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -157,13 +157,13 @@ strip = "debuginfo" opt-level = 3 [patch."https://github.com/EspressoSystems/HotShot.git"] -hotshot = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch6" } -hotshot-builder-api = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch6" } -hotshot-orchestrator = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch6" } -hotshot-stake-table = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch6" } -hotshot-task ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch6" } -hotshot-task-impls ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch6" } -hotshot-testing ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch6" } -hotshot-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch6" } -libp2p-networking = { git = "https://github.com/EspressoSystems//HotShot.git", tag = "0.5.78-patch6" } -hotshot-example-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch6" } +hotshot = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch7" } +hotshot-builder-api = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch7" } +hotshot-orchestrator = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch7" } +hotshot-stake-table = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch7" } +hotshot-task ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch7" } +hotshot-task-impls ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch7" } +hotshot-testing ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch7" } +hotshot-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch7" } +libp2p-networking = { git = "https://github.com/EspressoSystems//HotShot.git", tag = "0.5.78-patch7" } +hotshot-example-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch7" }