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

Bypass chain-selection subsystem until disputes are enabled. (#3676)

Browse Source 
* cleanup of rob's patch

* depend on feature disputes, both lag and query

* typo

* make it work

TODO move the fallback into selection

* option

* Update node/service/src/relay_chain_selection.rs

* remove trait implementation and fix errors

* hotfix: tests

* fmt

* remove unused trait

* make pub(crate) for test

* disable tests with disputed blocks

* Fix warnings

Co-authored-by: Robert Habermeier <rphmeier@gmail.com>
Co-authored-by: Lldenaurois <Ljdenaurois@gmail.com>
This commit is contained in:
Bernhard Schuster
2021-08-21 00:22:59 +02:00
committed by GitHub
parent 9a1b614c47
commit 5f622ee68c
2 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/service/src/relay_chain_selection.rs
+41 -26
View File
@@ -178,10 +178,15 @@ where
target_hash: Hash,
maybe_max_number: Option<BlockNumber>,
) -> Result<Option<Hash>, ConsensusError> {
let longest_chain_best =
self.fallback.finality_target(target_hash, maybe_max_number).await?;
if self.selection.overseer.is_disconnected() {
return self.fallback.finality_target(target_hash, maybe_max_number).await
return Ok(longest_chain_best)
}
self.selection.finality_target(target_hash, maybe_max_number).await
self.selection
.finality_target_with_fallback(target_hash, longest_chain_best, maybe_max_number)
.await
}
}
@@ -268,8 +273,7 @@ impl OverseerHandleT for Handle {
}
}
#[async_trait::async_trait]
impl<B, OH> SelectChain<PolkadotBlock> for SelectRelayChain<B, OH>
impl<B, OH> SelectRelayChain<B, OH>
where
B: HeaderProviderProvider<PolkadotBlock>,
OH: OverseerHandleT,
@@ -313,14 +317,15 @@ where
///
/// It will also constrain the chain to only chains which are fully
/// approved, and chains which contain no disputes.
async fn finality_target(
pub(crate) async fn finality_target_with_fallback(
&self,
target_hash: Hash,
best_leaf: Option<Hash>,
maybe_max_number: Option<BlockNumber>,
) -> Result<Option<Hash>, ConsensusError> {
let mut overseer = self.overseer.clone();
let subchain_head = {
let subchain_head = if cfg!(feature = "disputes") {
let (tx, rx) = oneshot::channel();
overseer
.send_msg(
@@ -339,6 +344,11 @@ where
None => return Ok(Some(target_hash)),
Some(best) => best,
}
} else {
match best_leaf {
None => return Ok(Some(target_hash)),
Some(best_leaf) => best_leaf,
}
};
let target_number = self.block_number(target_hash)?;
@@ -419,27 +429,32 @@ where
let lag = initial_leaf_number.saturating_sub(subchain_number);
self.metrics.note_approval_checking_finality_lag(lag);
// 3. Constrain according to disputes:
let (tx, rx) = oneshot::channel();
overseer
.send_msg(
DisputeCoordinatorMessage::DetermineUndisputedChain {
base_number: target_number,
block_descriptions: subchain_block_descriptions,
tx,
},
std::any::type_name::<Self>(),
)
.await;
let (subchain_number, subchain_head) = rx
.await
.map_err(Error::OverseerDisconnected)
.map_err(|e| ConsensusError::Other(Box::new(e)))?
.unwrap_or_else(|| (subchain_number, subchain_head));
let lag = if cfg!(feature = "disputes") {
// 3. Constrain according to disputes:
let (tx, rx) = oneshot::channel();
overseer
.send_msg(
DisputeCoordinatorMessage::DetermineUndisputedChain {
base_number: target_number,
block_descriptions: subchain_block_descriptions,
tx,
},
std::any::type_name::<Self>(),
)
.await;
let (subchain_number, _subchain_head) = rx
.await
.map_err(Error::OverseerDisconnected)
.map_err(|e| ConsensusError::Other(Box::new(e)))?
.unwrap_or_else(|| (subchain_number, subchain_head));
// The the total lag accounting for disputes.
let lag_disputes = initial_leaf_number.saturating_sub(subchain_number);
self.metrics.note_disputes_finality_lag(lag_disputes);
// The the total lag accounting for disputes.
let lag_disputes = initial_leaf_number.saturating_sub(subchain_number);
self.metrics.note_disputes_finality_lag(lag_disputes);
lag_disputes
} else {
lag
};
// 4. Apply the maximum safeguard to the finality lag.
if lag > MAX_FINALITY_LAG {