Merge branch 'main' into fix/bump-blockchain-types-in-rbac

Author: bkioshn

.github/workflows/ci.yml

@@ -4,6 +4,10 @@ on:
   push:
     branches: [main]
   pull_request:
+    types:
+      - synchronize
+      - ready_for_review
+    
 
 permissions:
   id-token: write

docs/src/architecture/08_concepts/catalyst_docs/comment.md

@@ -106,6 +106,38 @@ A list of used [Catalyst Signed Document protected header fields](./../signed_do
   "content-encoding" => "br"
   ```
 
+* [`category_id`](./../signed_doc/meta.md#category_id) (optional).
+  A reference to the category document,
+  which [`type`](./../signed_doc/spec.md#type) must be equal to
+  `48c20109-362a-4d32-9bba-e0a9cf8b45be` value.
+
+#### Fund 14 defined templates ids
+
+* id: `0194d494-4402-7e0e-b8d6-171f8fea18b0`, ver: `0194d494-4402-7e0e-b8d6-171f8fea18b0`,
+  category: `0194d490-30bf-7473-81c8-a0eaef369619`
+* id: `0194d494-4402-7444-9058-9030815eb029`, ver: `0194d494-4402-7444-9058-9030815eb029`,
+  category: `0194d490-30bf-7043-8c5c-f0e09f8a6d8c`
+* id: `0194d494-4402-7351-b4f7-24938dc2c12e`, ver: `0194d494-4402-7351-b4f7-24938dc2c12e`,
+  category: `0194d490-30bf-7e75-95c1-a6cf0e8086d9`
+* id: `0194d494-4402-79ad-93ba-4d7a0b65d563`, ver: `0194d494-4402-79ad-93ba-4d7a0b65d563`,
+  category: `0194d490-30bf-7703-a1c0-83a916b001e7`
+* id: `0194d494-4402-7cee-a5a6-5739839b3b8a`, ver: `0194d494-4402-7cee-a5a6-5739839b3b8a`,
+  category: `0194d490-30bf-79d1-9a0f-84943123ef38`
+* id: `0194d494-4402-7aee-8b24-b5300c976846`, ver: `0194d494-4402-7aee-8b24-b5300c976846`,
+  category: `0194d490-30bf-706d-91c6-0d4707f74cdf`
+* id: `0194d494-4402-7d75-be7f-1c4f3471a53c`, ver: `0194d494-4402-7d75-be7f-1c4f3471a53c`,
+  category: `0194d490-30bf-759e-b729-304306fbaa5e`
+* id: `0194d494-4402-7a2c-8971-1b4c255c826d`, ver: `0194d494-4402-7a2c-8971-1b4c255c826d`,
+  category: `0194d490-30bf-7e27-b5fd-de3133b54bf6`
+* id: `0194d494-4402-7074-86ac-3efd097ba9b0`, ver: `0194d494-4402-7074-86ac-3efd097ba9b0`,
+  category: `0194d490-30bf-7f9e-8a5d-91fb67c078f2`
+* id: `0194d494-4402-7202-8ebb-8c4c47c286d8`, ver: `0194d494-4402-7202-8ebb-8c4c47c286d8`,
+  category: `0194d490-30bf-7676-9658-36c0b67e656e`
+* id: `0194d494-4402-7fb5-b680-c23fe4beb088`, ver: `0194d494-4402-7fb5-b680-c23fe4beb088`,
+  category: `0194d490-30bf-7978-b031-7aa2ccc5e3fd`
+* id: `0194d494-4402-7aa5-9dbc-5fe886e60ebc`, ver: `0194d494-4402-7aa5-9dbc-5fe886e60ebc`,
+  category: `0194d490-30bf-7d34-bba9-8498094bd627`
+
 #### Content format
 
 TODO

docs/src/architecture/08_concepts/catalyst_docs/proposal.md

@@ -60,6 +60,21 @@ A list of used [Catalyst Signed Document protected header fields](./../signed_do
   which [`type`](./../signed_doc/spec.md#type) must be equal to
   `48c20109-362a-4d32-9bba-e0a9cf8b45be` value.
 
+#### Fund 14 defined category ids
+
+* id: `0194d490-30bf-7473-81c8-a0eaef369619`
+* id: `0194d490-30bf-7043-8c5c-f0e09f8a6d8c`
+* id: `0194d490-30bf-7e75-95c1-a6cf0e8086d9`
+* id: `0194d490-30bf-7703-a1c0-83a916b001e7`
+* id: `0194d490-30bf-79d1-9a0f-84943123ef38`
+* id: `0194d490-30bf-706d-91c6-0d4707f74cdf`
+* id: `0194d490-30bf-759e-b729-304306fbaa5e`
+* id: `0194d490-30bf-7e27-b5fd-de3133b54bf6`
+* id: `0194d490-30bf-7f9e-8a5d-91fb67c078f2`
+* id: `0194d490-30bf-7676-9658-36c0b67e656e`
+* id: `0194d490-30bf-7978-b031-7aa2ccc5e3fd`
+* id: `0194d490-30bf-7d34-bba9-8498094bd627`
+
 #### Content format
 
 TODO
@@ -97,6 +112,38 @@ A list of used [Catalyst Signed Document protected header fields](./../signed_do
   "content-encoding" => "br"
   ```
 
+* [`category_id`](./../signed_doc/meta.md#category_id) (optional).
+  A reference to the category document,
+  which [`type`](./../signed_doc/spec.md#type) must be equal to
+  `48c20109-362a-4d32-9bba-e0a9cf8b45be` value.
+
+#### Fund 14 defined templates ids
+
+* id: `0194d492-1daa-75b5-b4a4-5cf331cd8d1a`, ver: `0194d492-1daa-75b5-b4a4-5cf331cd8d1a`,
+  category: `0194d490-30bf-7473-81c8-a0eaef369619`
+* id: `0194d492-1daa-7371-8bd3-c15811b2b063`, ver: `0194d492-1daa-7371-8bd3-c15811b2b063`,
+  category: `0194d490-30bf-7043-8c5c-f0e09f8a6d8c`
+* id: `0194d492-1daa-79c7-a222-2c3b581443a8`, ver: `0194d492-1daa-79c7-a222-2c3b581443a8`,
+  category: `0194d490-30bf-7e75-95c1-a6cf0e8086d9`
+* id: `0194d492-1daa-716f-a04e-f422f08a99dc`, ver: `0194d492-1daa-716f-a04e-f422f08a99dc`,
+  category: `0194d490-30bf-7703-a1c0-83a916b001e7`
+* id: `0194d492-1daa-78fc-818a-bf20fc3e9b87`, ver: `0194d492-1daa-78fc-818a-bf20fc3e9b87`,
+  category: `0194d490-30bf-79d1-9a0f-84943123ef38`
+* id: `0194d492-1daa-7d98-a3aa-c57d99121f78`, ver: `0194d492-1daa-7d98-a3aa-c57d99121f78`,
+  category: `0194d490-30bf-706d-91c6-0d4707f74cdf`
+* id: `0194d492-1daa-77be-a1a5-c238fe25fe4f`, ver: `0194d492-1daa-77be-a1a5-c238fe25fe4f`,
+  category: `0194d490-30bf-759e-b729-304306fbaa5e`
+* id: `0194d492-1daa-7254-a512-30a4cdecfb90`, ver: `0194d492-1daa-7254-a512-30a4cdecfb90`,
+  category: `0194d490-30bf-7e27-b5fd-de3133b54bf6`
+* id: `0194d492-1daa-7de9-b535-1a0b0474ed4e`, ver: `0194d492-1daa-7de9-b535-1a0b0474ed4e`,
+  category: `0194d490-30bf-7f9e-8a5d-91fb67c078f2`
+* id: `0194d492-1daa-7fce-84ee-b872a4661075`, ver: `0194d492-1daa-7fce-84ee-b872a4661075`,
+  category: `0194d490-30bf-7676-9658-36c0b67e656e`
+* id: `0194d492-1daa-7878-9bcc-2c79fef0fc13`, ver: `0194d492-1daa-7878-9bcc-2c79fef0fc13`,
+  category: `0194d490-30bf-7978-b031-7aa2ccc5e3fd`
+* id: `0194d492-1daa-722f-94f4-687f2c068a5d`, ver: `0194d492-1daa-722f-94f4-687f2c068a5d`,
+  category: `0194d490-30bf-7d34-bba9-8498094bd627`
+
 #### Content format
 
 TODO

rust/cardano-blockchain-types/Cargo.toml

@@ -20,8 +20,8 @@ workspace = true
 [dependencies]
 pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
 # pallas-hardano = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
-cbork-utils = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250128-01" }
-catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250128-01" }
+cbork-utils = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250212-00" }
+catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250212-00" }
 
 ouroboros = "0.18.4"
 tracing = "0.1.41"

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

@@ -9,5 +9,5 @@ define_hashes!(
     /// A transaction hash - Blake2b-256 hash of a transaction.
     (TransactionHash, Blake2b256Hash),
     /// A public key hash - raw Blake2b-224 hash of an Ed25519 public key (has no discriminator, just the hash).
-    (PubKeyHash, Blake2b224Hash)
+    (PubKeyHash, Blake2b224Hash),
 );

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

@@ -10,6 +10,7 @@ mod network;
 mod point;
 mod slot;
 mod txn_index;
+mod txn_output_offset;
 mod txn_witness;
 
 pub use auxdata::{
@@ -29,4 +30,5 @@ pub use network::Network;
 pub use point::Point;
 pub use slot::Slot;
 pub use txn_index::TxnIndex;
+pub use txn_output_offset::TxnOutputOffset;
 pub use txn_witness::{TxnWitness, VKeyHash};

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

@@ -24,6 +24,7 @@ use crate::{
     point::Point,
     txn_index::TxnIndex,
     txn_witness::{TxnWitness, VKeyHash},
+    Slot,
 };
 
 /// Self-referencing CBOR encoded data of a multi-era block.
@@ -278,11 +279,25 @@ impl MultiEraBlock {
         self.decode().txs()
     }
 
+    /// Returns an iterator over `(TxnIndex, MultiEraTx)` pair.
+    pub fn enumerate_txs(&self) -> impl Iterator<Item = (TxnIndex, MultiEraTx)> {
+        self.txs()
+            .into_iter()
+            .enumerate()
+            .map(|(i, t)| (i.into(), t))
+    }
+
     /// Get the auxiliary data of the block.
     #[must_use]
     pub fn aux_data(&self) -> &BlockAuxData {
         &self.inner.aux_data
     }
+
+    /// Returns a slot of the block.
+    #[must_use]
+    pub fn slot(&self) -> Slot {
+        self.decode().slot().into()
+    }
 }
 
 impl Display for MultiEraBlock {

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

@@ -1,18 +1,14 @@
 //! Block Slot
 
-use std::{
-    cmp::Ordering,
-    ops::{MulAssign, Sub},
-};
+use std::ops::{MulAssign, Sub};
 
 use catalyst_types::conversion::from_saturating;
 use num_bigint::{BigInt, Sign};
 use serde::Serialize;
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Default, Serialize)]
-
 /// Slot on the blockchain, typically one slot equals one second. However chain
 /// parameters can alter how long a slot is.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Serialize)]
 pub struct Slot(u64);
 
 impl Slot {
@@ -45,12 +41,6 @@ impl MulAssign<u64> for Slot {
     }
 }
 
-impl PartialOrd for Slot {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.0.partial_cmp(&other.0)
-    }
-}
-
 impl Sub for Slot {
     type Output = Slot;
 

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

@@ -3,7 +3,7 @@ use catalyst_types::conversion::from_saturating;
 
 /// Transaction index within a block
 /// See: <https://github.com/IntersectMBO/cardano-ledger/blob/78b32d585fd4a0340fb2b184959fb0d46f32c8d2/eras/conway/impl/cddl-files/conway.cddl#L20C1-L20C33>
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct TxnIndex(u16);
 
 impl<

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

@@ -0,0 +1,87 @@
+//! A transaction output offset inside the transaction.
+use catalyst_types::conversion::from_saturating;
+
+/// A transaction output offset inside the transaction.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct TxnOutputOffset(u16);
+
+impl<
+        T: Copy
+            + TryInto<u16>
+            + std::ops::Sub<Output = T>
+            + PartialOrd<T>
+            + num_traits::identities::Zero,
+    > From<T> for TxnOutputOffset
+{
+    fn from(value: T) -> Self {
+        Self(from_saturating(value))
+    }
+}
+
+impl From<TxnOutputOffset> for i16 {
+    fn from(val: TxnOutputOffset) -> Self {
+        i16::try_from(val.0).unwrap_or(i16::MAX)
+    }
+}
+
+impl From<TxnOutputOffset> for usize {
+    fn from(value: TxnOutputOffset) -> Self {
+        value.0.into()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_from_u8_to_txn_index() {
+        let txn_index: TxnOutputOffset = 100u8.into(); // u8 is a valid type for conversion
+        assert_eq!(txn_index.0, 100);
+    }
+
+    #[test]
+    fn test_from_u16_to_txn_index() {
+        let txn_index: TxnOutputOffset = 500u16.into(); // u16 is valid and within range for `TxnOutputOffset`
+        assert_eq!(txn_index.0, 500);
+    }
+
+    #[test]
+    fn test_from_i32_to_txn_index() {
+        let txn_index: TxnOutputOffset = 1234i32.into(); // i32 can be converted into `TxnOutputOffset`
+        assert_eq!(txn_index.0, 1234);
+    }
+
+    #[test]
+    fn test_from_u32_to_txn_index() {
+        let txn_index: TxnOutputOffset = 500_000u32.into(); // u32 is larger but should be saturated to `u16::MAX`
+        assert_eq!(txn_index.0, u16::MAX);
+    }
+
+    #[test]
+    fn test_from_large_i32_to_txn_index() {
+        let txn_index: TxnOutputOffset = 70000i32.into(); // i32 too large for u16, should saturate to `u16::MAX`
+        assert_eq!(txn_index.0, u16::MAX);
+    }
+
+    #[test]
+    fn test_txn_index_to_i16_within_range() {
+        let txn_index = TxnOutputOffset(100);
+        let result: i16 = txn_index.into(); // Should successfully convert to i16
+        assert_eq!(result, 100);
+    }
+
+    #[test]
+    fn test_txn_index_to_i16_with_saturation() {
+        let txn_index = TxnOutputOffset(u16::MAX); // u16::MAX = 65535, which is too large for i16
+        let result: i16 = txn_index.into(); // Should saturate to i16::MAX
+        assert_eq!(result, i16::MAX);
+    }
+
+    #[test]
+    fn test_txn_index_to_i16_with_zero() {
+        let txn_index = TxnOutputOffset(0); // Should be able to convert to i16 without issue
+        let result: i16 = txn_index.into();
+        assert_eq!(result, 0);
+    }
+}