pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 19:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor beefy-mmr implementation (#4719)

Browse Source 
* update pallet-beefy-mmr implementation

* minor fix

* fix build

* use H256 for rococo leaf extra

* update lockfile for {"substrate"}

* fix fmt

Co-authored-by: acatangiu <adrian@parity.io>
This commit is contained in:
Web3 Smith
2022-04-01 11:09:45 +01:00
committed by GitHub
parent bd33013a4b
commit 30dcadacdc
5 changed files with 197 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/runtime/rococo/src/lib.rs
+25 -14
View File
@@ -21,7 +21,10 @@
#![recursion_limit = "256"]
use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
use beefy_primitives::{crypto::AuthorityId as BeefyId, mmr::MmrLeafVersion};
use beefy_primitives::{
crypto::AuthorityId as BeefyId,
mmr::{BeefyDataProvider, MmrLeafVersion},
};
use frame_support::{
construct_runtime, parameter_types,
traits::{Contains, InstanceFilter, KeyOwnerProofSystem},
@@ -47,7 +50,7 @@ use runtime_common::{
};
use runtime_parachains::{self, runtime_api_impl::v2 as runtime_api_impl};
use scale_info::TypeInfo;
use sp_core::{OpaqueMetadata, RuntimeDebug};
use sp_core::{OpaqueMetadata, RuntimeDebug, H256};
use sp_runtime::{
create_runtime_str, generic, impl_opaque_keys,
traits::{
@@ -673,25 +676,17 @@ impl pallet_beefy::Config for Runtime {
type BeefyId = BeefyId;
}
type MmrHash = <Keccak256 as sp_runtime::traits::Hash>::Output;
impl pallet_mmr::Config for Runtime {
const INDEXING_PREFIX: &'static [u8] = b"mmr";
type Hashing = Keccak256;
type Hash = <Keccak256 as sp_runtime::traits::Hash>::Output;
type Hash = MmrHash;
type OnNewRoot = pallet_beefy_mmr::DepositBeefyDigest<Runtime>;
type WeightInfo = ();
type LeafData = pallet_beefy_mmr::Pallet<Runtime>;
}
pub struct ParasProvider;
impl pallet_beefy_mmr::ParachainHeadsProvider for ParasProvider {
fn parachain_heads() -> Vec<(u32, Vec<u8>)> {
Paras::parachains()
.into_iter()
.filter_map(|id| Paras::para_head(&id).map(|head| (id.into(), head.0)))
.collect()
}
}
parameter_types! {
/// Version of the produced MMR leaf.
///
@@ -709,10 +704,26 @@ parameter_types! {
pub LeafVersion: MmrLeafVersion = MmrLeafVersion::new(0, 0);
}
pub struct ParasProvider;
impl BeefyDataProvider<H256> for ParasProvider {
fn extra_data() -> H256 {
let mut para_heads: Vec<(u32, Vec<u8>)> = Paras::parachains()
.into_iter()
.filter_map(|id| Paras::para_head(&id).map(|head| (id.into(), head.0)))
.collect();
para_heads.sort();
beefy_merkle_tree::merkle_root::<pallet_beefy_mmr::Pallet<Runtime>, _, _>(
para_heads.into_iter().map(|pair| pair.encode()),
)
.into()
}
}
impl pallet_beefy_mmr::Config for Runtime {
type LeafVersion = LeafVersion;
type BeefyAuthorityToMerkleLeaf = pallet_beefy_mmr::BeefyEcdsaToEthereum;
type ParachainHeads = ParasProvider;
type LeafExtra = H256;
type BeefyDataProvider = ParasProvider;
}
parameter_types! {