Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update hotshot version 0.5.20 #37

Closed
wants to merge 4 commits into from
Closed

update hotshot version 0.5.20 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46a41ce
change api response fields
move47 Feb 29, 2024
aa48903
make blockHeaderInput
move47 Feb 29, 2024
2253796
update hotshot version
move47 Mar 1, 2024
a7ad43b
update hotshot fix
move47 Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 34 additions & 21 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ async-trait = "0.1"
clap = { version = "4.4", features = ["derive", "env"] }
derive_more = "0.99"
futures = "0.3"
hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.14" }
serde = { version = "1.0", features = ["derive"] }
hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.20" }
serde = { version = "1.0.197", features = ["derive"] }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not like this. This is a dependabot thing, but it's bad. Just update the Cargo.lock instead.

In this case, you would do cargo update hotshot-types after making the change to Cargo.toml

snafu = { version = "0.7", features = ["backtraces"] }
tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64", tag = "0.3.4" }
tide-disco = { git = "https://github.com/EspressoSystems/tide-disco.git", tag = "v0.4.6" }
Expand Down
4 changes: 2 additions & 2 deletions src/block_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use std::{hash::Hash, marker::PhantomData};

use hotshot_types::{
data::{VidScheme, VidSchemeTrait},
traits::{node_implementation::NodeType, signature_key::SignatureKey, BlockPayload},
utils::BuilderCommitment,
vid::VidCommitment,
};
use serde::{Deserialize, Serialize};

Expand Down Expand Up @@ -31,7 +31,7 @@ pub struct AvailableBlockData<I: NodeType> {
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, Hash)]
#[serde(bound = "")]
pub struct AvailableBlockHeaderInput<I: NodeType> {
pub vid_commitment: <VidScheme as VidSchemeTrait>::Commit,
pub vid_commitment: VidCommitment,
pub signature: <<I as NodeType>::SignatureKey as SignatureKey>::PureAssembledSignatureType,
pub sender: <I as NodeType>::SignatureKey,
pub _phantom: PhantomData<I>,
Expand Down
2 changes: 1 addition & 1 deletion src/data_source.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use async_trait::async_trait;
use hotshot_types::{
data::VidCommitment,
traits::{node_implementation::NodeType, signature_key::SignatureKey},
utils::BuilderCommitment,
vid::VidCommitment,
};
use tagged_base64::TaggedBase64;

Expand Down
Loading