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

Migrate from MQCs in persisted validation data to merkle proofs (#317)

Browse Source 
* Update polkadot

* Migrate all uses of MQC heads to merkle proofs

* Mass rename `relay_parent_storage_root`

* Restore parachain-system tests

* Update polkadot and libp2p swarm for testing

* Collapse match into an if let

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Fix compilation error in test-service

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Sergei Shulepov
2021-02-08 19:48:30 +01:00
committed by GitHub
parent 9c125817f0
commit a4998998a9
10 changed files with 553 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/runtime/src/validate_block/implementation.rs
+6 -14
View File
@@ -180,7 +180,7 @@ pub fn validate_block<B: BlockT, E: ExecuteBlock<B>>(params: ValidationParams) -
.storage(HRMP_WATERMARK)
.flatten()
.map(|v| Decode::decode(&mut &v[..]).expect("HRMP watermark is not encoded correctly"))
.unwrap_or(validation_data.block_number);
.unwrap_or(validation_data.relay_parent_number);
ValidationResult {
head_data,
@@ -210,23 +210,15 @@ impl<'a, B: BlockT> WitnessExt<'a, B> {
assert_eq!(
self.params.parent_head,
validation_data.parent_head
validation_data.parent_head,
);
assert_eq!(
self.params.relay_chain_height,
validation_data.block_number
self.params.relay_parent_number,
validation_data.relay_parent_number,
);
assert_eq!(
self.params.hrmp_mqc_heads,
validation_data.hrmp_mqc_heads
);
assert_eq!(
self.params.dmq_mqc_head,
validation_data.dmq_mqc_head,
);
assert_eq!(
self.params.relay_storage_root,
validation_data.relay_storage_root,
self.params.relay_parent_storage_root,
validation_data.relay_parent_storage_root,
);
}
}
cumulus/runtime/src/validate_block/tests.rs
+13 -15
View File
@@ -42,17 +42,15 @@ use codec::{Decode, Encode};
fn call_validate_block(
parent_head: Header,
block_data: ParachainBlockData<Block>,
relay_storage_root: Hash,
relay_parent_storage_root: Hash,
) -> Result<Header> {
let mut ext = TestExternalities::default();
let mut ext_ext = ext.ext();
let params = ValidationParams {
block_data: BlockData(block_data.encode()),
parent_head: HeadData(parent_head.encode()),
relay_chain_height: 1,
relay_storage_root,
hrmp_mqc_heads: Vec::new(),
dmq_mqc_head: Default::default(),
relay_parent_number: 1,
relay_parent_storage_root,
}
.encode();
@@ -87,7 +85,7 @@ fn create_test_client() -> (Client, LongestChain) {
struct TestBlockData {
block: Block,
witness: sp_trie::StorageProof,
relay_storage_root: Hash,
relay_parent_storage_root: Hash,
}
fn build_block_with_witness(
@@ -96,12 +94,12 @@ fn build_block_with_witness(
parent_head: Header,
) -> TestBlockData {
let sproof_builder = RelayStateSproofBuilder::default();
let (relay_storage_root, _) = sproof_builder.clone().into_state_root_and_proof();
let (relay_parent_storage_root, _) = sproof_builder.clone().into_state_root_and_proof();
let block_id = BlockId::Hash(client.info().best_hash);
let mut builder = client.init_block_builder_at(
&block_id,
Some(PersistedValidationData {
block_number: 1,
relay_parent_number: 1,
parent_head: parent_head.encode().into(),
..Default::default()
}),
@@ -119,7 +117,7 @@ fn build_block_with_witness(
witness: built_block
.proof
.expect("We enabled proof recording before."),
relay_storage_root,
relay_parent_storage_root,
}
}
@@ -132,13 +130,13 @@ fn validate_block_no_extra_extrinsics() {
let TestBlockData {
block,
witness,
relay_storage_root,
relay_parent_storage_root,
} = build_block_with_witness(&client, vec![], parent_head.clone());
let (header, extrinsics) = block.deconstruct();
let block_data = ParachainBlockData::new(header.clone(), extrinsics, witness);
let res_header = call_validate_block(parent_head, block_data, relay_storage_root)
let res_header = call_validate_block(parent_head, block_data, relay_parent_storage_root)
.expect("Calls `validate_block`");
assert_eq!(header, res_header);
}
@@ -158,13 +156,13 @@ fn validate_block_with_extra_extrinsics() {
let TestBlockData {
block,
witness,
relay_storage_root,
relay_parent_storage_root,
} = build_block_with_witness(&client, extra_extrinsics, parent_head.clone());
let (header, extrinsics) = block.deconstruct();
let block_data = ParachainBlockData::new(header.clone(), extrinsics, witness);
let res_header = call_validate_block(parent_head, block_data, relay_storage_root)
let res_header = call_validate_block(parent_head, block_data, relay_parent_storage_root)
.expect("Calls `validate_block`");
assert_eq!(header, res_header);
}
@@ -179,12 +177,12 @@ fn validate_block_invalid_parent_hash() {
let TestBlockData {
block,
witness,
relay_storage_root,
relay_parent_storage_root,
} = build_block_with_witness(&client, vec![], parent_head.clone());
let (mut header, extrinsics) = block.deconstruct();
header.set_parent_hash(Hash::from_low_u64_be(1));
let block_data = ParachainBlockData::new(header, extrinsics, witness);
call_validate_block(parent_head, block_data, relay_storage_root)
call_validate_block(parent_head, block_data, relay_parent_storage_root)
.expect("Calls `validate_block`");
}