Skip to content

Update rust #922

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

Merged
AndreiEres merged 6 commits into from
Feb 27, 2026
Merged

Update rust #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6cee666
Update rust
AndreiEres Feb 27, 2026
6ab1a40
Fix fmt
AndreiEres Feb 27, 2026
5694c75
Fix clippy warnings
AndreiEres Feb 27, 2026
3e74725
Fix fmt
AndreiEres Feb 27, 2026
8437430
Clippy
AndreiEres Feb 27, 2026
83a7551
fmt
AndreiEres Feb 27, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

env:
DOCKERFILE: scripts/ci/dockerfiles/polkadot-introspector_injected.Dockerfile
CI_IMAGE: paritytech/ci-unified:bullseye-1.85.0
CI_IMAGE: paritytech/ci-unified:bullseye-1.93.0-2026-01-27-v202602020922
IMAGE_NAME: paritytech/polkadot-introspector

jobs:
Expand Down
1 change: 0 additions & 1 deletion essentials/src/api/dynamic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use crate::{
metadata::polkadot_primitives::ValidatorIndex,
types::{H256, OnDemandOrder},
};
use log::error;
use subxt::{
OnlineClient, PolkadotConfig,
dynamic::{At, Value},
Expand Down
17 changes: 7 additions & 10 deletions essentials/src/collector/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,11 @@ impl Collector {
};
let mut chain_events = vec![new_head_event];

if let Some(hash) = new_head_hash(event, self.subscribe_mode) {
if let Some(block_events) = self.executor.get_events(self.endpoint.as_str(), *hash).await? {
for block_event in block_events.iter() {
chain_events.push(decode_chain_event(*hash, block_event.unwrap(), self.hasher).await?);
}
if let Some(hash) = new_head_hash(event, self.subscribe_mode) &&
let Some(block_events) = self.executor.get_events(self.endpoint.as_str(), *hash).await?
{
for block_event in block_events.iter() {
chain_events.push(decode_chain_event(*hash, block_event.unwrap(), self.hasher).await?);
}
};

Expand Down Expand Up @@ -615,14 +615,11 @@ impl Collector {
let ts = self.executor.get_block_timestamp(self.endpoint.as_str(), block_hash).await?;
let block_number = header.number;

if self.state.last_finalized_block_number.is_some() {
if let Some(last_finalized) = self.state.last_finalized_block_number {
self.storage_write_prefixed(
CollectorPrefixType::RelevantFinalizedBlockNumber,
block_hash,
StorageEntry::new_onchain(
RecordTime::with_ts(block_number, Duration::from_secs(ts)),
self.state.last_finalized_block_number.unwrap(),
),
StorageEntry::new_onchain(RecordTime::with_ts(block_number, Duration::from_secs(ts)), last_finalized),
)
.await?;
}
Expand Down
6 changes: 0 additions & 6 deletions essentials/src/collector/ws.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,6 @@ async fn health_handler(api: CollectorStorageApi, ping: Option<HealthQuery>) ->
Ok(warp::reply::json(&HealthReply { candidates_stored: storage_size, ts }))
}

#[derive(Serialize, Clone, PartialEq, Eq, Debug)]
pub struct CandidatesReply {
/// How many candidates have we processed
pub candidates: Vec<H256>,
}

async fn candidates_handler(
api: CollectorStorageApi,
filter: Option<CandidatesQuery>,
Expand Down
250 changes: 140 additions & 110 deletions essentials/src/telemetry_feed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,15 +591,18 @@ mod test {
fn decode_version_best_block_best_finalized() {
let msg = r#"[0,32,1,[14783932,1679657352067,5998],2,[14783934,"0x0000000000000000000000000000000000000000000000000000000000000000"]]"#;

assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![
TelemetryFeed::Version(Version(32)),
TelemetryFeed::BestBlock(BestBlock {
block_number: 14783932,
timestamp: 1679657352067,
avg_block_time: Some(5998)
}),
TelemetryFeed::BestFinalized(BestFinalized { block_number: 14783934, block_hash: H256::zero() })
]);
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![
TelemetryFeed::Version(Version(32)),
TelemetryFeed::BestBlock(BestBlock {
block_number: 14783932,
timestamp: 1679657352067,
avg_block_time: Some(5998)
}),
TelemetryFeed::BestFinalized(BestFinalized { block_number: 14783934, block_hash: H256::zero() })
]
);
}

#[test]
Expand All @@ -617,138 +620,161 @@ mod test {
1619604694363
]
]"#;
assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![TelemetryFeed::AddedNode(AddedNode {
node_id: 2324,
details: NodeDetails {
name: "literate-burn-3334".to_owned(),
implementation: "Parity Polkadot".to_owned(),
version: "0.8.30-4b86755c3".to_owned(),
validator: None,
network_id: Some("12D3KooWQXtq1V6DP9SuPzZFL4VY3ye96XW4NdxR8KxnqfNvS7Vo".to_owned()),
ip: None,
sysinfo: None
},
stats: NodeStats { peers: 1, txcount: 0 },
io: NodeIO { used_state_cache_size: vec![51238524.0, 51238524.0, 51238524.0] },
hardware: NodeHardware {
upload: vec![5865.8125, 7220.9375, 8373.84375],
download: vec![103230.375, 195559.8125, 517880.0625],
chart_stamps: vec![1679673031643.2812, 1679673120180.5312, 1679673200282.875,]
},
block_details: BlockDetails {
block: Block { hash: H256::zero(), height: 6321619 },
block_time: 0,
block_timestamp: 1679660148935,
propagation_time: None
},
location: Some(NodeLocation { lat: 50.0804, long: 14.5045, city: "Prague".to_owned() }),
startup_time: Some(1619604694363),
hwbench: None
})]);
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![TelemetryFeed::AddedNode(AddedNode {
node_id: 2324,
details: NodeDetails {
name: "literate-burn-3334".to_owned(),
implementation: "Parity Polkadot".to_owned(),
version: "0.8.30-4b86755c3".to_owned(),
validator: None,
network_id: Some("12D3KooWQXtq1V6DP9SuPzZFL4VY3ye96XW4NdxR8KxnqfNvS7Vo".to_owned()),
ip: None,
sysinfo: None
},
stats: NodeStats { peers: 1, txcount: 0 },
io: NodeIO { used_state_cache_size: vec![51238524.0, 51238524.0, 51238524.0] },
hardware: NodeHardware {
upload: vec![5865.8125, 7220.9375, 8373.84375],
download: vec![103230.375, 195559.8125, 517880.0625],
chart_stamps: vec![1679673031643.2812, 1679673120180.5312, 1679673200282.875,]
},
block_details: BlockDetails {
block: Block { hash: H256::zero(), height: 6321619 },
block_time: 0,
block_timestamp: 1679660148935,
propagation_time: None
},
location: Some(NodeLocation { lat: 50.0804, long: 14.5045, city: "Prague".to_owned() }),
startup_time: Some(1619604694363),
hwbench: None
})]
);
}

