mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-15 10:21:05 +00:00
Storing multiple Justifications per block (#7640)
* primitives/runtime: initial changes on supporting multiple Justifications * primitives/runtime: make Justifications strongly typed * Encode/decode Justifications * primitives/runtime: add Justification type * backend: apply_finality and finalize_block takes a single Justification * manual-seal: create engine id and let rpc take encoded justification * backend: skeleton functions for appending justifications * backend: initial implementation append_justification Initial implementation of append_justification on the Backend trait, and also remove unused skeleton functions for append_justificaton on Finaziler trait. k * backend: guard against duplicate consensus engine id * client/db: add check for block finality * client/api: add append_justification to in_mem db * client/light: add no-op append_justification * network: fix decode call for Justification * network: only send a single Justification in BlockData * network: minor comment update * protocol: update field names to distinguish single justification * client: further field renames to plural * client: update function names to plural justifications * client/db: upgrade existing database for new format * network: remove dependency on grandpa crate * db: fix check for finalized block * grandpa: check for multiple grandpa justifications hwne importing * backend: update Finalizer trait to take multiple Justifications * db: remove debugging statements in migration code * manual-seal: update note about engine id * db: fix check for finalized block * client: update variable name to reflect it is now plural * grandpa: fix incorrect empty Justications in test * primitives: make Justifications opaque to avoid being empty * network: fix detecting empty Justification * runtime: doc strings for Justifications functions * runtime: add into_justifications * primitives: check for duplicates in when adding to Justifications * network/test: use real grandpa engine id in test * client: fix reviewer comments * primitives: rename Justifications::push to append * backend: revert changes to Finalizer trait * backend: revert mark_finalized * backend: revert changes to finalize_block * backend: revert finalized_blocks * db: add a quick early return for performance * client: minor reviewer comments * service/test: use local ConsensusEngineId * network: add link to issue for sending multiple Justifications * Apply suggestions from code review Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> * Apply suggestions from code review Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> * network: tweaks to review suggestions * network: revert change to BlockData for backwards compatibility * Apply suggestion from code review Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> * Apply suggestions from code review Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * primitives: update doc comment for Justifications * client/db/upgrade: avoid grandpa crate dependency * consensus: revert to single Justification for import_justification * primitives: improve justifications docs * style cleanups * use and_then * client: rename JUSTIFICATIONS db column * network: revert to using FRNK in network-test Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> Co-authored-by: André Silva <andrerfosilva@gmail.com>
This commit is contained in:
Jon Häggblad
@@ -43,11 +43,11 @@ use finality_grandpa::BlockNumberOps;
|
||||
use parity_scale_codec::{Encode, Decode};
|
||||
use sp_blockchain::{Backend as BlockchainBackend, Error as ClientError, Result as ClientResult};
|
||||
use sp_runtime::{
|
||||
Justification, generic::BlockId,
|
||||
EncodedJustification, generic::BlockId,
|
||||
traits::{NumberFor, Block as BlockT, Header as HeaderT, One},
|
||||
};
|
||||
use sc_client_api::backend::Backend;
|
||||
use sp_finality_grandpa::AuthorityId;
|
||||
use sp_finality_grandpa::{AuthorityId, GRANDPA_ENGINE_ID};
|
||||
|
||||
use crate::authorities::AuthoritySetChanges;
|
||||
use crate::justification::GrandpaJustification;
|
||||
@@ -190,8 +190,10 @@ where
|
||||
// Get the Justification stored at the last block of the set
|
||||
let last_block_for_set_id = BlockId::Number(last_block_for_set);
|
||||
let justification =
|
||||
if let Some(justification) = blockchain.justification(last_block_for_set_id)? {
|
||||
justification
|
||||
if let Some(grandpa_justification) = blockchain.justifications(last_block_for_set_id)?
|
||||
.and_then(|justifications| justifications.into_justification(GRANDPA_ENGINE_ID))
|
||||
{
|
||||
grandpa_justification
|
||||
} else {
|
||||
trace!(
|
||||
target: "afg",
|
||||
@@ -257,7 +259,7 @@ pub trait ProvableJustification<Header: HeaderT>: Encode + Decode {
|
||||
|
||||
/// Decode and verify justification.
|
||||
fn decode_and_verify(
|
||||
justification: &Justification,
|
||||
justification: &EncodedJustification,
|
||||
set_id: u64,
|
||||
authorities: &[(AuthorityId, u64)],
|
||||
) -> ClientResult<Self> {
|
||||
@@ -286,6 +288,7 @@ pub(crate) mod tests {
|
||||
use super::*;
|
||||
use crate::authorities::AuthoritySetChanges;
|
||||
use sp_core::crypto::Public;
|
||||
use sp_runtime::Justifications;
|
||||
use sp_finality_grandpa::AuthorityList;
|
||||
use sc_client_api::NewBlockState;
|
||||
use sc_client_api::in_mem::Blockchain as InMemoryBlockchain;
|
||||
@@ -330,31 +333,27 @@ pub(crate) mod tests {
|
||||
}
|
||||
|
||||
fn test_blockchain() -> InMemoryBlockchain<Block> {
|
||||
use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
|
||||
let blockchain = InMemoryBlockchain::<Block>::new();
|
||||
blockchain
|
||||
.insert(header(0).hash(), header(0), Some(vec![0]), None, NewBlockState::Final)
|
||||
.unwrap();
|
||||
blockchain
|
||||
.insert(header(1).hash(), header(1), Some(vec![1]), None, NewBlockState::Final)
|
||||
.unwrap();
|
||||
blockchain
|
||||
.insert(header(2).hash(), header(2), None, None, NewBlockState::Best)
|
||||
.unwrap();
|
||||
blockchain
|
||||
.insert(header(3).hash(), header(3), Some(vec![3]), None, NewBlockState::Final)
|
||||
.unwrap();
|
||||
let just0 = Some(Justifications::from((ID, vec![0])));
|
||||
let just1 = Some(Justifications::from((ID, vec![1])));
|
||||
let just2 = None;
|
||||
let just3 = Some(Justifications::from((ID, vec![3])));
|
||||
blockchain.insert(header(0).hash(), header(0), just0, None, NewBlockState::Final).unwrap();
|
||||
blockchain.insert(header(1).hash(), header(1), just1, None, NewBlockState::Final).unwrap();
|
||||
blockchain.insert(header(2).hash(), header(2), just2, None, NewBlockState::Best).unwrap();
|
||||
blockchain.insert(header(3).hash(), header(3), just3, None, NewBlockState::Final).unwrap();
|
||||
blockchain
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn finality_proof_fails_if_no_more_last_finalized_blocks() {
|
||||
use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
|
||||
let blockchain = test_blockchain();
|
||||
blockchain
|
||||
.insert(header(4).hash(), header(4), Some(vec![1]), None, NewBlockState::Best)
|
||||
.unwrap();
|
||||
blockchain
|
||||
.insert(header(5).hash(), header(5), Some(vec![2]), None, NewBlockState::Best)
|
||||
.unwrap();
|
||||
let just1 = Some(Justifications::from((ID, vec![1])));
|
||||
let just2 = Some(Justifications::from((ID, vec![2])));
|
||||
blockchain.insert(header(4).hash(), header(4), just1, None, NewBlockState::Best).unwrap();
|
||||
blockchain.insert(header(5).hash(), header(5), just2, None, NewBlockState::Best).unwrap();
|
||||
|
||||
let mut authority_set_changes = AuthoritySetChanges::empty();
|
||||
authority_set_changes.append(0, 5);
|
||||
@@ -430,22 +429,17 @@ pub(crate) mod tests {
|
||||
|
||||
#[test]
|
||||
fn finality_proof_using_authority_set_changes_fails_with_undefined_start() {
|
||||
use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
|
||||
let blockchain = test_blockchain();
|
||||
let auth = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
|
||||
let just4 = TestJustification((0, auth.clone()), vec![4]).encode();
|
||||
let just7 = TestJustification((1, auth.clone()), vec![7]).encode();
|
||||
blockchain
|
||||
.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final)
|
||||
.unwrap();
|
||||
blockchain
|
||||
.insert(header(5).hash(), header(5), None, None, NewBlockState::Final)
|
||||
.unwrap();
|
||||
blockchain
|
||||
.insert(header(6).hash(), header(6), None, None, NewBlockState::Final)
|
||||
.unwrap();
|
||||
blockchain
|
||||
.insert(header(7).hash(), header(7), Some(just7.clone()), None, NewBlockState::Final)
|
||||
.unwrap();
|
||||
let grandpa_just4 = TestJustification((0, auth.clone()), vec![4]).encode();
|
||||
let grandpa_just7 = TestJustification((1, auth.clone()), vec![7]).encode();
|
||||
let just4 = Some(Justifications::from((ID, grandpa_just4)));
|
||||
let just7 = Some(Justifications::from((ID, grandpa_just7)));
|
||||
blockchain.insert(header(4).hash(), header(4), just4, None, NewBlockState::Final).unwrap();
|
||||
blockchain.insert(header(5).hash(), header(5), None, None, NewBlockState::Final).unwrap();
|
||||
blockchain.insert(header(6).hash(), header(6), None, None, NewBlockState::Final).unwrap();
|
||||
blockchain.insert(header(7).hash(), header(7), just7, None, NewBlockState::Final).unwrap();
|
||||
|
||||
// We have stored the correct block number for the relevant set, but as we are missing the
|
||||
// block for the preceding set the start is not well-defined.
|
||||
@@ -462,22 +456,17 @@ pub(crate) mod tests {
|
||||
|
||||
#[test]
|
||||
fn finality_proof_using_authority_set_changes_works() {
|
||||
use sp_finality_grandpa::GRANDPA_ENGINE_ID as ID;
|
||||
let blockchain = test_blockchain();
|
||||
let auth = vec![(AuthorityId::from_slice(&[1u8; 32]), 1u64)];
|
||||
let just4 = TestJustification((0, auth.clone()), vec![4]).encode();
|
||||
let just7 = TestJustification((1, auth.clone()), vec![7]).encode();
|
||||
blockchain
|
||||
.insert(header(4).hash(), header(4), Some(just4), None, NewBlockState::Final)
|
||||
.unwrap();
|
||||
blockchain
|
||||
.insert(header(5).hash(), header(5), None, None, NewBlockState::Final)
|
||||
.unwrap();
|
||||
blockchain
|
||||
.insert(header(6).hash(), header(6), None, None, NewBlockState::Final)
|
||||
.unwrap();
|
||||
blockchain
|
||||
.insert(header(7).hash(), header(7), Some(just7.clone()), None, NewBlockState::Final)
|
||||
.unwrap();
|
||||
let grandpa_just4 = TestJustification((0, auth.clone()), vec![4]).encode();
|
||||
let grandpa_just7 = TestJustification((1, auth.clone()), vec![7]).encode();
|
||||
let just4 = Some(Justifications::from((ID, grandpa_just4)));
|
||||
let just7 = Some(Justifications::from((ID, grandpa_just7.clone())));
|
||||
blockchain.insert(header(4).hash(), header(4), just4, None, NewBlockState::Final) .unwrap();
|
||||
blockchain.insert(header(5).hash(), header(5), None, None, NewBlockState::Final) .unwrap();
|
||||
blockchain.insert(header(6).hash(), header(6), None, None, NewBlockState::Final).unwrap();
|
||||
blockchain.insert(header(7).hash(), header(7), just7, None, NewBlockState::Final).unwrap();
|
||||
|
||||
let mut authority_set_changes = AuthoritySetChanges::empty();
|
||||
authority_set_changes.append(0, 4);
|
||||
@@ -497,7 +486,7 @@ pub(crate) mod tests {
|
||||
proof_of_5,
|
||||
FinalityProof {
|
||||
block: header(7).hash(),
|
||||
justification: just7,
|
||||
justification: grandpa_just7,
|
||||
unknown_headers: vec![header(6)],
|
||||
}
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user