fix: update 1

storage/Cargo.toml

@@ -11,6 +11,7 @@ log.workspace = true
 serde.workspace = true
 lru.workspace = true
 thiserror.workspace = true
+elliptic-curve.workspace = true
 
 rocksdb.workspace = true
 rs_merkle.workspace = true

storage/src/transaction.rs

@@ -1,7 +1,17 @@
 use serde::{Deserialize, Serialize};
+use sha2::{digest::FixedOutput, Digest};
 
 use crate::merkle_tree_public::TreeHashType;
 
+use elliptic_curve::{
+    consts::{B0, B1},
+    generic_array::GenericArray,
+};
+use sha2::digest::typenum::{UInt, UTerm};
+
+pub type CipherText = Vec<u8>;
+pub type Nonce = GenericArray<u8, UInt<UInt<UInt<UInt<UTerm, B1>, B1>, B0>, B0>>;
+
 #[derive(Debug, Serialize, Deserialize, Clone, Copy)]
 pub enum TxKind {
     Public,
@@ -19,10 +29,58 @@ pub struct Transaction {
     pub execution_input: Vec<u8>,
     ///Tx output data (public_part)
     pub execution_output: Vec<u8>,
+    ///Tx input utxo commitments
+    pub utxo_commitments_spent_hashes: Vec<TreeHashType>,
     ///Tx output utxo commitments
     pub utxo_commitments_created_hashes: Vec<TreeHashType>,
     ///Tx output nullifiers
     pub nullifier_created_hashes: Vec<TreeHashType>,
     ///Execution proof (private part)
     pub execution_proof_private: String,
+    ///Encoded blobs of data
+    pub encoded_data: Vec<(CipherText, Vec<u8>)>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+///General transaction object
+pub struct TransactionPayload {
+    pub tx_kind: TxKind,
+    ///Tx input data (public part)
+    pub execution_input: Vec<u8>,
+    ///Tx output data (public_part)
+    pub execution_output: Vec<u8>,
+    ///Tx input utxo commitments
+    pub utxo_commitments_spent_hashes: Vec<TreeHashType>,
+    ///Tx output utxo commitments
+    pub utxo_commitments_created_hashes: Vec<TreeHashType>,
+    ///Tx output nullifiers
+    pub nullifier_created_hashes: Vec<TreeHashType>,
+    ///Execution proof (private part)
+    pub execution_proof_private: String,
+    ///Encoded blobs of data
+    pub encoded_data: Vec<(CipherText, Vec<u8>)>,
+}
+
+impl From<TransactionPayload> for Transaction {
+    fn from(value: TransactionPayload) -> Self {
+        let raw_data = serde_json::to_vec(&value).unwrap();
+
+        let mut hasher = sha2::Sha256::new();
+
+        hasher.update(&raw_data);
+
+        let hash = <TreeHashType>::from(hasher.finalize_fixed());
+
+        Self {
+            hash,
+            tx_kind: value.tx_kind,
+            execution_input: value.execution_input,
+            execution_output: value.execution_output,
+            utxo_commitments_spent_hashes: value.utxo_commitments_spent_hashes,
+            utxo_commitments_created_hashes: value.utxo_commitments_created_hashes,
+            nullifier_created_hashes: value.nullifier_created_hashes,
+            execution_proof_private: value.execution_proof_private,
+            encoded_data: value.encoded_data,
+        }
+    }
 }