From 18646d341e54230b9eab85c34d277fbe4e4aaf4d Mon Sep 17 00:00:00 2001 From: Jarred Parr Date: Thu, 8 Aug 2024 10:50:37 -0600 Subject: [PATCH 1/5] hackfix for weekly release --- Cargo.lock | 69 +++++++++++++++++++++--------------- Cargo.toml | 24 ++++++------- builder/src/permissioned.rs | 9 +++-- sequencer/src/context.rs | 6 +++- sequencer/src/lib.rs | 7 +++- types/src/v0/impls/header.rs | 1 + 6 files changed, 72 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ec8a77ae9..06dfdd681 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4042,8 +4042,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.68" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "anyhow", "async-broadcast", @@ -4083,13 +4083,14 @@ dependencies = [ "time 0.3.36", "tokio", "tracing", + "url", "vbs", ] [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "async-trait", "clap", @@ -4108,7 +4109,7 @@ dependencies = [ [[package]] name = "hotshot-builder-core" version = "0.1.39" -source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=0.1.39#f78273c7838a8c9da194a540b8ac91cf4d65844c" +source = "git+https://github.com/EspressoSystems/hotshot-builder-core?branch=hotshot/rc-0.5.69#4a10af9a68a1ec907d050236eda6b5c0f5fb4946" dependencies = [ "anyhow", "async-broadcast", @@ -4160,7 +4161,7 @@ dependencies = [ [[package]] name = "hotshot-events-service" version = "0.1.38" -source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.38#65cd285e930ef63cec83e9e694da26a5bd4ba801" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=hotshot/rc-0.5.69#b55340f60041b8b9648012abce7a8135d9a8ae76" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -4185,8 +4186,8 @@ dependencies = [ [[package]] name = "hotshot-example-types" -version = "0.5.68" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "anyhow", "async-broadcast", @@ -4218,8 +4219,8 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" -version = "0.5.68" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -4237,8 +4238,8 @@ dependencies = [ [[package]] name = "hotshot-macros" -version = "0.5.68" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "derive_builder", "proc-macro2", @@ -4248,8 +4249,8 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" -version = "0.5.68" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4278,13 +4279,13 @@ dependencies = [ [[package]] name = "hotshot-query-service" -version = "0.1.50" -source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=0.1.50#d9cb31cb4030fc85101fe74ad3fa25443f629a3e" +version = "0.1.51" +source = "git+https://github.com/EspressoSystems/hotshot-query-service?branch=hotshot/rc-0.5.69#14cc856ae0877f6064fb4648248e5c07b3bb6511" dependencies = [ "anyhow", "ark-serialize", "async-compatibility-layer", - "async-lock 2.8.0", + "async-lock 3.4.0", "async-std", "async-trait", "atomic_store", @@ -4334,8 +4335,8 @@ dependencies = [ [[package]] name = "hotshot-stake-table" -version = "0.5.68" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4398,8 +4399,8 @@ dependencies = [ [[package]] name = "hotshot-task" -version = "0.5.68" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "anyhow", "async-broadcast", @@ -4413,8 +4414,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.68" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "anyhow", "async-broadcast", @@ -4443,14 +4444,15 @@ dependencies = [ "time 0.3.36", "tokio", "tracing", + "url", "vbs", "vec1", ] [[package]] name = "hotshot-testing" -version = "0.5.68" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "anyhow", "async-broadcast", @@ -4473,6 +4475,7 @@ dependencies = [ "hotshot-task", "hotshot-task-impls", "hotshot-types", + "itertools 0.13.0", "jf-signature", "jf-vid", "lru 0.12.4", @@ -4495,7 +4498,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "anyhow", "ark-bn254", @@ -5088,6 +5091,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -5740,8 +5752,8 @@ dependencies = [ [[package]] name = "libp2p-networking" -version = "0.5.68" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.68#572c5c77d22c3e66acc9683efea8cc1ddbb7a9c5" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#8bb25e75a2b154d25eefc7d8e8c4daef782d7bf7" dependencies = [ "anyhow", "async-compatibility-layer", @@ -5759,6 +5771,7 @@ dependencies = [ "libp2p", "libp2p-identity", "libp2p-swarm-derive", + "pin-project", "rand 0.8.5", "serde", "serde_bytes", @@ -6136,7 +6149,7 @@ dependencies = [ [[package]] name = "marketplace-builder-core" version = "0.0.2" -source = "git+https://github.com/EspressoSystems/marketplace-builder-core?tag=0.0.2#2df34726a644181b47a1fb50c4bce2e1c7ce5066" +source = "git+https://github.com/EspressoSystems/marketplace-builder-core?branch=hotshot/rc-0.5.69#019285c67698141857a6fad743b3ea2ed116d40a" dependencies = [ "anyhow", "async-broadcast", diff --git a/Cargo.toml b/Cargo.toml index a46ef7e4b..ef66348ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,22 +52,22 @@ dotenvy = "0.15" ethers = { version = "2.0", features = ["solc"] } futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" } +hotshot = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } # Hotshot imports -hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.68" } -hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "0.1.39" } -marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.0.2" } -hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.38" } -hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" } -hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.50" } -hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" } +hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/0.5.69" } +hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", branch = "hotshot/rc-0.5.69" } +marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", branch = "hotshot/rc-0.5.69" } +hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "hotshot/rc-0.5.69" } +hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } +hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", branch = "hotshot/rc-0.5.69" } +hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" } -hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" } -hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" } -hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" } +hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } +hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } +hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } 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 = "0.5.68" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } # Push CDN imports cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", features = [ diff --git a/builder/src/permissioned.rs b/builder/src/permissioned.rs index aa7f0085f..3a26e2259 100644 --- a/builder/src/permissioned.rs +++ b/builder/src/permissioned.rs @@ -6,6 +6,7 @@ use std::{ mem, net::{IpAddr, Ipv4Addr}, num::NonZeroUsize, + str::FromStr, thread::Builder, time::Duration, }; @@ -46,7 +47,7 @@ use hotshot::{ BlockPayload, }, types::{SignatureKey, SystemContextHandle}, - HotShotInitializer, Memberships, SystemContext, + HotShotInitializer, MarketplaceConfig, Memberships, SystemContext, }; use hotshot_builder_api::v0_1::builder::{ BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions, @@ -80,6 +81,7 @@ use hotshot_types::{ light_client::StateKeyPair, signature_key::{BLSPrivKey, BLSPubKey}, traits::{ + auction_results_provider::AuctionResultsProvider, block_contents::{vid_commitment, GENESIS_VID_NUM_STORAGE_NODES}, election::Membership, metrics::Metrics, @@ -384,7 +386,10 @@ pub async fn init_hotshot< .unwrap(), ConsensusMetricsValue::new(metrics), da_storage, - TestAuctionResultsProvider::default(), + MarketplaceConfig { + auction_results_provider: Arc::new(TestAuctionResultsProvider::default()), + generic_builder_url: Url::from_str("http://localhost").unwrap(), + }, ) .await .unwrap() diff --git a/sequencer/src/context.rs b/sequencer/src/context.rs index 9b2e18c55..b175e71ba 100644 --- a/sequencer/src/context.rs +++ b/sequencer/src/context.rs @@ -88,6 +88,7 @@ impl, P: SequencerPersistence, Ver: StaticVersionTyp metrics: &dyn Metrics, stake_table_capacity: u64, public_api_url: Option, + generic_builder_url: Url, _: Ver, ) -> anyhow::Result { let config = &network_config.config; @@ -150,7 +151,10 @@ impl, P: SequencerPersistence, Ver: StaticVersionTyp initializer, ConsensusMetricsValue::new(metrics), persistence.clone(), - TestAuctionResultsProvider::default(), + hotshot::MarketplaceConfig { + auction_results_provider: Arc::new(TestAuctionResultsProvider::default()), + generic_builder_url, + }, ) .await? .0; diff --git a/sequencer/src/lib.rs b/sequencer/src/lib.rs index 8ba94f06f..f2dfd1116 100644 --- a/sequencer/src/lib.rs +++ b/sequencer/src/lib.rs @@ -31,7 +31,10 @@ pub mod state; #[cfg(feature = "libp2p")] use std::time::Duration; -use std::{collections::BTreeMap, fmt::Debug, marker::PhantomData, net::SocketAddr, sync::Arc}; +use std::{ + collections::BTreeMap, fmt::Debug, marker::PhantomData, net::SocketAddr, str::FromStr, + sync::Arc, +}; use derivative::Derivative; use espresso_types::v0::traits::{PersistenceOptions, SequencerPersistence}; @@ -404,6 +407,7 @@ pub async fn init_node( metrics, genesis.stake_table.capacity, network_params.public_api_url, + Url::from_str("http://localhost").unwrap(), bind_version, ) .await?; @@ -752,6 +756,7 @@ pub mod testing { metrics, stake_table_capacity, None, // The public API URL + Url::from_str("http://localhost").unwrap(), bind_version, ) .await diff --git a/types/src/v0/impls/header.rs b/types/src/v0/impls/header.rs index 9fdc6dad0..0cdcd6a4c 100644 --- a/types/src/v0/impls/header.rs +++ b/types/src/v0/impls/header.rs @@ -738,6 +738,7 @@ impl BlockHeader for Header { instance_state: &<::ValidatedState as hotshot_types::traits::ValidatedState>::Instance, parent_leaf: &hotshot_types::data::Leaf, payload_commitment: VidCommitment, + builder_commitment: BuilderCommitment, metadata: <::BlockPayload as BlockPayload>::Metadata, builder_fee: Vec>, _vid_common: VidCommon, From 4300f4295e76db4677096150268024a187449e97 Mon Sep 17 00:00:00 2001 From: Jarred Parr Date: Fri, 9 Aug 2024 11:11:15 -0600 Subject: [PATCH 2/5] fix build again --- Cargo.lock | 303 +++++++++++++++++++++++++++--------- Cargo.toml | 24 +-- builder/src/permissioned.rs | 2 +- sequencer/src/lib.rs | 2 +- sequencer/src/main.rs | 2 +- 5 files changed, 243 insertions(+), 90 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 397fd9b78..f168f53f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1843,7 +1843,7 @@ dependencies = [ "ark-serialize", "bitvec", "derivative", - "derive_more", + "derive_more 0.99.18", "funty", "hex", "serde", @@ -2530,6 +2530,26 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "diff" version = "0.1.13" @@ -2913,7 +2933,7 @@ dependencies = [ "cld", "committable", "contract-bindings", - "derive_more", + "derive_more 0.99.18", "ethers", "fluent-asserter", "futures", @@ -4042,8 +4062,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.67" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "anyhow", "async-broadcast", @@ -4061,7 +4081,7 @@ dependencies = [ "committable", "custom_debug 0.5.1", "dashmap", - "derive_more", + "derive_more 1.0.0", "either", "ethereum-types", "futures", @@ -4090,12 +4110,12 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "async-trait", "clap", "committable", - "derive_more", + "derive_more 1.0.0", "futures", "hotshot-types", "serde", @@ -4109,7 +4129,7 @@ dependencies = [ [[package]] name = "hotshot-builder-core" version = "0.1.39" -source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=rc-0.1.40#47e2b40d6af477c7ebcc6783c3de6ef129dd9fc8" +source = "git+https://github.com/EspressoSystems/hotshot-builder-core?branch=hotshot/rc-0.5.69#aa2558037970e7487f21b8690e8cf5b565de60f9" dependencies = [ "anyhow", "async-broadcast", @@ -4161,7 +4181,7 @@ dependencies = [ [[package]] name = "hotshot-events-service" version = "0.1.38" -source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.39#728372842d5247f2b4c65febbc1bda32919e07c9" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=hotshot/rc-0.5.69#a973799471a5a8175bf622758f71ac2710eed596" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -4170,7 +4190,7 @@ dependencies = [ "async-trait", "clap", "derivative", - "derive_more", + "derive_more 0.99.18", "either", "futures", "hotshot-types", @@ -4186,8 +4206,8 @@ dependencies = [ [[package]] name = "hotshot-example-types" -version = "0.5.67" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "anyhow", "async-broadcast", @@ -4219,8 +4239,8 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" -version = "0.5.67" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -4238,8 +4258,8 @@ dependencies = [ [[package]] name = "hotshot-macros" -version = "0.5.67" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "derive_builder", "proc-macro2", @@ -4249,8 +4269,8 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" -version = "0.5.67" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4280,7 +4300,7 @@ dependencies = [ [[package]] name = "hotshot-query-service" version = "0.1.51" -source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=rc-0.1.51#7519a044d09fec929c4123e0c0ef2a67528149c9" +source = "git+https://github.com/EspressoSystems/hotshot-query-service?branch=hotshot/rc-0.5.69#09cfbc8f3bd60263ab1a6f7bc21762487970c264" dependencies = [ "anyhow", "ark-serialize", @@ -4295,7 +4315,7 @@ dependencies = [ "committable", "custom_debug 0.6.1", "derivative", - "derive_more", + "derive_more 0.99.18", "either", "espresso-macros", "futures", @@ -4335,8 +4355,8 @@ dependencies = [ [[package]] name = "hotshot-stake-table" -version = "0.5.67" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4399,8 +4419,8 @@ dependencies = [ [[package]] name = "hotshot-task" -version = "0.5.67" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "anyhow", "async-broadcast", @@ -4414,8 +4434,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.67" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "anyhow", "async-broadcast", @@ -4451,8 +4471,8 @@ dependencies = [ [[package]] name = "hotshot-testing" -version = "0.5.67" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "anyhow", "async-broadcast", @@ -4498,7 +4518,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "anyhow", "ark-bn254", @@ -5493,17 +5513,17 @@ dependencies = [ "libp2p-allow-block-list", "libp2p-autonat", "libp2p-connection-limits", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-dns", - "libp2p-gossipsub", - "libp2p-identify", + "libp2p-gossipsub 0.46.1", + "libp2p-identify 0.44.2", "libp2p-identity", - "libp2p-kad", + "libp2p-kad 0.45.3", "libp2p-mdns", "libp2p-metrics", "libp2p-quic", "libp2p-request-response", - "libp2p-swarm", + "libp2p-swarm 0.44.2", "libp2p-tcp", "libp2p-upnp", "multiaddr", @@ -5518,9 +5538,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "107b238b794cb83ab53b74ad5dcf7cca3200899b72fe662840cfb52f5b0a32e6" dependencies = [ - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.44.2", "void", ] @@ -5535,10 +5555,10 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", "libp2p-request-response", - "libp2p-swarm", + "libp2p-swarm 0.44.2", "quick-protobuf", "quick-protobuf-codec 0.2.0", "rand 0.8.5", @@ -5551,9 +5571,9 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7cd50a78ccfada14de94cbacd3ce4b0138157f376870f13d3a8422cd075b4fd" dependencies = [ - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.44.2", "void", ] @@ -5586,6 +5606,34 @@ dependencies = [ "web-time", ] +[[package]] +name = "libp2p-core" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a61f26c83ed111104cd820fe9bc3aaabbac5f1652a1d213ed6e900b7918a1298" +dependencies = [ + "either", + "fnv", + "futures", + "futures-timer", + "libp2p-identity", + "multiaddr", + "multihash", + "multistream-select", + "once_cell", + "parking_lot", + "pin-project", + "quick-protobuf", + "rand 0.8.5", + "rw-stream-sink", + "smallvec", + "thiserror", + "tracing", + "unsigned-varint 0.8.0", + "void", + "web-time", +] + [[package]] name = "libp2p-dns" version = "0.41.1" @@ -5596,7 +5644,7 @@ dependencies = [ "async-trait", "futures", "hickory-resolver", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", "parking_lot", "smallvec", @@ -5620,9 +5668,9 @@ dependencies = [ "getrandom 0.2.15", "hex_fmt", "instant", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.44.2", "prometheus-client", "quick-protobuf", "quick-protobuf-codec 0.3.1", @@ -5635,6 +5683,37 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-gossipsub" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4e830fdf24ac8c444c12415903174d506e1e077fbe3875c404a78c5935a8543" +dependencies = [ + "asynchronous-codec 0.7.0", + "base64 0.22.1", + "byteorder", + "bytes 1.7.1", + "either", + "fnv", + "futures", + "futures-ticker", + "getrandom 0.2.15", + "hex_fmt", + "libp2p-core 0.42.0", + "libp2p-identity", + "libp2p-swarm 0.45.0", + "prometheus-client", + "quick-protobuf", + "quick-protobuf-codec 0.3.1", + "rand 0.8.5", + "regex", + "sha2 0.10.8", + "smallvec", + "tracing", + "void", + "web-time", +] + [[package]] name = "libp2p-identify" version = "0.44.2" @@ -5646,9 +5725,32 @@ dependencies = [ "futures", "futures-bounded", "futures-timer", - "libp2p-core", + "libp2p-core 0.41.3", + "libp2p-identity", + "libp2p-swarm 0.44.2", + "lru 0.12.4", + "quick-protobuf", + "quick-protobuf-codec 0.3.1", + "smallvec", + "thiserror", + "tracing", + "void", +] + +[[package]] +name = "libp2p-identify" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1711b004a273be4f30202778856368683bd9a83c4c7dcc8f848847606831a4e3" +dependencies = [ + "asynchronous-codec 0.7.0", + "either", + "futures", + "futures-bounded", + "futures-timer", + "libp2p-core 0.42.0", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.45.0", "lru 0.12.4", "quick-protobuf", "quick-protobuf-codec 0.3.1", @@ -5694,9 +5796,9 @@ dependencies = [ "futures-bounded", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.44.2", "quick-protobuf", "quick-protobuf-codec 0.3.1", "rand 0.8.5", @@ -5709,6 +5811,35 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-kad" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3fd4d149f0539e608d178b7cd1cfb0c1c6a8dc367eda2bc1cc81a28a1552161" +dependencies = [ + "arrayvec", + "asynchronous-codec 0.7.0", + "bytes 1.7.1", + "either", + "fnv", + "futures", + "futures-bounded", + "futures-timer", + "libp2p-core 0.42.0", + "libp2p-identity", + "libp2p-swarm 0.45.0", + "quick-protobuf", + "quick-protobuf-codec 0.3.1", + "rand 0.8.5", + "sha2 0.10.8", + "smallvec", + "thiserror", + "tracing", + "uint", + "void", + "web-time", +] + [[package]] name = "libp2p-mdns" version = "0.45.1" @@ -5721,9 +5852,9 @@ dependencies = [ "futures", "hickory-proto", "if-watch", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.44.2", "rand 0.8.5", "smallvec", "socket2 0.5.7", @@ -5734,26 +5865,26 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdac91ae4f291046a3b2660c039a2830c931f84df2ee227989af92f7692d3357" +checksum = "a70afa7692c81ee03e89c40d1e8638d634f18baef6aeeea30fd245edfae4d3fd" dependencies = [ "futures", - "instant", - "libp2p-core", - "libp2p-gossipsub", - "libp2p-identify", + "libp2p-core 0.42.0", + "libp2p-gossipsub 0.47.0", + "libp2p-identify 0.45.0", "libp2p-identity", - "libp2p-kad", - "libp2p-swarm", + "libp2p-kad 0.46.0", + "libp2p-swarm 0.45.0", "pin-project", "prometheus-client", + "web-time", ] [[package]] name = "libp2p-networking" -version = "0.5.67" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.70#88b22d90606ee22ece66857b9e70363d92082146" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" dependencies = [ "anyhow", "async-compatibility-layer", @@ -5794,7 +5925,7 @@ dependencies = [ "futures", "futures-timer", "if-watch", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", "libp2p-tls", "parking_lot", @@ -5820,9 +5951,9 @@ dependencies = [ "futures-bounded", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.44.2", "rand 0.8.5", "serde", "smallvec", @@ -5842,7 +5973,7 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", "libp2p-swarm-derive", "lru 0.12.4", @@ -5855,6 +5986,28 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-swarm" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b931eb2f00da515cec0914ab08a3d4c3694f29bc0e92e9ac66b3eaed5d354a5b" +dependencies = [ + "either", + "fnv", + "futures", + "futures-timer", + "libp2p-core 0.42.0", + "libp2p-identity", + "lru 0.12.4", + "multistream-select", + "once_cell", + "rand 0.8.5", + "smallvec", + "tracing", + "void", + "web-time", +] + [[package]] name = "libp2p-swarm-derive" version = "0.34.2" @@ -5878,7 +6031,7 @@ dependencies = [ "futures-timer", "if-watch", "libc", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", "socket2 0.5.7", "tokio", @@ -5893,7 +6046,7 @@ checksum = "72b7b831e55ce2aa6c354e6861a85fdd4dd0a2b97d5e276fabac0e4810a71776" dependencies = [ "futures", "futures-rustls", - "libp2p-core", + "libp2p-core 0.41.3", "libp2p-identity", "rcgen 0.11.3", "ring 0.17.8", @@ -5913,8 +6066,8 @@ dependencies = [ "futures", "futures-timer", "igd-next", - "libp2p-core", - "libp2p-swarm", + "libp2p-core 0.41.3", + "libp2p-swarm 0.44.2", "tokio", "tracing", "void", @@ -6149,7 +6302,7 @@ dependencies = [ [[package]] name = "marketplace-builder-core" version = "0.0.2" -source = "git+https://github.com/EspressoSystems/marketplace-builder-core?tag=rc-0.0.3#88a5cdb64bec7ffe02c711dd7132cb727a84cd19" +source = "git+https://github.com/EspressoSystems/marketplace-builder-core?branch=hotshot/rc-0.5.69#b32138ff2b70fca32f4669d99e405da317fd941b" dependencies = [ "anyhow", "async-broadcast", @@ -8401,7 +8554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", - "derive_more", + "derive_more 0.99.18", "parity-scale-codec", "scale-info-derive", ] @@ -8571,7 +8724,7 @@ dependencies = [ "contract-bindings", "csv", "derivative", - "derive_more", + "derive_more 0.99.18", "dotenvy", "escargot", "espresso-macros", @@ -8637,7 +8790,7 @@ dependencies = [ "clap", "committable", "contract-bindings", - "derive_more", + "derive_more 0.99.18", "ethers", "futures", "hotshot-contract-adapter", @@ -9798,7 +9951,7 @@ dependencies = [ "clap", "config", "derivative", - "derive_more", + "derive_more 0.99.18", "dirs", "edit-distance", "futures", @@ -10533,9 +10686,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64 0.22.1", "flate2", @@ -10643,7 +10796,7 @@ checksum = "6a9d83afb293d109ae418271619046cd9d87d63ba83e473e25a5e36101edc453" dependencies = [ "anyhow", "bincode", - "derive_more", + "derive_more 0.99.18", "serde", "serde_with", ] diff --git a/Cargo.toml b/Cargo.toml index ee8f68127..07f12e7c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,22 +52,22 @@ dotenvy = "0.15" ethers = { version = "2.0", features = ["solc"] } futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.70" } +hotshot = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } # Hotshot imports -hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.70" } -hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "rc-0.1.40" } -marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "rc-0.0.3" } -hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.39" } -hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.70" } -hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "rc-0.1.51" } -hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.70" } +hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/0.5.69" } +hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", branch = "hotshot/rc-0.5.69" } +marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", branch = "hotshot/rc-0.5.69" } +hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "hotshot/rc-0.5.69" } +hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } +hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", branch = "hotshot/rc-0.5.69" } +hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" } -hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.70" } -hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.70" } -hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.70" } +hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } +hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } +hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } 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.70" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } # Push CDN imports cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", features = [ diff --git a/builder/src/permissioned.rs b/builder/src/permissioned.rs index 3a3108046..76ade2dba 100644 --- a/builder/src/permissioned.rs +++ b/builder/src/permissioned.rs @@ -391,7 +391,7 @@ pub async fn init_hotshot< auction_results_provider: Arc::new(SolverAuctionResultsProvider( Url::from_str("https://some.solver").unwrap(), )), - generic_builder_url: Url::from_str("https://some.builder").unwrap(), + fallback_builder_url: Url::from_str("https://some.builder").unwrap(), }, ) .await diff --git a/sequencer/src/lib.rs b/sequencer/src/lib.rs index 6ecc59781..aa35f4ad3 100644 --- a/sequencer/src/lib.rs +++ b/sequencer/src/lib.rs @@ -767,7 +767,7 @@ pub mod testing { auction_results_provider: Arc::new(SolverAuctionResultsProvider( Url::from_str("https://some.solver").unwrap(), )), - generic_builder_url: Url::from_str("https://some.builder").unwrap(), + fallback_builder_url: Url::from_str("https://some.builder").unwrap(), }, ) .await diff --git a/sequencer/src/main.rs b/sequencer/src/main.rs index 9d9c82f25..705bfcf4c 100644 --- a/sequencer/src/main.rs +++ b/sequencer/src/main.rs @@ -102,7 +102,7 @@ where auction_results_provider: Arc::new(SolverAuctionResultsProvider( opt.auction_results_solver_url, )), - generic_builder_url: opt.generic_builder_url, + fallback_builder_url: opt.generic_builder_url, }; // Initialize HotShot. If the user requested the HTTP module, we must initialize the handle in From f9979877605bc8ff2ce5c044d19da416178d07ed Mon Sep 17 00:00:00 2001 From: Artemii Gerasimovich Date: Fri, 9 Aug 2024 21:27:32 +0200 Subject: [PATCH 3/5] Fix builder-related things --- sequencer/src/context.rs | 1 - sequencer/src/lib.rs | 7 +------ sequencer/src/main.rs | 2 +- sequencer/src/options.rs | 4 ++-- types/src/v0/impls/header.rs | 14 +++++++------- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/sequencer/src/context.rs b/sequencer/src/context.rs index 99f8b145d..0964c25ed 100644 --- a/sequencer/src/context.rs +++ b/sequencer/src/context.rs @@ -88,7 +88,6 @@ impl, P: SequencerPersistence, Ver: StaticVersionTyp metrics: &dyn Metrics, stake_table_capacity: u64, public_api_url: Option, - generic_builder_url: Url, _: Ver, marketplace_config: MarketplaceConfig>, ) -> anyhow::Result { diff --git a/sequencer/src/lib.rs b/sequencer/src/lib.rs index aa35f4ad3..2a3374edf 100644 --- a/sequencer/src/lib.rs +++ b/sequencer/src/lib.rs @@ -33,10 +33,7 @@ pub mod state; #[cfg(feature = "libp2p")] use std::time::Duration; -use std::{ - collections::BTreeMap, fmt::Debug, marker::PhantomData, net::SocketAddr, str::FromStr, - sync::Arc, -}; +use std::{collections::BTreeMap, fmt::Debug, marker::PhantomData, net::SocketAddr, sync::Arc}; use derivative::Derivative; use espresso_types::v0::traits::{PersistenceOptions, SequencerPersistence}; @@ -411,7 +408,6 @@ pub async fn init_node( metrics, genesis.stake_table.capacity, network_params.public_api_url, - Url::from_str("http://localhost").unwrap(), bind_version, marketplace_config, ) @@ -761,7 +757,6 @@ pub mod testing { metrics, stake_table_capacity, None, // The public API URL - Url::from_str("http://localhost").unwrap(), bind_version, MarketplaceConfig::> { auction_results_provider: Arc::new(SolverAuctionResultsProvider( diff --git a/sequencer/src/main.rs b/sequencer/src/main.rs index 705bfcf4c..0d927f7fb 100644 --- a/sequencer/src/main.rs +++ b/sequencer/src/main.rs @@ -102,7 +102,7 @@ where auction_results_provider: Arc::new(SolverAuctionResultsProvider( opt.auction_results_solver_url, )), - fallback_builder_url: opt.generic_builder_url, + fallback_builder_url: opt.fallback_builder_url, }; // Initialize HotShot. If the user requested the HTTP module, we must initialize the handle in diff --git a/sequencer/src/options.rs b/sequencer/src/options.rs index 9218286cd..94c98b9b5 100644 --- a/sequencer/src/options.rs +++ b/sequencer/src/options.rs @@ -116,11 +116,11 @@ pub struct Options { /// URL of generic builder #[clap( long, - env = "ESPRESSO_GENERIC_BUILDER_URL", + env = "ESPRESSO_FALLBACK_BUILDER_URL", default_value = "http://localhost:31004" )] #[derivative(Debug(format_with = "Display::fmt"))] - pub generic_builder_url: Url, + pub fallback_builder_url: Url, /// Path to TOML file containing genesis state. #[clap( diff --git a/types/src/v0/impls/header.rs b/types/src/v0/impls/header.rs index c19794651..2a34201c9 100644 --- a/types/src/v0/impls/header.rs +++ b/types/src/v0/impls/header.rs @@ -343,7 +343,7 @@ impl Header { #[allow(clippy::too_many_arguments)] fn from_info( payload_commitment: VidCommitment, - builder_commitment: Option, + builder_commitment: BuilderCommitment, ns_table: NsTable, parent_leaf: &Leaf, mut l1: L1Snapshot, @@ -470,7 +470,7 @@ impl Header { l1_head: l1.head, l1_finalized: l1.finalized, payload_commitment, - builder_commitment: builder_commitment.unwrap(), + builder_commitment, ns_table, block_merkle_tree_root, fee_merkle_tree_root, @@ -486,7 +486,7 @@ impl Header { l1_head: l1.head, l1_finalized: l1.finalized, payload_commitment, - builder_commitment: builder_commitment.unwrap(), + builder_commitment, ns_table, block_merkle_tree_root, fee_merkle_tree_root, @@ -500,7 +500,7 @@ impl Header { l1_head: l1.head, l1_finalized: l1.finalized, payload_commitment, - builder_commitment: builder_commitment.unwrap(), + builder_commitment, ns_table, block_merkle_tree_root, fee_merkle_tree_root, @@ -836,7 +836,7 @@ impl BlockHeader for Header { Ok(Self::from_info( payload_commitment, - None, + builder_commitment, metadata, parent_leaf, l1_snapshot, @@ -952,7 +952,7 @@ impl BlockHeader for Header { Ok(Self::from_info( payload_commitment, - Some(builder_commitment), + builder_commitment, metadata, parent_leaf, l1_snapshot, @@ -1154,7 +1154,7 @@ mod test_headers { let header = Header::from_info( genesis.header.payload_commitment(), - Some(genesis.header.builder_commitment().clone()), + genesis.header.builder_commitment().clone(), genesis.ns_table, &parent_leaf, L1Snapshot { From 7329a8f05f64b6f056ad3268ec7ba3c35ba503a1 Mon Sep 17 00:00:00 2001 From: Jarred Parr Date: Tue, 13 Aug 2024 08:58:12 -0600 Subject: [PATCH 4/5] hotshot --- Cargo.lock | 475 +++++++++++++++++++++++++++++++++++++++++++++-------- Cargo.toml | 16 +- 2 files changed, 417 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b3df12314..c27703d51 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1306,15 +1306,15 @@ dependencies = [ "espresso-types", "ethers", "futures", - "hotshot", - "hotshot-builder-api", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "hotshot-builder-core", "hotshot-events-service", - "hotshot-example-types", - "hotshot-orchestrator", + "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "hotshot-stake-table", "hotshot-state-prover", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "jf-merkle-tree", "jf-signature", "libp2p", @@ -2937,11 +2937,11 @@ dependencies = [ "ethers", "fluent-asserter", "futures", - "hotshot", - "hotshot-orchestrator", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "hotshot-query-service", - "hotshot-testing", - "hotshot-types", + "hotshot-testing 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "itertools 0.12.1", "jf-merkle-tree", "jf-utils", @@ -4060,6 +4060,53 @@ dependencies = [ "winapi", ] +[[package]] +name = "hotshot" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +dependencies = [ + "anyhow", + "async-broadcast", + "async-compatibility-layer", + "async-lock 2.8.0", + "async-std", + "async-trait", + "bimap", + "bincode", + "blake3", + "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.4)", + "chrono", + "committable", + "custom_debug 0.5.1", + "dashmap", + "derive_more 1.0.0", + "either", + "ethereum-types", + "futures", + "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "jf-signature", + "libp2p-identity", + "libp2p-networking 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "lru 0.12.4", + "num_enum", + "portpicker", + "rand 0.8.5", + "serde", + "sha2 0.10.8", + "snafu 0.8.4", + "surf-disco", + "time 0.3.36", + "tokio", + "tracing", + "url", + "vbs", +] + [[package]] name = "hotshot" version = "0.5.69" @@ -4085,13 +4132,13 @@ dependencies = [ "either", "ethereum-types", "futures", - "hotshot-orchestrator", - "hotshot-task", - "hotshot-task-impls", - "hotshot-types", + "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "jf-signature", "libp2p-identity", - "libp2p-networking", + "libp2p-networking 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "lru 0.12.4", "num_enum", "portpicker", @@ -4107,6 +4154,25 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-builder-api" +version = "0.1.7" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +dependencies = [ + "async-trait", + "clap", + "committable", + "derive_more 1.0.0", + "futures", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "serde", + "snafu 0.8.4", + "tagged-base64", + "tide-disco", + "toml", + "vbs", +] + [[package]] name = "hotshot-builder-api" version = "0.1.7" @@ -4117,7 +4183,7 @@ dependencies = [ "committable", "derive_more 1.0.0", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "serde", "snafu 0.8.4", "tagged-base64", @@ -4142,10 +4208,10 @@ dependencies = [ "derivative", "futures", "hex", - "hotshot", - "hotshot-builder-api", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "hotshot-events-service", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "lru 0.12.4", "serde", "sha2 0.10.8", @@ -4170,7 +4236,7 @@ dependencies = [ "contract-bindings", "diff-test-bn254", "ethers", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "jf-pcs", "jf-plonk", "jf-utils", @@ -4193,7 +4259,7 @@ dependencies = [ "derive_more 0.99.18", "either", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "rand 0.8.5", "serde", "snafu 0.8.4", @@ -4204,6 +4270,39 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-example-types" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +dependencies = [ + "anyhow", + "async-broadcast", + "async-compatibility-layer", + "async-lock 2.8.0", + "async-std", + "async-trait", + "bitvec", + "committable", + "either", + "ethereum-types", + "futures", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "rand 0.8.5", + "reqwest 0.12.5", + "serde", + "sha2 0.10.8", + "sha3", + "snafu 0.8.4", + "time 0.3.36", + "tokio", + "tracing", + "url", + "vbs", +] + [[package]] name = "hotshot-example-types" version = "0.5.69" @@ -4220,10 +4319,10 @@ dependencies = [ "either", "ethereum-types", "futures", - "hotshot", - "hotshot-task", - "hotshot-task-impls", - "hotshot-types", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "rand 0.8.5", "reqwest 0.12.5", "serde", @@ -4237,6 +4336,25 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-fakeapi" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +dependencies = [ + "anyhow", + "async-lock 2.8.0", + "async-trait", + "futures", + "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "rand 0.8.5", + "serde", + "tide-disco", + "toml", + "tracing", + "vbs", +] + [[package]] name = "hotshot-fakeapi" version = "0.5.69" @@ -4246,8 +4364,8 @@ dependencies = [ "async-lock 2.8.0", "async-trait", "futures", - "hotshot-example-types", - "hotshot-types", + "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "rand 0.8.5", "serde", "tide-disco", @@ -4256,6 +4374,17 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-macros" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +dependencies = [ + "derive_builder", + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "hotshot-macros" version = "0.5.69" @@ -4267,6 +4396,36 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "hotshot-orchestrator" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +dependencies = [ + "anyhow", + "async-compatibility-layer", + "async-lock 2.8.0", + "async-std", + "bincode", + "blake3", + "clap", + "csv", + "futures", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "libp2p", + "multiaddr", + "serde", + "serde-inline-default", + "serde_json", + "surf-disco", + "thiserror", + "tide-disco", + "tokio", + "toml", + "tracing", + "vbs", + "vec1", +] + [[package]] name = "hotshot-orchestrator" version = "0.5.69" @@ -4281,7 +4440,7 @@ dependencies = [ "clap", "csv", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "libp2p", "multiaddr", "serde", @@ -4319,10 +4478,10 @@ dependencies = [ "either", "espresso-macros", "futures", - "hotshot", - "hotshot-example-types", - "hotshot-testing", - "hotshot-types", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-testing 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "include_dir", "itertools 0.12.1", "jf-merkle-tree", @@ -4356,7 +4515,7 @@ dependencies = [ [[package]] name = "hotshot-stake-table" version = "0.5.69" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4365,7 +4524,7 @@ dependencies = [ "ark-std", "digest 0.10.7", "ethereum-types", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "jf-crhf", "jf-rescue", "jf-signature", @@ -4397,7 +4556,7 @@ dependencies = [ "futures", "hotshot-contract-adapter", "hotshot-stake-table", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "itertools 0.12.1", "jf-crhf", "jf-pcs", @@ -4418,6 +4577,21 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-task" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +dependencies = [ + "anyhow", + "async-broadcast", + "async-compatibility-layer", + "async-std", + "async-trait", + "futures", + "tokio", + "tracing", +] + [[package]] name = "hotshot-task" version = "0.5.69" @@ -4433,6 +4607,43 @@ dependencies = [ "tracing", ] +[[package]] +name = "hotshot-task-impls" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +dependencies = [ + "anyhow", + "async-broadcast", + "async-compatibility-layer", + "async-lock 2.8.0", + "async-std", + "async-trait", + "bincode", + "bitvec", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4)", + "chrono", + "committable", + "either", + "futures", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "jf-signature", + "jf-vid", + "rand 0.8.5", + "serde", + "sha2 0.10.8", + "snafu 0.8.4", + "surf-disco", + "tagged-base64", + "time 0.3.36", + "tokio", + "tracing", + "url", + "vbs", + "vec1", +] + [[package]] name = "hotshot-task-impls" version = "0.5.69" @@ -4451,9 +4662,9 @@ dependencies = [ "committable", "either", "futures", - "hotshot-builder-api", - "hotshot-task", - "hotshot-types", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "jf-signature", "jf-vid", "rand 0.8.5", @@ -4470,6 +4681,52 @@ dependencies = [ "vec1", ] +[[package]] +name = "hotshot-testing" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +dependencies = [ + "anyhow", + "async-broadcast", + "async-compatibility-layer", + "async-lock 2.8.0", + "async-std", + "async-trait", + "automod", + "bitvec", + "committable", + "either", + "ethereum-types", + "futures", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-fakeapi 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-macros 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "itertools 0.13.0", + "jf-signature", + "jf-vid", + "lru 0.12.4", + "portpicker", + "rand 0.8.5", + "reqwest 0.12.5", + "serde", + "sha2 0.10.8", + "sha3", + "snafu 0.8.4", + "tagged-base64", + "tide-disco", + "tokio", + "tracing", + "url", + "vbs", + "vec1", +] + [[package]] name = "hotshot-testing" version = "0.5.69" @@ -4487,15 +4744,15 @@ dependencies = [ "either", "ethereum-types", "futures", - "hotshot", - "hotshot-builder-api", - "hotshot-example-types", - "hotshot-fakeapi", - "hotshot-macros", - "hotshot-orchestrator", - "hotshot-task", - "hotshot-task-impls", - "hotshot-types", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-fakeapi 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-macros 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "itertools 0.13.0", "jf-signature", "jf-vid", @@ -4516,6 +4773,59 @@ dependencies = [ "vec1", ] +[[package]] +name = "hotshot-types" +version = "0.1.11" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +dependencies = [ + "anyhow", + "ark-bn254", + "ark-ed-on-bn254", + "ark-ff", + "ark-serialize", + "ark-srs", + "ark-std", + "async-compatibility-layer", + "async-lock 2.8.0", + "async-std", + "async-trait", + "bincode", + "bitvec", + "blake3", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4)", + "committable", + "custom_debug 0.5.1", + "derivative", + "digest 0.10.7", + "displaydoc", + "dyn-clone 1.0.17 (git+https://github.com/dtolnay/dyn-clone?tag=1.0.17)", + "either", + "espresso-systems-common 0.4.1", + "ethereum-types", + "futures", + "generic-array", + "jf-pcs", + "jf-signature", + "jf-utils", + "jf-vid", + "lazy_static", + "memoize", + "rand 0.8.5", + "rand_chacha 0.3.1", + "reqwest 0.12.5", + "serde", + "sha2 0.10.8", + "snafu 0.8.4", + "tagged-base64", + "time 0.3.36", + "tokio", + "tracing", + "typenum", + "url", + "vbs", + "vec1", +] + [[package]] name = "hotshot-types" version = "0.1.11" @@ -5882,6 +6192,39 @@ dependencies = [ "web-time", ] +[[package]] +name = "libp2p-networking" +version = "0.5.69" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.69#b3796d6abea494780f6220845d729cb186a11f6a" +dependencies = [ + "anyhow", + "async-compatibility-layer", + "async-lock 2.8.0", + "async-std", + "async-trait", + "bincode", + "blake3", + "custom_debug 0.5.1", + "derive_builder", + "either", + "futures", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "lazy_static", + "libp2p", + "libp2p-identity", + "libp2p-swarm-derive", + "pin-project", + "rand 0.8.5", + "serde", + "serde_bytes", + "serde_json", + "snafu 0.8.4", + "tokio", + "tokio-stream", + "tracing", + "void", +] + [[package]] name = "libp2p-networking" version = "0.5.69" @@ -5898,7 +6241,7 @@ dependencies = [ "derive_builder", "either", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "lazy_static", "libp2p", "libp2p-identity", @@ -6269,15 +6612,15 @@ dependencies = [ "espresso-types", "ethers", "futures", - "hotshot", - "hotshot-builder-api", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "hotshot-events-service", - "hotshot-example-types", - "hotshot-orchestrator", + "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "hotshot-query-service", "hotshot-stake-table", "hotshot-state-prover", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "jf-merkle-tree", "jf-signature", "libp2p", @@ -6316,11 +6659,11 @@ dependencies = [ "derivative", "futures", "hex", - "hotshot", - "hotshot-builder-api", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "hotshot-events-service", - "hotshot-task-impls", - "hotshot-types", + "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", "lru 0.12.4", "multimap", "serde", @@ -6351,10 +6694,10 @@ dependencies = [ "committable", "espresso-types", "futures", - "hotshot", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "hotshot-events-service", "hotshot-query-service", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "jf-signature", "portpicker", "rand 0.8.5", @@ -6725,11 +7068,11 @@ dependencies = [ "clap", "espresso-types", "futures", - "hotshot", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "hotshot-query-service", "hotshot-stake-table", - "hotshot-testing", - "hotshot-types", + "hotshot-testing 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "prometheus-parse", "reqwest 0.12.5", "serde", @@ -8732,16 +9075,16 @@ dependencies = [ "espresso-types", "ethers", "futures", - "hotshot", + "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "hotshot-contract-adapter", "hotshot-events-service", - "hotshot-example-types", - "hotshot-orchestrator", + "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "hotshot-query-service", "hotshot-stake-table", "hotshot-state-prover", - "hotshot-testing", - "hotshot-types", + "hotshot-testing 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", "include_dir", "itertools 0.12.1", "jf-crhf", diff --git a/Cargo.toml b/Cargo.toml index 07f12e7c1..27215600a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,22 +52,22 @@ dotenvy = "0.15" ethers = { version = "2.0", features = ["solc"] } futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } +hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.69" } # Hotshot imports -hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/0.5.69" } +hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.69" } hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", branch = "hotshot/rc-0.5.69" } marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", branch = "hotshot/rc-0.5.69" } hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "hotshot/rc-0.5.69" } -hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } +hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.69" } hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", branch = "hotshot/rc-0.5.69" } -hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } +hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.69" } hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" } -hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } -hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } -hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" } +hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.69" } +hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.69" } +hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.69" } 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", branch = "bump/0.5.69" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.69" } # Push CDN imports cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", features = [ From e6ff905edb6b620a4ec8e5a03bb6be2dedec65f4 Mon Sep 17 00:00:00 2001 From: Jarred Parr Date: Tue, 13 Aug 2024 09:01:07 -0600 Subject: [PATCH 5/5] bump versions to stable --- Cargo.lock | 481 ++++++++--------------------------------------------- Cargo.toml | 9 +- 2 files changed, 73 insertions(+), 417 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c27703d51..015645ec1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1306,15 +1306,15 @@ dependencies = [ "espresso-types", "ethers", "futures", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot", + "hotshot-builder-api", "hotshot-builder-core", "hotshot-events-service", - "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-example-types", + "hotshot-orchestrator", "hotshot-stake-table", "hotshot-state-prover", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types", "jf-merkle-tree", "jf-signature", "libp2p", @@ -2937,11 +2937,11 @@ dependencies = [ "ethers", "fluent-asserter", "futures", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot", + "hotshot-orchestrator", "hotshot-query-service", - "hotshot-testing 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-testing", + "hotshot-types", "itertools 0.12.1", "jf-merkle-tree", "jf-utils", @@ -4085,60 +4085,13 @@ dependencies = [ "either", "ethereum-types", "futures", - "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-orchestrator", + "hotshot-task", + "hotshot-task-impls", + "hotshot-types", "jf-signature", "libp2p-identity", - "libp2p-networking 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "lru 0.12.4", - "num_enum", - "portpicker", - "rand 0.8.5", - "serde", - "sha2 0.10.8", - "snafu 0.8.4", - "surf-disco", - "time 0.3.36", - "tokio", - "tracing", - "url", - "vbs", -] - -[[package]] -name = "hotshot" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" -dependencies = [ - "anyhow", - "async-broadcast", - "async-compatibility-layer", - "async-lock 2.8.0", - "async-std", - "async-trait", - "bimap", - "bincode", - "blake3", - "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.4)", - "chrono", - "committable", - "custom_debug 0.5.1", - "dashmap", - "derive_more 1.0.0", - "either", - "ethereum-types", - "futures", - "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "jf-signature", - "libp2p-identity", - "libp2p-networking 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "libp2p-networking", "lru 0.12.4", "num_enum", "portpicker", @@ -4164,26 +4117,7 @@ dependencies = [ "committable", "derive_more 1.0.0", "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "serde", - "snafu 0.8.4", - "tagged-base64", - "tide-disco", - "toml", - "vbs", -] - -[[package]] -name = "hotshot-builder-api" -version = "0.1.7" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" -dependencies = [ - "async-trait", - "clap", - "committable", - "derive_more 1.0.0", - "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types", "serde", "snafu 0.8.4", "tagged-base64", @@ -4195,7 +4129,7 @@ dependencies = [ [[package]] name = "hotshot-builder-core" version = "0.1.39" -source = "git+https://github.com/EspressoSystems/hotshot-builder-core?branch=hotshot/rc-0.5.69#aa2558037970e7487f21b8690e8cf5b565de60f9" +source = "git+https://github.com/EspressoSystems/hotshot-builder-core?tag=0.1.40#a052a71980f2b2adac9a32bdf10028a220a1e748" dependencies = [ "anyhow", "async-broadcast", @@ -4208,10 +4142,10 @@ dependencies = [ "derivative", "futures", "hex", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot", + "hotshot-builder-api", "hotshot-events-service", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types", "lru 0.12.4", "serde", "sha2 0.10.8", @@ -4236,7 +4170,7 @@ dependencies = [ "contract-bindings", "diff-test-bn254", "ethers", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types", "jf-pcs", "jf-plonk", "jf-utils", @@ -4247,7 +4181,7 @@ dependencies = [ [[package]] name = "hotshot-events-service" version = "0.1.38" -source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=hotshot/rc-0.5.69#a973799471a5a8175bf622758f71ac2710eed596" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.40#9ed690db7a12a4e8a64bb49a0437086232888765" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -4259,7 +4193,7 @@ dependencies = [ "derive_more 0.99.18", "either", "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types", "rand 0.8.5", "serde", "snafu 0.8.4", @@ -4286,43 +4220,10 @@ dependencies = [ "either", "ethereum-types", "futures", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "rand 0.8.5", - "reqwest 0.12.5", - "serde", - "sha2 0.10.8", - "sha3", - "snafu 0.8.4", - "time 0.3.36", - "tokio", - "tracing", - "url", - "vbs", -] - -[[package]] -name = "hotshot-example-types" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" -dependencies = [ - "anyhow", - "async-broadcast", - "async-compatibility-layer", - "async-lock 2.8.0", - "async-std", - "async-trait", - "bitvec", - "committable", - "either", - "ethereum-types", - "futures", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot", + "hotshot-task", + "hotshot-task-impls", + "hotshot-types", "rand 0.8.5", "reqwest 0.12.5", "serde", @@ -4345,27 +4246,8 @@ dependencies = [ "async-lock 2.8.0", "async-trait", "futures", - "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "rand 0.8.5", - "serde", - "tide-disco", - "toml", - "tracing", - "vbs", -] - -[[package]] -name = "hotshot-fakeapi" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" -dependencies = [ - "anyhow", - "async-lock 2.8.0", - "async-trait", - "futures", - "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-example-types", + "hotshot-types", "rand 0.8.5", "serde", "tide-disco", @@ -4385,17 +4267,6 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "hotshot-macros" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" -dependencies = [ - "derive_builder", - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "hotshot-orchestrator" version = "0.5.69" @@ -4410,37 +4281,7 @@ dependencies = [ "clap", "csv", "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "libp2p", - "multiaddr", - "serde", - "serde-inline-default", - "serde_json", - "surf-disco", - "thiserror", - "tide-disco", - "tokio", - "toml", - "tracing", - "vbs", - "vec1", -] - -[[package]] -name = "hotshot-orchestrator" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" -dependencies = [ - "anyhow", - "async-compatibility-layer", - "async-lock 2.8.0", - "async-std", - "bincode", - "blake3", - "clap", - "csv", - "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types", "libp2p", "multiaddr", "serde", @@ -4459,7 +4300,7 @@ dependencies = [ [[package]] name = "hotshot-query-service" version = "0.1.51" -source = "git+https://github.com/EspressoSystems/hotshot-query-service?branch=hotshot/rc-0.5.69#09cfbc8f3bd60263ab1a6f7bc21762487970c264" +source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=0.1.51#8e0ee4e862de99f19b9cbadd029f0d952782a3dd" dependencies = [ "anyhow", "ark-serialize", @@ -4478,10 +4319,10 @@ dependencies = [ "either", "espresso-macros", "futures", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-testing 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot", + "hotshot-example-types", + "hotshot-testing", + "hotshot-types", "include_dir", "itertools 0.12.1", "jf-merkle-tree", @@ -4524,7 +4365,7 @@ dependencies = [ "ark-std", "digest 0.10.7", "ethereum-types", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types", "jf-crhf", "jf-rescue", "jf-signature", @@ -4556,7 +4397,7 @@ dependencies = [ "futures", "hotshot-contract-adapter", "hotshot-stake-table", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types", "itertools 0.12.1", "jf-crhf", "jf-pcs", @@ -4592,21 +4433,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hotshot-task" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" -dependencies = [ - "anyhow", - "async-broadcast", - "async-compatibility-layer", - "async-std", - "async-trait", - "futures", - "tokio", - "tracing", -] - [[package]] name = "hotshot-task-impls" version = "0.5.69" @@ -4625,46 +4451,9 @@ dependencies = [ "committable", "either", "futures", - "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "jf-signature", - "jf-vid", - "rand 0.8.5", - "serde", - "sha2 0.10.8", - "snafu 0.8.4", - "surf-disco", - "tagged-base64", - "time 0.3.36", - "tokio", - "tracing", - "url", - "vbs", - "vec1", -] - -[[package]] -name = "hotshot-task-impls" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" -dependencies = [ - "anyhow", - "async-broadcast", - "async-compatibility-layer", - "async-lock 2.8.0", - "async-std", - "async-trait", - "bincode", - "bitvec", - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4)", - "chrono", - "committable", - "either", - "futures", - "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-builder-api", + "hotshot-task", + "hotshot-types", "jf-signature", "jf-vid", "rand 0.8.5", @@ -4698,61 +4487,15 @@ dependencies = [ "either", "ethereum-types", "futures", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-fakeapi 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-macros 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "itertools 0.13.0", - "jf-signature", - "jf-vid", - "lru 0.12.4", - "portpicker", - "rand 0.8.5", - "reqwest 0.12.5", - "serde", - "sha2 0.10.8", - "sha3", - "snafu 0.8.4", - "tagged-base64", - "tide-disco", - "tokio", - "tracing", - "url", - "vbs", - "vec1", -] - -[[package]] -name = "hotshot-testing" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" -dependencies = [ - "anyhow", - "async-broadcast", - "async-compatibility-layer", - "async-lock 2.8.0", - "async-std", - "async-trait", - "automod", - "bitvec", - "committable", - "either", - "ethereum-types", - "futures", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-fakeapi 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-macros 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-task 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot", + "hotshot-builder-api", + "hotshot-example-types", + "hotshot-fakeapi", + "hotshot-macros", + "hotshot-orchestrator", + "hotshot-task", + "hotshot-task-impls", + "hotshot-types", "itertools 0.13.0", "jf-signature", "jf-vid", @@ -4826,59 +4569,6 @@ dependencies = [ "vec1", ] -[[package]] -name = "hotshot-types" -version = "0.1.11" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" -dependencies = [ - "anyhow", - "ark-bn254", - "ark-ed-on-bn254", - "ark-ff", - "ark-serialize", - "ark-srs", - "ark-std", - "async-compatibility-layer", - "async-lock 2.8.0", - "async-std", - "async-trait", - "bincode", - "bitvec", - "blake3", - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.4)", - "committable", - "custom_debug 0.5.1", - "derivative", - "digest 0.10.7", - "displaydoc", - "dyn-clone 1.0.17 (git+https://github.com/dtolnay/dyn-clone?tag=1.0.17)", - "either", - "espresso-systems-common 0.4.1", - "ethereum-types", - "futures", - "generic-array", - "jf-pcs", - "jf-signature", - "jf-utils", - "jf-vid", - "lazy_static", - "memoize", - "rand 0.8.5", - "rand_chacha 0.3.1", - "reqwest 0.12.5", - "serde", - "sha2 0.10.8", - "snafu 0.8.4", - "tagged-base64", - "time 0.3.36", - "tokio", - "tracing", - "typenum", - "url", - "vbs", - "vec1", -] - [[package]] name = "http" version = "0.2.12" @@ -6208,40 +5898,7 @@ dependencies = [ "derive_builder", "either", "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "lazy_static", - "libp2p", - "libp2p-identity", - "libp2p-swarm-derive", - "pin-project", - "rand 0.8.5", - "serde", - "serde_bytes", - "serde_json", - "snafu 0.8.4", - "tokio", - "tokio-stream", - "tracing", - "void", -] - -[[package]] -name = "libp2p-networking" -version = "0.5.69" -source = "git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69#6b93ad0ced363c2d9b0944240dae0ef0059bf3b6" -dependencies = [ - "anyhow", - "async-compatibility-layer", - "async-lock 2.8.0", - "async-std", - "async-trait", - "bincode", - "blake3", - "custom_debug 0.5.1", - "derive_builder", - "either", - "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-types", "lazy_static", "libp2p", "libp2p-identity", @@ -6612,15 +6269,15 @@ dependencies = [ "espresso-types", "ethers", "futures", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot", + "hotshot-builder-api", "hotshot-events-service", - "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-example-types", + "hotshot-orchestrator", "hotshot-query-service", "hotshot-stake-table", "hotshot-state-prover", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types", "jf-merkle-tree", "jf-signature", "libp2p", @@ -6646,7 +6303,7 @@ dependencies = [ [[package]] name = "marketplace-builder-core" version = "0.0.2" -source = "git+https://github.com/EspressoSystems/marketplace-builder-core?branch=hotshot/rc-0.5.69#b32138ff2b70fca32f4669d99e405da317fd941b" +source = "git+https://github.com/EspressoSystems/marketplace-builder-core?tag=0.0.3#0e74c008a200532a09a637452b7d8cfcfa9fcc5c" dependencies = [ "anyhow", "async-broadcast", @@ -6659,11 +6316,11 @@ dependencies = [ "derivative", "futures", "hex", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot", + "hotshot-builder-api", "hotshot-events-service", - "hotshot-task-impls 0.5.69 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?branch=bump/0.5.69)", + "hotshot-task-impls", + "hotshot-types", "lru 0.12.4", "multimap", "serde", @@ -6694,10 +6351,10 @@ dependencies = [ "committable", "espresso-types", "futures", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot", "hotshot-events-service", "hotshot-query-service", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-types", "jf-signature", "portpicker", "rand 0.8.5", @@ -7068,11 +6725,11 @@ dependencies = [ "clap", "espresso-types", "futures", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot", "hotshot-query-service", "hotshot-stake-table", - "hotshot-testing 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-testing", + "hotshot-types", "prometheus-parse", "reqwest 0.12.5", "serde", @@ -9075,16 +8732,16 @@ dependencies = [ "espresso-types", "ethers", "futures", - "hotshot 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot", "hotshot-contract-adapter", "hotshot-events-service", - "hotshot-example-types 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-orchestrator 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-example-types", + "hotshot-orchestrator", "hotshot-query-service", "hotshot-stake-table", "hotshot-state-prover", - "hotshot-testing 0.5.69 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.69)", + "hotshot-testing", + "hotshot-types", "include_dir", "itertools 0.12.1", "jf-crhf", diff --git a/Cargo.toml b/Cargo.toml index 27215600a..dec444c89 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,11 +55,11 @@ futures = "0.3" hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.69" } # Hotshot imports hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.69" } -hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", branch = "hotshot/rc-0.5.69" } -marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", branch = "hotshot/rc-0.5.69" } -hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "hotshot/rc-0.5.69" } +hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "0.1.40" } +marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.0.3" } +hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.40" } hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.69" } -hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", branch = "hotshot/rc-0.5.69" } +hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.51" } hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.69" } hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" } hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.69" } @@ -136,4 +136,3 @@ paste = "1.0" rand = "0.8.5" time = "0.3" trait-set = "0.3.0" -