publish new package with encoded icrc3 with minicbor

Author: Gwojda

Cargo.lock

@@ -73,7 +73,7 @@ time = { version = "0.3.36", features = [
 async-trait = "0.1.86"
 enum_dispatch = "0.3.13"
 typetag = "0.2.18"
-minicbor = { version = "0.25.1", features = ["alloc", "derive"] }
+minicbor = { version = "1.0.0", features = ["alloc", "derive"] }
 canfund = "0.8.2"
 ic-asset-certification = "3.0.3"
 ic-http-certification = "3.0.3"
@@ -95,6 +95,6 @@ bity-ic-stable-memory = "0.1.0"
 bity-ic-types = "0.1.0"
 bity-ic-utils = "0.1.0"
 bity-ic-subcanister-manager = "0.2.4"
-bity-ic-icrc3-archive-api = "0.1.0"
-bity-ic-icrc3-archive-c2c-client = "0.1.0"
-bity-ic-icrc3 = "0.1.5"
+bity-ic-icrc3-archive-api = "0.2.0"
+bity-ic-icrc3-archive-c2c-client = "0.2.0"
+bity-ic-icrc3 = "0.2.4"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bity-ic-icrc3"
-version = "0.2.3"
+version = "0.2.4"
 edition = "2021"
 license = "MIT"
 description = "bity icrc3 library"
@@ -24,7 +24,6 @@ serde_cbor = { workspace = true }
 canfund = { workspace = true }
 ic-certification = { workspace = true }
 leb128 = { workspace = true }
-minicbor = { workspace = true }
 ic-stable-structures = { workspace = true }
 syn = { workspace = true }
 ic0 = { workspace = true }

src/icrc3/Cargo.toml

@@ -43,7 +43,7 @@ impl ArchiveCanister {
         }
 
         let res = retry_async(
-            || bity_ic_icrc3_archive_c2c_client::insert_blocks(self.canister_id(), &blocks),
+            || bity_ic_icrc3_archive_c2c_client::insert_blocks(self.canister_id(), blocks.clone()),
             3,
         )
         .await;

src/icrc3/src/blockchain/archive_canister.rs

@@ -1,6 +1,6 @@
 [package]
 name = "bity-ic-icrc3-archive-api"
-version = "0.1.0"
+version = "0.2.0"
 description = "bity icrc3 archive api"
 edition = "2021"
 license = "MIT"
@@ -21,4 +21,5 @@ serde_bytes = { workspace = true }
 ic-stable-structures = { workspace = true }
 sha2 = { workspace = true }
 hex = { workspace = true }
-serde_cbor = { workspace = true }
+serde_cbor = { workspace = true }
+minicbor = { workspace = true }

src/icrc3/wasm/icrc3_archive_canister.wasm.gz

@@ -11,6 +11,7 @@ type Args = variant { Upgrade : UpgradeArgs; Init : InitArgs };
 type BlockType = variant { ICRC1; Default };
 type BlockWithId = record { id : nat; block : ICRC3Value };
 type BuildVersion = record { major : nat32; minor : nat32; patch : nat32 };
+type EncodedBlock = record { block : blob };
 type GetBlocksRequest = record { start : nat; length : nat };
 type GetBlocksResult = record {
   log_length : nat;
@@ -43,7 +44,7 @@ type UpgradeArgs = record {
 service : (Args) -> {
   get_version : (null) -> (BuildVersion) query;
   icrc3_get_blocks : (vec GetBlocksRequest) -> (GetBlocksResult) query;
-  insert_blocks : (vec blob) -> (Response);
+  insert_blocks : (vec EncodedBlock) -> (Response);
   remaining_capacity : (null) -> (nat) query;
   total_transactions : (null) -> (nat64) query;
 }

src/icrc3_canisters/canisters/icrc3_archive/api/Cargo.toml

@@ -62,7 +62,9 @@ impl Block for DefaultBlock {
 
     fn block_hash(encoded: &EncodedBlock) -> HashOf<EncodedBlock> {
         let mut state = sha256::Sha256::new();
-        state.write(&serde_cbor::ser::to_vec_packed(encoded).unwrap());
+        let mut buffer = Vec::new();
+        minicbor::encode(encoded, &mut buffer).expect("failed to encode EncodedBlock");
+        state.write(&buffer);
         HashOf::new(state.finish())
     }
 

src/icrc3_canisters/canisters/icrc3_archive/api/can.did

@@ -1,22 +1,37 @@
 use candid::CandidType;
 use ic_stable_structures::{storable::Bound, Storable};
+use minicbor::{Decode, Encode};
 use serde::{Deserialize, Serialize};
-use serde_bytes::ByteBuf;
 use std::borrow::Cow;
 
 #[derive(
-    Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug, CandidType, Deserialize, Serialize,
+    Clone,
+    Eq,
+    PartialEq,
+    Ord,
+    PartialOrd,
+    Hash,
+    Debug,
+    Encode,
+    Decode,
+    CandidType,
+    Serialize,
+    Deserialize,
 )]
-#[serde(transparent)]
-pub struct EncodedBlock(pub ByteBuf);
-
+#[cbor(map)]
+pub struct EncodedBlock {
+    #[n(0)]
+    pub block: Vec<u8>,
+}
 impl Storable for EncodedBlock {
     fn to_bytes(&self) -> Cow<[u8]> {
-        Cow::Borrowed(self.0.as_slice())
+        let mut buffer = Vec::new();
+        minicbor::encode(self, &mut buffer).expect("failed to encode EncodedBlock");
+        Cow::Owned(buffer)
     }
 
     fn from_bytes(bytes: Cow<[u8]>) -> Self {
-        Self(ByteBuf::from(bytes.into_owned()))
+        minicbor::decode(&bytes).expect("failed to decode EncodedBlock")
     }
 
     const BOUND: Bound = Bound::Unbounded;
@@ -30,18 +45,18 @@ impl From<Vec<u8>> for EncodedBlock {
 
 impl EncodedBlock {
     pub fn from_vec(bytes: Vec<u8>) -> Self {
-        Self(ByteBuf::from(bytes))
+        Self { block: bytes }
     }
 
     pub fn into_vec(self) -> Vec<u8> {
-        self.0.to_vec()
+        self.block
     }
 
     pub fn as_slice(&self) -> &[u8] {
-        &self.0
+        &self.block
     }
 
     pub fn size_bytes(&self) -> usize {
-        self.0.len()
+        self.block.len()
     }
 }

src/icrc3_canisters/canisters/icrc3_archive/api/src/types/defaultblock.rs

@@ -16,4 +16,4 @@ bity-ic-canister-client = { workspace = true }
 bity-ic-icrc3-archive-api = { workspace = true }
 ic-cdk = { workspace = true }
 candid = { workspace = true }
-bity-ic-types = { workspace = true }
+bity-ic-types = { workspace = true }