Merge branch 'feat/voting-formats' of github.com:input-output-hk/catalyst-libs into feat/voting-formats

Author: stevenj

.config/dictionaries/project.dic

@@ -13,10 +13,12 @@ asyncio
 Attributes
 auditability
 Auliffe
+autonat
 auxdata
 babystep
 backpressure
 bech
+Behaviour
 bimap
 bindgen
 bkioshn
@@ -50,6 +52,7 @@ ciphertexts
 Coap
 codegen
 codepoints
+connexa
 coti
 coverallsapp
 cpus
@@ -64,6 +67,7 @@ Datelike
 DBSTATUS
 dbsync
 dcbor
+dcutr
 decompressor
 delegators
 devnet
@@ -145,6 +149,7 @@ jormungandr
 Jörmungandr
 jsonschema
 Justfile
+keypair
 kiduri
 labelloc
 lcov
@@ -255,6 +260,7 @@ pytype
 qpsg
 qrcode
 quic
+rafal
 rankdir
 rapidoc
 readlinkat

integration_tests/rust/Cargo.toml

@@ -1,9 +1,9 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = ["overhead_benchmark"]
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 
 [workspace.lints.rust]
 warnings = "deny"

rust/Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
     "c509-certificate",
     "cardano-blockchain-types",
@@ -21,7 +21,7 @@ members = [
 ]
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 authors = ["Steven Johnson <[email protected]>"]
 homepage = "https://github.com/input-output-hk/catalyst-libs"
 repository = "https://github.com/input-output-hk/catalyst-libs"

rust/c509-certificate/Cargo.toml

@@ -23,7 +23,7 @@ hex = "0.4.3"
 oid = "0.2.1"
 oid-registry = "0.7.1"
 asn1-rs = "0.6.2"
-anyhow = "1.0.95"
+anyhow = "1.0.99"
 bimap = "0.6.3"
 strum = "0.26.3"
 strum_macros = "0.26.4"
@@ -42,7 +42,7 @@ ignored = ["strum"]
 [dev-dependencies]
 clap = { version = "4.5.23", features = ["derive"] }
 serde_json = "1.0.134"
-rand = "0.8.5"
+rand = "0.9.0"
 chrono = "0.4.39"
 
 [[example]]

rust/c509-certificate/examples/cli/main.rs

@@ -6,7 +6,7 @@ use std::{
     path::PathBuf,
 };
 
-use asn1_rs::{oid, Oid};
+use asn1_rs::{Oid, oid};
 use c509_certificate::{
     attributes::attribute::Attribute,
     big_uint::UnwrappedBigUint,
@@ -131,7 +131,7 @@ struct C509Json {
 }
 
 /// Ed25519 oid and parameter - default algorithm.
-const ED25519: (Oid, Option<String>) = (oid!(1.3.101 .112), None);
+const ED25519: (Oid, Option<String>) = (oid!(1.3.101.112), None);
 
 /// Integer indicate that certificate is self-signed.
 /// 2 for Natively Signed C509 Certificate following X.509 v3
@@ -288,7 +288,7 @@ fn parse_or_default_date(
 
 /// Generate random serial number if not provided
 fn parse_serial_number(serial_number: Option<UnwrappedBigUint>) -> UnwrappedBigUint {
-    let random_number: u64 = rand::thread_rng().gen();
+    let random_number: u64 = rand::rng().random();
     serial_number.unwrap_or(UnwrappedBigUint::new(random_number))
 }
 

rust/c509-certificate/src/algorithm_identifier.rs

@@ -14,7 +14,7 @@
 //! visit [C509 Certificate](https://datatracker.ietf.org/doc/draft-ietf-cose-cbor-encoded-cert/11/)
 
 use asn1_rs::Oid;
-use minicbor::{encode::Write, Decode, Decoder, Encode, Encoder};
+use minicbor::{Decode, Decoder, Encode, Encoder, encode::Write};
 use serde::{Deserialize, Serialize};
 
 use crate::{

rust/c509-certificate/src/attributes/attribute.rs

@@ -18,10 +18,10 @@
 use std::str::FromStr;
 
 use asn1_rs::Oid;
-use minicbor::{encode::Write, Decode, Decoder, Encode, Encoder};
+use minicbor::{Decode, Decoder, Encode, Encoder, encode::Write};
 use serde::{Deserialize, Deserializer, Serialize};
 
-use super::data::{get_oid_from_int, ATTRIBUTES_LOOKUP};
+use super::data::{ATTRIBUTES_LOOKUP, get_oid_from_int};
 use crate::{
     helper::{
         decode::{decode_array_len, decode_datatype, decode_helper},
@@ -259,7 +259,7 @@ mod test_attribute {
     fn encode_decode_attribute_int() {
         let mut buffer = Vec::new();
         let mut encoder = Encoder::new(&mut buffer);
-        let mut attribute = Attribute::new(oid!(1.2.840 .113549 .1 .9 .1));
+        let mut attribute = Attribute::new(oid!(1.2.840.113549.1.9.1));
         attribute.add_value(AttributeValue::Text("[email protected]".to_string()));
         attribute
             .encode(&mut encoder, &mut ())
@@ -281,7 +281,7 @@ mod test_attribute {
     fn empty_attribute_value() {
         let mut buffer = Vec::new();
         let mut encoder = Encoder::new(&mut buffer);
-        let attribute = Attribute::new(oid!(1.2.840 .113549 .1 .9 .1));
+        let attribute = Attribute::new(oid!(1.2.840.113549.1.9.1));
         attribute
             .encode(&mut encoder, &mut ())
             .expect_err("Failed to encode Attribute");

rust/c509-certificate/src/attributes/data.rs

@@ -5,7 +5,7 @@
 use std::sync::LazyLock;
 
 use anyhow::Error;
-use asn1_rs::{oid, Oid};
+use asn1_rs::{Oid, oid};
 
 use crate::tables::IntegerToOidTable;
 

rust/c509-certificate/src/attributes/mod.rs

@@ -14,7 +14,7 @@
 //! visit [C509 Certificate](https://datatracker.ietf.org/doc/draft-ietf-cose-cbor-encoded-cert/11/)
 
 use attribute::Attribute;
-use minicbor::{encode::Write, Decode, Decoder, Encode, Encoder};
+use minicbor::{Decode, Decoder, Encode, Encoder, encode::Write};
 use serde::{Deserialize, Serialize};
 
 use crate::helper::{decode::decode_array_len, encode::encode_array_len};
@@ -113,7 +113,7 @@ mod test_attributes {
     fn encode_decode_attributes_int() {
         let mut buffer = Vec::new();
         let mut encoder = Encoder::new(&mut buffer);
-        let mut attr = Attribute::new(oid!(1.2.840 .113549 .1 .9 .1));
+        let mut attr = Attribute::new(oid!(1.2.840.113549.1.9.1));
         attr.add_value(AttributeValue::Text("[email protected]".to_string()));
         attr.add_value(AttributeValue::Text("[email protected]".to_string()));
         let mut attributes = Attributes::new();

rust/c509-certificate/src/big_uint.rs

@@ -5,7 +5,7 @@
 
 // cspell: words Bignum bignum biguint
 
-use minicbor::{encode::Write, Decode, Decoder, Encode, Encoder};
+use minicbor::{Decode, Decoder, Encode, Encoder, encode::Write};
 use serde::{Deserialize, Serialize};
 
 use crate::helper::{decode::decode_bytes, encode::encode_bytes};