update icrc3

Author: Gwojda

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bity-ic-icrc3"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 license = "MIT"
 description = "bity icrc3 library"

src/icrc3/Cargo.toml

@@ -66,6 +66,28 @@ pub struct ICRC3Properties {
     pub max_transactions_to_purge: u128,
 }
 
+impl ICRC3Properties {
+    pub fn new(
+        tx_window: Duration,
+        max_transactions_in_window: u128,
+        max_memory_size_bytes: u128,
+        max_blocks_per_response: u128,
+        initial_cycles: u128,
+        reserved_cycles: u128,
+        max_transactions_to_purge: u128,
+    ) -> Self {
+        Self {
+            tx_window,
+            max_transactions_in_window,
+            max_memory_size_bytes,
+            max_blocks_per_response,
+            initial_cycles,
+            reserved_cycles,
+            max_transactions_to_purge,
+        }
+    }
+}
+
 impl Default for ICRC3Properties {
     fn default() -> Self {
         ICRC3Properties {

src/icrc3/src/config.rs

@@ -134,6 +134,15 @@ impl<T: TransactionType> ICRC3Interface<T> for ICRC3 {
             }
         };
 
+        if !self
+            .icrc3_config
+            .supported_blocks
+            .iter()
+            .any(|b| b.block_type == transaction.block_type())
+        {
+            return Err(Icrc3Error::Icrc3Error("Unsupported block type".to_string()));
+        }
+
         let transaction_hash = transaction.hash();
 
         checked_transaction = ICRC3Value::Map(match checked_transaction {

src/icrc3/src/interface.rs

@@ -57,6 +57,8 @@ pub trait TransactionType: Sized + Clone + Into<ICRC3Value> {
 
     /// Computes and returns the hash of the transaction.
     fn hash(&self) -> Hash;
+
+    fn block_type(&self) -> String;
 }
 
 /// Enum representing different kinds of transactions supported by the system.

src/icrc3/src/transaction.rs

@@ -110,7 +110,7 @@ impl FakeTransaction {
         let now = ic_cdk::api::time();
         Self {
             phash: format!("phash_{}", now),
-            btype: format!("btype_{}", now),
+            btype: "btype_test".to_string(),
             timestamp: now,
             sender: Principal::anonymous(),
             recipient: Principal::anonymous(),
@@ -136,6 +136,10 @@ impl TransactionType for FakeTransaction {
         hasher.update(self.recipient.as_slice());
         hasher.finalize().into()
     }
+
+    fn block_type(&self) -> String {
+        self.btype.clone()
+    }
 }
 
 impl From<FakeTransaction> for ICRC3Value {

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

@@ -4,6 +4,7 @@ use bity_ic_icrc3::config::{ICRC3Config, ICRC3Properties};
 use bity_ic_types::{BuildVersion, CanisterId};
 use candid::Principal;
 use icrc3_example_api::Args;
+use icrc_ledger_types::icrc3::blocks::SupportedBlockType;
 use pocket_ic::{PocketIc, PocketIcBuilder};
 use std::time::Duration;
 
@@ -61,7 +62,10 @@ impl TestEnvBuilder {
             commit_hash: "".to_string(),
             authorized_principals: vec![self.controller],
             icrc3_config: ICRC3Config {
-                supported_blocks: vec![],
+                supported_blocks: vec![SupportedBlockType {
+                    block_type: "btype_test".to_string(),
+                    url: "https://github.com/dfinity/ICRC/blob/main/ICRCs/ICRC-3/README.md#supported-block-types".to_string(),
+                }],
                 constants,
             },
         });