fix(rust/signed-doc): Minor fixes for catalyst-singed-doc crate (#220)

* fix

* wip

* try

* try

* fix

* try

* wip

* fix readme

* wip

* wip

* try new rust cat-ci 1.85 compiler version

* wip

* fix deny.toml

* bump fmmap version

* wip

* fix

* fix

* revert using 1.85

* wip

* wip

* fix

Author: Mr-Leshiy

rust/Earthfile

@@ -68,7 +68,7 @@ build:
     SAVE ARTIFACT target/doc doc
     SAVE ARTIFACT target/release/cbork cbork
     # Catalyst Signed Documents cli tool
-    SAVE ARTIFACT target/release/examples/mk_signed_doc mk_signed_doc
+    SAVE ARTIFACT target/release/mk_signed_doc mk_signed_doc
 
 # build-src-check: Check for any caching issues with the source we are building against.
 check-builder-src-cache:

rust/cardano-blockchain-types/src/txn_witness.rs

@@ -81,7 +81,7 @@ impl TxnWitness {
     pub fn check_witness_in_tx(&self, vkey_hash: &VKeyHash, tx_num: TxnIndex) -> bool {
         self.0
             .get(vkey_hash)
-            .map_or(false, |entry| entry.1.contains(&tx_num))
+            .is_some_and(|entry| entry.1.contains(&tx_num))
     }
 
     /// Get the actual verifying key from the given public key hash.

rust/cardano-chain-follower/src/chain_sync_live_chains.rs

@@ -394,10 +394,7 @@ impl ProtectedLiveChainBlockList {
         // Search backwards for a fork smaller than or equal to the one we know.
         while this_block.fork() > fork {
             rollback_depth = rollback_depth.saturating_add(1);
-            entry = match entry.prev() {
-                Some(entry) => entry,
-                None => return None,
-            };
+            entry = entry.prev()?;
 
             this_block = entry.value().clone();
         }

rust/catalyst-types/Cargo.toml

@@ -30,7 +30,7 @@ thiserror = "2.0.11"
 base64-url = "3.0.0"
 uuid = { version = "1.12.0", features = ["v4", "v7", "serde"] }
 chrono = "0.4.39"
-fmmap = { version = "0.3.3", features = ["sync", "tokio-async"] }
+fmmap = { version = "0.4.0", features = ["sync", "tokio"] }
 once_cell = "1.20.2"
 tracing = "0.1.41"
 

rust/catalyst-voting/Cargo.toml

@@ -22,6 +22,8 @@ rand_core = { version = "0.6.4", features = ["getrandom"] }
 rand_chacha = "0.3.1"
 curve25519-dalek = { version = "4.1.3", features = ["digest", "rand_core"] }
 ed25519-dalek = { version = "2.1.1", features = ["rand_core"] }
+# Its a transitive dependency which fails to build on higher version with our current compiler 1.83
+base64ct = { version = "=1.6.0" }
 blake2b_simd = "1.0.2"
 rayon = "1.10.0"
 
@@ -31,3 +33,7 @@ proptest = { version = "1.5.0" }
 # Potentially it could be replaced with using `proptest::property_test` attribute macro,
 # after this PR will be merged https://github.com/proptest-rs/proptest/pull/523
 test-strategy = "0.4.0"
+
+[package.metadata.cargo-machete]
+# remove that after fixing issues with latest crates
+ignored = ["base64ct"]

rust/signed_doc/Cargo.toml

@@ -18,7 +18,7 @@ serde_json = "1.0.134"
 coset = "0.3.8"
 minicbor = { version = "0.25.1", features = ["half"] }
 brotli = "7.0.0"
-ed25519-dalek = { version = "2.1.1" }
+ed25519-dalek = { version = "2.1.1", features = ["rand_core", "pem"] }
 hex = "0.4.3"
 strum = { version = "0.26.3", features = ["derive"] }
 clap = { version = "4.5.23",  features = ["derive", "env"] }
@@ -30,4 +30,7 @@ futures = "0.3.31"
 base64-url = "3.0.0"
 rand = "0.8.5"
 tokio = { version = "1.42.0", features = [ "macros" ] }
-ed25519-dalek = { version = "2.1.1", features = ["rand_core", "pem"] }
+
+[[bin]]
+name = "mk_signed_doc"
+path = "bins/mk_signed_doc.rs"

rust/signed_doc/README.md

@@ -18,19 +18,19 @@ openssl genpkey -algorithm=ED25519 -out=private.pem -outpubkey=public.pem
 `meta.json` file should follow the [`meta.schema.json`](./meta.schema.json).
 
 ```shell
-cargo run -p catalyst-signed-doc --example mk_signed_doc build signed_doc/doc.json signed_doc/doc.cose signed_doc/meta.json
+cargo run -p catalyst-signed-doc build signed_doc/doc.json signed_doc/doc.cose signed_doc/meta.json
 ```
 
 ### Sign document
 
 `KID` is a valid Catalyst ID URI.
 
 ```shell
-cargo run -p catalyst-signed-doc --example mk_signed_doc sign signed_doc/doc.cose signed_doc/meta.json <KID>
+cargo run -p catalyst-signed-doc sign signed_doc/doc.cose signed_doc/meta.json <KID>
 ```
 
 ### Inspect document
 
 ```shell
-cargo run -p catalyst-signed-doc --example mk_signed_doc inspect signed_doc/doc.cose
+cargo run -p catalyst-signed-doc inspect signed_doc/doc.cose
 ```

rust/signed_doc/examples/mk_signed_doc.rs renamed to rust/signed_doc/bins/mk_signed_doc.rs

@@ -42,7 +42,7 @@ fn document_rules_init() -> HashMap<Uuid, Rules> {
                 .try_into()
                 .expect("Must be a valid UUID V4"),
         },
-        category: CategoryRule::Specified { optional: false },
+        category: CategoryRule::Specified { optional: true },
         doc_ref: RefRule::NotSpecified,
         reply: ReplyRule::NotSpecified,
         section: SectionRule::NotSpecified,

rust/signed_doc/src/validator/mod.rs

@@ -18,7 +18,7 @@ where
     } else {
         report.functional_validation(
             format!("Cannot retrieve a document {doc_ref}").as_str(),
-            "Validation data provider could not return a corresponding {doc_name}.",
+            "Validation data provider could not return a corresponding document.",
         );
         Ok(false)
     }