Merge branch 'main' into schouhy/sequencer-retries-pending-blocks

nssa/core/src/account.rs

@@ -68,6 +68,10 @@ impl AccountId {
     pub fn value(&self) -> &[u8; 32] {
         &self.value
     }
+
+    pub fn into_value(self) -> [u8; 32] {
+        self.value
+    }
 }
 
 impl AsRef<[u8]> for AccountId {

nssa/core/src/encoding.rs

@@ -69,6 +69,11 @@ impl Commitment {
         self.0
     }
 
+    #[cfg(feature = "host")]
+    pub fn from_byte_array(bytes: [u8; 32]) -> Self {
+        Self(bytes)
+    }
+
     #[cfg(feature = "host")]
     pub fn from_cursor(cursor: &mut Cursor<&[u8]>) -> Result<Self, NssaCoreError> {
         let mut bytes = [0u8; 32];
@@ -89,6 +94,11 @@ impl Nullifier {
         self.0
     }
 
+    #[cfg(feature = "host")]
+    pub fn from_byte_array(bytes: [u8; 32]) -> Self {
+        Self(bytes)
+    }
+
     pub fn from_cursor(cursor: &mut Cursor<&[u8]>) -> Result<Self, NssaCoreError> {
         let mut bytes = [0u8; 32];
         cursor.read_exact(&mut bytes)?;
@@ -106,6 +116,16 @@ impl Ciphertext {
         bytes
     }
 
+    #[cfg(feature = "host")]
+    pub fn into_inner(self) -> Vec<u8> {
+        self.0
+    }
+
+    #[cfg(feature = "host")]
+    pub fn from_inner(inner: Vec<u8>) -> Self {
+        Self(inner)
+    }
+
     #[cfg(feature = "host")]
     pub fn from_cursor(cursor: &mut Cursor<&[u8]>) -> Result<Self, NssaCoreError> {
         let mut u32_bytes = [0; 4];

nssa/src/privacy_preserving_transaction/circuit.rs

@@ -20,6 +20,16 @@ use crate::{
 #[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 pub struct Proof(pub(crate) Vec<u8>);
 
+impl Proof {
+    pub fn into_inner(self) -> Vec<u8> {
+        self.0
+    }
+
+    pub fn from_inner(inner: Vec<u8>) -> Self {
+        Self(inner)
+    }
+}
+
 #[derive(Clone)]
 pub struct ProgramWithDependencies {
     pub program: Program,

nssa/src/privacy_preserving_transaction/message.rs

@@ -45,12 +45,12 @@ impl EncryptedAccountData {
 
 #[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 pub struct Message {
-    pub(crate) public_account_ids: Vec<AccountId>,
-    pub(crate) nonces: Vec<Nonce>,
-    pub(crate) public_post_states: Vec<Account>,
+    pub public_account_ids: Vec<AccountId>,
+    pub nonces: Vec<Nonce>,
+    pub public_post_states: Vec<Account>,
     pub encrypted_private_post_states: Vec<EncryptedAccountData>,
     pub new_commitments: Vec<Commitment>,
-    pub(crate) new_nullifiers: Vec<(Nullifier, CommitmentSetDigest)>,
+    pub new_nullifiers: Vec<(Nullifier, CommitmentSetDigest)>,
 }
 
 impl Message {

nssa/src/privacy_preserving_transaction/transaction.rs

@@ -16,7 +16,7 @@ use crate::{
 #[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 pub struct PrivacyPreservingTransaction {
     pub message: Message,
-    witness_set: WitnessSet,
+    pub witness_set: WitnessSet,
 }
 
 impl PrivacyPreservingTransaction {

nssa/src/privacy_preserving_transaction/witness_set.rs

@@ -46,4 +46,18 @@ impl WitnessSet {
     pub fn proof(&self) -> &Proof {
         &self.proof
     }
+
+    pub fn into_raw_parts(self) -> (Vec<(Signature, PublicKey)>, Proof) {
+        (self.signatures_and_public_keys, self.proof)
+    }
+
+    pub fn from_raw_parts(
+        signatures_and_public_keys: Vec<(Signature, PublicKey)>,
+        proof: Proof,
+    ) -> Self {
+        Self {
+            signatures_and_public_keys,
+            proof,
+        }
+    }
 }

nssa/src/program_deployment_transaction/message.rs

@@ -9,4 +9,8 @@ impl Message {
     pub fn new(bytecode: Vec<u8>) -> Self {
         Self { bytecode }
     }
+
+    pub fn into_bytecode(self) -> Vec<u8> {
+        self.bytecode
+    }
 }

nssa/src/program_deployment_transaction/transaction.rs

@@ -14,6 +14,10 @@ impl ProgramDeploymentTransaction {
         Self { message }
     }
 
+    pub fn into_message(self) -> Message {
+        self.message
+    }
+
     pub(crate) fn validate_and_produce_public_state_diff(
         &self,
         state: &V02State,

nssa/src/public_transaction/message.rs

@@ -9,10 +9,10 @@ use crate::{AccountId, error::NssaError, program::Program};
 
 #[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 pub struct Message {
-    pub(crate) program_id: ProgramId,
-    pub(crate) account_ids: Vec<AccountId>,
-    pub(crate) nonces: Vec<Nonce>,
-    pub(crate) instruction_data: InstructionData,
+    pub program_id: ProgramId,
+    pub account_ids: Vec<AccountId>,
+    pub nonces: Vec<Nonce>,
+    pub instruction_data: InstructionData,
 }
 
 impl Message {

nssa/src/public_transaction/witness_set.rs

@@ -37,6 +37,16 @@ impl WitnessSet {
     pub fn signatures_and_public_keys(&self) -> &[(Signature, PublicKey)] {
         &self.signatures_and_public_keys
     }
+
+    pub fn into_raw_parts(self) -> Vec<(Signature, PublicKey)> {
+        self.signatures_and_public_keys
+    }
+
+    pub fn from_raw_parts(signatures_and_public_keys: Vec<(Signature, PublicKey)>) -> Self {
+        Self {
+            signatures_and_public_keys,
+        }
+    }
 }
 
 #[cfg(test)]

nssa/src/signature/mod.rs

@@ -8,7 +8,7 @@ use rand::{RngCore, rngs::OsRng};
 
 #[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 pub struct Signature {
-    value: [u8; 64],
+    pub value: [u8; 64],
 }
 
 impl Signature {