mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-11-11 05:07:06 +00:00
* Merged BEEFY primitives with generic signature and keyset commitment support from old pull to current code * - Add bls-experimental feature to application-crypto and beefy primitives - Fix remaining crypto -> ecdsa_crypto - code build but not tests * Make beefy primitive tests compile * move bls related beefy primitives code and test behind bls-experimental flag * Make BEEFY clients complies with BEEFY API depending on AuthorityId * - Rename `BeefyAuthoritySet.root` → `BeefyAuthoritySet.keyset_commitment`. - Remove apk proof keyset_commitment from `BeefyAuthoritySet`. - Fix failing signed commitment and signature to witness test. - Make client compatible with BeefyAPI generic on AuthorityId. - `crypto` → `ecdsa_crypto` in BEEFY client and frame. * Commit Cargo lock remove ark-serialize from BEEFY primitives * Use Codec instead of Encode + Decode in primitives/consensus/beefy/src/lib.rs Co-authored-by: Davide Galassi <davxy@datawok.net> * - Make `BeefyApi` generic over Signature type. - Make new `BeeyApi` functinos also generic over AuthorityId and Signature * Unmake BeefyAPI generic over Signature. Recover Signature type from AuthId. * - dont use hex or hex-literal use array-bytes instead in beefy primitives and bls crypto. - CamelCase ECDSA and BLS everywhere. * Move the definition of BEEFY key type from `primitives/beefy` to `crypto.rs` according to new convention. * - Add bls377_generate_new to `sp-io` and `application_crypto::bls`. - Add `bls-experimental` to `sp-io` Does not compile because PassByCodec can not derive PassBy using customly implemented PassByIner. * Implement PassBy for `bls::Public` manually * fix Beefy `KEY_TYPE` in `frame/beefy` tests to come from `sp-core::key_types` enum * specify both generic for `hex2array_unchecked` in `sp-core/bls.rs` * Rename `crypto`→`ecdsa_crypto` in `primitives/consensus/beefy/src/test_utils.rs` docs * remove commented-out code in `primitives/consensus/beefy/src/commitment.rs` Co-authored-by: Davide Galassi <davxy@datawok.net> * Fix inconsistency in panic message in `primitives/io/src/lib.rs` Co-authored-by: Davide Galassi <davxy@datawok.net> * Remove redundant feature activation in `primitives/io/Cargo.toml` Co-authored-by: Davide Galassi <davxy@datawok.net> * - make `w3f-bls` a dev-dependancy only for beefy primitives. - clean up comments. Co-authored-by: Davide Galassi <davxy@datawok.net> * export BEEFY KEY_TYPE from primitives/consensus/beefy make `frame/consensus/beefy` in dependent of sp_crypto_app use consistent naming in the beefy primitive tests. * - implement `BeefyAuthorityId` for `bls_crypto::AuthorityId`. - implement `bls_verify_works` test for BEEFY `bls_crypto`. * Remove BEEFY `ecdsa_n_bls_crypto` for now for later re-introduction * Make commitment and witness BEEFY tests not use Keystore. * put `bls_beefy_verify_works` test under `bls-experimental` flag. * bump up Runtime `BeefyAPI` to version 3 due to introducing generic AuthorityId. * reuse code and encapsulate w3f-bls backend in sp-core as most as possible Co-authored-by: Davide Galassi <davxy@datawok.net> * Make comments in primities BEEFY `commitment.rs` and `witness.rs``tests convention conforming * Use master dep versions * Trivial change. Mostly to trigger CI * Apply suggestions from code review Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Fix Cargo.toml * Trigger CI with cumulus companion * Trigger CI after polkadot companion change --------- Co-authored-by: Davide Galassi <davxy@datawok.net> Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
225 lines
7.4 KiB
Rust
225 lines
7.4 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#![cfg_attr(not(feature = "std"), no_std)]
|
|
#![warn(missing_docs)]
|
|
|
|
//! A BEEFY+MMR pallet combo.
|
|
//!
|
|
//! While both BEEFY and Merkle Mountain Range (MMR) can be used separately,
|
|
//! these tools were designed to work together in unison.
|
|
//!
|
|
//! The pallet provides a standardized MMR Leaf format that can be used
|
|
//! to bridge BEEFY+MMR-based networks (both standalone and Polkadot-like).
|
|
//!
|
|
//! The MMR leaf contains:
|
|
//! 1. Block number and parent block hash.
|
|
//! 2. Merkle Tree Root Hash of next BEEFY validator set.
|
|
//! 3. Arbitrary extra leaf data to be used by downstream pallets to include custom data.
|
|
//!
|
|
//! and thanks to versioning can be easily updated in the future.
|
|
|
|
use sp_runtime::traits::{Convert, Member};
|
|
use sp_std::prelude::*;
|
|
|
|
use pallet_mmr::{LeafDataProvider, ParentNumberAndHash};
|
|
use sp_consensus_beefy::{
|
|
mmr::{BeefyAuthoritySet, BeefyDataProvider, BeefyNextAuthoritySet, MmrLeaf, MmrLeafVersion},
|
|
ValidatorSet as BeefyValidatorSet,
|
|
};
|
|
|
|
use frame_support::{crypto::ecdsa::ECDSAExt, traits::Get};
|
|
use frame_system::pallet_prelude::BlockNumberFor;
|
|
|
|
pub use pallet::*;
|
|
|
|
#[cfg(test)]
|
|
mod mock;
|
|
#[cfg(test)]
|
|
mod tests;
|
|
|
|
/// A BEEFY consensus digest item with MMR root hash.
|
|
pub struct DepositBeefyDigest<T>(sp_std::marker::PhantomData<T>);
|
|
|
|
impl<T> pallet_mmr::primitives::OnNewRoot<sp_consensus_beefy::MmrRootHash> for DepositBeefyDigest<T>
|
|
where
|
|
T: pallet_mmr::Config<Hashing = sp_consensus_beefy::MmrHashing>,
|
|
T: pallet_beefy::Config,
|
|
{
|
|
fn on_new_root(root: &sp_consensus_beefy::MmrRootHash) {
|
|
let digest = sp_runtime::generic::DigestItem::Consensus(
|
|
sp_consensus_beefy::BEEFY_ENGINE_ID,
|
|
codec::Encode::encode(&sp_consensus_beefy::ConsensusLog::<
|
|
<T as pallet_beefy::Config>::BeefyId,
|
|
>::MmrRoot(*root)),
|
|
);
|
|
<frame_system::Pallet<T>>::deposit_log(digest);
|
|
}
|
|
}
|
|
|
|
/// Convert BEEFY secp256k1 public keys into Ethereum addresses
|
|
pub struct BeefyEcdsaToEthereum;
|
|
impl Convert<sp_consensus_beefy::ecdsa_crypto::AuthorityId, Vec<u8>> for BeefyEcdsaToEthereum {
|
|
fn convert(beefy_id: sp_consensus_beefy::ecdsa_crypto::AuthorityId) -> Vec<u8> {
|
|
sp_core::ecdsa::Public::from(beefy_id)
|
|
.to_eth_address()
|
|
.map(|v| v.to_vec())
|
|
.map_err(|_| {
|
|
log::error!(target: "runtime::beefy", "Failed to convert BEEFY PublicKey to ETH address!");
|
|
})
|
|
.unwrap_or_default()
|
|
}
|
|
}
|
|
|
|
type MerkleRootOf<T> = <<T as pallet_mmr::Config>::Hashing as sp_runtime::traits::Hash>::Output;
|
|
|
|
#[frame_support::pallet]
|
|
pub mod pallet {
|
|
#![allow(missing_docs)]
|
|
|
|
use super::*;
|
|
use frame_support::pallet_prelude::*;
|
|
|
|
/// BEEFY-MMR pallet.
|
|
#[pallet::pallet]
|
|
pub struct Pallet<T>(_);
|
|
|
|
/// The module's configuration trait.
|
|
#[pallet::config]
|
|
#[pallet::disable_frame_system_supertrait_check]
|
|
pub trait Config: pallet_mmr::Config + pallet_beefy::Config {
|
|
/// Current leaf version.
|
|
///
|
|
/// Specifies the version number added to every leaf that get's appended to the MMR.
|
|
/// Read more in [`MmrLeafVersion`] docs about versioning leaves.
|
|
type LeafVersion: Get<MmrLeafVersion>;
|
|
|
|
/// Convert BEEFY AuthorityId to a form that would end up in the Merkle Tree.
|
|
///
|
|
/// For instance for ECDSA (secp256k1) we want to store uncompressed public keys (65 bytes)
|
|
/// and later to Ethereum Addresses (160 bits) to simplify using them on Ethereum chain,
|
|
/// but the rest of the Substrate codebase is storing them compressed (33 bytes) for
|
|
/// efficiency reasons.
|
|
type BeefyAuthorityToMerkleLeaf: Convert<<Self as pallet_beefy::Config>::BeefyId, Vec<u8>>;
|
|
|
|
/// The type expected for the leaf extra data
|
|
type LeafExtra: Member + codec::FullCodec;
|
|
|
|
/// Retrieve arbitrary data that should be added to the mmr leaf
|
|
type BeefyDataProvider: BeefyDataProvider<Self::LeafExtra>;
|
|
}
|
|
|
|
/// Details of current BEEFY authority set.
|
|
#[pallet::storage]
|
|
#[pallet::getter(fn beefy_authorities)]
|
|
pub type BeefyAuthorities<T: Config> =
|
|
StorageValue<_, BeefyAuthoritySet<MerkleRootOf<T>>, ValueQuery>;
|
|
|
|
/// Details of next BEEFY authority set.
|
|
///
|
|
/// This storage entry is used as cache for calls to `update_beefy_next_authority_set`.
|
|
#[pallet::storage]
|
|
#[pallet::getter(fn beefy_next_authorities)]
|
|
pub type BeefyNextAuthorities<T: Config> =
|
|
StorageValue<_, BeefyNextAuthoritySet<MerkleRootOf<T>>, ValueQuery>;
|
|
}
|
|
|
|
impl<T: Config> LeafDataProvider for Pallet<T> {
|
|
type LeafData = MmrLeaf<
|
|
BlockNumberFor<T>,
|
|
<T as frame_system::Config>::Hash,
|
|
MerkleRootOf<T>,
|
|
T::LeafExtra,
|
|
>;
|
|
|
|
fn leaf_data() -> Self::LeafData {
|
|
MmrLeaf {
|
|
version: T::LeafVersion::get(),
|
|
parent_number_and_hash: ParentNumberAndHash::<T>::leaf_data(),
|
|
leaf_extra: T::BeefyDataProvider::extra_data(),
|
|
beefy_next_authority_set: Pallet::<T>::beefy_next_authorities(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<T> sp_consensus_beefy::OnNewValidatorSet<<T as pallet_beefy::Config>::BeefyId> for Pallet<T>
|
|
where
|
|
T: pallet::Config,
|
|
{
|
|
/// Compute and cache BEEFY authority sets based on updated BEEFY validator sets.
|
|
fn on_new_validator_set(
|
|
current_set: &BeefyValidatorSet<<T as pallet_beefy::Config>::BeefyId>,
|
|
next_set: &BeefyValidatorSet<<T as pallet_beefy::Config>::BeefyId>,
|
|
) {
|
|
let current = Pallet::<T>::compute_authority_set(current_set);
|
|
let next = Pallet::<T>::compute_authority_set(next_set);
|
|
// cache the result
|
|
BeefyAuthorities::<T>::put(¤t);
|
|
BeefyNextAuthorities::<T>::put(&next);
|
|
}
|
|
}
|
|
|
|
impl<T: Config> Pallet<T> {
|
|
/// Return the currently active BEEFY authority set proof.
|
|
pub fn authority_set_proof() -> BeefyAuthoritySet<MerkleRootOf<T>> {
|
|
Pallet::<T>::beefy_authorities()
|
|
}
|
|
|
|
/// Return the next/queued BEEFY authority set proof.
|
|
pub fn next_authority_set_proof() -> BeefyNextAuthoritySet<MerkleRootOf<T>> {
|
|
Pallet::<T>::beefy_next_authorities()
|
|
}
|
|
|
|
/// Returns details of a BEEFY authority set.
|
|
///
|
|
/// Details contain authority set id, authority set length and a merkle root,
|
|
/// constructed from uncompressed secp256k1 public keys converted to Ethereum addresses
|
|
/// of the next BEEFY authority set.
|
|
fn compute_authority_set(
|
|
validator_set: &BeefyValidatorSet<<T as pallet_beefy::Config>::BeefyId>,
|
|
) -> BeefyAuthoritySet<MerkleRootOf<T>> {
|
|
let id = validator_set.id();
|
|
let beefy_addresses = validator_set
|
|
.validators()
|
|
.into_iter()
|
|
.cloned()
|
|
.map(T::BeefyAuthorityToMerkleLeaf::convert)
|
|
.collect::<Vec<_>>();
|
|
let len = beefy_addresses.len() as u32;
|
|
let keyset_commitment = binary_merkle_tree::merkle_root::<
|
|
<T as pallet_mmr::Config>::Hashing,
|
|
_,
|
|
>(beefy_addresses)
|
|
.into();
|
|
BeefyAuthoritySet { id, len, keyset_commitment }
|
|
}
|
|
}
|
|
|
|
sp_api::decl_runtime_apis! {
|
|
/// API useful for BEEFY light clients.
|
|
pub trait BeefyMmrApi<H>
|
|
where
|
|
BeefyAuthoritySet<H>: sp_api::Decode,
|
|
{
|
|
/// Return the currently active BEEFY authority set proof.
|
|
fn authority_set_proof() -> BeefyAuthoritySet<H>;
|
|
|
|
/// Return the next/queued BEEFY authority set proof.
|
|
fn next_authority_set_proof() -> BeefyNextAuthoritySet<H>;
|
|
}
|
|
}
|