From df7adee0097ea0aeae9b3aa0a6235dbd11411ceb Mon Sep 17 00:00:00 2001 From: Jarred Parr Date: Fri, 31 May 2024 10:29:07 -0600 Subject: [PATCH] bump versions --- Cargo.lock | 43 ++++++++++++++++++++++--------------------- Cargo.toml | 6 +++--- sequencer/src/lib.rs | 4 ++-- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 17b703e20b..71d163a4da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4027,7 +4027,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/hotshot?branch=main#74ee1daf26e5df8883a4dd6d77881886e087bf31" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.56#1138cfeafc061839494391eb52a46d0259008cf0" dependencies = [ "anyhow", "async-broadcast", @@ -4041,6 +4041,7 @@ dependencies = [ "cdn-broker", "cdn-client", "cdn-marshal", + "chrono", "committable", "custom_debug 0.5.1", "dashmap", @@ -4072,7 +4073,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/hotshot?branch=main#74ee1daf26e5df8883a4dd6d77881886e087bf31" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.56#1138cfeafc061839494391eb52a46d0259008cf0" dependencies = [ "async-trait", "clap", @@ -4090,8 +4091,8 @@ dependencies = [ [[package]] name = "hotshot-builder-core" -version = "0.1.21" -source = "git+https://github.com/EspressoSystems/hotshot-builder-core?branch=daily-build#6b1f25f3660229fb220fd23c6ab1a6a73a3b8348" +version = "0.1.25" +source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=0.1.25#0862a0a1335ca07e1b5bb3d619c1cd996a886382" dependencies = [ "anyhow", "async-broadcast", @@ -4143,8 +4144,8 @@ dependencies = [ [[package]] name = "hotshot-events-service" -version = "0.1.23" -source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=daily-build#9b5891dd85b98baf42058131219d425514447325" +version = "0.1.25" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.25#964c175d9145dcde354cbaf407f26f05976c5348" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -4169,7 +4170,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/hotshot?branch=main#74ee1daf26e5df8883a4dd6d77881886e087bf31" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.56#1138cfeafc061839494391eb52a46d0259008cf0" dependencies = [ "anyhow", "async-broadcast", @@ -4200,7 +4201,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/hotshot?branch=main#74ee1daf26e5df8883a4dd6d77881886e087bf31" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.56#1138cfeafc061839494391eb52a46d0259008cf0" dependencies = [ "derive_builder", "proc-macro2", @@ -4211,7 +4212,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/hotshot?branch=main#74ee1daf26e5df8883a4dd6d77881886e087bf31" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.56#1138cfeafc061839494391eb52a46d0259008cf0" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4239,8 +4240,8 @@ dependencies = [ [[package]] name = "hotshot-query-service" -version = "0.1.27" -source = "git+https://github.com/EspressoSystems/hotshot-query-service?branch=daily-build#2f2aa3adf38c344b63e380d3375086341f4be3c9" +version = "0.1.28" +source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=0.1.28#154abf85019788ddbf02a94073f677983e5ba4cf" dependencies = [ "anyhow", "ark-serialize", @@ -4294,7 +4295,7 @@ dependencies = [ [[package]] name = "hotshot-stake-table" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/hotshot?branch=main#74ee1daf26e5df8883a4dd6d77881886e087bf31" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.56#1138cfeafc061839494391eb52a46d0259008cf0" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4365,7 +4366,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/hotshot?branch=main#74ee1daf26e5df8883a4dd6d77881886e087bf31" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.56#1138cfeafc061839494391eb52a46d0259008cf0" dependencies = [ "anyhow", "async-broadcast", @@ -4380,7 +4381,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/hotshot?branch=main#74ee1daf26e5df8883a4dd6d77881886e087bf31" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.56#1138cfeafc061839494391eb52a46d0259008cf0" dependencies = [ "anyhow", "async-broadcast", @@ -4415,7 +4416,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/hotshot?branch=main#74ee1daf26e5df8883a4dd6d77881886e087bf31" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.56#1138cfeafc061839494391eb52a46d0259008cf0" dependencies = [ "anyhow", "async-broadcast", @@ -4456,7 +4457,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/hotshot?branch=main#74ee1daf26e5df8883a4dd6d77881886e087bf31" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.56#1138cfeafc061839494391eb52a46d0259008cf0" dependencies = [ "anyhow", "ark-bls12-381", @@ -5719,7 +5720,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/hotshot?branch=main#74ee1daf26e5df8883a4dd6d77881886e087bf31" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.56#1138cfeafc061839494391eb52a46d0259008cf0" dependencies = [ "anyhow", "async-compatibility-layer", @@ -10012,9 +10013,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes 1.6.0", @@ -10042,9 +10043,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index d03f4bac3b..b97229999a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,10 +50,10 @@ futures = "0.3" hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.56" } # Hotshot imports hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.56" } -hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", branch = "daily-build" } -hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "daily-build" } +hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "0.1.25" } +hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.25" } hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.56" } -hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", branch = "daily-build" } +hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.28" } hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.56" } hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" } hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.56" } diff --git a/sequencer/src/lib.rs b/sequencer/src/lib.rs index 194e23ddc8..86eba56c81 100644 --- a/sequencer/src/lib.rs +++ b/sequencer/src/lib.rs @@ -513,7 +513,7 @@ pub mod testing { use hotshot::types::{EventType::Decide, Message}; use hotshot_stake_table::vec_based::StakeTable; use hotshot_testing::block_builder::{ - BuilderTask, SimpleBuilderImplementation, TestBuilderImplementation, + BuilderTask, SimpleBuilderConfig, SimpleBuilderImplementation, TestBuilderImplementation, }; use hotshot_types::{ event::LeafInfo, @@ -529,7 +529,7 @@ pub mod testing { pub async fn run_test_builder() -> (Option>>, Url) { >::start( TestConfig::NUM_NODES, - (), + SimpleBuilderConfig { port: 1234 }, ) .await }