diff --git a/Cargo.lock b/Cargo.lock index 31fcf47ce9..7a5840709e 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 ac4e03a35b..24899ae2a1 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()] } }