Skip to content

Commit

Permalink
fix(rust/cardano-blockchain-types): cardano-blockchain-types base c…
Browse files Browse the repository at this point in the history 
…hange (#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]>
  • Loading branch information
@bkioshn @stevenj @stanislav-tkach
4 people authored Jan 9, 2025
1 parent 38d0eb7 commit 6a00a8b
Show file tree
Hide file tree
Showing 12 changed files with 1,306 additions and 16 deletions.
7 changes: 6 additions & 1 deletion rust/cardano-blockchain-types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ workspace = true
pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
pallas-crypto = { 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 = "v0.0.11" }
catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250108-00" }

ouroboros = "0.18.4"
tracing = "0.1.41"
Expand All @@ -33,4 +35,7 @@ dashmap = "6.1.0"
blake2b_simd = "1.0.2"
minicbor = { version = "0.25.1", features = ["alloc"] }
num-traits = "0.2.19"
ed25519-dalek = "2.1.1"
ed25519-dalek = "2.1.1"
serde = "1.0.210"
num-bigint = "0.4.6"
serde_json = "1.0.134"
6 changes: 3 additions & 3 deletions rust/cardano-blockchain-types/src/auxdata/block.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ impl TryFrom<&MultiEraBlock<'_>> for BlockAuxData {
for (txn_idx, metadata) in alonzo_block.auxiliary_data_set.iter() {
let mut d = minicbor::Decoder::new(metadata.raw_cbor());
let txn_aux_data = d.decode::<TransactionAuxData>()?;
aux_data.insert(TxnIndex::from_saturating(*txn_idx), txn_aux_data);
aux_data.insert((*txn_idx).into(), txn_aux_data);
}
} else if let Some(babbage_block) = block.as_babbage() {
for (txn_idx, metadata) in babbage_block.auxiliary_data_set.iter() {
let mut d = minicbor::Decoder::new(metadata.raw_cbor());
let txn_aux_data = d.decode::<TransactionAuxData>()?;
aux_data.insert(TxnIndex::from_saturating(*txn_idx), txn_aux_data);
aux_data.insert((*txn_idx).into(), txn_aux_data);
}
} else if let Some(conway_block) = block.as_conway() {
for (txn_idx, metadata) in conway_block.auxiliary_data_set.iter() {
let mut d = minicbor::Decoder::new(metadata.raw_cbor());
let txn_aux_data = d.decode::<TransactionAuxData>()?;
aux_data.insert(TxnIndex::from_saturating(*txn_idx), txn_aux_data);
aux_data.insert((*txn_idx).into(), txn_aux_data);
}
} else {
bail!("Undecodable metadata, unknown Era");
Expand Down
2 changes: 2 additions & 0 deletions rust/cardano-blockchain-types/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ mod auxdata;
pub mod conversion;
mod fork;
pub mod hashes;
mod metadata;
mod multi_era_block_data;
mod network;
mod point;
Expand All @@ -20,6 +21,7 @@ pub use auxdata::{
scripts::{Script, ScriptArray, ScriptType, TransactionScripts},
};
pub use fork::Fork;
pub use metadata::cip36::{voting_pk::VotingPubKey, Cip36};
pub use multi_era_block_data::MultiEraBlock;
pub use network::Network;
pub use point::Point;
Expand Down
Loading

0 comments on commit 6a00a8b

Please sign in to comment.