mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-02 05:57:23 +00:00
c7d1204ce5
* Introduce inherent digests * Implement inherent digests * fix silly error * Implementation of inherent digests in BABE All tests pass. There are still limitations: 1. The runtime strips out inherent digests, so BABE must re-add them. 2. The test runtime checks that it can re-compute all digests. It can’t, so I had to comment out that test. * Fix compilation and seal import Seals were not imported correctly: the pre-digest was imported twice, instead of both it and the seal being imported. Also, other parts of the code did not compile due to incomplete refactoring. * Remove bogus assertion * Fix testsuite compilation * Remove unused import * Fix compiler diagnostics * Add inherent digest parameters to block constructors This enforces that inherent digests are added first. * Fixup Cargo.lock * Fix build errors * Re-add an incorrectly removed import * Bump primitive-types version * Update Cargo.lock * Refactoring * Use inherent digests for AuRa They do reach the runtime, but get stripped. I have not figured out where. * Fix compilation errors * Fix compilation errors due to incorrect types * Fix whitespace Suggested-by: Tomasz Drwiega <tomasz@parity.io> * Add preamble Suggested-by: Tomasz Drwiega <tomasz@parity.io> * Fix silly compile error * Refactor pre-digest finding code into a separate function * Remove unwanted assertion It is too likely to bring down the entire blockchain. Suggested-by: Tomasz Drwiega <tomasz@parity.io> * Use `find_pre_digest` after runtime, too Also, use `Member` trait rather than rolling our own requirements. Suggested-by: Tomasz Drwiega <tomasz@parity.io> * Fix various warnings mostly due to upgrading the dependency on `error_chain`. * Pre-digests nearly complete This nearly completes the implementation of pre-runtime digests. * `Seal2` → `Seal` and fix test suite * Try to fix the storage error * Try to fix storage (again) * Fix tests * Hopefully finish pre-runtime digests The key is to pass *only* the pre-runtime digests to the runtime. The others must be stripped out by `initialize_block`. * Fix silly typo * Fix another silly mistake * Remove unnecessary filtering of BABE pre-digests We no longer get duplicate BABE pre-digests, so if they appear, the header should be rejected outright. * Update Cargo.lock files * Reformatting * Fix silly typo in inherent digest code Also, revert `error.rs` files that contained calls to the `error_chain!` macro. * Try to keep the runtime from stripping pre-digests Currently runs into the “Storage root must match that calculated” assertion. * Don’t compute storage root until storage changes are done. Also, fix a compilation error. * Fix compile-time error * Fix compilation errors * Fix more compile errors * Hopefully it compiles this time… * Fix compilation and add docs * Prevent BABE from adding duplicate pre-runtime digests Found by comparing with the AuRa code. I also did some refactoring. * Respond to review and fix some warnings * Delete some dead code introduced earlier * More dead code goes away * `ref mut` → `&mut` * Respond to review and fix some warnings * Fix compilation error * Remove unneeded `HashT` type parameter Suggested-by: Robert Habermeier <robert@parity.io> * Remove spurious #[allow(deprecated)] * Document inherent digest parameter to `build_block` * Delete `Simple` trait It wasn’t needed * delete wrongly added files * Fix trait bounds * Digest serialization tests I also did some reformatting and cleanup. * Apply suggestions from code review Reformatting Co-Authored-By: André Silva <andre.beat@gmail.com> * Swap two arguments to `propose` and `propose_with` Also, remove some needless unsafe code. * Remove bogus `#![allow(deprecated)]` annotations With the removal of the deprecated `Seal` variant, these are not needed. * Add a missing `#[allow(deprecated)]` in the AuRa tests * Fix silly compile error * Fix silly compiler error RLS did not tell me that I hadn’t fixed `babe/lib.rs`, so I missed it. * Fixes made automatically by Cargo
149 lines
4.1 KiB
Rust
149 lines
4.1 KiB
Rust
// Copyright 2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Substrate.
|
|
|
|
// Substrate is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Substrate is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Private mplementation details of BABE digests.
|
|
use primitives::sr25519::{Public, Signature};
|
|
use babe_primitives::BABE_ENGINE_ID;
|
|
use runtime_primitives::generic::DigestItem;
|
|
use std::fmt::Debug;
|
|
use parity_codec::{Decode, Encode, Input};
|
|
use log::info;
|
|
use schnorrkel::{
|
|
vrf::{VRFProof, VRFOutput, VRF_OUTPUT_LENGTH, VRF_PROOF_LENGTH},
|
|
PUBLIC_KEY_LENGTH,
|
|
};
|
|
|
|
/// A BABE pre-digest. It includes:
|
|
///
|
|
/// * The public key of the author.
|
|
/// * The VRF proof.
|
|
/// * The VRF output.
|
|
/// * The slot number.
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
pub struct BabePreDigest {
|
|
pub(super) vrf_output: VRFOutput,
|
|
pub(super) proof: VRFProof,
|
|
pub(super) author: Public,
|
|
pub(super) slot_num: u64,
|
|
}
|
|
|
|
/// The prefix used by BABE for its VRF keys.
|
|
pub const BABE_VRF_PREFIX: &'static [u8] = b"substrate-babe-vrf";
|
|
|
|
type TmpDecode = (
|
|
[u8; VRF_OUTPUT_LENGTH],
|
|
[u8; VRF_PROOF_LENGTH],
|
|
[u8; PUBLIC_KEY_LENGTH],
|
|
u64,
|
|
);
|
|
|
|
impl Encode for BabePreDigest {
|
|
fn encode(&self) -> Vec<u8> {
|
|
let tmp: TmpDecode = (
|
|
*self.vrf_output.as_bytes(),
|
|
self.proof.to_bytes(),
|
|
self.author.0,
|
|
self.slot_num,
|
|
);
|
|
parity_codec::Encode::encode(&tmp)
|
|
}
|
|
}
|
|
|
|
impl Decode for BabePreDigest {
|
|
fn decode<R: Input>(i: &mut R) -> Option<Self> {
|
|
let (output, proof, public_key, slot_num): TmpDecode = Decode::decode(i)?;
|
|
Some(BabePreDigest {
|
|
proof: VRFProof::from_bytes(&proof).ok()?,
|
|
vrf_output: VRFOutput::from_bytes(&output).ok()?,
|
|
author: Public(public_key),
|
|
slot_num,
|
|
})
|
|
}
|
|
}
|
|
|
|
/// A digest item which is usable with BABE consensus.
|
|
pub trait CompatibleDigestItem: Sized {
|
|
/// Construct a digest item which contains a BABE pre-digest.
|
|
fn babe_pre_digest(seal: BabePreDigest) -> Self;
|
|
|
|
/// If this item is an BABE pre-digest, return it.
|
|
fn as_babe_pre_digest(&self) -> Option<BabePreDigest>;
|
|
|
|
/// Construct a digest item which contains a BABE seal.
|
|
fn babe_seal(signature: Signature) -> Self;
|
|
|
|
/// If this item is a BABE signature, return the signature.
|
|
fn as_babe_seal(&self) -> Option<Signature>;
|
|
}
|
|
|
|
impl<Hash: Debug> CompatibleDigestItem for DigestItem<Hash, Public, Vec<u8>>
|
|
{
|
|
fn babe_pre_digest(digest: BabePreDigest) -> Self {
|
|
DigestItem::PreRuntime(BABE_ENGINE_ID, digest.encode())
|
|
}
|
|
|
|
fn as_babe_pre_digest(&self) -> Option<BabePreDigest> {
|
|
match self {
|
|
DigestItem::PreRuntime(BABE_ENGINE_ID, seal) => {
|
|
let decoded = Decode::decode(&mut &seal[..]);
|
|
if decoded.is_none() {
|
|
info!(target: "babe", "Failed to decode {:?}", seal)
|
|
}
|
|
decoded
|
|
}
|
|
_ => {
|
|
info!(target: "babe", "Invalid consensus: {:?}!", self);
|
|
None
|
|
}
|
|
}
|
|
}
|
|
|
|
fn babe_seal(signature: Signature) -> Self {
|
|
DigestItem::Seal(BABE_ENGINE_ID, signature.encode())
|
|
}
|
|
|
|
fn as_babe_seal(&self) -> Option<Signature> {
|
|
match self {
|
|
DigestItem::Seal(BABE_ENGINE_ID, signature) => Decode::decode(&mut &signature[..]),
|
|
_ => None,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<Hash: Debug> CompatibleDigestItem for DigestItem<Hash, Public, Signature>
|
|
{
|
|
fn babe_pre_digest(digest: BabePreDigest) -> Self {
|
|
DigestItem::PreRuntime(BABE_ENGINE_ID, digest.encode())
|
|
}
|
|
|
|
fn as_babe_pre_digest(&self) -> Option<BabePreDigest> {
|
|
match self {
|
|
DigestItem::PreRuntime(BABE_ENGINE_ID, seal) => Decode::decode(&mut &seal[..]),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
fn babe_seal(signature: Signature) -> Self {
|
|
DigestItem::Seal(BABE_ENGINE_ID, signature)
|
|
}
|
|
|
|
fn as_babe_seal(&self) -> Option<Signature> {
|
|
match self {
|
|
DigestItem::Seal(BABE_ENGINE_ID, signature) => Some(signature.clone()),
|
|
_ => None,
|
|
}
|
|
}
|
|
} |