Persist name records for Peer Discovery #2529

fabiotdf · 2025-11-06T21:54:12Z

Related issue:
https://github.com/category-labs/category-internal/issues/1659

eerkaijun

what's the test plan for this?

monad-peer-discovery/src/lib.rs

monad-peer-discovery/src/mock.rs

monad-peer-discovery/src/discovery.rs

eerkaijun · 2025-11-07T16:40:53Z

monad-peer-discovery/src/discovery.rs

+            routing_info: self.routing_info.clone(),
+            pending_queue: self.pending_queue.clone(),
+        };
+        match toml::to_string(&persisted) {


maybe we can even format to the same format as [[bootstrap.peers]] format, that would probably make it consistent

monad-peer-discovery/src/message.rs

docker/devnet/monad/config/node.toml

docker/single-node/nets/compose.yaml

monad-node/src/state.rs

eerkaijun · 2025-11-20T18:34:35Z

monad-peer-discovery/src/discovery.rs

+                match toml::from_str::<
+                    BTreeMap<NodeId<CertificateSignaturePubKey<ST>>, MonadNameRecord<ST>>,
+                >(&contents)


As discussed, is it possible to reuse the struct NodeBootstrapPeerConfig when writing and reading from peers.toml file? so that these name records are recorded in the same format as node.toml

I think it should be pretty straightforward to parse MonadNameRecord into NodeBootstrapPeerConfig, but let me know if that's not the case

I tried to reuse that struct for serialization but I can't get it to work.
I get "error":"Error { inner: UnsupportedType(None) }" from toml::to_string()

This is an example of a logged persisted struct:

{"message":"persist_peers aggregated routing_info / pending_queue","persisted":"[PersistedPeers { address: \"10.50.37.52:8888\", record_seq_num: 0, secp256k1_pubkey: 02537dd8d905d0e72467fef17fbd1ef5505b1e50993d2be41d3c726d11f750c710, name_record_sig: SecpSignature(RecoverableSignature(574fb64ff66e3d661e303e35618a31a3209b69bfbb93ef13a9ac68eb87cd328a67f2356f28db6ab8745196b2cbc639141d3a72176f66837f533e6a55d1cd2dd901)) }, PersistedPeers { address: \"10.50.37.50:8888\", record_seq_num: 0, secp256k1_pubkey: 0272ac793d36a71739e7080ee5e62029b665aa19a373e7efbc5d28660ad944ab4e, name_record_sig: SecpSignature(RecoverableSignature(f74bd97302961f7c9828963bd5a3394d88d1ac5136004c52c094459537aedf0f2363ad660ca0df738dc77c335e35a519c1049d642fd13cf9e25da393d1ca1fd200)) }]"},"target":"monad_peer_discovery::discovery"}

Attempted method:

fn persist_peers(&self) { // Persist both routing_info and pending_queue to TOML file let mut persisted: Vec<PersistedPeers<ST>> = self .routing_info .iter() .map(|(peer_id, name_record)| PersistedPeers { address: name_record.udp_address().to_string(), record_seq_num: name_record.seq(), secp256k1_pubkey: peer_id.pubkey(), name_record_sig: name_record.signature.clone(), }) .collect(); for (peer_id, conn_info) in self.pending_queue.iter() { persisted.push( PersistedPeers { address: conn_info.name_record.udp_address().to_string(), record_seq_num: conn_info.name_record.seq(), secp256k1_pubkey: peer_id.pubkey(), name_record_sig: conn_info.name_record.signature.clone(), }); } match toml::to_string(&persisted) { Ok(serialized) => { if let Err(error) = std::fs::write(&self.persisted_peers_path, serialized) { warn!(path =? self.persisted_peers_path, ?error, "failed to persist peers"); } else { debug!(path =? self.persisted_peers_path, persisted_len = persisted.len(), "persisted peers to disk"); } } Err(error) => { warn!(path =? self.persisted_peers_path, ?error, "failed to serialize persisted peers"); } }

eerkaijun · 2025-11-20T18:35:55Z

monad-peer-discovery/src/discovery.rs

+                                continue;
+                            }
+
+                            match name_record.recover_pubkey() {


if we use NodeBootstrapPeerConfig to store the entries in peers.toml, we do not need to do recover_pubkey here

eerkaijun · 2025-11-20T18:37:21Z

monad-peer-discovery/src/discovery.rs

+        let mut routing_info = self.routing_info.clone();
+        for (peer_id, conn_info) in self.pending_queue.iter() {
+            routing_info.insert(*peer_id, conn_info.name_record.clone());
+        }


we can parse these name records into NodeBootstrapPeerConfig here

eerkaijun · 2025-11-20T18:38:01Z

monad-peer-discovery/src/lib.rs

 }

-#[derive(Debug, Clone, Copy, PartialEq, Eq, RlpEncodable, RlpDecodable)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, RlpEncodable, RlpDecodable, Deserialize, Serialize)]


https://github.com/category-labs/monad-bft/pull/2529/files#r2547199504
we wouldn't need Deserialize and Serialize if we do the above

eerkaijun · 2025-11-20T18:38:15Z

monad-peer-discovery/src/lib.rs

 }

-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]


same as above

eerkaijun · 2025-11-20T18:38:27Z

monad-peer-discovery/src/lib.rs

 }

-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]


same as above

dshulyak · 2025-11-21T09:34:29Z

monad-peer-discovery/src/discovery.rs

+#[serde(deny_unknown_fields)]
+#[serde(bound = "ST: CertificateSignatureRecoverable")]
+pub struct PersistedPeers<ST: CertificateSignatureRecoverable> {
+    pub address: String,


please don't introduce another type that is not future proof.

there is v1 and v2 name record already in the codebase, i think new code should support both of them

dshulyak · 2025-11-21T09:44:23Z

monad-peer-discovery/src/discovery.rs

+                address: name_record.udp_address().to_string(),
+                record_seq_num: name_record.seq(),
+                secp256k1_pubkey: peer_id.pubkey(),
+                name_record_sig: name_record.signature.clone(),


this is not going to work for v2 record, also it is better to introduce From trait for casts

fabiotdf requested a review from eerkaijun November 6, 2025 21:54

fabiotdf force-pushed the fabio/pers_name_recs branch from 668c7e3 to 082d149 Compare November 6, 2025 21:55

eerkaijun reviewed Nov 7, 2025

View reviewed changes

fabiotdf force-pushed the fabio/pers_name_recs branch 2 times, most recently from 8e894ef to 4037ac6 Compare November 9, 2025 23:32

fabiotdf force-pushed the fabio/pers_name_recs branch from 4037ac6 to d186c76 Compare November 20, 2025 17:44

eerkaijun reviewed Nov 20, 2025

View reviewed changes

Persist name records for Peer Discovery

65bde5e

fabiotdf force-pushed the fabio/pers_name_recs branch from d186c76 to 65bde5e Compare November 20, 2025 19:04

Fabio Fernandes and others added 3 commits November 20, 2025 15:52

review feedback

9775493

r2

db1f1ea

test version 1

9c0de8c

dshulyak requested changes Nov 21, 2025

View reviewed changes

dshulyak reviewed Nov 21, 2025

View reviewed changes

Persist name records for Peer Discovery #2529

Are you sure you want to change the base?

Persist name records for Peer Discovery #2529

Conversation

fabiotdf commented Nov 6, 2025

Uh oh!

eerkaijun left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fabiotdf Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

fabiotdf Nov 21, 2025 •

edited

Loading