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

Jump to bottom

diffs #12242

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

diffs #12242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 20 additions & 1 deletion core/primitives/src/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::block::BlockValidityError::{
InvalidChallengeRoot, InvalidChunkHeaderRoot, InvalidChunkMask, InvalidReceiptRoot,
InvalidStateRoot, InvalidTransactionRoot,
};
use crate::block_body::{BlockBody, BlockBodyV1, ChunkEndorsementSignatures};
use crate::block_body::{BlockBody, BlockBodyV1, ChunkEndorsementSignatures, MaybeNew};
pub use crate::block_header::*;
use crate::challenge::Challenges;
use crate::checked_feature;
Expand Down Expand Up @@ -621,6 +621,17 @@ impl Block {
}
}

pub fn chunks_v2(&self) -> ChunksCollection {
match self {
Block::BlockV1(block) => ChunksCollection::V1(
block.chunks.iter().map(|h| ShardChunkHeader::V1(h.clone())).collect(),
),
Block::BlockV2(block) => ChunksCollection::V2(&block.chunks),
Block::BlockV3(block) => ChunksCollection::V2(&block.body.chunks),
Block::BlockV4(block) => ChunksCollection::V3(&block.body.chunks()),
}
}

#[inline]
pub fn challenges(&self) -> &Challenges {
match self {
Expand Down Expand Up @@ -750,6 +761,7 @@ pub enum ChunksCollection<'a> {
V2(&'a [ShardChunkHeader]),
}

// Make generic for ShardChunkHeader and MaybeNew<ShardChunkHeader>
pub struct VersionedChunksIter<'a> {
chunks: &'a [ShardChunkHeader],
curr_index: usize,
Expand Down Expand Up @@ -809,6 +821,13 @@ impl<'a> ChunksCollection<'a> {
}
}

pub fn iter_v2(&'a self) -> VersionedChunksIter_v2<'a> {
match self {
ChunksCollection::V1(chunks) => VersionedChunksIter::new(chunks),
ChunksCollection::V2(chunks) => VersionedChunksIter::new(chunks),
}
}

pub fn get(&self, index: ShardIndex) -> Option<&ShardChunkHeader> {
match self {
ChunksCollection::V1(chunks) => chunks.get(index),
Expand Down
131 changes: 127 additions & 4 deletions core/primitives/src/block_body.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use near_crypto::vrf::{Proof, Value};
use near_crypto::Signature;
use near_primitives_core::checked_feature;
use near_primitives_core::hash::CryptoHash;
use near_primitives_core::types::ProtocolVersion;
use near_primitives_core::types::{BlockHeight, ProtocolVersion};
use near_schema_checker_lib::ProtocolSchema;

#[derive(BorshSerialize, BorshDeserialize, Debug, Clone, Eq, PartialEq, ProtocolSchema)]
Expand Down Expand Up @@ -45,6 +45,37 @@ pub struct BlockBodyV2 {
pub chunk_endorsements: Vec<ChunkEndorsementSignatures>,
}

#[derive(BorshSerialize, BorshDeserialize, Debug, Clone, Eq, PartialEq, ProtocolSchema)]
enum MaybeNewShardChunkHeader {
Old(ShardChunkHeader),
New(ShardChunkHeader),
}

#[derive(BorshSerialize, BorshDeserialize, Debug, Clone, Eq, PartialEq, ProtocolSchema)]
pub enum MaybeNew<T> {
Old(T),
New(T),
}

#[derive(BorshSerialize, BorshDeserialize, Debug, Clone, Eq, PartialEq, ProtocolSchema)]
pub struct BlockBodyV3 {
pub chunks: Vec<MaybeNewShardChunkHeader>,
pub challenges: Challenges,

// Data to confirm the correctness of randomness beacon output
pub vrf_value: Value,
pub vrf_proof: Proof,

// Chunk endorsements
// These are structured as a vector of Signatures from all ordered chunk_validators
// for each shard got from fn get_ordered_chunk_validators
// chunk_endorsements[shard_id][chunk_validator_index] is the signature (if present).
// If the chunk_validator did not endorse the chunk, the signature is None.
// For cases of missing chunk, we include the chunk endorsements from the previous
// block just like we do for chunks.
pub chunk_endorsements: Vec<ChunkEndorsementSignatures>,
}

pub type ChunkEndorsementSignatures = Vec<Option<Box<Signature>>>;

// For now, we only have one version of block body.
Expand All @@ -53,6 +84,12 @@ pub type ChunkEndorsementSignatures = Vec<Option<Box<Signature>>>;
pub enum BlockBody {
V1(BlockBodyV1),
V2(BlockBodyV2),
V3(BlockBodyV3),
}

enum Either<Left, Right> {
Left(Left),
Right(Right),
}

impl BlockBody {
Expand All @@ -78,18 +115,101 @@ impl BlockBody {
}

#[inline]
pub fn chunks(&self) -> &[ShardChunkHeader] {
pub fn chunks(&self) -> Box<dyn Iterator<Item = MaybeNewShardChunkHeader> + '_> {
match self {
BlockBody::V1(body) => Box::new(
body.chunks.iter().cloned().map(|chunk| MaybeNewShardChunkHeader::V1V2(chunk)),
),
BlockBody::V2(body) => Box::new(
body.chunks.iter().cloned().map(|chunk| MaybeNewShardChunkHeader::V1V2(chunk)),
),
BlockBody::V3(body) => Box::new(body.chunks.iter().cloned()),
}
}

#[inline]
pub fn chunks_v2(&self, height: BlockHeight) -> Vec<MaybeNewShardChunkHeader> {
match self {
BlockBody::V1(body) => body
.chunks
.iter()
.cloned()
.map(|thing| {
if thing.is_new_chunk(height) {
MaybeNewShardChunkHeader::New(thing)
} else {
MaybeNewShardChunkHeader::Old(thing)
}
})
.collect(),
BlockBody::V2(body) => body
.chunks
.iter()
.cloned()
.map(|thing| {
if thing.is_new_chunk(height) {
MaybeNewShardChunkHeader::New(thing)
} else {
MaybeNewShardChunkHeader::Old(thing)
}
})
.collect(),
BlockBody::V3(body) => body.chunks.clone(),
}
}

#[inline]
pub fn chunks_v3(&self, height: BlockHeight) -> Vec<MaybeNew<&ShardChunkHeader>> {
match self {
BlockBody::V1(body) => body
.chunks
.iter()
.map(|thing| {
if thing.is_new_chunk(height) {
MaybeNew::New(thing)
} else {
MaybeNew::Old(thing)
}
})
.collect(),
BlockBody::V2(body) => body
.chunks
.iter()
.map(|thing| {
if thing.is_new_chunk(height) {
MaybeNew::New(thing)
} else {
MaybeNew::Old(thing)
}
})
.collect(),
BlockBody::V3(body) => todo!(),
}
}

#[inline]
pub fn chunks_v4(&self) -> Either<&[ShardChunkHeader], &[MaybeNewShardChunkHeader]> {
match self {
BlockBody::V1(body) => &body.chunks,
BlockBody::V2(body) => &body.chunks,
BlockBody::V1(body) => Either::Left(&body.chunks),
BlockBody::V2(body) => Either::Left(&body.chunks),
BlockBody::V3(body) => Either::Right(&body.chunks),
}
}

// pub fn chunks(&self) -> &[MaybeNewShardChunkHeader] {
// match self {
// BlockBody::V1(body) => &body.chunks,
// BlockBody::V2(body) => &body.chunks,
// BlockBody::V3(body) => &body.chunks,
// }
// }

#[inline]
pub fn challenges(&self) -> &Challenges {
match self {
BlockBody::V1(body) => &body.challenges,
BlockBody::V2(body) => &body.challenges,
BlockBody::V3(body) => &body.challenges,
}
}

Expand All @@ -98,6 +218,7 @@ impl BlockBody {
match self {
BlockBody::V1(body) => &body.vrf_value,
BlockBody::V2(body) => &body.vrf_value,
BlockBody::V3(body) => &body.vrf_value,
}
}

Expand All @@ -106,6 +227,7 @@ impl BlockBody {
match self {
BlockBody::V1(body) => &body.vrf_proof,
BlockBody::V2(body) => &body.vrf_proof,
BlockBody::V3(body) => &body.vrf_proof,
}
}

Expand All @@ -114,6 +236,7 @@ impl BlockBody {
match self {
BlockBody::V1(_) => &[],
BlockBody::V2(body) => &body.chunk_endorsements,
BlockBody::V3(body) => &body.chunk_endorsements,
}
}

Expand Down
Loading