Fixed dependency

crates/cdk-signatory/Cargo.toml

@@ -9,7 +9,7 @@ default = []
 grpc = ["dep:tonic", "tokio/full", "dep:prost", "dep:tonic-build"]
 
 [dependencies]
-async-trait = "0.1.83"
+async-trait.workspace = true
 cashu.workspace = true
 bitcoin.workspace = true
 cdk-common = { workspace = true, default-features=false, features = [

crates/cdk-signatory/src/db_signatory.rs

@@ -3,11 +3,10 @@ use std::sync::Arc;
 
 use bitcoin::bip32::{DerivationPath, Xpriv};
 use bitcoin::secp256k1::{self, Secp256k1};
-use cdk_common::database;
 use cdk_common::dhke::{sign_message, verify_message};
-use cdk_common::error::Error;
 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 crate::common::{create_new_keyset, derivation_path_from_unit, init_keysets};

crates/cdk-signatory/src/service.rs → crates/cdk-signatory/src/embedded.rs

@@ -1,8 +1,10 @@
+//! Run a Signatory in a embedded environment, inside a CDK instance, but this wrapper makes sure to
+//! run the Signatory in another thread, isolated form the main CDK, communicating through messages
 use std::sync::Arc;
 
 use cashu::{BlindSignature, BlindedMessage, Proof};
-use cdk_common::error::Error;
 use cdk_common::mint::MintKeySetInfo;
+use cdk_common::Error;
 use tokio::sync::{mpsc, oneshot};
 use tokio::task::JoinHandle;
 

crates/cdk-signatory/src/lib.rs

@@ -15,5 +15,5 @@ pub use proto::{client::SignatoryRpcClient, server::grpc_server};
 mod common;
 
 pub mod db_signatory;
-pub mod service;
+pub mod embedded;
 pub mod signatory;

crates/cdk/Cargo.toml

@@ -11,19 +11,17 @@ license.workspace = true
 
 
 [features]
-default = ["mint", "wallet", "auth", "grpc"]
+default = ["mint", "wallet", "auth"]
 wallet = ["dep:reqwest", "cdk-common/wallet"]
 mint = ["dep:futures", "dep:reqwest", "cdk-common/mint"]
 auth = ["dep:jsonwebtoken", "cdk-common/auth", "cdk-common/auth"]
 # We do not commit to a MSRV with swagger enabled
 swagger = ["mint", "dep:utoipa", "cdk-common/swagger"]
 bench = []
-grpc = ["cdk-signatory/grpc"]
 http_subscription = []
 
 
 [dependencies]
-cdk-signatory.workspace = true
 cdk-common.workspace = true
 cbor-diag.workspace = true
 async-trait.workspace = true
@@ -56,6 +54,7 @@ tokio = { workspace = true, features = [
     "sync",
 ] }
 getrandom = { version = "0.2" }
+cdk-signatory = { workspace = true, features = ["grpc"] }
 tokio-tungstenite = { workspace = true, features = [
     "rustls",
     "rustls-tls-native-roots",
@@ -64,6 +63,7 @@ tokio-tungstenite = { workspace = true, features = [
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 tokio = { workspace = true, features = ["rt", "macros", "sync", "time"] }
+cdk-signatory = { workspace = true, features = [] }
 getrandom = { version = "0.2", features = ["js"] }
 
 [[example]]

crates/cdk/src/mint/builder.rs

@@ -353,7 +353,7 @@ impl MintBuilder {
             )
             .await?;
 
-            Arc::new(cdk_signatory::service::Service::new(Arc::new(
+            Arc::new(cdk_signatory::embedded::Service::new(Arc::new(
                 in_memory_signatory,
             )))
         };