Skip to content

Commit 6a00a8b

Browse files
bkioshnstevenjstanislav-tkach
authored
fix(rust/cardano-blockchain-types): cardano-blockchain-types base change (#123)
* feat(rust): add cardano-blockchain-types crate * fix(rust): Remove unused dependencies * fix(cardano-blockchain-types): time_to_slot calculation Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): remove justfile Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): point new should take type Slot and Blake2bHash Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): Fork type Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): point and fuzzy point test Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): add Fork increment function Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): add comment on tag 259 Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): add Fork decrement function Signed-off-by: bkioshn <[email protected]> * test(rust): try earthly no-cache Signed-off-by: bkioshn <[email protected]> * test(rust): try earthly no-cache and fix doc artifact Signed-off-by: bkioshn <[email protected]> * test(rust): remove no-cache Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): expose Fork and Network Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): add partailOrd to Fork Signed-off-by: bkioshn <[email protected]> * Update rust/cardano-blockchain-types/src/point.rs Co-authored-by: Stanislav Tkach <[email protected]> * fix(cardano-blockchain-types): cleanup Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): testdoc Signed-off-by: bkioshn <[email protected]> * Update rust/cardano-blockchain-types/src/point.rs * fix(cardano-blockchain-types): cleanup Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): format * fix(cardano-blockchain-types): add validate PR title * fix(cardano-blockchain-types): comments * fix(cardano-blockchain-types): fix hash_or_default * fix(cardano-blockchain-types): redundant code * test: no cache * test: revert change * test ci * test ci * test ci * test ci * test ci * test ci * test ci * test ci * test ci * test ci * revert change * test ci * revert change * fix(rust/cardano-blockchain-types): add more functionality to `Slot` (#124) * fix(cardano-blockchain-types): add more trait to slot Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): add serde serialize to slot Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): format Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): use sat_mul for slot Signed-off-by: bkioshn <[email protected]> --------- Signed-off-by: bkioshn <[email protected]> * feat(rust/cardano-blockchain-types): Add CIP36 (#125) * feat(cardano-blockchain-types): add cip36 Signed-off-by: bkioshn <[email protected]> * feat(cardano-blockchain-types): add decode helper utils Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): fix type Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): add clone Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): fix type Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): check dup keys Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): fix linter Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): fix visibility and comment Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): add validation test Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): key registration decoding test Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): move voting pk to its own file Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): derive debug Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): use .context Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): fix getter Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): check required keys Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): network tag of payment addr Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): add constructor Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): linter Signed-off-by: bkioshn <[email protected]> --------- Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): expose from_saturating (#131) Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): slot bigint conversion Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): txn index conversion Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): conversion Signed-off-by: bkioshn <[email protected]> * fix(rust/cardano-blockchain-types): fix CIP36 (#133) * fix(cardano-blockchain-types): key registration Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): registration witness Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): voting pk Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): validation test Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): cip36 constructor Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): format Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): move cip36 to be under metadata Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): use decode_helper from cbork-utils Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): visibility, cip36 constructor Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): cip36 constructor Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): handle unset data Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): cip36 err report Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): update cbor-utils tag Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): cip36 now contain validation Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): cip36 validation implement getter Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): remove validation from cip36 struct Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): improve verifying key error log Signed-off-by: bkioshn <[email protected]> --------- Signed-off-by: bkioshn <[email protected]> * fix(rust/cardano-blockchain-types): implement new error report for CIP36 (#142) * fix(cardano-blockchain-types): key registration Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): registration witness Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): voting pk Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): validation test Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): cip36 constructor Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): format Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): move cip36 to be under metadata Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): use decode_helper from cbork-utils Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): visibility, cip36 constructor Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): cip36 constructor Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): handle unset data Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): cip36 err report Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): update cbor-utils tag Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): cip36 now contain validation Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): cip36 validation implement getter Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): remove validation from cip36 struct Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): improve verifying key error log Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): implement new error report Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): function name Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): print report Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): version for catalyst-types Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): move found key check to its own function Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): pass cip36 ProblemReport as context Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): format Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): key reg redundant code and missing key checking Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): remove cip36validation struct Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): add more fileds, fix return error Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): add cip36_from_block function Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): remove serde_json Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): format Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): impl display for cip36 error Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): cip36 key reg function Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): problem report conversion err Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): impl display for cip36 Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): err report getter Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): update catalyst-types tag Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): return type for cip36 constructor Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): logic Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): format Signed-off-by: bkioshn <[email protected]> * fix(cardano-blockchain-types): rename ctx Signed-off-by: bkioshn <[email protected]> --------- Signed-off-by: bkioshn <[email protected]> --------- Signed-off-by: bkioshn <[email protected]> Co-authored-by: Steven Johnson <[email protected]> Co-authored-by: Steven Johnson <[email protected]> Co-authored-by: Stanislav Tkach <[email protected]>
1 parent 38d0eb7 commit 6a00a8b

File tree

12 files changed

+1306
-16
lines changed

12 files changed

+1306
-16
lines changed

rust/cardano-blockchain-types/Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ workspace = true
2121
pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
2222
pallas-crypto = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
2323
# pallas-hardano = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
24+
cbork-utils = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "v0.0.11" }
25+
catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250108-00" }
2426

