fixing again compilation as library is now publishing. preparing the publication of icrc3 library and icrc3 macros

Gwojda · Gwojda · commit b6d9a62efba9 · 2025-04-15T10:05:01.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,8 +19,9 @@ members = [
     # "src/icrc3_impl/backend/canisters/icrc3_example/impl",
     "src/icrc3_impl/backend/canisters/icrc3_archive/api",
     "src/icrc3_impl/backend/canisters/icrc3_archive/c2c_client",
-    # "src/icrc3_impl/backend/canisters/icrc3_archive/impl",
-    # "src/icrc3_impl/icrc3_library",
+    "src/icrc3_impl/backend/canisters/icrc3_archive/impl",
+    "src/icrc3_impl/icrc3_library",
+    "src/icrc3_impl/icrc3_macros",
     # "src/icrc3_impl/backend/integration_testing",
 ]
 
diff --git a/src/icrc3_impl/backend/canisters/icrc3_archive/impl/Cargo.toml b/src/icrc3_impl/backend/canisters/icrc3_archive/impl/Cargo.toml
@@ -10,21 +10,22 @@ crate-type = ["cdylib"]
 
 [dependencies]
 candid = { workspace = true }
-bity-ic-canister-logger = { workspace = true }
-bity-ic-canister-state-macros ={ workspace = true }
-bity-ic-canister-tracing-macros = { workspace = true }
 ic-cdk = { workspace = true }
 ic-cdk-macros = { workspace = true }
 ic-stable-structures = { workspace = true }
 icrc-ledger-types = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_bytes = { workspace = true}
-bity-ic-serializer ={ workspace = true }
-bity-ic-stable-memory ={ workspace = true }
-bity-ic-types = { workspace = true }
-bity-ic-utils = { workspace = true }
 tracing = { workspace = true }
-icrc3_archive_api = { path = "../api" }
 ciborium = { workspace = true }
 num-traits = { workspace = true }
 ic0 = { workspace = true }
+
+bity-ic-serializer ={ workspace = true }
+bity-ic-stable-memory ={ workspace = true }
+bity-ic-types = { workspace = true }
+bity-ic-utils = { workspace = true }
+bity-ic-icrc3-archive-api = { path = "../api" }
+bity-ic-canister-logger = { workspace = true }
+bity-ic-canister-state-macros ={ workspace = true }
+bity-ic-canister-tracing-macros = { workspace = true }
diff --git a/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/lifecycle/init.rs b/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/lifecycle/init.rs
@@ -8,7 +8,7 @@ use crate::state::{Data, RuntimeState};
 
 use super::init_canister;
 use crate::utils::trace;
