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.

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

Chore/merge master to develop 20240206 #4347

Merged
merged 11 commits into from
Feb 7, 2024
Merged
Prev Previous commit
Next Next commit
fix: fix comments on rc_consensus_hash
  • Loading branch information
jcnelson committed Feb 6, 2024
commit b259ba3e85b3ba579ec994f4d03d6210b73d3ef4
11 changes: 7 additions & 4 deletions stackslib/src/net/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,7 @@ pub mod NackErrorCodes {
pub const InvalidMessage: u32 = 5;
pub const NoSuchDB: u32 = 6;
pub const StaleVersion: u32 = 7;
pub const StaleView: u32 = 8;
}

#[derive(Debug, Clone, PartialEq)]
Expand All @@ -997,7 +998,9 @@ pub struct NatPunchData {
/// Inform the remote peer of (a page of) the list of stacker DB contracts this node supports
#[derive(Debug, Clone, PartialEq)]
pub struct StackerDBHandshakeData {
/// current reward cycle ID
/// current reward cycle consensus hash (i.e. the consensus hash of the Stacks tip in the
/// current reward cycle, which commits to both the Stacks block tip and the underlying PoX
/// history).
pub rc_consensus_hash: ConsensusHash,
/// list of smart contracts that we index.
/// there can be as many as 256 entries.
Expand All @@ -1009,7 +1012,7 @@ pub struct StackerDBHandshakeData {
pub struct StackerDBGetChunkInvData {
/// smart contract being used to determine chunk quantity and order
pub contract_id: QualifiedContractIdentifier,
/// consensus hash of the sortition that started this reward cycle
/// consensus hash of the Stacks chain tip in this reward cycle
pub rc_consensus_hash: ConsensusHash,
}

Expand All @@ -1028,7 +1031,7 @@ pub struct StackerDBChunkInvData {
pub struct StackerDBGetChunkData {
/// smart contract being used to determine slot quantity and order
pub contract_id: QualifiedContractIdentifier,
/// consensus hash of the sortition that started this reward cycle
/// consensus hash of the Stacks chain tip in this reward cycle
pub rc_consensus_hash: ConsensusHash,
/// slot ID
pub slot_id: u32,
Expand All @@ -1041,7 +1044,7 @@ pub struct StackerDBGetChunkData {
pub struct StackerDBPushChunkData {
/// smart contract being used to determine chunk quantity and order
pub contract_id: QualifiedContractIdentifier,
/// consensus hash of the sortition that started this reward cycle
/// consensus hash of the Stacks chain tip in this reward cycle
pub rc_consensus_hash: ConsensusHash,
/// the pushed chunk
pub chunk_data: StackerDBChunkData,
Expand Down