From 8a682b0a7cae6df811b1969378c2ab62bf736707 Mon Sep 17 00:00:00 2001 From: Sosthene Date: Tue, 17 Dec 2024 22:34:00 +0100 Subject: [PATCH] Modify prd update to take the roles map as payload --- src/prd.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/prd.rs b/src/prd.rs index f83e8e0..52e80d8 100644 --- a/src/prd.rs +++ b/src/prd.rs @@ -1,19 +1,17 @@ -use std::collections::HashSet; -use std::str::FromStr; +use std::collections::{HashMap, HashSet}; -use anyhow::{Error, Result}; +use anyhow::Result; use serde::{Deserialize, Serialize}; use serde_json::{Map, Value}; use sp_client::bitcoin::hashes::{sha256t_hash_newtype, Hash, HashEngine}; -use sp_client::bitcoin::hex::FromHex; use sp_client::bitcoin::secp256k1::{PublicKey, SecretKey}; -use sp_client::bitcoin::{OutPoint, Psbt}; +use sp_client::bitcoin::OutPoint; use sp_client::silentpayments::utils::SilentPaymentAddress; use sp_client::spclient::SpWallet; use tsify::Tsify; -use crate::pcd::{AnkPcdHash, Member, Pcd}; +use crate::pcd::{Member, RoleDefinition}; use crate::signature::{AnkHash, AnkMessageHash, Proof}; #[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize, Tsify)] @@ -89,7 +87,7 @@ impl Prd { pub fn new_update( root_commitment: OutPoint, sender: String, // Should take Member as argument - encrypted_values_merkle_root: String, + roles: HashMap, keys: Map, pcd_commitments: Value, ) -> Self { @@ -100,7 +98,7 @@ impl Prd { validation_tokens: vec![], keys, pcd_commitments, - payload: encrypted_values_merkle_root, + payload: serde_json::to_string(&roles).expect("We're confident it's serializable"), proof: None, } }