2527
ouroboros = "0.18.4"
2628
tracing = "0.1.41"
@@ -33,4 +35,7 @@ dashmap = "6.1.0"
3335
blake2b_simd = "1.0.2"
3436
minicbor = { version = "0.25.1", features = ["alloc"] }
3537
num-traits = "0.2.19"
36-
ed25519-dalek = "2.1.1"
38+
ed25519-dalek = "2.1.1"
39+
serde = "1.0.210"
40+
num-bigint = "0.4.6"
41+
serde_json = "1.0.134"

rust/cardano-blockchain-types/src/auxdata/block.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ impl TryFrom<&MultiEraBlock<'_>> for BlockAuxData {
4444
for (txn_idx, metadata) in alonzo_block.auxiliary_data_set.iter() {
4545
let mut d = minicbor::Decoder::new(metadata.raw_cbor());
4646
let txn_aux_data = d.decode::<TransactionAuxData>()?;
47-
aux_data.insert(TxnIndex::from_saturating(*txn_idx), txn_aux_data);
47+
aux_data.insert((*txn_idx).into(), txn_aux_data);
4848
}
4949
} else if let Some(babbage_block) = block.as_babbage() {
5050
for (txn_idx, metadata) in babbage_block.auxiliary_data_set.iter() {
5151
let mut d = minicbor::Decoder::new(metadata.raw_cbor());
5252
let txn_aux_data = d.decode::<TransactionAuxData>()?;
53-
aux_data.insert(TxnIndex::from_saturating(*txn_idx), txn_aux_data);
53+
aux_data.insert((*txn_idx).into(), txn_aux_data);
5454
}
5555
} else if let Some(conway_block) = block.as_conway() {
5656
for (txn_idx, metadata) in conway_block.auxiliary_data_set.iter() {
5757
let mut d = minicbor::Decoder::new(metadata.raw_cbor());
5858
let txn_aux_data = d.decode::<TransactionAuxData>()?;
59-
aux_data.insert(TxnIndex::from_saturating(*txn_idx), txn_aux_data);
59+
aux_data.insert((*txn_idx).into(), txn_aux_data);
6060
}
6161
} else {
6262
bail!("Undecodable metadata, unknown Era");

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ mod auxdata;
44
pub mod conversion;
55
mod fork;
66
pub mod hashes;
7+
mod metadata;
78
mod multi_era_block_data;
89
mod network;
910
mod point;
@@ -20,6 +21,7 @@ pub use auxdata::{
2021
scripts::{Script, ScriptArray, ScriptType, TransactionScripts},
2122
};
2223
pub use fork::Fork;
24+
pub use metadata::cip36::{voting_pk::VotingPubKey, Cip36};
2325
pub use multi_era_block_data::MultiEraBlock;
2426
pub use network::Network;
2527
pub use point::Point;

0 commit comments

Comments
 (0)