Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add dispute initiators to dispute info #443

Merged
merged 5 commits into from
Jul 14, 2023
Merged

Add dispute initiators to dispute info #443

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c65241
Add dispute initiators to dispute info
AndreiEres Jul 13, 2023
6e426f9
Add sessin index to dispute info
AndreiEres Jul 14, 2023
2fce462
Show dispute initiators
AndreiEres Jul 14, 2023
8d7388f
Read dispute session index from its statement
AndreiEres Jul 14, 2023
9bc8296
Update parachain-tracer/src/progress.rs
AndreiEres Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 45 additions & 7 deletions essentials/src/collector/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ mod ws;

use crate::{
api::{
subxt_wrapper::{RequestExecutor, SubxtWrapperError},
subxt_wrapper::{InherentData, RequestExecutor, SubxtWrapperError},
ApiService,
},
chain_events::{
decode_chain_event, ChainEvent, SubxtCandidateEvent, SubxtCandidateEventType, SubxtDispute, SubxtDisputeResult,
},
chain_subscription::ChainSubscriptionEvent,
metadata::polkadot_primitives::DisputeStatement,
storage::{RecordTime, RecordsStorageConfig, StorageEntry},
types::{Timestamp, H256},
utils::RetryOptions,
Expand Down Expand Up @@ -112,6 +113,7 @@ pub type CollectorStorageApi = ApiService<H256, CollectorPrefixType>;
#[derive(Clone, Debug, Encode, Decode)]
pub struct DisputeInfo {
pub initiated: <PolkadotConfig as subxt::Config>::Index,
pub initiators_idx: Vec<u32>,
ordian marked this conversation as resolved.
Show resolved Hide resolved
pub dispute: SubxtDispute,
pub parachain_id: u32,
pub outcome: Option<SubxtDisputeResult>,
Expand Down Expand Up @@ -541,7 +543,17 @@ impl Collector {
self.state.current_session_index = cur_session;
self.broadcast_event(CollectorUpdateEvent::NewSession(cur_session)).await?;
}
self.write_parainherent_data(block_hash, block_number, ts).await?;

Ok(())
}

async fn write_parainherent_data(
&mut self,
block_hash: H256,
block_number: u32,
ts: Timestamp,
) -> color_eyre::Result<(), CollectorError> {
let inherent_data = self
.executor
.extract_parainherent_data(self.endpoint.as_str(), Some(block_hash))
Expand Down Expand Up @@ -767,6 +779,7 @@ impl Collector {
let now = get_unix_time_unwrap();
let para_id = candidate.parachain_id();
candidate.candidate_disputed = Some(CandidateDisputed { disputed: relay_block_number, concluded: None });
let initiators_idx = self.extract_dispute_initiators(dispute_event).await?;
if let Some(to_websocket) = self.to_websocket.as_mut() {
to_websocket
.send(WebSocketUpdateEvent {
Expand All @@ -781,7 +794,8 @@ impl Collector {
// Fill and write dispute info structure
let dispute_info = DisputeInfo {
dispute: dispute_event.clone(),
initiated: self.state.current_relay_chain_block_number,
initiated: relay_block_number,
initiators_idx,
concluded: None,
parachain_id: candidate.parachain_id(),
outcome: None,
Expand All @@ -796,24 +810,48 @@ impl Collector {
self.storage_write_prefixed(
CollectorPrefixType::Dispute(para_id),
dispute_event.candidate_hash,
StorageEntry::new_onchain(
RecordTime::with_ts(self.state.current_relay_chain_block_number, now),
dispute_info,
),
StorageEntry::new_onchain(RecordTime::with_ts(relay_block_number, now), dispute_info),
)
.await?;

// Update candidate
self.storage_replace_prefixed(
CollectorPrefixType::Candidate(para_id),
dispute_event.candidate_hash,
StorageEntry::new_onchain(RecordTime::with_ts(self.state.current_relay_chain_block_number, now), candidate),
StorageEntry::new_onchain(RecordTime::with_ts(relay_block_number, now), candidate),
)
.await;

Ok(())
}

async fn extract_dispute_initiators(&mut self, dispute_event: &SubxtDispute) -> color_eyre::Result<Vec<u32>> {
let entry = match self
.storage_read_prefixed(CollectorPrefixType::InherentData, dispute_event.relay_parent_block)
.await
{
Some(v) => v,
None => return Ok(vec![]),
};

let data: InherentData = entry.into_inner()?;
let statement_set = match data
.disputes
.iter()
.find(|&d| d.candidate_hash.0 == dispute_event.candidate_hash)
{
Some(v) => v,
None => return Ok(vec![]),
};

Ok(statement_set
.statements
.iter()
.filter(|(statement, _, _)| matches!(statement, DisputeStatement::Invalid(_)))
.map(|(_, idx, _)| idx.0)
.collect())
}

async fn process_dispute_concluded(
&mut self,
dispute_event: &SubxtDispute,
Expand Down