Skip to content

Commit 8121f33

Browse files
authored
Merge branch 'main' into feat/cat-sign-doc-validator
2 parents b7bbe15 + f76ccf3 commit 8121f33

File tree

10 files changed

+31
-22
lines changed

10 files changed

+31
-22
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions:
1717

1818
jobs:
1919
ci:
20-
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.5.1
20+
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.1
2121
with:
2222
forge_version: 0.8.0
2323

.github/workflows/generate-allure-report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ jobs:
2626
- uses: actions/checkout@v4
2727

2828
- name: Install Forge
29-
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.5.1
29+
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.1
3030
with:
3131
version: 0.8.0
3232
if: always()
3333

3434
- name: Setup CI
35-
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.5.1
35+
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.1
3636

3737
- name: Get catalyst libs unit test report
38-
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.1
38+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
3939
if: always()
4040
continue-on-error: true
4141
with:

.github/workflows/semantic_pull_request.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ jobs:
3131
dart
3232
docs
3333
general
34+
deps

.github/workflows/stale-branches.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Stale Branches
16-
uses: crs-k/stale-branches@v6.0.2
16+
uses: crs-k/stale-branches@v7.0.0
1717
with:
1818
repo-token: '${{ secrets.GITHUB_TOKEN }}'
1919
days-before-stale: 30

rust/cardano-blockchain-types/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "cardano-blockchain-types"
33
description = "Common Cardano Blockchain data types for use in both applications and crates"
44
keywords = ["cardano", "catalyst", ]
5-
version = "0.0.1"
5+
version = "0.0.2"
66
authors = [
77
"Steven Johnson <[email protected]>"
88
]
@@ -20,8 +20,8 @@ workspace = true
2020
[dependencies]
2121
pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
2222
# pallas-hardano = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
23-
cbork-utils = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250212-00" }
24-
catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250212-00" }
23+
cbork-utils = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250218-00" }
24+
catalyst-types = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250218-00" }
2525

2626
ouroboros = "0.18.4"
2727
tracing = "0.1.41"

rust/cardano-chain-follower/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cardano-chain-follower"
3-
version = "0.0.6"
3+
version = "0.0.7"
44
edition.workspace = true
55
authors.workspace = true
66
homepage.workspace = true
@@ -19,8 +19,8 @@ mithril-client = { version = "0.10.4", default-features = false, features = [
1919
"full",
2020
"num-integer-backend",
2121
] }
22-
cardano-blockchain-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250214-00" }
23-
catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250212-00" }
22+
cardano-blockchain-types = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250218-00" }
23+
catalyst-types = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250218-00" }
2424

2525
thiserror = "1.0.69"
2626
tokio = { version = "1.42.0", features = [
@@ -63,7 +63,7 @@ test-log = { version = "0.2.16", default-features = false, features = [
6363
"trace",
6464
] }
6565
clap = "4.5.23"
66-
# rbac-registration = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "v0.0.8" }
66+
rbac-registration = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250218-00" }
6767

6868
# Note, these features are for support of features exposed by dependencies.
6969
[features]

rust/cardano-chain-follower/examples/follow_chains.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use cardano_blockchain_types::{
1010
};
1111
#[cfg(feature = "mimalloc")]
1212
use mimalloc::MiMalloc;
13+
use rbac_registration::cardano::cip509::Cip509;
1314

1415
/// Use Mimalloc for the global allocator.
1516
#[cfg(feature = "mimalloc")]
@@ -457,8 +458,15 @@ fn log_bad_cip36_info(block: &MultiEraBlock, network: Network) {
457458
}
458459

459460
/// Function for logging bad CIP509.
460-
fn log_bad_cip509_info(_block: &MultiEraBlock, _network: Network) {
461-
// TODO - Implement this function.
461+
fn log_bad_cip509_info(block: &MultiEraBlock, network: Network) {
462+
for cip509 in Cip509::from_block(block, &[]) {
463+
if cip509.report().is_problematic() {
464+
info!(
465+
network = network.to_string(),
466+
"CIP509 invalid: {:?}", cip509
467+
);
468+
}
469+
}
462470
}
463471

464472
#[tokio::main]

rust/catalyst-types/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "catalyst-types"
3-
version = "0.0.1"
3+
version = "0.0.2"
44
edition.workspace = true
55
license.workspace = true
66
authors.workspace = true

rust/rbac-registration/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "rbac-registration"
33
description = "Role Based Access Control Registration"
44
keywords = ["cardano", "catalyst", "rbac registration"]
5-
version = "0.0.2"
5+
version = "0.0.3"
66
authors = [
77
"Arissara Chotivichit <[email protected]>"
88
]
@@ -30,8 +30,8 @@ tracing = "0.1.40"
3030
ed25519-dalek = "2.1.1"
3131
uuid = "1.11.0"
3232

33-
c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "v0.0.3" }
33+
c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250218-00" }
3434
pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
35-
cbork-utils = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250212-00" }
36-
cardano-blockchain-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250214-00" }
37-
catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250212-00" }
35+
cbork-utils = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250218-00" }
36+
cardano-blockchain-types = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250218-00" }
37+
catalyst-types = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250218-00" }

rust/signed_doc/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "catalyst-signed-doc"
3-
version = "0.0.1"
3+
version = "0.0.2"
44
edition.workspace = true
55
authors.workspace = true
66
homepage.workspace = true
@@ -11,7 +11,7 @@ license.workspace = true
1111
workspace = true
1212

1313
[dependencies]
14-
catalyst-types = { version = "0.0.1", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250212-00" }
14+
catalyst-types = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250218-00" }
1515
anyhow = "1.0.95"
1616
serde = { version = "1.0.217", features = ["derive"] }
1717
serde_json = "1.0.134"

0 commit comments

Comments
 (0)