refactor(signer/client): re-export bls types and rename methods for c…

…onsistency
Commit-Boost · Aug 29, 2024 · f103c8d · f103c8d
1 parent 0bcd2d7
commit f103c8d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/bin/src/lib.rs b/bin/src/lib.rs
@@ -10,7 +10,7 @@ pub mod prelude {
             load_pbs_custom_config, StartCommitModuleConfig,
         },
         pbs::{BuilderEvent, BuilderEventClient, OnBuilderApiEvent},
-        signer::{EcdsaPublicKey, EcdsaSignature},
+        signer::{BlsPublicKey, BlsSignature, EcdsaPublicKey, EcdsaSignature},
         utils::{
             initialize_pbs_tracing_log, initialize_tracing_log, utcnow_ms, utcnow_ns, utcnow_sec,
             utcnow_us,

diff --git a/crates/common/src/commit/client.rs b/crates/common/src/commit/client.rs
@@ -93,14 +93,14 @@ impl SignerClient {
         self.request_signature(&request.into()).await
     }
 
-    pub async fn request_proxy_ecdsa_signature(
+    pub async fn request_proxy_signature_ecdsa(
         &self,
         request: SignProxyRequest<EcdsaPublicKey>,
     ) -> Result<EcdsaSignature, SignerClientError> {
         self.request_signature(&request.into()).await
     }
 
-    pub async fn request_proxy_bls_signature(
+    pub async fn request_proxy_signature_bls(
         &self,
         request: SignProxyRequest<BlsPublicKey>,
     ) -> Result<BlsSignature, SignerClientError> {
@@ -132,7 +132,7 @@ impl SignerClient {
         Ok(signed_proxy_delegation)
     }
 
-    pub async fn generate_bls_proxy_key(
+    pub async fn generate_proxy_key_bls(
         &self,
         consensus_pubkey: BlsPublicKey,
     ) -> Result<SignedProxyDelegation<BlsPublicKey>, SignerClientError> {
@@ -143,7 +143,7 @@ impl SignerClient {
         Ok(bls_signed_proxy_delegation)
     }
 
-    pub async fn generate_ecdsa_proxy_key(
+    pub async fn generate_proxy_key_ecdsa(
         &self,
         consensus_pubkey: BlsPublicKey,
     ) -> Result<SignedProxyDelegation<EcdsaPublicKey>, SignerClientError> {

diff --git a/crates/common/src/signer/mod.rs b/crates/common/src/signer/mod.rs
@@ -1,7 +1,7 @@
 pub mod schemes;
 
 pub use schemes::{
-    bls::{BlsSecretKey, BlsSigner},
+    bls::{BlsPublicKey, BlsSecretKey, BlsSignature, BlsSigner},
     ecdsa::{EcdsaPublicKey, EcdsaSecretKey, EcdsaSignature, EcdsaSigner},
 };
 

diff --git a/crates/common/src/signer/schemes/bls.rs b/crates/common/src/signer/schemes/bls.rs
@@ -1,6 +1,5 @@
-use alloy::rpc::types::beacon::{
-    constants::BLS_DST_SIG, BlsPublicKey as BlsPublicKeyInner, BlsSignature,
-};
+pub use alloy::rpc::types::beacon::BlsSignature;
+use alloy::rpc::types::beacon::{constants::BLS_DST_SIG, BlsPublicKey as BlsPublicKeyInner};
 use blst::BLST_ERROR;
 use derive_more::derive::{Deref, Display, From, Into, LowerHex};
 use serde::{Deserialize, Serialize};

diff --git a/examples/da_commit/src/main.rs b/examples/da_commit/src/main.rs
@@ -1,6 +1,5 @@
 use std::time::Duration;
 
-use alloy::rpc::types::beacon::BlsPublicKey;
 use commit_boost::prelude::*;
 use eyre::{OptionExt, Result};
 use lazy_static::lazy_static;
@@ -51,19 +50,19 @@ impl DaCommitService {
         let pubkey = *pubkeys.consensus.first().ok_or_eyre("no key available")?;
         info!("Registered validator {pubkey}");
 
-        let proxy_delegation_bls = self.config.signer_client.generate_bls_proxy_key(pubkey).await?;
+        let proxy_delegation_bls = self.config.signer_client.generate_proxy_key_bls(pubkey).await?;
         info!("Obtained a BLS proxy delegation:\n{proxy_delegation_bls}");
         let proxy_bls = proxy_delegation_bls.message.proxy;
 
         let proxy_delegation_ecdsa =
-            self.config.signer_client.generate_ecdsa_proxy_key(pubkey).await?;
+            self.config.signer_client.generate_proxy_key_ecdsa(pubkey).await?;
         info!("Obtained an ECDSA proxy delegation:\n{proxy_delegation_ecdsa}");
         let proxy_ecdsa = proxy_delegation_ecdsa.message.proxy;
 
         let mut data = 0;
 
         loop {
-            self.send_request(data, pubkey.into(), proxy_bls.into(), proxy_ecdsa).await?;
+            self.send_request(data, pubkey, proxy_bls, proxy_ecdsa).await?;
             sleep(Duration::from_secs(self.config.extra.sleep_secs)).await;
             data += 1;
         }
@@ -78,16 +77,16 @@ impl DaCommitService {
     ) -> Result<()> {
         let datagram = Datagram { data };
 
-        let request = SignConsensusRequest::builder(pubkey.into()).with_msg(&datagram);
+        let request = SignConsensusRequest::builder(pubkey).with_msg(&datagram);
         let signature = self.config.signer_client.request_consensus_signature(request);
 
-        let proxy_request_bls = SignProxyRequest::builder(proxy_bls.into()).with_msg(&datagram);
+        let proxy_request_bls = SignProxyRequest::builder(proxy_bls).with_msg(&datagram);
         let proxy_signature_bls =
-            self.config.signer_client.request_proxy_bls_signature(proxy_request_bls);
+            self.config.signer_client.request_proxy_signature_bls(proxy_request_bls);
 
         let proxy_request_ecdsa = SignProxyRequest::builder(proxy_ecdsa).with_msg(&datagram);
         let proxy_signature_ecdsa =
-            self.config.signer_client.request_proxy_ecdsa_signature(proxy_request_ecdsa);
+            self.config.signer_client.request_proxy_signature_ecdsa(proxy_request_ecdsa);
 
         let (signature, proxy_signature_bls, proxy_signature_ecdsa) = {
             let res = tokio::join!(signature, proxy_signature_bls, proxy_signature_ecdsa);