From 760c3fc8df4febfcb3454d63d52893f31660af78 Mon Sep 17 00:00:00 2001
From: Conrado Gouvea <conradoplg@gmail.com>
Date: Thu, 20 Jul 2023 19:27:33 -0300
Subject: [PATCH] use serde in trusted-dealer

---
 Cargo.lock                   |  1 +
 trusted-dealer/Cargo.toml    |  2 ++
 trusted-dealer/src/output.rs | 53 +++++-------------------------------
 3 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 48cf303..62268d1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1045,6 +1045,7 @@ dependencies = [
  "hex",
  "itertools 0.11.0",
  "rand",
+ "serde_json",
  "thiserror",
 ]
 
diff --git a/trusted-dealer/Cargo.toml b/trusted-dealer/Cargo.toml
index 60d66c4..658092d 100644
--- a/trusted-dealer/Cargo.toml
+++ b/trusted-dealer/Cargo.toml
@@ -12,3 +12,5 @@ rand = "0.8"
 hex = "0.4"
 itertools = "0.11.0"
 exitcode = "1.1.2"
+serde_json = "1.0"
+
diff --git a/trusted-dealer/src/output.rs b/trusted-dealer/src/output.rs
index 387bdb9..58c72e0 100644
--- a/trusted-dealer/src/output.rs
+++ b/trusted-dealer/src/output.rs
@@ -1,4 +1,4 @@
-use frost::keys::{PublicKeyPackage, SecretShare, VerifiableSecretSharingCommitment};
+use frost::keys::{PublicKeyPackage, SecretShare};
 use frost::Identifier;
 use frost_ed25519 as frost;
 use itertools::Itertools;
@@ -8,17 +8,6 @@ pub trait Logger {
     fn log(&mut self, value: String);
 }
 
-fn encode_commitment(vss_commitment: &VerifiableSecretSharingCommitment) -> String {
-    let serialized = vss_commitment.serialize();
-    let num = serialized.len();
-
-    let mut out = hex::encode([num as u8]);
-    for cc in serialized {
-        out = out + &hex::encode(cc)
-    }
-    out
-}
-
 fn get_identifier_value(i: Identifier) -> String {
     let s = i.serialize();
     let le_bytes: [u8; 2] = [s[0], s[1]];
@@ -31,8 +20,8 @@ pub fn print_values(
     logger: &mut dyn Logger,
 ) {
     logger.log(format!(
-        "Group public key: {}",
-        hex::encode(pubkeys.group_public().serialize())
+        "Public key package:\n{}",
+        serde_json::to_string(pubkeys).unwrap()
     ));
 
     println!("---");
@@ -40,16 +29,8 @@ pub fn print_values(
     for (k, v) in keys.iter().sorted_by_key(|x| x.0) {
         logger.log(format!("Participant: {}", get_identifier_value(*k)));
         logger.log(format!(
-            "Secret share: {}",
-            hex::encode(v.value().serialize())
-        ));
-        logger.log(format!(
-            "Public key: {}",
-            hex::encode(pubkeys.signer_pubkeys()[k].serialize())
-        ));
-        logger.log(format!(
-            "Your verifiable secret sharing commitment: {}",
-            encode_commitment(v.commitment())
+            "Secret share:\n{}",
+            serde_json::to_string(v).unwrap()
         ));
         println!("---")
     }
@@ -57,29 +38,9 @@ pub fn print_values(
 
 #[cfg(test)]
 mod tests {
-    use crate::output::{encode_commitment, get_identifier_value};
-    use frost::{keys::VerifiableSecretSharingCommitment, Identifier};
+    use crate::output::get_identifier_value;
+    use frost::Identifier;
     use frost_ed25519 as frost;
-    use hex::FromHex;
-
-    #[test]
-    fn check_encode_commitment() {
-        let coeff_comm_1 = "538d43e67bc9c22a3befdf24e68f29bfc9bcbd844736e5b82fdab1545bceddcf";
-        let coeff_comm_2 = "6bc2053a2bedc6a071c74495965c960a6d2655720edba2a5aa68b8e160c9f55d";
-        let coeff_comm_3 = "eb73cfae619afa59984754e5f3e93ba2357164ce113b09e542365d8313d6f091";
-
-        let expected = "03".to_string() + coeff_comm_1 + coeff_comm_2 + coeff_comm_3;
-
-        let decoded_1 = <[u8; 32]>::from_hex(coeff_comm_1).unwrap();
-        let decoded_2 = <[u8; 32]>::from_hex(coeff_comm_2).unwrap();
-        let decoded_3 = <[u8; 32]>::from_hex(coeff_comm_3).unwrap();
-
-        let vss_commitment =
-            VerifiableSecretSharingCommitment::deserialize(vec![decoded_1, decoded_2, decoded_3])
-                .unwrap();
-        let commitment = encode_commitment(&vss_commitment);
-        assert!(commitment == expected)
-    }
 
     #[test]
     fn check_get_identifier_value() {