fix: privacy-preserving test

nssa/core/src/account.rs

@@ -1,11 +1,12 @@
 use crate::{address::Address, program::ProgramId};
+use borsh::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Serialize};
 
 pub type Nonce = u128;
 pub type Data = Vec<u8>;
 
 /// Account to be used both in public and private contexts
-#[derive(Serialize, Deserialize, Clone, Default, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Clone, Default, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 #[cfg_attr(any(feature = "host", test), derive(Debug))]
 pub struct Account {
     pub program_owner: ProgramId,

nssa/core/src/commitment.rs

@@ -1,9 +1,10 @@
+use borsh::{BorshDeserialize, BorshSerialize};
 use risc0_zkvm::sha::{Impl, Sha256};
 use serde::{Deserialize, Serialize};
 
 use crate::{NullifierPublicKey, account::Account};
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, BorshSerialize, BorshDeserialize)]
 #[cfg_attr(any(feature = "host", test), derive(Debug, Clone, PartialEq, Eq, Hash))]
 pub struct Commitment(pub(super) [u8; 32]);
 

nssa/core/src/encryption/mod.rs

@@ -1,3 +1,4 @@
+use borsh::{BorshDeserialize, BorshSerialize};
 use chacha20::{
     ChaCha20,
     cipher::{KeyIvInit, StreamCipher},
@@ -20,7 +21,7 @@ pub struct SharedSecretKey(pub [u8; 32]);
 
 pub struct EncryptionScheme;
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, BorshSerialize, BorshDeserialize)]
 #[cfg_attr(any(feature = "host", test), derive(Debug, Clone, PartialEq, Eq))]
 pub struct Ciphertext(pub(crate) Vec<u8>);
 

nssa/core/src/encryption/shared_key_derivation.rs

@@ -1,3 +1,4 @@
+use borsh::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Serialize};
 
 use k256::{
@@ -10,7 +11,7 @@ use k256::{
 
 use crate::{SharedSecretKey, encryption::Scalar};
 
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 pub struct Secp256k1Point(pub Vec<u8>);
 
 impl Secp256k1Point {

nssa/core/src/nullifier.rs

@@ -1,3 +1,4 @@
+use borsh::{BorshDeserialize, BorshSerialize};
 use risc0_zkvm::sha::{Impl, Sha256};
 use serde::{Deserialize, Serialize};
 
@@ -40,7 +41,7 @@ impl From<&NullifierSecretKey> for NullifierPublicKey {
 
 pub type NullifierSecretKey = [u8; 32];
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, BorshSerialize, BorshDeserialize)]
 #[cfg_attr(any(feature = "host", test), derive(Debug, Clone, PartialEq, Eq, Hash))]
 pub struct Nullifier(pub(super) [u8; 32]);
 

nssa/src/encoding/privacy_preserving_transaction.rs

@@ -209,20 +209,11 @@ impl WitnessSet {
 
 impl PrivacyPreservingTransaction {
     pub fn to_bytes(&self) -> Vec<u8> {
-        let mut bytes = self.message().to_bytes();
-        bytes.extend_from_slice(&self.witness_set().to_bytes());
-        bytes
+        borsh::to_vec(&self).unwrap()
     }
 
     pub fn from_bytes(bytes: &[u8]) -> Result<Self, NssaError> {
-        let mut cursor = Cursor::new(bytes);
-        Self::from_cursor(&mut cursor)
-    }
-
-    pub fn from_cursor(cursor: &mut Cursor<&[u8]>) -> Result<Self, NssaError> {
-        let message = Message::from_cursor(cursor)?;
-        let witness_set = WitnessSet::from_cursor(cursor)?;
-        Ok(PrivacyPreservingTransaction::new(message, witness_set))
+        Ok(borsh::from_slice(bytes)?)
     }
 }
 

nssa/src/privacy_preserving_transaction/circuit.rs

@@ -1,3 +1,4 @@
+use borsh::{BorshDeserialize, BorshSerialize};
 use nssa_core::{
     MembershipProof, NullifierPublicKey, NullifierSecretKey, PrivacyPreservingCircuitInput,
     PrivacyPreservingCircuitOutput, SharedSecretKey,
@@ -11,7 +12,7 @@ use crate::{error::NssaError, program::Program};
 use crate::program_methods::{PRIVACY_PRESERVING_CIRCUIT_ELF, PRIVACY_PRESERVING_CIRCUIT_ID};
 
 /// Proof of the privacy preserving execution circuit
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 pub struct Proof(pub(crate) Vec<u8>);
 
 /// Generates a proof of the execution of a NSSA program inside the privacy preserving execution

nssa/src/privacy_preserving_transaction/message.rs

@@ -1,3 +1,4 @@
+use borsh::{BorshDeserialize, BorshSerialize};
 use nssa_core::{
     Commitment, CommitmentSetDigest, Nullifier, NullifierPublicKey, PrivacyPreservingCircuitOutput,
     account::{Account, Nonce},
@@ -9,7 +10,7 @@ use crate::{Address, error::NssaError};
 
 pub type ViewTag = u8;
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 pub struct EncryptedAccountData {
     pub ciphertext: Ciphertext,
     pub epk: EphemeralPublicKey,
@@ -42,7 +43,7 @@ impl EncryptedAccountData {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 pub struct Message {
     pub(crate) public_addresses: Vec<Address>,
     pub(crate) nonces: Vec<Nonce>,

nssa/src/privacy_preserving_transaction/transaction.rs

@@ -1,5 +1,6 @@
 use std::collections::{HashMap, HashSet};
 
+use borsh::{BorshDeserialize, BorshSerialize};
 use nssa_core::{
     Commitment, CommitmentSetDigest, Nullifier, PrivacyPreservingCircuitOutput,
     account::{Account, AccountWithMetadata},
@@ -13,7 +14,7 @@ use crate::{Address, V02State};
 use super::message::Message;
 use super::witness_set::WitnessSet;
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 pub struct PrivacyPreservingTransaction {
     pub message: Message,
     witness_set: WitnessSet,

nssa/src/privacy_preserving_transaction/witness_set.rs

@@ -1,9 +1,11 @@
+use borsh::{BorshDeserialize, BorshSerialize};
+
 use crate::{
     PrivateKey, PublicKey, Signature,
     privacy_preserving_transaction::{circuit::Proof, message::Message},
 };
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 pub struct WitnessSet {
     pub(crate) signatures_and_public_keys: Vec<(Signature, PublicKey)>,
     pub(crate) proof: Proof,