Update proto buf to use the newest format

Author: crodas

crates/cdk-mintd/src/config.rs

@@ -30,8 +30,12 @@ impl std::fmt::Debug for Info {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         // Use a fallback approach that won't panic
         let mnemonic_display = {
-            let hash = sha256::Hash::hash(self.mnemonic.clone().into_bytes().as_ref());
-            format!("<hashed: {hash}>")
+            if let Some(mnemonic) = self.mnemonic.as_ref() {
+                let hash = sha256::Hash::hash(mnemonic.as_bytes());
+                format!("<hashed: {hash}>")
+            } else {
+                format!("<url: {}>", self.signatory_url.clone().unwrap_or_default())
+            }
         };
 
         f.debug_struct("Info")

crates/cdk-signatory/proto/signatory.proto

@@ -2,167 +2,155 @@ syntax = "proto3";
 
 package signatory;
 
-/// TODO: research about the stream, to notify when RotateKeyset is triggered.
 service Signatory {
-  rpc BlindSign (BlindedMessages) returns (BlindSignResponse);
-
-  rpc VerifyProofs (Proofs) returns (BooleanResponse);
-
-  rpc Keysets (EmptyRequest) returns (KeysResponse);
-
-  rpc RotateKeyset (RotationRequest) returns (KeyRotationResponse);
+  rpc BlindSign(BlindedMessages) returns (BlindSignResponse);
+  rpc VerifyProofs(Proofs) returns (BooleanResponse);
+  // returns all the keysets for the mint
+  rpc Keysets(EmptyRequest) returns (KeysResponse);
+  // rotates the keysets
+  rpc RotateKeyset(RotationRequest) returns (KeyRotationResponse);
 }
 
 message BlindSignResponse {
-    oneof result {
-        BlindSignatures sigs  = 1;
-        Error error = 2;
-    }
+  Error error = 1;
+  BlindSignatures sigs = 2;
 }
 
 message BlindedMessages {
-    repeated BlindedMessage blinded_messages = 1;
+  repeated BlindedMessage blinded_messages = 1;
 }
 
 // Represents a blinded message
 message BlindedMessage {
-    uint64 amount = 1;
-    string keyset_id = 2;
-    bytes blinded_secret = 3;
+  uint64 amount = 1;
+  string keyset_id = 2;
+  bytes blinded_secret = 3;
 }
 
 message BooleanResponse {
-    oneof result {
-        bool success  = 1;
-        Error error = 2;
-    }
+  Error error = 1;
+  bool success = 2;
 }
 
 message KeyRotationResponse {
-    oneof result {
-        KeySet keyset  = 1;
-        Error error = 2;
-    }
+  Error error = 1;
+  KeySet keyset = 2;
 }
 
 message KeysResponse {
-    oneof result {
-        SignatoryKeysets keysets = 1;
-        Error error = 2;
-    }
+  Error error = 1;
+  SignatoryKeysets keysets = 2;
 }
 
 message SignatoryKeysets {
-    bytes pubkey = 1;
-    repeated KeySet keysets = 2;
+  bytes pubkey = 1;
+  repeated KeySet keysets = 2;
 }
 
 message KeySet {
-    string id = 1;
-    CurrencyUnit unit = 2;
-    bool active = 3;
-    uint64 input_fee_ppk = 4;
-    Keys keys = 5;
+  string id = 1;
+  CurrencyUnit unit = 2;
+  bool active = 3;
+  uint64 input_fee_ppk = 4;
+  Keys keys = 5;
 }
 
 message Keys {
-    map<uint64, bytes> keys = 1;
+  map<uint64, bytes> keys = 1;
 }
 
 message RotationRequest {
-    CurrencyUnit unit  = 1;
-    uint64 input_fee_ppk  = 2;
-    uint64 max_order = 3;
+  CurrencyUnit unit = 1;
+  uint64 input_fee_ppk = 2;
+  uint64 max_order = 3;
 }
 
 enum CurrencyUnitType {
-    SAT = 0;
-    MSAT = 1;
-    USD = 2;
-    EUR = 3;
-    AUTH = 4;
+  SAT = 0;
+  MSAT = 1;
+  USD = 2;
+  EUR = 3;
+  AUTH = 4;
 }
 
 message CurrencyUnit {
-    oneof currency_unit {
-        CurrencyUnitType unit = 1;
-        string custom_unit = 2;
-    }
+  oneof currency_unit {
+    CurrencyUnitType unit = 1;
+    string custom_unit = 2;
+  }
 }
 
 message Proofs {
-    repeated Proof proof = 1;
+  repeated Proof proof = 1;
 }
 
 message Proof {
-    uint64 amount = 1;
-    string keyset_id = 2;
-    bytes secret = 3;
-    bytes C = 4;
+  uint64 amount = 1;
+  string keyset_id = 2;
+  bytes secret = 3;
+  bytes C = 4;
 }
 
 message ProofDLEQ {
-    bytes e = 1;
-    bytes s = 2;
-    bytes r = 3;
+  bytes e = 1;
+  bytes s = 2;
+  bytes r = 3;
 }
 
 message SigningResponse {
-    oneof result {
-        BlindSignatures blind_signatures = 1;
-        Error error = 2;
-    }
+  Error error = 1;
+  BlindSignatures blind_signatures = 2;
 }
 message BlindSignatures {
-    repeated BlindSignature blind_signatures = 1;
+  repeated BlindSignature blind_signatures = 1;
 }
 
 message BlindSignature {
-    uint64 amount = 1;
-    string keyset_id = 2;
-    bytes blinded_secret = 3;
-    optional BlindSignatureDLEQ dleq = 4;
+  uint64 amount = 1;
+  string keyset_id = 2;
+  bytes blinded_secret = 3;
+  optional BlindSignatureDLEQ dleq = 4;
 }
 
 message BlindSignatureDLEQ {
-    bytes e = 1;
-    bytes s = 2;
+  bytes e = 1;
+  bytes s = 2;
 }
 
 // Witness type
 message Witness {
-    oneof witness_type {
-        P2PKWitness p2pk_witness = 1;
-        HTLCWitness htlc_witness = 2;
-    }
+  oneof witness_type {
+    P2PKWitness p2pk_witness = 1;
+    HTLCWitness htlc_witness = 2;
+  }
 }
 
 // P2PKWitness type
 message P2PKWitness {
-    // List of signatures
-    repeated string signatures = 1;
+  // List of signatures
+  repeated string signatures = 1;
 }
 
 // HTLCWitness type
 message HTLCWitness {
-    // Preimage
-    string preimage = 1;
-    // List of signatures
-    repeated string signatures = 2;
+  // Preimage
+  string preimage = 1;
+  // List of signatures
+  repeated string signatures = 2;
 }
 
 enum ErrorCode {
-    UNKNOWN = 0;
-    AMOUNT_OUTSIDE_LIMIT = 1;
-    DUPLICATE_INPUTS_PROVIDED = 2;
-    DUPLICATE_OUTPUTS_PROVIDED = 3;
-    KEYSET_NOT_KNOWN = 4;
-    KEYSET_INACTIVE = 5;
-    MINTING_DISABLED = 6;
-    COULD_NOT_ROTATE_KEYSET = 7;
-    INVALID_PROOF = 8;
-    INVALID_BLIND_MESSAGE = 9;
-    UNIT_NOT_SUPPORTED = 10;
+  UNKNOWN = 0;
+  AMOUNT_OUTSIDE_LIMIT = 1;
+  DUPLICATE_INPUTS_PROVIDED = 2;
+  DUPLICATE_OUTPUTS_PROVIDED = 3;
+  KEYSET_NOT_KNOWN = 4;
+  KEYSET_INACTIVE = 5;
+  MINTING_DISABLED = 6;
+  COULD_NOT_ROTATE_KEYSET = 7;
+  INVALID_PROOF = 8;
+  INVALID_BLIND_MESSAGE = 9;
+  UNIT_NOT_SUPPORTED = 10;
 }
 
 message Error {

crates/cdk-signatory/src/db_signatory.rs

@@ -22,6 +22,7 @@ use crate::signatory::{RotateKeyArguments, Signatory, SignatoryKeySet, Signatory
 pub struct DbSignatory {
     keysets: RwLock<HashMap<Id, (MintKeySetInfo, MintKeySet)>>,
     active_keysets: RwLock<HashMap<CurrencyUnit, Id>>,
+    /// TODO: Merge localstore with auth_localstore (use the same db). It makes sense in CDK but not here.
     localstore: Arc<dyn database::MintKeysDatabase<Err = database::Error> + Send + Sync>,
     auth_localstore:
         Option<Arc<dyn database::MintAuthDatabase<Err = database::Error> + Send + Sync>>,

crates/cdk-signatory/src/main.rs

@@ -1,11 +1,11 @@
 #[cfg(not(target_arch = "wasm32"))]
 mod cli {
     use std::collections::HashMap;
-    use std::fs;
     use std::net::SocketAddr;
     use std::path::PathBuf;
     use std::str::FromStr;
     use std::sync::Arc;
+    use std::{env, fs};
 
     use anyhow::{bail, Result};
     use bip39::rand::{thread_rng, Rng};
@@ -22,6 +22,7 @@ mod cli {
     use tracing_subscriber::EnvFilter;
 
     const DEFAULT_WORK_DIR: &str = ".cdk-signatory";
+    const ENV_MNEMONIC: &str = "CDK_MINTD_MNEMONIC";
 
     /// Simple CLI application to interact with cashu
     #[derive(Parser)]
@@ -48,6 +49,7 @@ mod cli {
         listen_port: u32,
         #[arg(long, short)]
         certs: Option<String>,
+        /// Supported units with the format of name,fee and max_order
         #[arg(long, short, default_value = "sat,0,32")]
         units: Vec<String>,
     }
@@ -74,7 +76,7 @@ mod cli {
 
         let sqlx_filter = "sqlx=warn,hyper_util=warn,reqwest=warn";
 
-        let env_filter = EnvFilter::new(format!("{},{}", default_filter, sqlx_filter));
+        let env_filter = EnvFilter::new(format!("{default_filter},{sqlx_filter}"));
 
         // Parse input
         tracing_subscriber::fmt().with_env_filter(env_filter).init();
@@ -136,21 +138,25 @@ mod cli {
 
         let seed_path = work_dir.join("seed");
 
-        let mnemonic = match fs::metadata(seed_path.clone()) {
-            Ok(_) => {
-                let contents = fs::read_to_string(seed_path.clone())?;
-                Mnemonic::from_str(&contents)?
-            }
-            Err(_e) => {
-                let mut rng = thread_rng();
-                let random_bytes: [u8; 32] = rng.gen();
+        let mnemonic = if let Ok(mnemonic) = env::var(ENV_MNEMONIC) {
+            Mnemonic::from_str(&mnemonic)?
+        } else {
+            match fs::metadata(seed_path.clone()) {
+                Ok(_) => {
+                    let contents = fs::read_to_string(seed_path.clone())?;
+                    Mnemonic::from_str(&contents)?
+                }
+                Err(_e) => {
+                    let mut rng = thread_rng();
+                    let random_bytes: [u8; 32] = rng.gen();
 
-                let mnemonic = Mnemonic::from_entropy(&random_bytes)?;
-                tracing::info!("Creating new seed");
+                    let mnemonic = Mnemonic::from_entropy(&random_bytes)?;
+                    tracing::info!("Creating new seed");
 
-                fs::write(seed_path, mnemonic.to_string())?;
+                    fs::write(seed_path, mnemonic.to_string())?;
 
-                mnemonic
+                    mnemonic
+                }
             }
         };
         let seed = mnemonic.to_seed_normalized("");