Merge pull request #675 from EspressoSystems/hotshot/rc-0.5.68

[WEEKLY RELEASE] HotShot - rc-0.5.68

Cargo.toml

@@ -12,7 +12,7 @@
 
 [package]
 name = "hotshot-query-service"
-version = "0.1.49"
+version = "0.1.50"
 authors = ["Espresso Systems <[email protected]>"]
 edition = "2021"
 license = "GPL-3.0-or-later"
@@ -63,7 +63,7 @@ ark-serialize = "0.4.2"
 async-compatibility-layer = { version = "1.1", default-features = false, features = [
 	"logging-utils",
 ] }
-async-lock = "3.3.0"
+async-lock = "2.8"
 async-std = { version = "1.9.0", features = ["unstable", "attributes"] }
 async-trait = "0.1"
 bincode = "1.3"
@@ -75,9 +75,9 @@ derivative = "2.2"
 derive_more = "0.99"
 either = "1.12"
 futures = "0.3"
-hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.67" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.67" }
-hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.67" }
+hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.68" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.68" }
+hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.68" }
 itertools = "0.12.1"
 jf-merkle-tree = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [
 	"std",
@@ -119,7 +119,7 @@ tokio-postgres = { version = "0.7", optional = true, default-features = false, f
 
 # Dependencies enabled by feature "testing".
 espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0", optional = true }
-hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.67", optional = true }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.68", optional = true }
 portpicker = { version = "0.1", optional = true }
 rand = { version = "0.8", optional = true }
 spin_sleep = { version = "1.2", optional = true }
@@ -140,7 +140,7 @@ backtrace-on-stack-overflow = { version = "0.3", optional = true }
 clap = { version = "4.5", features = ["derive", "env"] }
 espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0" }
 generic-array = "0.14"
-hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.67" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.68" }
 portpicker = "0.1"
 rand = "0.8"
 reqwest = "0.12.3"

src/testing/mocks.rs

@@ -22,6 +22,7 @@ use hotshot::traits::{
 };
 use hotshot_example_types::auction_results_provider_types::TestAuctionResultsProvider;
 use hotshot_example_types::{
+    auction_results_provider_types::TestAuctionResult,
     block_types::{TestBlockHeader, TestBlockPayload, TestTransaction},
     state_types::{TestInstanceState, TestValidatedState},
     storage_types::TestStorage,
@@ -44,6 +45,7 @@ use vbs::version::StaticVersion;
 pub type MockHeader = TestBlockHeader;
 pub type MockPayload = TestBlockPayload;
 pub type MockTransaction = TestTransaction;
+pub type MockAuctionResults = TestAuctionResult;
 
 pub fn mock_transaction(payload: Vec<u8>) -> MockTransaction {
     TestTransaction::new(payload)
@@ -135,6 +137,7 @@ impl NodeType for MockTypes {
     type BuilderSignatureKey = BLSPubKey;
     type Base = StaticVersion<0, 1>;
     type Upgrade = StaticVersion<0, 2>;
+    type AuctionResult = MockAuctionResults;
     const UPGRADE_HASH: [u8; 32] = [
         1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
         0, 0,
@@ -158,7 +161,7 @@ pub struct MockNodeImpl;
 impl NodeImplementation<MockTypes> for MockNodeImpl {
     type Network = MockNetwork;
     type Storage = MockStorage;
-    type AuctionResultsProvider = TestAuctionResultsProvider;
+    type AuctionResultsProvider = TestAuctionResultsProvider<MockTypes>;
 }
 
 pub type MockMerkleTree = UniversalMerkleTree<usize, Sha3Digest, usize, 8, Sha3Node>;