-pub use icrc3_archive_api::lifecycle::Args;
+pub use bity_ic_icrc3_archive_api::lifecycle::Args;
 
 #[init]
 fn init(args: Args) {
diff --git a/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/lifecycle/post_upgrade.rs b/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/lifecycle/post_upgrade.rs
@@ -1,9 +1,9 @@
 use crate::{memory::get_upgrades_memory, state::RuntimeState};
 use bity_ic_canister_logger::LogEntry;
 use bity_ic_canister_tracing_macros::trace;
+pub use bity_ic_icrc3_archive_api::lifecycle::Args;
 use bity_ic_stable_memory::get_reader;
 use ic_cdk_macros::post_upgrade;
-pub use icrc3_archive_api::lifecycle::Args;
 use tracing::info;
 
 use super::init_canister;
diff --git a/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/queries/get_version.rs b/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/queries/get_version.rs
@@ -1,6 +1,8 @@
 use crate::state::read_state;
+pub use bity_ic_icrc3_archive_api::get_version::{
+    Args as GetVersionArg, Response as GetVersionResponse,
+};
 use ic_cdk::query;
-pub use icrc3_archive_api::get_version::{Args as GetVersionArg, Response as GetVersionResponse};
 
 #[query]
 async fn get_version(_: GetVersionArg) -> GetVersionResponse {
diff --git a/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/queries/icrc3_get_blocks.rs b/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/queries/icrc3_get_blocks.rs
@@ -2,15 +2,15 @@
 use crate::state::read_state;
 use crate::utils::trace;
 
+pub use bity_ic_icrc3_archive_api::icrc3_get_blocks::{
+    Args as GetBlocksArg, Response as GetBlockseResponse,
+};
+use bity_ic_icrc3_archive_api::{
+    lifecycle::BlockType,
+    types::{block_interface::Block, defaultblock::DefaultBlock, encoded_blocks::EncodedBlock},
+};
 use candid::Nat;
 use ic_cdk::query;
-use icrc3_archive_api::lifecycle::BlockType;
-use icrc3_archive_api::types::block_interface::Block;
-use icrc3_archive_api::types::defaultblock::DefaultBlock;
-pub use icrc3_archive_api::{
-    icrc3_get_blocks::{Args as GetBlocksArg, Response as GetBlockseResponse},
-    types::encoded_blocks::EncodedBlock,
-};
 use icrc_ledger_types::icrc3::blocks::BlockWithId;
 
 // #[query(guard = "caller_is_main_canister")]
@@ -20,7 +20,7 @@ fn icrc3_get_blocks(req: GetBlocksArg) -> GetBlockseResponse {
     let block_type = read_state(|s| s.data.block_type.clone());
     let mut blocks = vec![];
 
-    let mut response = for arg in req {
+    for arg in req {
         let start = arg.start.clone().0.try_into().unwrap();
         let length = arg.length.clone().0.try_into().unwrap();
 
@@ -50,7 +50,7 @@ fn icrc3_get_blocks(req: GetBlocksArg) -> GetBlockseResponse {
                 }
             }
         }
-    };
+    }
 
     GetBlockseResponse {
         log_length: Nat::from(log_length),
diff --git a/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/queries/remaining_capacity.rs b/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/queries/remaining_capacity.rs
@@ -1,8 +1,8 @@
 use crate::state::read_state;
-use ic_cdk::query;
-pub use icrc3_archive_api::queries::remaining_capacity::{
+pub use bity_ic_icrc3_archive_api::queries::remaining_capacity::{
     Args as GetArchiveSizeArg, Response as GetArchiveSizeResponse,
 };
+use ic_cdk::query;
 
 #[query]
 async fn remaining_capacity(_: GetArchiveSizeArg) -> GetArchiveSizeResponse {
diff --git a/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/queries/total_transactions.rs b/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/queries/total_transactions.rs
@@ -1,8 +1,8 @@
 use crate::state::read_state;
-use ic_cdk::query;
-pub use icrc3_archive_api::queries::total_transactions::{
+pub use bity_ic_icrc3_archive_api::queries::total_transactions::{
     Args as GetTotalTransactionsArg, Response as GetTotalTransactionsResponse,
 };
+use ic_cdk::query;
 
 #[query]
 async fn total_transactions(_: GetTotalTransactionsArg) -> GetTotalTransactionsResponse {
diff --git a/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/state.rs b/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/state.rs
@@ -1,12 +1,12 @@
 use crate::types::archive::Archive;
 use bity_ic_canister_state_macros::canister_state;
+use bity_ic_icrc3_archive_api::{archive_config::ArchiveConfig, lifecycle::BlockType};
 use bity_ic_types::{BuildVersion, TimestampMillis};
 use bity_ic_utils::{
     env::{CanisterEnv, Environment},
     memory::MemorySize,
 };
 use candid::{CandidType, Principal};
-use icrc3_archive_api::{archive_config::ArchiveConfig, lifecycle::BlockType};
 use serde::{Deserialize, Serialize};
 
 canister_state!(RuntimeState);
diff --git a/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/types/archive.rs b/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/types/archive.rs
@@ -1,10 +1,11 @@
 use crate::memory::{get_block_log_data_memory, get_block_log_index_memory, VM};
 
+use bity_ic_icrc3_archive_api::{
+    archive_config::ArchiveConfig, types::encoded_blocks::EncodedBlock,
+};
 use candid::Nat;
 use ic_cdk::api::stable::{stable_size, WASM_PAGE_SIZE_IN_BYTES};
 use ic_stable_structures::{StableLog, Storable};
-use icrc3_archive_api::archive_config::ArchiveConfig;
-use icrc3_archive_api::types::encoded_blocks::EncodedBlock;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
diff --git a/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/updates/insert_blocks.rs b/src/icrc3_impl/backend/canisters/icrc3_archive/impl/src/updates/insert_blocks.rs
@@ -1,10 +1,9 @@
 use crate::guards::caller_is_authorized;
 use crate::state::mutate_state;
-use crate::state::read_state;
-use ic_cdk::update;
-pub use icrc3_archive_api::insert_blocks::{
+pub use bity_ic_icrc3_archive_api::insert_blocks::{
     Args as AppendTransactionsArgs, Response as AppendTransactionsResponse,
 };
+use ic_cdk::update;
 
 #[update(guard = "caller_is_authorized")]
 async fn insert_blocks(new_blocks: AppendTransactionsArgs) -> AppendTransactionsResponse {
diff --git a/src/icrc3_impl/icrc3_library/src/blockchain/archive_canister.rs b/src/icrc3_impl/icrc3_library/src/blockchain/archive_canister.rs
@@ -1,8 +1,8 @@
 use crate::utils::trace;
+use bity_ic_icrc3_archive_api::types::encoded_blocks::EncodedBlock;
 use bity_ic_subcanister_manager::Canister;
 use bity_ic_utils::retry_async::retry_async;
 use candid::{CandidType, Principal};
-use icrc3_archive_api::types::encoded_blocks::EncodedBlock;
 use icrc_ledger_types::icrc3::archive::ICRC3ArchiveInfo;
 use serde::{Deserialize, Serialize};
 
@@ -15,7 +15,7 @@ pub struct ArchiveCanister {
     /// The current state of the canister
     pub state: bity_ic_subcanister_manager::CanisterState,
     /// The parameters used to initialize or upgrade the canister
-    pub canister_param: icrc3_archive_api::Args,
+    pub canister_param: bity_ic_icrc3_archive_api::Args,
     /// Information about the blocks stored in this archive
     pub archive_info: ICRC3ArchiveInfo,
 }
@@ -43,14 +43,14 @@ impl ArchiveCanister {
         }
 
         let res = retry_async(
-            || icrc3_archive_c2c_client::insert_blocks(self.canister_id(), &blocks),
+            || bity_ic_icrc3_archive_c2c_client::insert_blocks(self.canister_id(), &blocks),
             3,
         )
         .await;
 
         match res {
             Ok(data_response) => match data_response {
-                icrc3_archive_api::insert_blocks::Response::Success => {
+                bity_ic_icrc3_archive_api::insert_blocks::Response::Success => {
                     // Update the archive info: increment the `end` by the number of blocks inserted
                     let block_count = blocks.len() as u64;
                     self.archive_info.end += block_count;
@@ -64,7 +64,7 @@ impl ArchiveCanister {
 
                     Ok(())
                 }
-                icrc3_archive_api::insert_blocks::Response::Error(_) => {
+                bity_ic_icrc3_archive_api::insert_blocks::Response::Error(_) => {
                     Err("Failed to insert data".to_string())
                 }
             },
@@ -80,7 +80,7 @@ impl ArchiveCanister {
     /// * `Err(String)` if the operation failed
     pub async fn get_available_space(&self) -> Result<u128, String> {
         let res = retry_async(
-            || icrc3_archive_c2c_client::remaining_capacity(self.canister_id(), &()),
+            || bity_ic_icrc3_archive_c2c_client::remaining_capacity(self.canister_id(), &()),
             3, // Retry up to 3 times
         )
         .await;
@@ -105,7 +105,7 @@ impl ArchiveCanister {
 }
 
 impl bity_ic_subcanister_manager::Canister for ArchiveCanister {
-    type ParamType = icrc3_archive_api::Args;
+    type ParamType = bity_ic_icrc3_archive_api::Args;
 
     /// Creates a new archive canister instance.
     ///
@@ -124,7 +124,7 @@ impl bity_ic_subcanister_manager::Canister for ArchiveCanister {
         canister_param: Self::ParamType,
     ) -> Self {
         match &canister_param {
-            icrc3_archive_api::Args::Init(init_args) => Self {
+            bity_ic_icrc3_archive_api::Args::Init(init_args) => Self {
                 state,
                 canister_param: canister_param.clone(),
                 archive_info: ICRC3ArchiveInfo {
@@ -133,7 +133,7 @@ impl bity_ic_subcanister_manager::Canister for ArchiveCanister {
                     end: init_args.archive_config.block_offset.into(),
                 },
             },
-            icrc3_archive_api::Args::Upgrade(_) => {
+            bity_ic_icrc3_archive_api::Args::Upgrade(_) => {
                 panic!(
                     "Cannot initialize the canister with an Upgrade argument. Please provide an Init argument."
                 );
diff --git a/src/icrc3_impl/icrc3_library/src/blockchain/archive_canister_manager.rs b/src/icrc3_impl/icrc3_library/src/blockchain/archive_canister_manager.rs
@@ -1,13 +1,13 @@
-use crate::{blockchain::archive_canister::ArchiveCanister, utils::trace};
+use crate::blockchain::archive_canister::ArchiveCanister;
 
+use bity_ic_icrc3_archive_api::{
+    archive_config::ArchiveConfig, lifecycle::BlockType, types::encoded_blocks::EncodedBlock,
+};
 use bity_ic_subcanister_manager::{Canister, SubCanisterManager};
 use bity_ic_types::BuildVersion;
 use candid::Principal;
 use canfund::manager::options::{CyclesThreshold, FundManagerOptions, FundStrategy};
 use ic_ledger_types::BlockIndex;
-use icrc3_archive_api::archive_config::ArchiveConfig;
-use icrc3_archive_api::lifecycle::BlockType;
-use icrc3_archive_api::types::encoded_blocks::EncodedBlock;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::collections::HashMap;
@@ -29,9 +29,9 @@ pub struct ArchiveCanisterManager {
     /// The sub-canister manager for handling canister lifecycle
     pub sub_canister_manager: SubCanisterManager<ArchiveCanister>,
     /// Arguments used for initializing new canisters
-    pub init_args: icrc3_archive_api::init::InitArgs,
+    pub init_args: bity_ic_icrc3_archive_api::init::InitArgs,
     /// Arguments used for upgrading existing canisters
-    pub upgrade_args: icrc3_archive_api::post_upgrade::UpgradeArgs,
+    pub upgrade_args: bity_ic_icrc3_archive_api::post_upgrade::UpgradeArgs,
     /// Mapping of block IDs to canister IDs
     pub canisters_by_block_id: Vec<(BlockIndex, Principal)>,
 }
@@ -40,7 +40,7 @@ impl Default for ArchiveCanisterManager {
     /// Creates a default ArchiveCanisterManager with default settings.
     fn default() -> Self {
         let this_canister_id = ic_cdk::api::id();
-        let version = icrc3_archive_api::VERSION.to_string();
+        let version = bity_ic_icrc3_archive_api::VERSION.to_string();
         let mut hasher = Sha256::new();
         hasher.update(version.as_bytes());
         let commit_hash = format!("{:x}", hasher.finalize());
@@ -64,17 +64,21 @@ impl Default for ArchiveCanisterManager {
                             .with_fund_cycles(DEFAULT_FUND_CYCLES),
                     )),
             ),
-            init_args: icrc3_archive_api::init::InitArgs {
+            init_args: bity_ic_icrc3_archive_api::init::InitArgs {
                 test_mode: false,
-                version: icrc3_archive_api::VERSION.parse::<BuildVersion>().unwrap(),
+                version: bity_ic_icrc3_archive_api::VERSION
+                    .parse::<BuildVersion>()
+                    .unwrap(),
                 commit_hash: commit_hash.clone(),
                 authorized_principals: vec![this_canister_id],
                 archive_config: ArchiveConfig::default(),
                 master_canister_id: this_canister_id,
                 block_type: BlockType::Default,
             },
-            upgrade_args: icrc3_archive_api::post_upgrade::UpgradeArgs {
-                version: icrc3_archive_api::VERSION.parse::<BuildVersion>().unwrap(),
+            upgrade_args: bity_ic_icrc3_archive_api::post_upgrade::UpgradeArgs {
+                version: bity_ic_icrc3_archive_api::VERSION
+                    .parse::<BuildVersion>()
+                    .unwrap(),
                 commit_hash,
                 block_type: BlockType::Default,
             },
@@ -97,8 +101,8 @@ impl ArchiveCanisterManager {
     /// * `reserved_cycles` - Reserved number of cycles
     /// * `wasm` - The WASM module for the archive canister
     pub fn new(
-        init_args: icrc3_archive_api::init::InitArgs,
-        upgrade_args: icrc3_archive_api::post_upgrade::UpgradeArgs,
+        init_args: bity_ic_icrc3_archive_api::init::InitArgs,
+        upgrade_args: bity_ic_icrc3_archive_api::post_upgrade::UpgradeArgs,
         sub_canisters: HashMap<Principal, Box<ArchiveCanister>>,
         controllers: Vec<Principal>,
         authorized_principal: Vec<Principal>,
@@ -186,7 +190,7 @@ impl ArchiveCanisterManager {
         // If no canister had enough space, create a new canister
         match self
             .sub_canister_manager
-            .create_canister(icrc3_archive_api::Args::Init(init_args))
+            .create_canister(bity_ic_icrc3_archive_api::Args::Init(init_args))
             .await
         {
             Ok(mut new_canister) => {
diff --git a/src/icrc3_impl/icrc3_library/src/blockchain/blockchain.rs b/src/icrc3_impl/icrc3_library/src/blockchain/blockchain.rs
@@ -2,10 +2,12 @@ use crate::blockchain::archive_canister_manager::ArchiveCanisterManager;
 use crate::utils::trace;
 use std::collections::VecDeque;
 
+use bity_ic_icrc3_archive_api::types::{
+    block_interface::{Block, BlockIndex},
+    encoded_blocks::EncodedBlock,
+    hash::HashOf,
+};
 use candid::Principal;
-use icrc3_archive_api::types::block_interface::{Block, BlockIndex};
-use icrc3_archive_api::types::encoded_blocks::EncodedBlock;
-use icrc3_archive_api::types::hash::HashOf;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::sync::{Arc, RwLock};
 
diff --git a/src/icrc3_impl/icrc3_library/src/icrc3.rs b/src/icrc3_impl/icrc3_library/src/icrc3.rs
@@ -1,14 +1,12 @@
 use crate::blockchain::blockchain::Blockchain;
-use crate::config::{ICRC3Config, ICRC3Properties};
+use crate::config::ICRC3Config;
 use crate::utils::{get_timestamp, last_block_hash_tree, trace};
 
+use bity_ic_icrc3_archive_api::types::hash::HashOf;
 use candid::Nat;
 use ic_certification::AsHashTree;
-use icrc3_archive_api::types::hash::HashOf;
 use icrc_ledger_types::icrc::generic_value::ICRC3Value;
-use icrc_ledger_types::icrc3::blocks::{ICRC3DataCertificate, SupportedBlockType};
 use serde::{Deserialize, Serialize};
-use serde_bytes::ByteBuf;
 use std::collections::VecDeque;
 use std::time::Duration;
 
diff --git a/src/icrc3_impl/icrc3_library/src/interface.rs b/src/icrc3_impl/icrc3_library/src/interface.rs
@@ -3,14 +3,15 @@ use crate::transaction::{BasicTransaction, TransactionKind, TransactionType};
 use crate::types::Icrc3Error;
 use crate::utils::trace;
 
+use bity_ic_icrc3_archive_api::types::{block_interface::Block, defaultblock::DefaultBlock};
 use candid::Nat;
-use icrc3_archive_api::types::block_interface::Block;
-use icrc3_archive_api::types::defaultblock::DefaultBlock;
-use icrc_ledger_types::icrc::generic_value::ICRC3Value;
-use icrc_ledger_types::icrc3::archive::ICRC3ArchiveInfo;
-use icrc_ledger_types::icrc3::blocks::{BlockWithId, ICRC3DataCertificate};
-use icrc_ledger_types::icrc3::blocks::{GetBlocksRequest, GetBlocksResult, SupportedBlockType};
-use icrc_ledger_types::icrc3::{archive::QueryArchiveFn, blocks::ArchivedBlocks};
+use icrc_ledger_types::{
+    icrc::generic_value::ICRC3Value,
+    icrc3::archive::ICRC3ArchiveInfo,
+    icrc3::blocks::{BlockWithId, ICRC3DataCertificate},
+    icrc3::blocks::{GetBlocksRequest, GetBlocksResult, SupportedBlockType},
+    icrc3::{archive::QueryArchiveFn, blocks::ArchivedBlocks},
+};
 use serde_bytes::ByteBuf;
 
 /// The main interface for ICRC3 operations.