#[test]
fn decode_removed_node_located_node() {
let msg = r#"[4,42,5,[1560,35.6893,139.6899,"Tokyo"]]"#;
assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![
TelemetryFeed::RemovedNode(RemovedNode { node_id: 42 }),
TelemetryFeed::LocatedNode(LocatedNode {
node_id: 1560,
lat: 35.6893,
long: 139.6899,
city: "Tokyo".to_owned()
})
]);
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![
TelemetryFeed::RemovedNode(RemovedNode { node_id: 42 }),
TelemetryFeed::LocatedNode(LocatedNode {
node_id: 1560,
lat: 35.6893,
long: 139.6899,
city: "Tokyo".to_owned()
})
]
);
}

#[test]
fn decode_imported_block_finalized_block() {
let msg = r#"[6,[297,[11959,"0x0000000000000000000000000000000000000000000000000000000000000000",6073,1679669286310,233]],7,[92,12085,"0x0000000000000000000000000000000000000000000000000000000000000000"]]"#;
assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![
TelemetryFeed::ImportedBlock(ImportedBlock {
node_id: 297,
block_details: BlockDetails {
block: Block { hash: H256::zero(), height: 11959 },
block_time: 6073,
block_timestamp: 1679669286310,
propagation_time: Some(233)
}
}),
TelemetryFeed::FinalizedBlock(FinalizedBlock {
node_id: 92,
block_number: 12085,
block_hash: H256::zero()
})
]);
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![
TelemetryFeed::ImportedBlock(ImportedBlock {
node_id: 297,
block_details: BlockDetails {
block: Block { hash: H256::zero(), height: 11959 },
block_time: 6073,
block_timestamp: 1679669286310,
propagation_time: Some(233)
}
}),
TelemetryFeed::FinalizedBlock(FinalizedBlock {
node_id: 92,
block_number: 12085,
block_hash: H256::zero()
})
]
);
}

#[test]
fn decode_node_stats_update_telemetry_feed() {
let msg = r#"[8,[1645,[8,0]],9,[514,[[10758,554,20534],[12966,13631,17685],[1679678136573,1679678136573,1679678141574]]]]"#;
assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![
TelemetryFeed::NodeStatsUpdate(NodeStatsUpdate {
node_id: 1645,
stats: NodeStats { peers: 8, txcount: 0 }
}),
TelemetryFeed::Hardware(Hardware {
node_id: 514,
hardware: NodeHardware {
upload: vec![10758.0, 554.0, 20534.0],
download: vec![12966.0, 13631.0, 17685.0],
chart_stamps: vec![1679678136573.0, 1679678136573.0, 1679678141574.0]
}
})
]);
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![
TelemetryFeed::NodeStatsUpdate(NodeStatsUpdate {
node_id: 1645,
stats: NodeStats { peers: 8, txcount: 0 }
}),
TelemetryFeed::Hardware(Hardware {
node_id: 514,
hardware: NodeHardware {
upload: vec![10758.0, 554.0, 20534.0],
download: vec![12966.0, 13631.0, 17685.0],
chart_stamps: vec![1679678136573.0, 1679678136573.0, 1679678141574.0]
}
})
]
);
}

