fix: bugs after merge

Author: varex83

crates/dkg/examples/sync.rs

@@ -639,10 +639,13 @@ async fn main() -> Result<()> {
                         log_relay_event(relay_event, &cluster_info);
                     }
                     SwarmEvent::Behaviour(PlutoBehaviourEvent::Inner(
+                        ExampleBehaviourEvent::Sync(sync_event),
+                    )) => {
                         log_sync_event(sync_event, &cluster_info);
                     }
                     SwarmEvent::Behaviour(PlutoBehaviourEvent::Ping(ping::Event {
                         peer,
+                        result,
                         ..
                     })) => {
                         log_ping_event(peer, result, &relay_peer_ids, &cluster_info);
@@ -749,7 +752,6 @@ async fn main() -> Result<()> {
             }
         }
     }
-
     cancellation.cancel();
     Ok(())
 }

crates/dkg/src/dkg.rs

@@ -1,6 +1,7 @@
 use std::{path, time::Duration};
 
 use bon::Builder;
+use libp2p::PeerId;
 use pluto_cluster::version::{
     support_node_signatures, support_partial_deposits, support_pregen_registrations,
 };
@@ -10,7 +11,6 @@ use pluto_eth2util::{
 };
 use tokio_util::sync::CancellationToken;
 use tracing::{debug, info, warn};
-use libp2p::PeerId;
 
 pub use crate::{
     aggregate::{AggregateError, agg_deposit_data, agg_lock_hash_sig, agg_validator_registrations},
@@ -26,7 +26,7 @@ const DEFAULT_DATA_DIR: &str = ".charon";
 const DEFAULT_DEFINITION_FILE: &str = ".charon/cluster-definition.json";
 const DEFAULT_PUBLISH_ADDRESS: &str = "https://api.obol.tech/v1";
 const DEFAULT_PUBLISH_TIMEOUT: Duration = Duration::from_secs(30);
-const DEFAULT_SHUTDOWN_DELAY: Duration = Duration::from_secs(1);
+const DEFAULT_SHUTDOWN_DELAY: Duration = Duration::from_secs(10);
 const DEFAULT_TIMEOUT: Duration = Duration::from_secs(60);
 
 /// Entry-point DKG error.

crates/dkg/src/signing.rs

@@ -275,7 +275,12 @@ pub async fn sign_and_agg_validator_registrations(
     )?;
 
     let peer_sigs = exchanger.exchange(SIG_VALIDATOR_REG, set).await?;
-    Ok(agg_validator_registrations(&peer_sigs, shares, &msgs, fork_version)?)
+    Ok(agg_validator_registrations(
+        &peer_sigs,
+        shares,
+        &msgs,
+        fork_version,
+    )?)
 }
 
 /// Signs, exchanges, and aggregates lock-hash partial signatures; builds the
@@ -315,8 +320,7 @@ pub async fn sign_and_aggregate_lock_hash(
         })
         .collect::<Result<_>>()?;
 
-    let (agg_sig, all_pubshares) =
-        agg_lock_hash_sig(&peer_sigs, &shares_map, &lock.lock_hash)?;
+    let (agg_sig, all_pubshares) = agg_lock_hash_sig(&peer_sigs, &shares_map, &lock.lock_hash)?;
 
     BlstImpl.verify_aggregate(&all_pubshares, agg_sig, &lock.lock_hash)?;
     lock.signature_aggregate = agg_sig.to_vec();