Skip to content

Bf/epochs #4096

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

Draft
bfish713 wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Bf/epochs #4096

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5b87d8
make new proposal type to handle new epoch change
bfish713 Mar 27, 2026
f1ed3dc
epochs wip
bfish713 Mar 28, 2026
01a71bb
epoch logic, send next justify qc, and check it, send drb result and …
bfish713 Mar 28, 2026
ae7938c
add the epoch manager I forgot to commit...
bfish713 Mar 28, 2026
bd49901
Merge remote-tracking branch 'origin/main' into bf/epochs
bfish713 Mar 28, 2026
69bff20
push handle
bfish713 Mar 29, 2026
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
2 changes: 2 additions & 0 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.

2 changes: 2 additions & 0 deletions crates/hotshot/new-protocol/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ async-lock = { workspace = true }
async-trait = { workspace = true }
bon = { workspace = true }
committable = { workspace = true }
derive_more = { workspace = true }
futures = { workspace = true }
hotshot = { workspace = true }
hotshot-example-types = { workspace = true }
hotshot-testing = { workspace = true }
hotshot-types = { workspace = true }
serde = { workspace = true }
serde_bytes = { workspace = true }
thiserror = { workspace = true }
time = { workspace = true }
tokio = { workspace = true }
Expand Down
8 changes: 5 additions & 3 deletions crates/hotshot/new-protocol/src/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
use hotshot_types::{
data::{EpochNumber, QuorumProposal2, ViewNumber},
data::{EpochNumber, ViewNumber},
traits::node_implementation::NodeType,
};

use crate::message::Proposal;

#[derive(Clone, Eq, PartialEq, Debug)]
pub struct BlockAndHeaderRequest<T: NodeType> {
pub view: ViewNumber,
pub epoch: EpochNumber,
pub parent_proposal: QuorumProposal2<T>,
pub parent_proposal: Proposal<T>,
}

#[derive(Clone, Eq, PartialEq, Debug)]
pub struct BlockRequest<T: NodeType> {
pub view: ViewNumber,
pub parent_proposal: QuorumProposal2<T>,
pub parent_proposal: Proposal<T>,
pub epoch: EpochNumber,
}
Loading
Loading