update icrc3

Author: Gwojda

src/icrc3/src/icrc3.rs

@@ -7,6 +7,7 @@ use candid::Nat;
 use ic_certification::AsHashTree;
 use icrc_ledger_types::icrc::generic_value::ICRC3Value;
 use serde::{Deserialize, Serialize};
+use serde_bytes::ByteBuf;
 use std::collections::VecDeque;
 use std::time::Duration;
 
@@ -29,6 +30,7 @@ pub struct ICRC3 {
     pub blockchain: Blockchain,
     pub ledger: VecDeque<ICRC3Value>,
     pub last_index: u64,
+    pub last_phash: Option<ByteBuf>,
     pub icrc3_config: ICRC3Config,
 }
 
@@ -50,6 +52,7 @@ impl ICRC3 {
             blockchain: Blockchain::default(),
             ledger: VecDeque::new(),
             last_index: 0,
+            last_phash: None,
             icrc3_config,
         }
     }
@@ -177,6 +180,22 @@ impl ICRC3 {
         .root_hash();
         hash_tree_root.to_vec()
     }
+
+    pub fn add_phash(&mut self, icrc3_transaction: &mut ICRC3Value) {
+        if let ICRC3Value::Map(map) = icrc3_transaction {
+            if let Some(last_phash) = self.last_phash.clone() {
+                map.insert(
+                    "phash".to_string(),
+                    ICRC3Value::Blob(ByteBuf::from(last_phash.to_vec())),
+                );
+            } else {
+                map.insert(
+                    "phash".to_string(),
+                    ICRC3Value::Blob(ByteBuf::from(vec![0; 32])),
+                );
+            }
+        }
+    }
 }
 
 use ic_certification::fork;

src/icrc3/src/interface.rs

@@ -1,5 +1,5 @@
 use crate::icrc3::ICRC3;
-use crate::transaction::{BasicTransaction, TransactionKind, TransactionType};
+use crate::transaction::{self, BasicTransaction, TransactionKind, TransactionType};
 use crate::types::Icrc3Error;
 use crate::utils::trace;
 
@@ -115,6 +115,10 @@ impl<T: TransactionType> ICRC3Interface<T> for ICRC3 {
             }
         }
 
+        let mut transaction_as_icrc3: ICRC3Value = transaction.clone().into();
+
+        self.add_phash(&mut transaction_as_icrc3);
+
         let basic_transaction = BasicTransaction::new(transaction.clone().into());
 
         let mut checked_transaction = match basic_transaction.validate_transaction_fields() {
@@ -163,6 +167,7 @@ impl<T: TransactionType> ICRC3Interface<T> for ICRC3 {
 
         self.ledger.push_back(checked_transaction.clone());
         self.last_index += 1;
+        self.last_phash = Some(ByteBuf::from(checked_transaction.clone().hash().to_vec()));
 
         let block =
             DefaultBlock::from_transaction(self.blockchain.last_hash, checked_transaction, now);

src/icrc3/src/transaction.rs

@@ -104,7 +104,7 @@ impl BasicTransaction {
             ICRC3Value::Map(map) => {
                 trace(&format!("validate_transaction_fields {:?}", map));
 
-                let phash = match map.get("phash") {
+                match map.get("phash") {
                     Some(phash) => match phash {
                         ICRC3Value::Blob(_) => {
                             trace(&format!("phash is a blob"));