update

Author: Gwojda

Cargo.lock

@@ -18,3 +18,5 @@ tracing = { workspace = true }
 anyhow = { workspace = true }
 
 bity-ic-types = "0.1.2"
+
+# bity-ic-types = { path = "../types" }

src/canister_client/Cargo.toml

@@ -207,6 +207,11 @@ impl ICRC3Interface for ICRC3 {
             }
         };
 
+        trace(format!(
+            "checked_transaction as ICRC3Value: {:?}",
+            transaction.tx()
+        ));
+
         if !self
             .icrc3_config
             .supported_blocks
@@ -220,14 +225,14 @@ impl ICRC3Interface for ICRC3 {
 
         // Check if transaction already exists in ledger
         for (i, existing_tx) in self.ledger.iter().enumerate() {
-            if let ICRC3Value::Map(ref existing_map) = existing_tx {
-                if let Some(tx) = existing_map.get("tx") {
-                    if tx.clone().hash().as_slice() == transaction_hash.as_slice() {
-                        return Err(Icrc3Error::DuplicateTransaction {
-                            duplicate_of: self.next_index - i as u64 - 1,
-                        });
-                    }
-                }
+            let mut existing_tx_clone = existing_tx.clone();
+            if let ICRC3Value::Map(ref mut existing_map) = existing_tx_clone {
+                existing_map.remove("phash");
+            }
+            if existing_tx_clone.clone().hash().as_slice() == transaction_hash.as_slice() {
+                return Err(Icrc3Error::DuplicateTransaction {
+                    duplicate_of: self.next_index - i as u64 - 1,
+                });
             }
         }
         self.ledger.push_back(checked_transaction.clone());
@@ -313,14 +318,14 @@ impl ICRC3Interface for ICRC3 {
 
         // Check if transaction already exists in ledger
         for (i, existing_tx) in self.ledger.iter().enumerate() {
-            if let ICRC3Value::Map(ref existing_map) = existing_tx {
-                if let Some(tx) = existing_map.get("tx") {
-                    if tx.clone().hash().as_slice() == transaction_hash.as_slice() {
-                        return Err(Icrc3Error::DuplicateTransaction {
-                            duplicate_of: self.next_index - i as u64 - 1,
-                        });
-                    }
-                }
+            let mut existing_tx_clone = existing_tx.clone();
+            if let ICRC3Value::Map(ref mut existing_map) = existing_tx_clone {
+                existing_map.remove("phash");
+            }
+            if existing_tx_clone.clone().hash().as_slice() == transaction_hash.as_slice() {
+                return Err(Icrc3Error::DuplicateTransaction {
+                    duplicate_of: self.next_index - i as u64 - 1,
+                });
             }
         }
 
@@ -345,7 +350,7 @@ impl ICRC3Interface for ICRC3 {
 
         let basic_transaction = GlobalTransaction::new(transaction_as_icrc3);
 
-        let mut icrc3_transaction = ICRC3Value::from(basic_transaction);
+        let icrc3_transaction = ICRC3Value::from(basic_transaction);
 
         let transaction_hash = transaction.tx().hash().to_vec();
 
@@ -371,12 +376,13 @@ impl ICRC3Interface for ICRC3 {
             ));
         }
 
-        self.last_phash = Some(ByteBuf::from(icrc3_transaction.clone().hash().to_vec()));
-
         // Add block to blockchain
         let block =
             DefaultBlock::from_transaction(self.blockchain.last_hash, icrc3_transaction, timestamp);
 
+        let block_hash = DefaultBlock::block_hash(&block.clone().encode());
+        self.last_phash = Some(ByteBuf::from(block_hash.into_bytes()));
+
         return match self.blockchain.add_block(block) {
             Ok(index) => {
                 self.next_index = index + 1;

src/icrc3/src/interface.rs

@@ -24,4 +24,5 @@ serde_cbor = { workspace = true }
 minicbor = { workspace = true }
 
 bity-ic-types = "0.1.2"
+
 # bity-ic-types = { path = "../types" }

src/icrc3/wasm/icrc3_archive_canister.wasm.gz

@@ -7,7 +7,7 @@ pub mod prepare_transaction;
 
 pub use add_created_transaction::*;
 pub use add_random_transaction::*;
-pub use add_same_transactions::*;
+// pub use add_same_transactions::*;
 pub use add_transactions_with_async::*;
 pub use commit_prepared_transaction::*;
 pub use prepare_transaction::*;

src/icrc3_archive_api/Cargo.toml

@@ -3,8 +3,6 @@ use std::borrow::Cow;
 pub fn trace<'a>(msg: impl Into<Cow<'a, str>>) {
     let msg: Cow<'a, str> = msg.into();
 
-    unsafe {
-        ic0::debug_print(msg.as_bytes());
-    }
+    ic0::debug_print(msg.as_bytes());
     ic_cdk::println!("{}", msg);
 }

src/icrc3_canisters/canisters/icrc3_example/impl/src/updates/mod.rs

@@ -13,6 +13,7 @@ lazy_static = "1.4.0"
 # icrc3_index_api = { path = "../canisters/icrc3_index/api" }
 serde_bytes = { workspace = true}
 icrc-ledger-types = { workspace = true }
+hex = { workspace = true }
 
 arbitrary = { version = "1.4.1", features = ["derive"] } 
 

src/icrc3_canisters/canisters/icrc3_example/impl/src/utils.rs

@@ -1,3 +1,4 @@
 pub mod test_insert_transaction;
 pub mod test_migration;
 pub mod test_predefined_blocks;
+pub mod test_icrc3_hashing;