From dc4fc980e325149359e717c98ae7633f01cf02da Mon Sep 17 00:00:00 2001 From: Brendon Fish Date: Fri, 19 Jul 2024 08:43:22 -0400 Subject: [PATCH 1/9] bump hotshot --- Cargo.lock | 80 +++++++++++++++++++++------------ Cargo.toml | 22 ++++----- builder/src/lib.rs | 11 +++-- builder/src/non_permissioned.rs | 10 ++--- builder/src/permissioned.rs | 12 ++--- sequencer/src/api.rs | 27 +++++++---- sequencer/src/lib.rs | 2 +- 7 files changed, 99 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 186132527..3be84eeb7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -627,9 +627,9 @@ dependencies = [ [[package]] name = "async-compatibility-layer" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c928880329566b45c159fca61fbc2a1d301a7e5fd2a0e94c17476bb1a3ea526" +checksum = "32dd1dfd4a05a197583e51036d9615f04a4d851089dc119ee965d440d0bcaa39" dependencies = [ "async-lock 3.4.0", "async-std", @@ -4151,8 +4151,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" dependencies = [ "anyhow", "async-broadcast", @@ -4198,7 +4198,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" dependencies = [ "async-trait", "clap", @@ -4217,7 +4217,7 @@ dependencies = [ [[package]] name = "hotshot-builder-core" version = "0.1.26" -source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=rc-0.1.33#e4368407d273fd600e4d3b9a5e48c466f64f54ec" +source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=rc-0.1.34#810a2a4acc905a9842b77814deefa82dd5f5325e" dependencies = [ "anyhow", "async-broadcast", @@ -4269,8 +4269,8 @@ dependencies = [ [[package]] name = "hotshot-events-service" -version = "0.1.27" -source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=rc-0.1.32#1cab5bc0cb738a89b97c32e786a4fc469869b031" +version = "0.1.33" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=rc-0.1.33#765c2fa5871d548a20f0aef8f6d15ed49e26dab5" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -4283,6 +4283,7 @@ dependencies = [ "either", "futures", "hotshot-types", + "rand 0.8.5", "serde", "snafu 0.8.4", "tagged-base64", @@ -4294,8 +4295,8 @@ dependencies = [ [[package]] name = "hotshot-example-types" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" dependencies = [ "anyhow", "async-broadcast", @@ -4313,6 +4314,7 @@ dependencies = [ "hotshot-task-impls", "hotshot-types", "rand 0.8.5", + "reqwest 0.12.5", "serde", "sha2 0.10.8", "sha3", @@ -4324,10 +4326,29 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-fakeapi" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +dependencies = [ + "anyhow", + "async-lock 2.8.0", + "async-trait", + "futures", + "hotshot-example-types", + "hotshot-types", + "rand 0.8.5", + "serde", + "tide-disco", + "toml", + "tracing", + "vbs", +] + [[package]] name = "hotshot-macros" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" dependencies = [ "derive_builder", "proc-macro2", @@ -4337,8 +4358,8 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4367,8 +4388,8 @@ dependencies = [ [[package]] name = "hotshot-query-service" -version = "0.1.39" -source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=rc-0.1.44#26bf254b3684177683592b50c3776560f6c467bb" +version = "0.1.45" +source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=rc-0.1.45#5cc621e42a876247421793807b1acf7fac178cfd" dependencies = [ "anyhow", "ark-serialize", @@ -4423,8 +4444,8 @@ dependencies = [ [[package]] name = "hotshot-stake-table" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4495,8 +4516,8 @@ dependencies = [ [[package]] name = "hotshot-task" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" dependencies = [ "anyhow", "async-broadcast", @@ -4510,8 +4531,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" dependencies = [ "anyhow", "async-broadcast", @@ -4546,8 +4567,8 @@ dependencies = [ [[package]] name = "hotshot-testing" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" dependencies = [ "anyhow", "async-broadcast", @@ -4564,6 +4585,7 @@ dependencies = [ "hotshot", "hotshot-builder-api", "hotshot-example-types", + "hotshot-fakeapi", "hotshot-macros", "hotshot-orchestrator", "hotshot-task", @@ -4574,6 +4596,7 @@ dependencies = [ "lru 0.12.3", "portpicker", "rand 0.8.5", + "reqwest 0.12.5", "serde", "sha2 0.10.8", "sha3", @@ -4582,6 +4605,7 @@ dependencies = [ "tide-disco", "tokio", "tracing", + "url", "vbs", "vec1", ] @@ -4589,7 +4613,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" dependencies = [ "anyhow", "ark-bls12-381", @@ -5869,8 +5893,8 @@ dependencies = [ [[package]] name = "libp2p-networking" -version = "0.5.60" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.61#b7f5fa34f22df7af6fcfde92caa1b2153102d1df" +version = "0.5.63" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" dependencies = [ "anyhow", "async-compatibility-layer", @@ -7624,7 +7648,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.70", diff --git a/Cargo.toml b/Cargo.toml index 2faef8782..f72a5f9f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,21 +48,21 @@ dotenvy = "0.15" ethers = { version = "2.0", features = ["solc"] } futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" } +hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" } # Hotshot imports -hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.61" } -hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "rc-0.1.33" } -hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "rc-0.1.32" } -hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" } -hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "rc-0.1.44" } -hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" } +hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.63" } +hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "rc-0.1.34" } +hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "rc-0.1.33" } +hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" } +hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "rc-0.1.45" } +hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" } hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" } -hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" } -hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" } -hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" } +hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" } +hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" } +hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" } hotshot-contract-adapter = { version = "0.1.0", path = "contracts/rust/adapter" } # Temporary, used to pull in the mock auction results provider -hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" } # Push CDN imports cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", features = [ diff --git a/builder/src/lib.rs b/builder/src/lib.rs index e3a62a8c2..309b3f35c 100644 --- a/builder/src/lib.rs +++ b/builder/src/lib.rs @@ -32,7 +32,7 @@ use hotshot::{ types::{SignatureKey, SystemContextHandle}, HotShotInitializer, Memberships, SystemContext, }; -use hotshot_builder_api::builder::{ +use hotshot_builder_api::v0_2::builder::{ BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions, }; use hotshot_builder_core::service::{GlobalState, ProxyGlobalState}; @@ -76,15 +76,14 @@ pub mod permissioned; // It runs the api service for the builder pub fn run_builder_api_service(url: Url, source: ProxyGlobalState) { // it is to serve hotshot - let builder_api = hotshot_builder_api::builder::define_api::< + let builder_api = hotshot_builder_api::v0_2::builder::define_api::< ProxyGlobalState, SeqTypes, - ::Base, >(&HotshotBuilderApiOptions::default()) .expect("Failed to construct the builder APIs"); // it enables external clients to submit txn to the builder's private mempool - let private_mempool_api = hotshot_builder_api::builder::submit_api::< + let private_mempool_api = hotshot_builder_api::v0_2::builder::submit_api::< ProxyGlobalState, SeqTypes, ::Base, @@ -138,7 +137,7 @@ pub mod testing { }, types::{EventType::Decide, Message}, }; - use hotshot_builder_api::builder::{ + use hotshot_builder_api::v0_2::builder::{ BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions, }; use hotshot_builder_core::{ @@ -676,7 +675,7 @@ mod test { use ethers::providers::Quorum; use futures::StreamExt; use hotshot::types::EventType::Decide; - use hotshot_builder_api::block_info::AvailableBlockData; + use hotshot_builder_api::v0_2::block_info::AvailableBlockData; use hotshot_builder_core::service::GlobalState; use sequencer::{ empty_builder_commitment, diff --git a/builder/src/non_permissioned.rs b/builder/src/non_permissioned.rs index fbcc508ee..d8e565d69 100644 --- a/builder/src/non_permissioned.rs +++ b/builder/src/non_permissioned.rs @@ -19,7 +19,7 @@ use ethers::{ types::{Address, U256}, }; use hotshot::traits::BlockPayload; -use hotshot_builder_api::builder::{ +use hotshot_builder_api::v0_2::builder::{ BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions, }; use hotshot_builder_core::{ @@ -34,7 +34,7 @@ use hotshot_builder_core::{ }; use hotshot_events_service::{ events::{Error as EventStreamApiError, Options as EventStreamingApiOptions}, - events_source::{BuilderEvent, EventConsumer, EventsStreamer}, + events_source::{EventConsumer, EventsStreamer}, }; use hotshot_types::{ data::{fake_commitment, Leaf, ViewNumber}, @@ -232,7 +232,7 @@ mod test { use async_std::task; use es_version::SequencerVersion; use espresso_types::{FeeAccount, NamespaceId, Transaction}; - use hotshot_builder_api::{ + use hotshot_builder_api::v0_2::{ block_info::{AvailableBlockData, AvailableBlockHeaderInput, AvailableBlockInfo}, builder::BuildError, }; @@ -245,7 +245,7 @@ mod test { }; use hotshot_events_service::{ events::{Error as EventStreamApiError, Options as EventStreamingApiOptions}, - events_source::{BuilderEvent, EventConsumer, EventsStreamer}, + events_source::{EventConsumer, EventsStreamer}, }; use hotshot_types::{ signature_key::BLSPubKey, @@ -318,7 +318,7 @@ mod test { // Start a builder api client let builder_client = Client::< - hotshot_builder_api::builder::Error, + hotshot_builder_api::v0_2::builder::Error, ::Base, >::new(hotshot_builder_api_url.clone()); assert!(builder_client.connect(Some(Duration::from_secs(60))).await); diff --git a/builder/src/permissioned.rs b/builder/src/permissioned.rs index b40c7ea66..d7b1530a8 100644 --- a/builder/src/permissioned.rs +++ b/builder/src/permissioned.rs @@ -48,7 +48,7 @@ use hotshot::{ types::{SignatureKey, SystemContextHandle}, HotShotInitializer, Memberships, SystemContext, }; -use hotshot_builder_api::builder::{ +use hotshot_builder_api::v0_2::builder::{ BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions, }; use hotshot_builder_core::{ @@ -64,7 +64,7 @@ use hotshot_builder_core::{ }; use hotshot_events_service::{ events::{Error as EventStreamApiError, Options as EventStreamingApiOptions}, - events_source::{BuilderEvent, EventConsumer, EventsStreamer}, + events_source::{EventConsumer, EventsStreamer}, }; use hotshot_example_types::auction_results_provider_types::TestAuctionResultsProvider; use hotshot_orchestrator::{ @@ -241,7 +241,7 @@ pub async fn init_node::Base, >::new(hotshot_builder_api_url.clone()); assert!(builder_client.connect(Some(Duration::from_secs(60))).await); diff --git a/sequencer/src/api.rs b/sequencer/src/api.rs index 94961d2e5..890b6411a 100644 --- a/sequencer/src/api.rs +++ b/sequencer/src/api.rs @@ -17,7 +17,9 @@ use futures::{ stream::{BoxStream, Stream}, }; use hotshot::types::{Event, SystemContextHandle}; -use hotshot_events_service::events_source::{BuilderEvent, EventsSource, EventsStreamer}; +use hotshot_events_service::events_source::{ + EventFilterSet, EventsSource, EventsStreamer, StartupInfo, +}; use hotshot_orchestrator::config::NetworkConfig; use hotshot_query_service::data_source::ExtensibleDataSource; use hotshot_state_prover::service::light_client_genesis_from_stake_table; @@ -127,14 +129,25 @@ type StorageState = ExtensibleDataSource>; impl, Ver: StaticVersionType + 'static, P: SequencerPersistence> EventsSource for ApiState { - type EventStream = BoxStream<'static, Arc>>; + type EventStream = BoxStream<'static, Arc>>; - async fn get_event_stream(&self) -> Self::EventStream { + async fn get_event_stream( + &self, + _filter: Option>, + ) -> Self::EventStream { + self.event_streamer() + .await + .read() + .await + .get_event_stream(None) + .await + } + async fn get_startup_info(&self) -> StartupInfo { self.event_streamer() .await .read() .await - .get_event_stream() + .get_startup_info() .await } } @@ -964,7 +977,6 @@ mod api_tests { #[async_std::test] pub(crate) async fn test_hotshot_event_streaming() { - use hotshot_events_service::events_source::BuilderEvent; use HotshotEvents; setup_logging(); @@ -998,7 +1010,7 @@ mod api_tests { let mut subscribed_events = client .socket("hotshot-events/events") - .subscribe::>() + .subscribe::>() .await .unwrap(); @@ -1017,8 +1029,7 @@ mod api_tests { break; } } - // Offset 1 is due to the startup event info - assert_eq!(receive_count, total_count + 1); + assert_eq!(receive_count, total_count); } } diff --git a/sequencer/src/lib.rs b/sequencer/src/lib.rs index a837b7996..346db3b09 100644 --- a/sequencer/src/lib.rs +++ b/sequencer/src/lib.rs @@ -297,7 +297,7 @@ pub async fn init_node( Arc::from(CombinedNetworks::new( cdn_network, p2p_network, - Duration::from_secs(1), + Some(Duration::from_secs(1)), )) }; From e87e43ba50edbf5d64bcc4f6f9baf6bb86b7e9ef Mon Sep 17 00:00:00 2001 From: Brendon Fish Date: Fri, 19 Jul 2024 09:32:33 -0400 Subject: [PATCH 2/9] fix event streaming test --- sequencer/src/api.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer/src/api.rs b/sequencer/src/api.rs index 890b6411a..df2abaf67 100644 --- a/sequencer/src/api.rs +++ b/sequencer/src/api.rs @@ -1029,7 +1029,7 @@ mod api_tests { break; } } - assert_eq!(receive_count, total_count); + assert_eq!(receive_count, total_count + 1); } } From 9e5cbb5ad26791e8c14465ebd3dbcdea9fa12bca Mon Sep 17 00:00:00 2001 From: bfish713 Date: Fri, 19 Jul 2024 14:08:20 -0400 Subject: [PATCH 3/9] Try using builder v0_1 types --- builder/src/lib.rs | 10 +++++----- builder/src/non_permissioned.rs | 6 +++--- builder/src/permissioned.rs | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/builder/src/lib.rs b/builder/src/lib.rs index 309b3f35c..fd654bf29 100644 --- a/builder/src/lib.rs +++ b/builder/src/lib.rs @@ -32,7 +32,7 @@ use hotshot::{ types::{SignatureKey, SystemContextHandle}, HotShotInitializer, Memberships, SystemContext, }; -use hotshot_builder_api::v0_2::builder::{ +use hotshot_builder_api::v0_1::builder::{ BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions, }; use hotshot_builder_core::service::{GlobalState, ProxyGlobalState}; @@ -76,14 +76,14 @@ pub mod permissioned; // It runs the api service for the builder pub fn run_builder_api_service(url: Url, source: ProxyGlobalState) { // it is to serve hotshot - let builder_api = hotshot_builder_api::v0_2::builder::define_api::< + let builder_api = hotshot_builder_api::v0_1::builder::define_api::< ProxyGlobalState, SeqTypes, >(&HotshotBuilderApiOptions::default()) .expect("Failed to construct the builder APIs"); // it enables external clients to submit txn to the builder's private mempool - let private_mempool_api = hotshot_builder_api::v0_2::builder::submit_api::< + let private_mempool_api = hotshot_builder_api::v0_1::builder::submit_api::< ProxyGlobalState, SeqTypes, ::Base, @@ -137,7 +137,7 @@ pub mod testing { }, types::{EventType::Decide, Message}, }; - use hotshot_builder_api::v0_2::builder::{ + use hotshot_builder_api::v0_1::builder::{ BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions, }; use hotshot_builder_core::{ @@ -675,7 +675,7 @@ mod test { use ethers::providers::Quorum; use futures::StreamExt; use hotshot::types::EventType::Decide; - use hotshot_builder_api::v0_2::block_info::AvailableBlockData; + use hotshot_builder_api::v0_1::block_info::AvailableBlockData; use hotshot_builder_core::service::GlobalState; use sequencer::{ empty_builder_commitment, diff --git a/builder/src/non_permissioned.rs b/builder/src/non_permissioned.rs index d8e565d69..53b5183a0 100644 --- a/builder/src/non_permissioned.rs +++ b/builder/src/non_permissioned.rs @@ -19,7 +19,7 @@ use ethers::{ types::{Address, U256}, }; use hotshot::traits::BlockPayload; -use hotshot_builder_api::v0_2::builder::{ +use hotshot_builder_api::v0_1::builder::{ BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions, }; use hotshot_builder_core::{ @@ -232,7 +232,7 @@ mod test { use async_std::task; use es_version::SequencerVersion; use espresso_types::{FeeAccount, NamespaceId, Transaction}; - use hotshot_builder_api::v0_2::{ + use hotshot_builder_api::v0_1::{ block_info::{AvailableBlockData, AvailableBlockHeaderInput, AvailableBlockInfo}, builder::BuildError, }; @@ -318,7 +318,7 @@ mod test { // Start a builder api client let builder_client = Client::< - hotshot_builder_api::v0_2::builder::Error, + hotshot_builder_api::v0_1::builder::Error, ::Base, >::new(hotshot_builder_api_url.clone()); assert!(builder_client.connect(Some(Duration::from_secs(60))).await); diff --git a/builder/src/permissioned.rs b/builder/src/permissioned.rs index d7b1530a8..0d83828da 100644 --- a/builder/src/permissioned.rs +++ b/builder/src/permissioned.rs @@ -48,7 +48,7 @@ use hotshot::{ types::{SignatureKey, SystemContextHandle}, HotShotInitializer, Memberships, SystemContext, }; -use hotshot_builder_api::v0_2::builder::{ +use hotshot_builder_api::v0_1::builder::{ BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions, }; use hotshot_builder_core::{ @@ -550,7 +550,7 @@ mod test { use async_std::task; use es_version::SequencerVersion; use espresso_types::{FeeAccount, NamespaceId, Transaction}; - use hotshot_builder_api::v0_2::{ + use hotshot_builder_api::v0_1::{ block_info::{AvailableBlockData, AvailableBlockHeaderInput, AvailableBlockInfo}, builder::BuildError, }; @@ -625,7 +625,7 @@ mod test { // Start a builder api client let builder_client = Client::< - hotshot_builder_api::v0_2::builder::Error, + hotshot_builder_api::v0_1::builder::Error, ::Base, >::new(hotshot_builder_api_url.clone()); assert!(builder_client.connect(Some(Duration::from_secs(60))).await); From ad0e7a4f057b859bcf3c81c86e213153ef166268 Mon Sep 17 00:00:00 2001 From: Jeb Bearer Date: Fri, 19 Jul 2024 14:12:47 -0400 Subject: [PATCH 4/9] Include more information in error message when builder signature is invalid --- types/src/v0/impls/header.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/types/src/v0/impls/header.rs b/types/src/v0/impls/header.rs index 6ccbf4dee..841e47f25 100644 --- a/types/src/v0/impls/header.rs +++ b/types/src/v0/impls/header.rs @@ -458,7 +458,8 @@ impl Header { &ns_table, &payload_commitment, ), - "invalid builder signature" + "invalid builder signature, account: {}, fee: {builder_fee:?}, ns_table: {ns_table:?}, payload_commitment: {payload_commitment}", + builder_fee.fee_account, ); let builder_signature = Some(builder_fee.fee_signature); let fee_info = builder_fee.into(); From 751f717eb59da2fbab0b58a90656cb76e1595b56 Mon Sep 17 00:00:00 2001 From: bfish713 Date: Fri, 19 Jul 2024 15:44:36 -0400 Subject: [PATCH 5/9] new HS --- Cargo.lock | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3be84eeb7..31fcf47ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4152,7 +4152,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "anyhow", "async-broadcast", @@ -4198,7 +4198,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "async-trait", "clap", @@ -4217,7 +4217,7 @@ dependencies = [ [[package]] name = "hotshot-builder-core" version = "0.1.26" -source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=rc-0.1.34#810a2a4acc905a9842b77814deefa82dd5f5325e" +source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=rc-0.1.34#58d7efa5bf6cca3f09951510b141a87527798da0" dependencies = [ "anyhow", "async-broadcast", @@ -4270,7 +4270,7 @@ dependencies = [ [[package]] name = "hotshot-events-service" version = "0.1.33" -source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=rc-0.1.33#765c2fa5871d548a20f0aef8f6d15ed49e26dab5" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=rc-0.1.33#9826fb46d13ae74cc9353f455d54345a7ab5e7f4" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -4296,7 +4296,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "anyhow", "async-broadcast", @@ -4329,7 +4329,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -4348,7 +4348,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "derive_builder", "proc-macro2", @@ -4359,7 +4359,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4389,7 +4389,7 @@ dependencies = [ [[package]] name = "hotshot-query-service" version = "0.1.45" -source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=rc-0.1.45#5cc621e42a876247421793807b1acf7fac178cfd" +source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=rc-0.1.45#c930f60f8a20d7bbac36065ac46a331925e768b4" dependencies = [ "anyhow", "ark-serialize", @@ -4445,7 +4445,7 @@ dependencies = [ [[package]] name = "hotshot-stake-table" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4517,7 +4517,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "anyhow", "async-broadcast", @@ -4532,7 +4532,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "anyhow", "async-broadcast", @@ -4568,7 +4568,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "anyhow", "async-broadcast", @@ -4613,7 +4613,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "anyhow", "ark-bls12-381", @@ -4908,7 +4908,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core", ] [[package]] @@ -5894,7 +5894,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#3091d4aac668e2bd0fff8b8a171d36efca3ceb01" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" dependencies = [ "anyhow", "async-compatibility-layer", @@ -11153,7 +11153,7 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core 0.51.1", + "windows-core", "windows-targets 0.48.5", ] @@ -11166,15 +11166,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.48.0" From d33fda9b6aa0c8ac2dcb65d6f4021bd0d8b9e004 Mon Sep 17 00:00:00 2001 From: Brendon Fish Date: Mon, 22 Jul 2024 13:41:05 -0400 Subject: [PATCH 6/9] bump HS and update types --- Cargo.lock | 81 +++++++++++++++-------------------- types/src/v0/impls/auction.rs | 14 +++--- 2 files changed, 41 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 31fcf47ce..7a5840709 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1513,13 +1513,13 @@ dependencies = [ [[package]] name = "cdn-broker" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2#09389360284c51dd44a3dae1f1c3b395125abe82" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.3#26a7b21372c4b38dca2f4aecb4267b271d1ac883" dependencies = [ "async-std", - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2)", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.3)", "clap", "console-subscriber 0.3.0", - "dashmap 5.5.3", + "dashmap", "derivative", "jf-signature", "lazy_static", @@ -1537,13 +1537,13 @@ dependencies = [ [[package]] name = "cdn-broker" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.3#26a7b21372c4b38dca2f4aecb4267b271d1ac883" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4#398b77fb2f461218a611294e1484b7e0bd571d64" dependencies = [ "async-std", - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.3)", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4)", "clap", "console-subscriber 0.3.0", - "dashmap 6.0.1", + "dashmap", "derivative", "jf-signature", "lazy_static", @@ -1561,10 +1561,10 @@ dependencies = [ [[package]] name = "cdn-client" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2#09389360284c51dd44a3dae1f1c3b395125abe82" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4#398b77fb2f461218a611294e1484b7e0bd571d64" dependencies = [ "async-std", - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2)", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4)", "clap", "jf-signature", "rand 0.8.5", @@ -1576,10 +1576,10 @@ dependencies = [ [[package]] name = "cdn-marshal" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2#09389360284c51dd44a3dae1f1c3b395125abe82" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.3#26a7b21372c4b38dca2f4aecb4267b271d1ac883" dependencies = [ "async-std", - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2)", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.3)", "clap", "jf-signature", "tokio", @@ -1590,10 +1590,10 @@ dependencies = [ [[package]] name = "cdn-marshal" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.3#26a7b21372c4b38dca2f4aecb4267b271d1ac883" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4#398b77fb2f461218a611294e1484b7e0bd571d64" dependencies = [ "async-std", - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.3)", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4)", "clap", "jf-signature", "tokio", @@ -1604,7 +1604,7 @@ dependencies = [ [[package]] name = "cdn-proto" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2#09389360284c51dd44a3dae1f1c3b395125abe82" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.3#26a7b21372c4b38dca2f4aecb4267b271d1ac883" dependencies = [ "anyhow", "ark-serialize", @@ -1638,7 +1638,7 @@ dependencies = [ [[package]] name = "cdn-proto" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.3#26a7b21372c4b38dca2f4aecb4267b271d1ac883" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4#398b77fb2f461218a611294e1484b7e0bd571d64" dependencies = [ "anyhow", "ark-serialize", @@ -2446,19 +2446,6 @@ dependencies = [ "syn 2.0.70", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - [[package]] name = "dashmap" version = "6.0.1" @@ -4152,7 +4139,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "anyhow", "async-broadcast", @@ -4163,13 +4150,13 @@ dependencies = [ "bimap", "bincode", "blake3", - "cdn-broker 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2)", + "cdn-broker 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4)", "cdn-client", - "cdn-marshal 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2)", + "cdn-marshal 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4)", "chrono", "committable", "custom_debug 0.5.1", - "dashmap 6.0.1", + "dashmap", "derive_more", "either", "ethereum-types", @@ -4198,7 +4185,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "async-trait", "clap", @@ -4217,7 +4204,7 @@ dependencies = [ [[package]] name = "hotshot-builder-core" version = "0.1.26" -source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=rc-0.1.34#58d7efa5bf6cca3f09951510b141a87527798da0" +source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=rc-0.1.34#63c5627459367ba974ac97747b9b8323abe01e89" dependencies = [ "anyhow", "async-broadcast", @@ -4270,7 +4257,7 @@ dependencies = [ [[package]] name = "hotshot-events-service" version = "0.1.33" -source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=rc-0.1.33#9826fb46d13ae74cc9353f455d54345a7ab5e7f4" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=rc-0.1.33#66f5645a10f99784bc233618de04dc661a659f83" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -4296,7 +4283,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "anyhow", "async-broadcast", @@ -4329,7 +4316,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -4348,7 +4335,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "derive_builder", "proc-macro2", @@ -4359,7 +4346,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4389,7 +4376,7 @@ dependencies = [ [[package]] name = "hotshot-query-service" version = "0.1.45" -source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=rc-0.1.45#c930f60f8a20d7bbac36065ac46a331925e768b4" +source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=rc-0.1.45#ce06223267a4d417031667fc1358fb1a47656b47" dependencies = [ "anyhow", "ark-serialize", @@ -4445,7 +4432,7 @@ dependencies = [ [[package]] name = "hotshot-stake-table" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4517,7 +4504,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "anyhow", "async-broadcast", @@ -4532,7 +4519,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "anyhow", "async-broadcast", @@ -4542,7 +4529,7 @@ dependencies = [ "async-trait", "bincode", "bitvec", - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2)", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4)", "chrono", "committable", "either", @@ -4568,7 +4555,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "anyhow", "async-broadcast", @@ -4613,7 +4600,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "anyhow", "ark-bls12-381", @@ -4631,7 +4618,7 @@ dependencies = [ "bincode", "bitvec", "blake3", - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.2)", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4)", "committable", "custom_debug 0.5.1", "derivative", @@ -5894,7 +5881,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#52ac6465874bfa16ba84b6e51ee976bb63558287" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" dependencies = [ "anyhow", "async-compatibility-layer", diff --git a/types/src/v0/impls/auction.rs b/types/src/v0/impls/auction.rs index ac4e03a35..24899ae2a 100644 --- a/types/src/v0/impls/auction.rs +++ b/types/src/v0/impls/auction.rs @@ -9,7 +9,7 @@ use ethers::types::Signature; use hotshot_types::{ data::ViewNumber, traits::{ - auction_results_provider::HasUrl, node_implementation::ConsensusTime, + auction_results_provider::HasUrls, node_implementation::ConsensusTime, signature_key::BuilderSignatureKey, }, }; @@ -215,17 +215,17 @@ impl BidTx { } } -impl HasUrl for BidTx { +impl HasUrls for BidTx { /// Get the `url` field from the body. - fn url(&self) -> Url { - self.body.url() + fn urls(&self) -> Vec { + self.body.urls() } } -impl HasUrl for BidTxBody { +impl HasUrls for BidTxBody { /// Get the cloned `url` field. - fn url(&self) -> Url { - self.url.clone() + fn urls(&self) -> Vec { + vec![self.url.clone()] } } From 97d394e9a21aff24046db4e9af4532c948ce151a Mon Sep 17 00:00:00 2001 From: Brendon Fish Date: Mon, 22 Jul 2024 17:12:25 -0400 Subject: [PATCH 7/9] Revert "Merge remote-tracking branch 'origin/main' into hotshot/rc-0.5.63" This reverts commit c7324fdb2dd415c40105f9dabd8c0ca8c9ae5632, reversing changes made to d33fda9b6aa0c8ac2dcb65d6f4021bd0d8b9e004. --- types/src/v0/impls/block/full_payload/payload.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/types/src/v0/impls/block/full_payload/payload.rs b/types/src/v0/impls/block/full_payload/payload.rs index bbb75399a..4785a0b36 100644 --- a/types/src/v0/impls/block/full_payload/payload.rs +++ b/types/src/v0/impls/block/full_payload/payload.rs @@ -219,14 +219,6 @@ impl QueryablePayload for Payload { TxProof::new(index, self, &common) } - - fn transaction( - &self, - _meta: &Self::Metadata, - index: &Self::TransactionIndex, - ) -> Option { - self.transaction(index) - } } impl std::fmt::Display for Payload { From 2a8ead529f00a4b183f73370310faac04c53f4da Mon Sep 17 00:00:00 2001 From: Brendon Fish Date: Tue, 23 Jul 2024 12:42:39 -0400 Subject: [PATCH 8/9] update hotshot --- Cargo.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7a5840709..ae9708b5e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4139,7 +4139,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-broadcast", @@ -4185,7 +4185,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "async-trait", "clap", @@ -4204,7 +4204,7 @@ dependencies = [ [[package]] name = "hotshot-builder-core" version = "0.1.26" -source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=rc-0.1.34#63c5627459367ba974ac97747b9b8323abe01e89" +source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=rc-0.1.34#970b0b365df073a326e613be65a32b435af9453a" dependencies = [ "anyhow", "async-broadcast", @@ -4257,7 +4257,7 @@ dependencies = [ [[package]] name = "hotshot-events-service" version = "0.1.33" -source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=rc-0.1.33#66f5645a10f99784bc233618de04dc661a659f83" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=rc-0.1.33#ea7ee48d5909b0c014489d2b7760c2a40879c344" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -4283,7 +4283,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-broadcast", @@ -4316,7 +4316,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -4335,7 +4335,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "derive_builder", "proc-macro2", @@ -4346,7 +4346,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4376,7 +4376,7 @@ dependencies = [ [[package]] name = "hotshot-query-service" version = "0.1.45" -source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=rc-0.1.45#ce06223267a4d417031667fc1358fb1a47656b47" +source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=rc-0.1.45#9f78df7c924a5c310f0925980e663f2818d2d8ce" dependencies = [ "anyhow", "ark-serialize", @@ -4432,7 +4432,7 @@ dependencies = [ [[package]] name = "hotshot-stake-table" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4504,7 +4504,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-broadcast", @@ -4519,7 +4519,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-broadcast", @@ -4555,7 +4555,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-broadcast", @@ -4600,7 +4600,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "ark-bls12-381", @@ -5881,7 +5881,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.63" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#00ec3cf6cd3abfb37471ab55fba352a01e923d3e" +source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.63#86aac47dcdc39e826bedda83e222895c04d87889" dependencies = [ "anyhow", "async-compatibility-layer", From 1cec17cb2691e1d9d968f101edf9ee6796cdd244 Mon Sep 17 00:00:00 2001 From: Brendon Fish Date: Tue, 23 Jul 2024 13:17:02 -0400 Subject: [PATCH 9/9] add back transcations fix --- types/src/v0/impls/block/full_payload/payload.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/types/src/v0/impls/block/full_payload/payload.rs b/types/src/v0/impls/block/full_payload/payload.rs index 4785a0b36..bbb75399a 100644 --- a/types/src/v0/impls/block/full_payload/payload.rs +++ b/types/src/v0/impls/block/full_payload/payload.rs @@ -219,6 +219,14 @@ impl QueryablePayload for Payload { TxProof::new(index, self, &common) } + + fn transaction( + &self, + _meta: &Self::Metadata, + index: &Self::TransactionIndex, + ) -> Option { + self.transaction(index) + } } impl std::fmt::Display for Payload {