From 09c02d4601ed843ccb3efe5a539caa69275bd6ac Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 14 Aug 2024 15:49:48 -0400 Subject: [PATCH 1/8] Hotshot rc-0.5.71 --- Cargo.lock | 36 +++++++++++++++++++++++----------- Cargo.toml | 10 +++++----- src/availability.rs | 7 +++++-- src/data_source.rs | 28 +++++++++++++++----------- src/data_source/sql.rs | 2 +- src/data_source/storage/sql.rs | 4 ++-- src/lib.rs | 23 +++++++++++++++------- src/testing/consensus.rs | 8 ++++---- src/testing/mocks.rs | 13 ++++++++++-- 9 files changed, 86 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55c82680c..ca1faea37 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2007,6 +2007,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "delegate" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "der" version = "0.7.9" @@ -3049,7 +3060,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "async-broadcast", @@ -3096,7 +3107,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "async-trait", "clap", @@ -3115,7 +3126,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "async-broadcast", @@ -3148,7 +3159,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3167,7 +3178,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "derive_builder", "proc-macro2", @@ -3178,7 +3189,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3267,7 +3278,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "async-broadcast", @@ -3282,7 +3293,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "async-broadcast", @@ -3319,7 +3330,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "async-broadcast", @@ -3365,7 +3376,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "ark-bn254", @@ -3398,11 +3409,13 @@ dependencies = [ "jf-utils", "jf-vid", "lazy_static", + "libp2p", "memoize", "rand 0.8.5", "rand_chacha 0.3.1", "reqwest", "serde", + "serde_bytes", "sha2 0.10.8", "snafu 0.8.4", "tagged-base64", @@ -4537,7 +4550,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4547,6 +4560,7 @@ dependencies = [ "bincode", "blake3", "custom_debug 0.5.1", + "delegate", "derive_builder", "either", "futures", diff --git a/Cargo.toml b/Cargo.toml index a1918326c..88f699cd0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 = "0.5.69" } -hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.69" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.69" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.71" } +hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.71" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.71" } 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 = "0.5.69", optional = true } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.71", 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 = "0.5.69" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.71" } portpicker = "0.1" rand = "0.8" reqwest = "0.12.3" diff --git a/src/availability.rs b/src/availability.rs index 0b6e883dc..6f329e6a8 100644 --- a/src/availability.rs +++ b/src/availability.rs @@ -861,8 +861,11 @@ mod test { ); // mock up some consensus data. - let leaf = - Leaf::::genesis(&TestValidatedState::default(), &TestInstanceState {}).await; + let leaf = Leaf::::genesis( + &TestValidatedState::default(), + &TestInstanceState::default(), + ) + .await; let block = BlockQueryData::new(leaf.block_header().clone(), MockPayload::genesis()); diff --git a/src/data_source.rs b/src/data_source.rs index 46051b27e..2f05145dc 100644 --- a/src/data_source.rs +++ b/src/data_source.rs @@ -465,11 +465,14 @@ pub mod persistence_tests { // Mock up some consensus data. let mut qc = QuorumCertificate::::genesis( &TestValidatedState::default(), - &TestInstanceState {}, + &TestInstanceState::default(), + ) + .await; + let mut leaf = Leaf::::genesis( + &TestValidatedState::default(), + &TestInstanceState::default(), ) .await; - let mut leaf = - Leaf::::genesis(&TestValidatedState::default(), &TestInstanceState {}).await; // Increment the block number, to distinguish this block from the genesis block, which // already exists. leaf.block_header_mut().block_number += 1; @@ -513,11 +516,14 @@ pub mod persistence_tests { // Mock up some consensus data. let mut qc = QuorumCertificate::::genesis( &TestValidatedState::default(), - &TestInstanceState {}, + &TestInstanceState::default(), + ) + .await; + let mut leaf = Leaf::::genesis( + &TestValidatedState::default(), + &TestInstanceState::default(), ) .await; - let mut leaf = - Leaf::::genesis(&TestValidatedState::default(), &TestInstanceState {}).await; // Increment the block number, to distinguish this block from the genesis block, which // already exists. leaf.block_header_mut().block_number += 1; @@ -600,14 +606,14 @@ pub mod node_tests { let mut leaves = vec![ LeafQueryData::::genesis( &TestValidatedState::default(), - &TestInstanceState {}, + &TestInstanceState::default(), ) .await, ]; let mut blocks = vec![ BlockQueryData::::genesis( &TestValidatedState::default(), - &TestInstanceState {}, + &TestInstanceState::default(), ) .await, ]; @@ -746,7 +752,7 @@ pub mod node_tests { >::from_transactions( [mock_transaction(vec![i as u8 % 2])], &TestValidatedState::default(), - &TestInstanceState {}, + &TestInstanceState::default(), ) .await .unwrap(); @@ -764,7 +770,7 @@ pub mod node_tests { let mut leaf = LeafQueryData::::genesis( &TestValidatedState::default(), - &TestInstanceState {}, + &TestInstanceState::default(), ) .await; *leaf.leaf.block_header_mut() = header.clone(); @@ -820,7 +826,7 @@ pub mod node_tests { // Insert test data with VID common and a share. let leaf = LeafQueryData::::genesis( &TestValidatedState::default(), - &TestInstanceState {}, + &TestInstanceState::default(), ) .await; let common = VidCommonQueryData::new(leaf.header().clone(), disperse.common); diff --git a/src/data_source/sql.rs b/src/data_source/sql.rs index 335cde066..2bde4026a 100644 --- a/src/data_source/sql.rs +++ b/src/data_source/sql.rs @@ -444,7 +444,7 @@ mod test { // Insert test data with VID common but no share. let leaf = LeafQueryData::::genesis( &TestValidatedState::default(), - &TestInstanceState {}, + &TestInstanceState::default(), ) .await; let common = VidCommonQueryData::new(leaf.header().clone(), disperse.common); diff --git a/src/data_source/storage/sql.rs b/src/data_source/storage/sql.rs index 057cf90f4..a7154fbfb 100644 --- a/src/data_source/storage/sql.rs +++ b/src/data_source/storage/sql.rs @@ -3341,7 +3341,7 @@ mod test { let mut storage = SqlStorage::connect(cfg).await.unwrap(); let mut leaf = LeafQueryData::::genesis( &TestValidatedState::default(), - &TestInstanceState {}, + &TestInstanceState::default(), ) .await; // insert some mock data @@ -3424,7 +3424,7 @@ mod test { let mut storage = SqlStorage::connect(db.config()).await.unwrap(); let mut leaf = LeafQueryData::::genesis( &TestValidatedState::default(), - &TestInstanceState {}, + &TestInstanceState::default(), ) .await; // insert some mock data diff --git a/src/lib.rs b/src/lib.rs index 1fb65e003..c85bc3bd8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -431,7 +431,7 @@ use async_std::sync::{Arc, RwLock}; use futures::StreamExt; use hotshot::types::SystemContextHandle; use hotshot_types::traits::{ - node_implementation::{NodeImplementation, NodeType}, + node_implementation::{NodeImplementation, NodeType, Versions}, BlockPayload, }; use serde::{Deserialize, Serialize}; @@ -487,11 +487,17 @@ pub struct Options { } /// Run an instance of the HotShot Query service with no customization. -pub async fn run_standalone_service, D, Ver>( +pub async fn run_standalone_service< + Types: NodeType, + I: NodeImplementation, + D, + ApiVer, + HsVer: Versions, +>( options: Options, data_source: D, - hotshot: SystemContextHandle, - bind_version: Ver, + hotshot: SystemContextHandle, + bind_version: ApiVer, ) -> Result<(), Error> where Payload: availability::QueryablePayload, @@ -504,7 +510,7 @@ where + Send + Sync + 'static, - Ver: StaticVersionType + 'static, + ApiVer: StaticVersionType + 'static, { // Create API modules. let availability_api = @@ -714,8 +720,11 @@ mod test { .unwrap(); // Mock up some data and add a block to the store. - let leaf = - Leaf::::genesis(&TestValidatedState::default(), &TestInstanceState {}).await; + let leaf = Leaf::::genesis( + &TestValidatedState::default(), + &TestInstanceState::default(), + ) + .await; let block = BlockQueryData::new(leaf.block_header().clone(), MockPayload::genesis()); hotshot_qs.insert_block(block.clone()).await.unwrap(); diff --git a/src/testing/consensus.rs b/src/testing/consensus.rs index 76b0bf8e4..dbdc6c291 100644 --- a/src/testing/consensus.rs +++ b/src/testing/consensus.rs @@ -10,7 +10,7 @@ // You should have received a copy of the GNU General Public License along with this program. If not, // see . -use super::mocks::{MockMembership, MockNodeImpl, MockTransaction, MockTypes}; +use super::mocks::{MockMembership, MockNodeImpl, MockTransaction, MockTypes, MockVersions}; use crate::{ availability::AvailabilityDataSource, data_source::{FileSystemDataSource, SqlDataSource, UpdateDataSource, VersionedDataSource}, @@ -50,7 +50,7 @@ use tracing::{info_span, Instrument}; use url::Url; struct MockNode { - hotshot: SystemContextHandle, + hotshot: SystemContextHandle, data_source: Arc>, storage: D::Storage, } @@ -202,7 +202,7 @@ impl MockNetwork { config, memberships, network, - HotShotInitializer::from_genesis(TestInstanceState {}) + HotShotInitializer::from_genesis(TestInstanceState::default()) .await .unwrap(), ConsensusMetricsValue::new(&*data_source.populate_metrics()), @@ -244,7 +244,7 @@ impl MockNetwork { } impl MockNetwork { - pub fn handle(&self) -> &SystemContextHandle { + pub fn handle(&self) -> &SystemContextHandle { &self.nodes[0].hotshot } diff --git a/src/testing/mocks.rs b/src/testing/mocks.rs index 897cfd300..c1fcdcf2e 100644 --- a/src/testing/mocks.rs +++ b/src/testing/mocks.rs @@ -26,6 +26,7 @@ use hotshot_example_types::{ state_types::{TestInstanceState, TestValidatedState}, storage_types::TestStorage, }; +use hotshot_types::traits::node_implementation::Versions; use hotshot_types::{ data::{QuorumProposal, ViewNumber}, signature_key::BLSPubKey, @@ -134,17 +135,25 @@ impl NodeType for MockTypes { type ValidatedState = TestValidatedState; type Membership = GeneralStaticCommittee; type BuilderSignatureKey = BLSPubKey; + type AuctionResult = TestAuctionResult; +} + +#[derive(Clone, Debug, Copy)] +pub struct MockVersions {} + +impl Versions for MockVersions { type Base = StaticVersion<0, 1>; type Upgrade = StaticVersion<0, 2>; - type AuctionResult = TestAuctionResult; const UPGRADE_HASH: [u8; 32] = [ 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, ]; + + type Marketplace = StaticVersion<0, 3>; } /// A type alias for the mock base version -pub type MockBase = ::Base; +pub type MockBase = ::Base; pub type MockMembership = GeneralStaticCommittee::SignatureKey>; pub type MockQuorumProposal = QuorumProposal; From a66246382dd7e0fdfe8fa05bb55c87d62d1a69a2 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 14 Aug 2024 15:54:37 -0400 Subject: [PATCH 2/8] Lint --- examples/simple-server.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/simple-server.rs b/examples/simple-server.rs index fb82878fe..125d50385 100644 --- a/examples/simple-server.rs +++ b/examples/simple-server.rs @@ -36,7 +36,7 @@ use hotshot_query_service::{ status::UpdateStatusData, testing::{ consensus::DataSourceLifeCycle, - mocks::{MockBase, MockMembership, MockNodeImpl, MockTypes}, + mocks::{MockBase, MockMembership, MockNodeImpl, MockTypes, MockVersions}, }, Error, }; @@ -143,7 +143,7 @@ async fn main() -> Result<(), Error> { async fn init_consensus( data_sources: &[DataSource], -) -> Vec> { +) -> Vec> { let (pub_keys, priv_keys): (Vec<_>, Vec<_>) = (0..data_sources.len()) .map(|i| BLSPubKey::generated_from_seed_indexed([0; 32], i as u64)) .unzip(); @@ -270,7 +270,7 @@ async fn init_consensus( config, memberships, network, - HotShotInitializer::from_genesis(TestInstanceState {}) + HotShotInitializer::from_genesis(TestInstanceState::default()) .await .unwrap(), ConsensusMetricsValue::new(&*data_source.populate_metrics()), From e61a19af7070a21f77273851b50763a0bf49b23e Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 14 Aug 2024 16:59:20 -0400 Subject: [PATCH 3/8] doc versions --- src/data_source/fs.rs | 4 ++-- src/data_source/metrics.rs | 4 ++-- src/data_source/sql.rs | 4 ++-- src/lib.rs | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/data_source/fs.rs b/src/data_source/fs.rs index 907e88fc2..38edb9ff7 100644 --- a/src/data_source/fs.rs +++ b/src/data_source/fs.rs @@ -97,7 +97,7 @@ use std::path::Path; /// # }; /// # use hotshot_query_service::fetching::provider::NoFetching; /// # use hotshot_query_service::testing::mocks::{ -/// # MockNodeImpl as AppNodeImpl, MockTypes as AppTypes, +/// # MockNodeImpl as AppNodeImpl, MockTypes as AppTypes, MockVersions as AppVersions /// # }; /// # use std::path::Path; /// # use tide_disco::App; @@ -111,7 +111,7 @@ use std::path::Path; /// /// async fn init_server( /// storage_path: &Path, -/// hotshot: SystemContextHandle, +/// hotshot: SystemContextHandle, /// ) -> Result>, Error>, Error> { /// let mut loader = AtomicStoreLoader::create(storage_path, "my_app") // or `open` /// .map_err(Error::internal)?; diff --git a/src/data_source/metrics.rs b/src/data_source/metrics.rs index c29a6d0fe..785884e98 100644 --- a/src/data_source/metrics.rs +++ b/src/data_source/metrics.rs @@ -35,13 +35,13 @@ use async_trait::async_trait; /// # use hotshot_query_service::{ /// # data_source::MetricsDataSource, /// # status::UpdateStatusData, -/// # testing::mocks::{MockNodeImpl as AppNodeImpl, MockTypes as AppTypes}, +/// # testing::mocks::{MockNodeImpl as AppNodeImpl, MockTypes as AppTypes, MockVersions as AppVersions}, /// # Error, /// # }; /// # use hotshot_types::consensus::ConsensusMetricsValue; /// # async fn doc() -> Result<(), hotshot_query_service::Error> { /// let data_source = MetricsDataSource::default(); -/// let hotshot = SystemContext::::init( +/// let hotshot = SystemContext::::init( /// # panic!(), panic!(), panic!(), panic!(), panic!(), panic!(), panic!(), /// ConsensusMetricsValue::new(&*data_source.populate_metrics()), panic!(), /// panic!(), diff --git a/src/data_source/sql.rs b/src/data_source/sql.rs index 2bde4026a..6d27a3024 100644 --- a/src/data_source/sql.rs +++ b/src/data_source/sql.rs @@ -261,7 +261,7 @@ impl Config { /// # }; /// # use hotshot_query_service::fetching::provider::NoFetching; /// # use hotshot_query_service::testing::mocks::{ -/// # MockNodeImpl as AppNodeImpl, MockTypes as AppTypes, +/// # MockNodeImpl as AppNodeImpl, MockTypes as AppTypes, MockVersions as AppVersions /// # }; /// # use tide_disco::App; /// # use vbs::version::StaticVersionType; @@ -272,7 +272,7 @@ impl Config { /// /// async fn init_server( /// config: Config, -/// hotshot: SystemContextHandle, +/// hotshot: SystemContextHandle, /// ) -> Result>, Error>, Error> { /// let mut hotshot_qs = config.connect(NoFetching).await.map_err(Error::internal)?; /// // Initialize storage for other modules, using `hotshot_qs` to access the database. diff --git a/src/lib.rs b/src/lib.rs index c85bc3bd8..d64f42837 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -22,7 +22,7 @@ //! ``` //! # use hotshot::types::SystemContextHandle; //! # use hotshot_query_service::testing::mocks::{ -//! # MockNodeImpl as AppNodeImpl, MockTypes as AppTypes, +//! # MockNodeImpl as AppNodeImpl, MockTypes as AppTypes, MockVersions as AppVersions, //! # }; //! # use hotshot_types::consensus::ConsensusMetricsValue; //! # use std::path::Path; @@ -49,7 +49,7 @@ //! .map_err(Error::internal)?; //! //! // Create hotshot, giving it a handle to the status metrics. -//! let hotshot = SystemContext::::init( +//! let hotshot = SystemContext::::init( //! # panic!(), panic!(), panic!(), panic!(), panic!(), panic!(), panic!(), //! ConsensusMetricsValue::new(&*data_source.populate_metrics()), panic!(), //! panic!() @@ -101,9 +101,9 @@ //! # use vbs::version::StaticVersionType; //! # use hotshot_query_service::{data_source::FileSystemDataSource, Error, Options}; //! # use hotshot_query_service::fetching::provider::NoFetching; -//! # use hotshot_query_service::testing::mocks::{MockBase, MockNodeImpl, MockTypes}; +//! # use hotshot_query_service::testing::mocks::{MockBase, MockNodeImpl, MockTypes, MockVersions}; //! # use std::path::Path; -//! # async fn doc(storage_path: &Path, options: Options, hotshot: SystemContextHandle) -> Result<(), Error> { +//! # async fn doc(storage_path: &Path, options: Options, hotshot: SystemContextHandle) -> Result<(), Error> { //! use hotshot_query_service::run_standalone_service; //! //! let data_source = FileSystemDataSource::create(storage_path, NoFetching).await.map_err(Error::internal)?; From cf531df0ce78b31ee7383e341f9430c08b777679 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 14 Aug 2024 17:11:44 -0400 Subject: [PATCH 4/8] update QS HS --- Cargo.lock | 40 ++++++++++++++++++++-------------------- Cargo.toml | 10 +++++----- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca1faea37..c197dc69d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3059,8 +3059,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-broadcast", @@ -3107,7 +3107,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "async-trait", "clap", @@ -3125,8 +3125,8 @@ dependencies = [ [[package]] name = "hotshot-example-types" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-broadcast", @@ -3158,8 +3158,8 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3177,8 +3177,8 @@ dependencies = [ [[package]] name = "hotshot-macros" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "derive_builder", "proc-macro2", @@ -3188,8 +3188,8 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3277,8 +3277,8 @@ dependencies = [ [[package]] name = "hotshot-task" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-broadcast", @@ -3292,8 +3292,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-broadcast", @@ -3329,8 +3329,8 @@ dependencies = [ [[package]] name = "hotshot-testing" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-broadcast", @@ -3376,7 +3376,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "ark-bn254", @@ -4549,8 +4549,8 @@ dependencies = [ [[package]] name = "libp2p-networking" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.71#56e3f2c663aad796c3d831c77ca47e5648a209be" +version = "0.5.71" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" dependencies = [ "anyhow", "async-compatibility-layer", diff --git a/Cargo.toml b/Cargo.toml index 88f699cd0..aa76362f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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.71" } -hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.71" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.71" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.71" } +hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.71" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.71" } 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.71", optional = true } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.71", 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.71" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.71" } portpicker = "0.1" rand = "0.8" reqwest = "0.12.3" From 3685e90b303553cbbed0123205f71e6406e4e75c Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 15 Aug 2024 08:49:04 -0400 Subject: [PATCH 5/8] bump HS --- Cargo.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c197dc69d..272e13806 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3060,7 +3060,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-broadcast", @@ -3107,7 +3107,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "async-trait", "clap", @@ -3126,7 +3126,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-broadcast", @@ -3159,7 +3159,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3178,7 +3178,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "derive_builder", "proc-macro2", @@ -3189,7 +3189,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3278,7 +3278,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-broadcast", @@ -3293,7 +3293,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-broadcast", @@ -3330,7 +3330,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-broadcast", @@ -3376,7 +3376,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "ark-bn254", @@ -4550,7 +4550,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4cc37458dfacfcdff340ef5e0bbbe6183367fb77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" dependencies = [ "anyhow", "async-compatibility-layer", From 03861ecbb9a2ab222758efa26dfcc65e34102f94 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 15 Aug 2024 09:00:24 -0400 Subject: [PATCH 6/8] bump --- Cargo.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 272e13806..d32ef8217 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3060,7 +3060,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-broadcast", @@ -3107,7 +3107,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "async-trait", "clap", @@ -3126,7 +3126,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-broadcast", @@ -3159,7 +3159,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3178,7 +3178,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "derive_builder", "proc-macro2", @@ -3189,7 +3189,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3278,7 +3278,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-broadcast", @@ -3293,7 +3293,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-broadcast", @@ -3330,7 +3330,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-broadcast", @@ -3376,7 +3376,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "ark-bn254", @@ -4550,7 +4550,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#2d391be364524b585c50f3b83f5ad238b4cb3360" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" dependencies = [ "anyhow", "async-compatibility-layer", From 1146ea195b1353c9cb34e3ce40709e9c2cb4244c Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 15 Aug 2024 13:36:07 -0400 Subject: [PATCH 7/8] update HS --- Cargo.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d32ef8217..7eb79dd1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3060,7 +3060,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3107,7 +3107,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "async-trait", "clap", @@ -3126,7 +3126,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3159,7 +3159,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3178,7 +3178,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "derive_builder", "proc-macro2", @@ -3189,7 +3189,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3278,7 +3278,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3293,7 +3293,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3330,7 +3330,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3376,7 +3376,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "ark-bn254", @@ -4550,7 +4550,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#3ed0268a832bfb325c5582d13c8482ca6abe6e3f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-compatibility-layer", From 203a8b5f3542bef66b41dc5fe6bdb76fe2a4b478 Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 19 Aug 2024 09:57:37 -0400 Subject: [PATCH 8/8] bump HS --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7eb79dd1a..3be89b028 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3060,7 +3060,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3107,7 +3107,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "async-trait", "clap", @@ -3126,7 +3126,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3159,7 +3159,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3178,7 +3178,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "derive_builder", "proc-macro2", @@ -3189,7 +3189,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3278,7 +3278,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3293,7 +3293,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3330,7 +3330,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-broadcast", @@ -3376,7 +3376,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "ark-bn254", @@ -4550,7 +4550,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.71" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.71#4058349be9bd021f8e78f4e1b71327ee61c588de" dependencies = [ "anyhow", "async-compatibility-layer", diff --git a/Cargo.toml b/Cargo.toml index aa76362f2..2ee190f7a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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", branch = "bump/rc-0.5.71" } -hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.71" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.71" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" } +hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" } 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", branch = "bump/rc-0.5.71", optional = true } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71", 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", branch = "bump/rc-0.5.71" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" } portpicker = "0.1" rand = "0.8" reqwest = "0.12.3"