absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-09 04:39:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #183

Browse Source
This commit is contained in:
Luke Parker
2023-01-28 02:35:32 -05:00
parent b253529413
commit 9241bdc3b5
5 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
substrate/tendermint/client/src/authority/mod.rs
View File

@@ -22,7 +22,7 @@ use sp_runtime::{
};
use sp_blockchain::HeaderBackend;
use sp_consensus::{Error, BlockOrigin, Proposer, Environment};
use sp_consensus::{Error, BlockOrigin, BlockStatus, Proposer, Environment};
use sc_consensus::import_queue::IncomingBlock;
use sc_service::ImportQueue;
@@ -86,7 +86,6 @@ async fn get_proposal<T: TendermintValidator>(
env: &Arc<Mutex<T::Environment>>,
import: &TendermintImport<T>,
header: &<T::Block as Block>::Header,
stub: bool,
) -> T::Block {
let proposer =
env.lock().await.init(header).await.expect("Failed to create a proposer for the new block");
@@ -95,15 +94,11 @@ async fn get_proposal<T: TendermintValidator>(
.propose(
import.inherent_data(*header.parent_hash()).await,
Digest::default(),
if stub {
Duration::ZERO
} else {
// The first processing time is to build the block
// The second is for it to be downloaded (assumes a block won't take longer to download
// than it'll take to process)
// The third is for it to actually be processed
Duration::from_secs((T::BLOCK_PROCESSING_TIME_IN_SECONDS / 3).into())
},
// The first processing time is to build the block
// The second is for it to be downloaded (assumes a block won't take longer to download
// than it'll take to process)
// The third is for it to actually be processed
Duration::from_secs((T::BLOCK_PROCESSING_TIME_IN_SECONDS / 3).into()),
Some(T::PROPOSED_BLOCK_SIZE_LIMIT),
)
.await
@@ -118,7 +113,7 @@ impl<T: TendermintValidator> TendermintAuthority<T> {
}
async fn get_proposal(&self, header: &<T::Block as Block>::Header) -> T::Block {
get_proposal(&self.active.as_ref().unwrap().env, &self.import, header, false).await
get_proposal(&self.active.as_ref().unwrap().env, &self.import, header).await
}
/// Create and run a new Tendermint Authority, proposing and voting on blocks.
@@ -263,9 +258,10 @@ impl<T: TendermintValidator> TendermintAuthority<T> {
step.send((
BlockNumber(number),
Commit::decode(&mut justifications.get(CONSENSUS_ID).unwrap().as_ref()).unwrap(),
// This will fail if syncing occurs radically faster than machine stepping takes
// TODO: Set true when initial syncing
get_proposal(&env, &import, &notif.header, false).await
// Creating a proposal will fail if syncing occurs radically faster than machine
// stepping takes
// Don't create proposals when stepping accordingly
None
)).await.unwrap();
} else {
debug!(
@@ -437,10 +433,16 @@ impl<T: TendermintValidator> Network for TendermintAuthority<T> {
&mut self,
block: T::Block,
commit: Commit<TendermintValidators<T>>,
) -> T::Block {
) -> Option<T::Block> {
// Prevent import_block from being called while we run
let _lock = self.import.sync_lock.lock().await;
// If we didn't import this block already, return
// If it's a legitimate block, we'll pick it up in the standard sync loop
if self.import.client.block_status(block.hash()).unwrap() != BlockStatus::InChainWithState {
return None;
}
// Check if we already imported this externally
if self.import.client.justifications(block.hash()).unwrap().is_some() {
debug!(target: "tendermint", "Machine produced a commit after we already synced it");
@@ -487,6 +489,6 @@ impl<T: TendermintValidator> Network for TendermintAuthority<T> {
// Clear any blocks for the previous slot which we were willing to recheck
*self.import.recheck.write().unwrap() = HashSet::new();
self.get_proposal(block.header()).await
Some(self.get_proposal(block.header()).await)
}
}