Skip to content

Commit

Permalink
Merge branch 'main' into feat/doc-signing-logic
Browse files Browse the repository at this point in the history
  • Loading branch information
saibatizoku authored Jan 29, 2025
2 parents 262b1ad + dfa5e3e commit a1c11ea
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rust/cardano-blockchain-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "r20250127-00" }
catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250127-00" }
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" }

ouroboros = "0.18.4"
tracing = "0.1.41"
Expand Down
13 changes: 13 additions & 0 deletions rust/cardano-blockchain-types/src/hashes.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//! Cardano blockchain specific hash types.
use catalyst_types::{
define_hashes,
hashes::{Blake2b224Hash, Blake2b256Hash},
};

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)
);
2 changes: 2 additions & 0 deletions rust/cardano-blockchain-types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
mod auxdata;
mod cip134_uri;
mod fork;
mod hashes;
mod metadata;
mod multi_era_block_data;
mod network;
Expand All @@ -21,6 +22,7 @@ pub use auxdata::{
};
pub use cip134_uri::Cip0134Uri;
pub use fork::Fork;
pub use hashes::{PubKeyHash, TransactionHash};
pub use metadata::cip36::{voting_pk::VotingPubKey, Cip36};
pub use multi_era_block_data::MultiEraBlock;
pub use network::Network;
Expand Down

0 comments on commit a1c11ea

Please sign in to comment.