Cesar Rodas 5 сар өмнө
parent
commit
35d3980093

+ 4 - 0
crates/cdk-signatory/src/db_signatory.rs

@@ -9,6 +9,7 @@ use cdk_common::mint::MintKeySetInfo;
 use cdk_common::nuts::{BlindSignature, BlindedMessage, CurrencyUnit, Id, MintKeySet, Proof};
 use cdk_common::{database, Error};
 use tokio::sync::RwLock;
+use tracing::instrument;
 
 use crate::common::{create_new_keyset, derivation_path_from_unit, init_keysets};
 use crate::signatory::{RotateKeyArguments, Signatory, SignatoryKeySet, SignatoryKeysets};
@@ -183,6 +184,7 @@ impl Signatory for DbSignatory {
         format!("Signatory {}", env!("CARGO_PKG_VERSION"))
     }
 
+    #[instrument(skip_all)]
     async fn blind_sign(
         &self,
         blinded_messages: Vec<BlindedMessage>,
@@ -220,6 +222,7 @@ impl Signatory for DbSignatory {
             .collect::<Result<Vec<_>, _>>()
     }
 
+    #[tracing::instrument(skip_all)]
     async fn verify_proofs(&self, proofs: Vec<Proof>) -> Result<(), Error> {
         let keysets = self.keysets.read().await;
 
@@ -231,6 +234,7 @@ impl Signatory for DbSignatory {
         })
     }
 
+    #[tracing::instrument(skip_all)]
     async fn keysets(&self) -> Result<SignatoryKeysets, Error> {
         Ok(SignatoryKeysets {
             pubkey: self.xpub,

+ 4 - 0
crates/cdk-signatory/src/embedded.rs

@@ -97,6 +97,7 @@ impl Signatory for Service {
         "Embedded".to_owned()
     }
 
+    #[tracing::instrument(skip_all)]
     async fn blind_sign(
         &self,
         blinded_messages: Vec<BlindedMessage>,
@@ -110,6 +111,7 @@ impl Signatory for Service {
         rx.await.map_err(|e| Error::RecvError(e.to_string()))?
     }
 
+    #[tracing::instrument(skip_all)]
     async fn verify_proofs(&self, proofs: Vec<Proof>) -> Result<(), Error> {
         let (tx, rx) = oneshot::channel();
         self.pipeline
@@ -120,6 +122,7 @@ impl Signatory for Service {
         rx.await.map_err(|e| Error::RecvError(e.to_string()))?
     }
 
+    #[tracing::instrument(skip_all)]
     async fn keysets(&self) -> Result<SignatoryKeysets, Error> {
         let (tx, rx) = oneshot::channel();
         self.pipeline
@@ -130,6 +133,7 @@ impl Signatory for Service {
         rx.await.map_err(|e| Error::RecvError(e.to_string()))?
     }
 
+    #[tracing::instrument(skip(self))]
     async fn rotate_keyset(&self, args: RotateKeyArguments) -> Result<SignatoryKeySet, Error> {
         let (tx, rx) = oneshot::channel();
         self.pipeline

+ 4 - 0
crates/cdk-signatory/src/proto/client.rs

@@ -93,6 +93,7 @@ impl Signatory for SignatoryRpcClient {
         format!("Rpc Signatory {}", self.url)
     }
 
+    #[tracing::instrument(skip_all)]
     async fn blind_sign(&self, request: Vec<BlindedMessage>) -> Result<Vec<BlindSignature>, Error> {
         let req = super::BlindedMessages {
             blinded_messages: request
@@ -117,6 +118,7 @@ impl Signatory for SignatoryRpcClient {
             .map_err(|e| Error::Custom(e.to_string()))?
     }
 
+    #[tracing::instrument(skip_all)]
     async fn verify_proofs(&self, proofs: Vec<Proof>) -> Result<(), Error> {
         let req: super::Proofs = proofs.into();
         self.client
@@ -133,6 +135,7 @@ impl Signatory for SignatoryRpcClient {
             .map_err(|e| Error::Custom(e.to_string()))?
     }
 
+    #[tracing::instrument(skip_all)]
     async fn keysets(&self) -> Result<SignatoryKeysets, Error> {
         self.client
             .clone()
@@ -142,6 +145,7 @@ impl Signatory for SignatoryRpcClient {
             .map_err(|e| Error::Custom(e.to_string()))?
     }
 
+    #[tracing::instrument(skip(self))]
     async fn rotate_keyset(&self, args: RotateKeyArguments) -> Result<SignatoryKeySet, Error> {
         let req: super::RotationRequest = args.into();
         self.client

+ 2 - 0
crates/cdk-signatory/src/proto/server.rs

@@ -19,6 +19,7 @@ impl<T> signatory_server::Signatory for CdkSignatoryServer<T>
 where
     T: Signatory + Send + Sync + 'static,
 {
+    #[tracing::instrument(skip_all)]
     async fn blind_sign(
         &self,
         request: Request<proto::BlindedMessages>,
@@ -53,6 +54,7 @@ where
         Ok(Response::new(result))
     }
 
+    #[tracing::instrument(skip_all)]
     async fn verify_proofs(
         &self,
         request: Request<proto::Proofs>,

+ 2 - 2
crates/cdk/src/mint/mod.rs

@@ -359,7 +359,7 @@ impl Mint {
     }
 
     /// Blind Sign
-    #[instrument(skip_all)]
+    #[tracing::instrument(skip_all)]
     pub async fn blind_sign(
         &self,
         blinded_message: &BlindedMessage,
@@ -372,7 +372,7 @@ impl Mint {
     }
 
     /// Verify [`Proof`] meets conditions and is signed
-    #[instrument(skip_all)]
+    #[tracing::instrument(skip_all)]
     pub async fn verify_proofs(&self, proofs: &Proofs) -> Result<(), Error> {
         proofs
             .iter()