#[test]
fn decode_time_sync() {
let msg = r#"[10,1679670187855]"#;
assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![TelemetryFeed::TimeSync(TimeSync {
time: 1679670187855
})]);
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![TelemetryFeed::TimeSync(TimeSync { time: 1679670187855 })]
);
}

#[test]
fn decode_added_chain_removed_chain() {
let msg = r#"[11,["Tick 558","0x0000000000000000000000000000000000000000000000000000000000000000",2],12,"0x0000000000000000000000000000000000000000000000000000000000000000"]"#;
assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![
TelemetryFeed::AddedChain(AddedChain {
name: "Tick 558".to_owned(),
genesis_hash: H256::zero(),
node_count: 2
}),
TelemetryFeed::RemovedChain(RemovedChain { genesis_hash: H256::zero() })
]);
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![
TelemetryFeed::AddedChain(AddedChain {
name: "Tick 558".to_owned(),
genesis_hash: H256::zero(),
node_count: 2
}),
TelemetryFeed::RemovedChain(RemovedChain { genesis_hash: H256::zero() })
]
);
}

#[test]
fn decode_subscribed_to_unsubscribed_from() {
let msg = r#"[13,"0x0000000000000000000000000000000000000000000000000000000000000000",14,"0x0000000000000000000000000000000000000000000000000000000000000000"]"#;
assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![
TelemetryFeed::SubscribedTo(SubscribedTo { genesis_hash: H256::zero() }),
TelemetryFeed::UnsubscribedFrom(UnsubscribedFrom { genesis_hash: H256::zero() })
]);
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![
TelemetryFeed::SubscribedTo(SubscribedTo { genesis_hash: H256::zero() }),
TelemetryFeed::UnsubscribedFrom(UnsubscribedFrom { genesis_hash: H256::zero() })
]
);
}

#[test]
fn decode_pong_stale_node() {
let msg = r#"[15,"pong",20,297]"#;
assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![
TelemetryFeed::Pong(Pong { msg: "pong".to_owned() }),
TelemetryFeed::StaleNode(StaleNode { node_id: 297 })
]);
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![
TelemetryFeed::Pong(Pong { msg: "pong".to_owned() }),
TelemetryFeed::StaleNode(StaleNode { node_id: 297 })
]
);
}

#[test]
fn decode_node_io_update() {
let msg = r#"[21,[555,[[48442256,54228400,52903216]]]]"#;
assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![TelemetryFeed::NodeIOUpdate(
NodeIOUpdate {
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![TelemetryFeed::NodeIOUpdate(NodeIOUpdate {
node_id: 555,
io: NodeIO { used_state_cache_size: vec![48442256.0, 54228400.0, 52903216.0] }
}
)]);
})]
);
}

#[test]
Expand All @@ -771,8 +797,9 @@ mod test {
"disk_random_write_score": {"list": [[[0,10],22],[[10,30],218],[[30,50],96]],"other": 0,"unknown": 686}
}
]"#;
assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![TelemetryFeed::ChainStatsUpdate(
ChainStatsUpdate {
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![TelemetryFeed::ChainStatsUpdate(ChainStatsUpdate {
stats: ChainStats {
version: Ranking {
list: vec![
Expand Down Expand Up @@ -852,20 +879,23 @@ mod test {
unknown: 686
}
}
}
)]);
})]
);
}

#[test]
fn decode_unknown() {
let msg = r#"[0,32,42,["0x0000000000000000000000000000000000000000000000000000000000000000", 1]]"#;

assert_eq!(TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(), vec![
TelemetryFeed::Version(Version(32)),
TelemetryFeed::UnknownValue(UnknownValue {
action: 42,
value: "[\"0x0000000000000000000000000000000000000000000000000000000000000000\", 1]".to_owned()
})
]);
assert_eq!(
TelemetryFeed::from_bytes(msg.as_bytes()).unwrap(),
vec![
TelemetryFeed::Version(Version(32)),
TelemetryFeed::UnknownValue(UnknownValue {
action: 42,
value: "[\"0x0000000000000000000000000000000000000000000000000000000000000000\", 1]".to_owned()
})
]
);
}
}
Loading
Loading