diff --git a/Cargo.lock b/Cargo.lock index 86c444c72..6d876c42e 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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "jf-merkle-tree", "jf-signature", "libp2p", - "libp2p-networking 0.5.78 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch1)", + "libp2p-networking 0.5.78 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch2)", "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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "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-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" 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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "jf-signature", "libp2p-identity", - "libp2p-networking 0.5.78 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1)", + "libp2p-networking 0.5.78 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "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-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" 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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "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-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" 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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "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-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" 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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "rand 0.8.5", "serde", "tide-disco", @@ -4316,7 +4316,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" dependencies = [ "derive_builder", "proc-macro2", @@ -4327,7 +4327,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4338,7 +4338,7 @@ dependencies = [ "clap", "csv", "futures", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "libp2p", "multiaddr", "serde", @@ -4377,7 +4377,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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "include_dir", "itertools 0.12.1", "jf-merkle-tree", @@ -4409,7 +4409,7 @@ dependencies = [ [[package]] name = "hotshot-stake-table" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4418,7 +4418,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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "jf-crhf", "jf-rescue", "jf-signature", @@ -4447,7 +4447,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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "itertools 0.12.1", "jf-crhf", "jf-pcs", @@ -4471,7 +4471,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" dependencies = [ "anyhow", "async-broadcast", @@ -4486,7 +4486,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" dependencies = [ "anyhow", "async-broadcast", @@ -4503,7 +4503,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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "jf-signature", "jf-vid", "rand 0.8.5", @@ -4523,7 +4523,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" dependencies = [ "anyhow", "async-broadcast", @@ -4545,7 +4545,7 @@ dependencies = [ "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "itertools 0.13.0", "jf-signature", "jf-vid", @@ -4569,7 +4569,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" dependencies = [ "anyhow", "ark-bn254", @@ -4628,7 +4628,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" dependencies = [ "anyhow", "ark-bn254", @@ -5889,7 +5889,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.78" -source = "git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" dependencies = [ "anyhow", "async-compatibility-layer", @@ -5903,7 +5903,7 @@ dependencies = [ "derive_builder", "either", "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch1)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch2)", "lazy_static", "libp2p", "libp2p-identity", @@ -5924,7 +5924,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.78" -source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1#09db1dd99fb2d7ea3cd99dd7a309abfe45930096" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2#ae47969e68cc4d099082da8a81a4f1a32a89cf86" dependencies = [ "anyhow", "async-compatibility-layer", @@ -5938,7 +5938,7 @@ dependencies = [ "derive_builder", "either", "futures", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "lazy_static", "libp2p", "libp2p-identity", @@ -6292,7 +6292,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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "jf-merkle-tree", "jf-signature", "marketplace-builder-core", @@ -6331,7 +6331,7 @@ dependencies = [ "hotshot-builder-api", "hotshot-events-service", "hotshot-task-impls", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "lru 0.12.5", "marketplace-builder-shared", "multimap", @@ -6365,7 +6365,7 @@ dependencies = [ "hotshot-builder-api", "hotshot-events-service", "hotshot-task-impls", - "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "surf-disco", "tracing", "url", @@ -6389,7 +6389,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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "jf-signature", "portpicker", "rand 0.8.5", @@ -6772,7 +6772,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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "prometheus-parse", "reqwest 0.12.8", "serde", @@ -7673,7 +7673,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.77", @@ -8783,7 +8783,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-patch1)", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch2)", "include_dir", "itertools 0.12.1", "jf-crhf", @@ -8792,7 +8792,7 @@ dependencies = [ "jf-signature", "jf-vid", "libp2p", - "libp2p-networking 0.5.78 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch1)", + "libp2p-networking 0.5.78 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch2)", "marketplace-builder-core", "marketplace-builder-shared", "marketplace-solver", diff --git a/Cargo.toml b/Cargo.toml index b00ad90fd..310dcea9a 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-patch1" } -hotshot-builder-api = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch1" } -hotshot-orchestrator = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch1" } -hotshot-stake-table = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch1" } -hotshot-task ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch1" } -hotshot-task-impls ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch1" } -hotshot-testing ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch1" } -hotshot-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch1" } -libp2p-networking = { git = "https://github.com/EspressoSystems//HotShot.git", tag = "0.5.78-patch1" } -hotshot-example-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch1" } +hotshot = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch2" } +hotshot-builder-api = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch2" } +hotshot-orchestrator = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch2" } +hotshot-stake-table = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch2" } +hotshot-task ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch2" } +hotshot-task-impls ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch2" } +hotshot-testing ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch2" } +hotshot-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch2" } +libp2p-networking = { git = "https://github.com/EspressoSystems//HotShot.git", tag = "0.5.78-patch2" } +hotshot-example-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch2" } diff --git a/data/v1/messages.bin b/data/v1/messages.bin index d3549aecf..bb6172918 100644 Binary files a/data/v1/messages.bin and b/data/v1/messages.bin differ diff --git a/data/v1/messages.json b/data/v1/messages.json index 0b394cb58..85e80a7e3 100644 --- a/data/v1/messages.json +++ b/data/v1/messages.json @@ -42,7 +42,7 @@ }, "signatures": null, "view_number": 0, - "vote_commitment": "COMMIT~f11eqw2KFTy-i-EaXUfEC1v0CPo8gPcd2My10Y5zSNok" + "vote_commitment": "COMMIT~tzMwZg2x5QJTx7Di9eEvNC0P8CZ_iNX7LJ01DHA9XEdO" }, "proposal_certificate": { "Timeout": { diff --git a/data/v2/messages.bin b/data/v2/messages.bin index e3549e275..c08c76fbf 100644 Binary files a/data/v2/messages.bin and b/data/v2/messages.bin differ diff --git a/data/v2/messages.json b/data/v2/messages.json index 7791e5025..bfdd2ddb4 100644 --- a/data/v2/messages.json +++ b/data/v2/messages.json @@ -50,7 +50,7 @@ }, "signatures": null, "view_number": 0, - "vote_commitment": "COMMIT~f11eqw2KFTy-i-EaXUfEC1v0CPo8gPcd2My10Y5zSNok" + "vote_commitment": "COMMIT~tzMwZg2x5QJTx7Di9eEvNC0P8CZ_iNX7LJ01DHA9XEdO" }, "proposal_certificate": { "Timeout": { diff --git a/data/v3/messages.bin b/data/v3/messages.bin index 2795dea9d..034e2422c 100644 Binary files a/data/v3/messages.bin and b/data/v3/messages.bin differ diff --git a/data/v3/messages.json b/data/v3/messages.json index ccf60b3da..bc22398eb 100644 --- a/data/v3/messages.json +++ b/data/v3/messages.json @@ -58,7 +58,7 @@ }, "signatures": null, "view_number": 0, - "vote_commitment": "COMMIT~f11eqw2KFTy-i-EaXUfEC1v0CPo8gPcd2My10Y5zSNok" + "vote_commitment": "COMMIT~tzMwZg2x5QJTx7Di9eEvNC0P8CZ_iNX7LJ01DHA9XEdO" }, "proposal_certificate": { "Timeout": {