Update discv5 and fix failing tests

Cargo.toml

@@ -15,7 +15,7 @@ exclude = [
 ]
 
 [dependencies]
-discv5 = { version = "0.8", features = ["libp2p"] }
+discv5 = { version = "0.10", features = ["libp2p"] }
 sha2 = "0.10"
 libsecp256k1 = "0.7"
 libp2p-identity = { version = "0.2.9", features = ["secp256k1"] }

src/packet/mod.rs

@@ -15,7 +15,7 @@ pub fn decode(decode: &Decode) {
 
     log::info!("Using decoding node id: {}", node_id);
 
-    match discv5::packet::Packet::decode::<discv5::DefaultProtocolId>(&node_id, &packet_bytes) {
+    match discv5::packet::Packet::decode(&node_id, Default::default(), &packet_bytes) {
         Ok(p) => log::info!("Packet decoded: {:?}", p),
         Err(e) => log::error!("Packet failed to be decoded. Error: {:?}", e),
     }

src/server/command.rs

@@ -34,7 +34,7 @@ pub struct Server {
     pub listen_port: u16,
     /// Optionally specify the listening ipv6 port.
     #[clap(
-        short = 'p',
+        short = '6',
         long = "listen-port-v6",
         help = "Specifies the listening UDP port of the server if an ipv6 address is specified as a listening address."
     )]
@@ -55,7 +55,7 @@ pub struct Server {
     pub enr_v4_port: Option<u16>,
     /// The port associated with an ipv6 address.
     #[clap(
-        short = 'u',
+        short = 'U',
         long = "enr-v6-port",
         help = "Specifies the UDP port of the ENR record corresponding to ipv6 address. Not specifying this results in an ENR with no UDP field, unless the -w switch is used."
     )]

tests/bootstrap.rs

@@ -1,4 +1,4 @@
-use discv5::{ConnectionState, Discv5, Discv5ConfigBuilder, ListenConfig};
+use discv5::{ConfigBuilder, ConnectionState, Discv5, ListenConfig};
 use discv5_cli::server::{bootstrap, command, enr_build, keys};
 
 #[tokio::test]
@@ -23,7 +23,7 @@ pub async fn test_bootstrap_file() -> std::result::Result<(), eyre::Report> {
             .expect("Valid IP"),
         server.listen_port,
     );
-    let config = Discv5ConfigBuilder::new(listen_config)
+    let config = ConfigBuilder::new(listen_config)
         .enr_peer_update_min(2usize)
         .build();
     let mut discv5 = Discv5::new(enr, enr_key, config).unwrap();

tests/packet.rs

@@ -11,7 +11,7 @@ pub fn test_packet_decoding() {
     let hex_dest_node_id = hex::encode(dest_node_id.raw());
     println!("Destination node id: {hex_dest_node_id:?}");
 
-    let packet = discv5_packet::Packet::new_random(&source_node_id).unwrap();
-    let encoded = hex::encode(packet.encode::<discv5::DefaultProtocolId>(&dest_node_id));
+    let packet = discv5_packet::Packet::new_random(&source_node_id, Default::default()).unwrap();
+    let encoded = hex::encode(packet.encode(&dest_node_id));
     println!("Packet as hex: 0x{encoded:?}");
 }