Skip to content

Commit f4ad317

Browse files
echobtechobt
committed
refactor: use SS58 format for all hotkey logs
- Replace to_hex() with to_ss58() for hotkey display - Only log peer events when hotkey is known (no more 'unknown') - Consistent SS58 format across all validator identity logs
1 parent 242f711 commit f4ad317

File tree

2 files changed

+63
-69
lines changed

2 files changed

+63
-69
lines changed

‎bins/validator-node/src/main.rs‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1594,7 +1594,7 @@ async fn handle_network_event(
15941594
if hb.core_state_hash != [0u8; 32] && hb.core_state_hash != our_core_hash {
15951595
let our_mutation_seq = chain_state.read().mutation_sequence;
15961596
debug!(
1597-
peer = %hb.validator.to_hex(),
1597+
peer = %hb.validator.to_ss58(),
15981598
peer_core_hash = %hex::encode(&hb.core_state_hash[..8]),
15991599
our_core_hash = %hex::encode(&our_core_hash[..8]),
16001600
"Core state hash divergence detected, requesting sync"
@@ -1629,7 +1629,7 @@ async fn handle_network_event(
16291629
info!(
16301630
submission_id = %sub.submission_id,
16311631
challenge_id = %sub.challenge_id,
1632-
miner = %sub.miner.to_hex(),
1632+
miner = %sub.miner.to_ss58(),
16331633
"Received submission from P2P network"
16341634
);
16351635
let already_exists = state_manager
@@ -1663,7 +1663,7 @@ async fn handle_network_event(
16631663
P2PMessage::Evaluation(eval) => {
16641664
info!(
16651665
submission_id = %eval.submission_id,
1666-
validator = %eval.validator.to_hex(),
1666+
validator = %eval.validator.to_ss58(),
16671667
score = eval.score,
16681668
"Received evaluation from peer validator"
16691669
);
@@ -1687,14 +1687,14 @@ async fn handle_network_event(
16871687
) {
16881688
warn!(
16891689
submission_id = %eval.submission_id,
1690-
validator = %validator_hotkey.to_hex(),
1690+
validator = %validator_hotkey.to_ss58(),
16911691
error = %e,
16921692
"Failed to add peer evaluation to state"
16931693
);
16941694
} else {
16951695
debug!(
16961696
submission_id = %eval.submission_id,
1697-
validator = %validator_hotkey.to_hex(),
1697+
validator = %validator_hotkey.to_ss58(),
16981698
score = eval.score,
16991699
"Peer evaluation recorded in state"
17001700
);
@@ -1703,36 +1703,36 @@ async fn handle_network_event(
17031703
}
17041704
P2PMessage::StateRequest(req) => {
17051705
debug!(
1706-
requester = %req.requester.to_hex(),
1706+
requester = %req.requester.to_ss58(),
17071707
sequence = req.current_sequence,
17081708
"Received state request"
17091709
);
17101710
}
17111711
P2PMessage::StateResponse(resp) => {
17121712
debug!(
1713-
responder = %resp.responder.to_hex(),
1713+
responder = %resp.responder.to_ss58(),
17141714
sequence = resp.sequence,
17151715
"Received state response"
17161716
);
17171717
}
17181718
P2PMessage::WeightVote(wv) => {
17191719
debug!(
1720-
validator = %wv.validator.to_hex(),
1720+
validator = %wv.validator.to_ss58(),
17211721
epoch = wv.epoch,
17221722
"Received weight vote"
17231723
);
17241724
}
17251725
P2PMessage::PeerAnnounce(pa) => {
17261726
debug!(
1727-
validator = %pa.validator.to_hex(),
1727+
validator = %pa.validator.to_ss58(),
17281728
peer_id = %pa.peer_id,
17291729
addresses = pa.addresses.len(),
17301730
"Received peer announce"
17311731
);
17321732
}
17331733
P2PMessage::JobClaim(claim) => {
17341734
info!(
1735-
validator = %claim.validator.to_hex(),
1735+
validator = %claim.validator.to_ss58(),
17361736
challenge_id = %claim.challenge_id,
17371737
max_jobs = claim.max_jobs,
17381738
"Received job claim"
@@ -1742,8 +1742,8 @@ async fn handle_network_event(
17421742
info!(
17431743
submission_id = %assignment.submission_id,
17441744
challenge_id = %assignment.challenge_id,
1745-
assigned_validator = %assignment.assigned_validator.to_hex(),
1746-
assigner = %assignment.assigner.to_hex(),
1745+
assigned_validator = %assignment.assigned_validator.to_ss58(),
1746+
assigner = %assignment.assigner.to_ss58(),
17471747
"Received job assignment"
17481748
);
17491749
let job = JobRecord {
@@ -1761,14 +1761,14 @@ async fn handle_network_event(
17611761
P2PMessage::DataRequest(req) => {
17621762
debug!(
17631763
request_id = %req.request_id,
1764-
requester = %req.requester.to_hex(),
1764+
requester = %req.requester.to_ss58(),
17651765
challenge_id = %req.challenge_id,
17661766
data_type = %req.data_type,
17671767
"Received data request"
17681768
);
17691769

17701770
if !validator_set.is_validator(&req.requester) {
1771-
warn!(requester = %req.requester.to_hex(), "Data request from unknown validator");
1771+
warn!(requester = %req.requester.to_ss58(), "Data request from unknown validator");
17721772
} else if req.data_type == "challenge_storage" {
17731773
// Respond with storage data for the requested challenge
17741774
let challenge_id_str = req.challenge_id.to_string();
@@ -1836,14 +1836,14 @@ async fn handle_network_event(
18361836
P2PMessage::DataResponse(resp) => {
18371837
debug!(
18381838
request_id = %resp.request_id,
1839-
responder = %resp.responder.to_hex(),
1839+
responder = %resp.responder.to_ss58(),
18401840
challenge_id = %resp.challenge_id,
18411841
data_bytes = resp.data.len(),
18421842
"Received data response"
18431843
);
18441844

18451845
if !validator_set.is_validator(&resp.responder) {
1846-
warn!(responder = %resp.responder.to_hex(), "Data response from unknown validator");
1846+
warn!(responder = %resp.responder.to_ss58(), "Data response from unknown validator");
18471847
} else if resp.data_type == "challenge_storage" {
18481848
// Merge storage data from peer
18491849
match bincode::deserialize::<Vec<(String, Vec<u8>)>>(&resp.data) {
@@ -1901,7 +1901,7 @@ async fn handle_network_event(
19011901
debug!(
19021902
submission_id = %progress.submission_id,
19031903
challenge_id = %progress.challenge_id,
1904-
validator = %progress.validator.to_hex(),
1904+
validator = %progress.validator.to_ss58(),
19051905
task_index = progress.task_index,
19061906
total_tasks = progress.total_tasks,
19071907
progress_pct = progress.progress_pct,
@@ -1925,7 +1925,7 @@ async fn handle_network_event(
19251925
info!(
19261926
submission_id = %result.submission_id,
19271927
challenge_id = %result.challenge_id,
1928-
validator = %result.validator.to_hex(),
1928+
validator = %result.validator.to_ss58(),
19291929
task_id = %result.task_id,
19301930
passed = result.passed,
19311931
score = result.score,
@@ -1935,7 +1935,7 @@ async fn handle_network_event(
19351935
}
19361936
P2PMessage::LeaderboardRequest(req) => {
19371937
debug!(
1938-
requester = %req.requester.to_hex(),
1938+
requester = %req.requester.to_ss58(),
19391939
challenge_id = %req.challenge_id,
19401940
limit = req.limit,
19411941
offset = req.offset,
@@ -1944,14 +1944,14 @@ async fn handle_network_event(
19441944
}
19451945
P2PMessage::LeaderboardResponse(resp) => {
19461946
debug!(
1947-
responder = %resp.responder.to_hex(),
1947+
responder = %resp.responder.to_ss58(),
19481948
challenge_id = %resp.challenge_id,
19491949
total_count = resp.total_count,
19501950
"Received leaderboard response"
19511951
);
19521952
}
19531953
P2PMessage::ChallengeUpdate(update) => {
1954-
let updater_ss58 = update.updater.to_hex();
1954+
let updater_ss58 = update.updater.to_ss58();
19551955
if updater_ss58 == platform_p2p_consensus::SUDO_HOTKEY
19561956
|| update.updater.0 == platform_core::SUDO_KEY_BYTES
19571957
{
@@ -2192,7 +2192,7 @@ async fn handle_network_event(
21922192
info!(
21932193
proposal_id = %hex::encode(&proposal.proposal_id[..8]),
21942194
challenge_id = %proposal.challenge_id,
2195-
proposer = %proposal.proposer.to_hex(),
2195+
proposer = %proposal.proposer.to_ss58(),
21962196
key_len = proposal.key.len(),
21972197
value_len = proposal.value.len(),
21982198
"Received storage proposal"
@@ -2203,7 +2203,7 @@ async fn handle_network_event(
22032203

22042204
if !proposer_valid {
22052205
warn!(
2206-
proposer = %proposal.proposer.to_hex(),
2206+
proposer = %proposal.proposer.to_ss58(),
22072207
"Storage proposal from unknown validator, ignoring"
22082208
);
22092209
} else {
@@ -2271,14 +2271,14 @@ async fn handle_network_event(
22712271
P2PMessage::StorageVote(vote) => {
22722272
debug!(
22732273
proposal_id = %hex::encode(&vote.proposal_id[..8]),
2274-
voter = %vote.voter.to_hex(),
2274+
voter = %vote.voter.to_ss58(),
22752275
approve = vote.approve,
22762276
"Received storage vote"
22772277
);
22782278

22792279
// Verify voter is a known validator
22802280
if !validator_set.is_validator(&vote.voter) {
2281-
warn!(voter = %vote.voter.to_hex(), "Vote from unknown validator");
2281+
warn!(voter = %vote.voter.to_ss58(), "Vote from unknown validator");
22822282
} else {
22832283
// Add vote to proposal
22842284
let consensus_result = state_manager.apply(|state| {
@@ -2353,7 +2353,7 @@ async fn handle_network_event(
23532353
P2PMessage::ReviewAssignment(msg) => {
23542354
debug!(
23552355
submission_id = %msg.submission_id,
2356-
assigner = %msg.assigner.to_hex(),
2356+
assigner = %msg.assigner.to_ss58(),
23572357
assigned_count = msg.assigned_validators.len(),
23582358
"Received review assignment"
23592359
);
@@ -2362,15 +2362,15 @@ async fn handle_network_event(
23622362
let safe_reason = sanitize_for_log(&msg.reason);
23632363
debug!(
23642364
submission_id = %msg.submission_id,
2365-
validator = %msg.validator.to_hex(),
2365+
validator = %msg.validator.to_ss58(),
23662366
reason = %safe_reason,
23672367
"Received review decline"
23682368
);
23692369
}
23702370
P2PMessage::ReviewResult(msg) => {
23712371
debug!(
23722372
submission_id = %msg.submission_id,
2373-
validator = %msg.validator.to_hex(),
2373+
validator = %msg.validator.to_ss58(),
23742374
score = msg.score,
23752375
"Received review result"
23762376
);
@@ -2383,7 +2383,7 @@ async fn handle_network_event(
23832383
} else {
23842384
debug!(
23852385
submission_id = %msg.submission_id,
2386-
validator = %msg.validator_hotkey.to_hex(),
2386+
validator = %msg.validator_hotkey.to_ss58(),
23872387
"Received valid agent log proposal"
23882388
);
23892389
// Store in chain state for consensus
@@ -2398,7 +2398,7 @@ async fn handle_network_event(
23982398
}
23992399
P2PMessage::StorageRootSync(msg) => {
24002400
if !validator_set.is_validator(&msg.validator) {
2401-
warn!(validator = %msg.validator.to_hex(), "Storage root sync from unknown validator");
2401+
warn!(validator = %msg.validator.to_ss58(), "Storage root sync from unknown validator");
24022402
} else {
24032403
let local_roots: Vec<(platform_core::ChallengeId, [u8; 32])> = state_manager
24042404
.apply(|state| {
@@ -2419,7 +2419,7 @@ async fn handle_network_event(
24192419
if needs_sync {
24202420
info!(
24212421
challenge_id = %cid,
2422-
remote_validator = %msg.validator.to_hex(),
2422+
remote_validator = %msg.validator.to_ss58(),
24232423
"Storage divergence detected, requesting challenge data"
24242424
);
24252425

@@ -2460,12 +2460,12 @@ async fn handle_network_event(
24602460
info!(
24612461
proposal_id = %hex::encode(&proposal.proposal_id[..8]),
24622462
mutation_type = ?proposal.mutation_type,
2463-
proposer = %proposal.proposer.to_hex(),
2463+
proposer = %proposal.proposer.to_ss58(),
24642464
"Received state mutation proposal"
24652465
);
24662466

24672467
if !validator_set.is_validator(&proposal.proposer) {
2468-
warn!(proposer = %proposal.proposer.to_hex(), "State mutation from unknown validator");
2468+
warn!(proposer = %proposal.proposer.to_ss58(), "State mutation from unknown validator");
24692469
} else {
24702470
// Add proposal to P2P state
24712471
let entry = platform_p2p_consensus::StateMutationEntry {
@@ -2494,7 +2494,7 @@ async fn handle_network_event(
24942494
}
24952495
platform_p2p_consensus::StateMutationType::SudoAction => {
24962496
// Verify proposer is sudo
2497-
let proposer_hex = proposal.proposer.to_hex();
2497+
let proposer_hex = proposal.proposer.to_ss58();
24982498
proposer_hex == platform_p2p_consensus::SUDO_HOTKEY
24992499
|| proposal.proposer.0 == platform_core::SUDO_KEY_BYTES
25002500
}
@@ -2529,13 +2529,13 @@ async fn handle_network_event(
25292529
P2PMessage::StateMutationVote(vote) => {
25302530
debug!(
25312531
proposal_id = %hex::encode(&vote.proposal_id[..8]),
2532-
voter = %vote.voter.to_hex(),
2532+
voter = %vote.voter.to_ss58(),
25332533
approve = vote.approve,
25342534
"Received state mutation vote"
25352535
);
25362536

25372537
if !validator_set.is_validator(&vote.voter) {
2538-
warn!(voter = %vote.voter.to_hex(), "State mutation vote from unknown validator");
2538+
warn!(voter = %vote.voter.to_ss58(), "State mutation vote from unknown validator");
25392539
} else {
25402540
let consensus_result = state_manager.apply(|state| {
25412541
state.vote_state_mutation(
@@ -2646,13 +2646,13 @@ async fn handle_network_event(
26462646
}
26472647
P2PMessage::CoreStateRequest(req) => {
26482648
info!(
2649-
requester = %req.requester.to_hex(),
2649+
requester = %req.requester.to_ss58(),
26502650
mutation_seq = req.mutation_sequence,
26512651
"Received core state sync request"
26522652
);
26532653

26542654
if !validator_set.is_validator(&req.requester) {
2655-
warn!(requester = %req.requester.to_hex(), "Core state request from unknown validator");
2655+
warn!(requester = %req.requester.to_ss58(), "Core state request from unknown validator");
26562656
} else {
26572657
let cs = chain_state.read();
26582658
let state_data = serde_json::to_vec(&*cs).unwrap_or_default();
@@ -2687,13 +2687,13 @@ async fn handle_network_event(
26872687
}
26882688
P2PMessage::CoreStateResponse(resp) => {
26892689
info!(
2690-
responder = %resp.responder.to_hex(),
2690+
responder = %resp.responder.to_ss58(),
26912691
mutation_seq = resp.mutation_sequence,
26922692
"Received core state sync response"
26932693
);
26942694

26952695
if !validator_set.is_validator(&resp.responder) {
2696-
warn!(responder = %resp.responder.to_hex(), "Core state response from unknown validator");
2696+
warn!(responder = %resp.responder.to_ss58(), "Core state response from unknown validator");
26972697
} else {
26982698
// Deserialize and merge
26992699
match serde_json::from_slice::<platform_core::ChainState>(&resp.state_data) {

0 commit comments

Comments
 (0)