From d3aad930f8dc336aa92df8fae007e49eea844e67 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Fri, 4 Jul 2025 14:15:20 +0200 Subject: [PATCH 01/15] test: tries to remove mithiril --- rust/cardano-blockchain-types/src/network.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/cardano-blockchain-types/src/network.rs b/rust/cardano-blockchain-types/src/network.rs index d0d93b49b8f..e894822a199 100644 --- a/rust/cardano-blockchain-types/src/network.rs +++ b/rust/cardano-blockchain-types/src/network.rs @@ -63,7 +63,7 @@ const DEFAULT_PREPROD_RELAY: &str = "preprod-node.play.dev.cardano.org:3001"; const DEFAULT_PREPROD_MITHRIL_GENESIS_KEY: &str = include_str!("data/preprod-genesis.vkey"); /// Default Mithril Aggregator to use. const DEFAULT_PREPROD_MITHRIL_AGGREGATOR: &str = - "https://aggregator.release-preprod.api.mithril.network/aggregator"; + "https://NOT_ESISTENT"; // Preview Defaults /// Preview Default Public Cardano Relay. From f2b45fa5173fa9a5a3c07c493885da3d775ae243 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Fri, 11 Jul 2025 13:26:48 +0200 Subject: [PATCH 02/15] adds local mithirl and node addresses --- rust/cardano-blockchain-types/src/data/preprod-genesis.vkey | 2 +- rust/cardano-blockchain-types/src/network.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/cardano-blockchain-types/src/data/preprod-genesis.vkey b/rust/cardano-blockchain-types/src/data/preprod-genesis.vkey index 575154ce701..a7530de44eb 100644 --- a/rust/cardano-blockchain-types/src/data/preprod-genesis.vkey +++ b/rust/cardano-blockchain-types/src/data/preprod-genesis.vkey @@ -1 +1 @@ -5b3132372c37332c3132342c3136312c362c3133372c3133312c3231332c3230372c3131372c3139382c38352c3137362c3139392c3136322c3234312c36382c3132332c3131392c3134352c31332c3233322c3234332c34392c3232392c322c3234392c3230352c3230352c33392c3233352c34345d \ No newline at end of file +5b33322c3235332c3138362c3230312c3137372c31312c3131372c3133352c3138372c3136372c3138312c3138382c32322c35392c3230362c3130352c3233312c3135302c3231352c33302c37382c3231322c37362c31362c3235322c3138302c37322c3133342c3133372c3234372c3136312c36385d \ No newline at end of file diff --git a/rust/cardano-blockchain-types/src/network.rs b/rust/cardano-blockchain-types/src/network.rs index e894822a199..da1ff94765e 100644 --- a/rust/cardano-blockchain-types/src/network.rs +++ b/rust/cardano-blockchain-types/src/network.rs @@ -58,12 +58,12 @@ const DEFAULT_MAINNET_MITHRIL_AGGREGATOR: &str = // Preprod Defaults /// Preprod Default Public Cardano Relay. -const DEFAULT_PREPROD_RELAY: &str = "preprod-node.play.dev.cardano.org:3001"; +const DEFAULT_PREPROD_RELAY: &str = "127.0.0.1:3001"; /// Preprod network Mithril Signature genesis vkey. const DEFAULT_PREPROD_MITHRIL_GENESIS_KEY: &str = include_str!("data/preprod-genesis.vkey"); /// Default Mithril Aggregator to use. const DEFAULT_PREPROD_MITHRIL_AGGREGATOR: &str = - "https://NOT_ESISTENT"; + "http://localhost:8080/aggregator"; // Preview Defaults /// Preview Default Public Cardano Relay. From 7807f8bdfc70dc625f71be3a52184387e7b48a55 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Fri, 11 Jul 2025 16:06:02 +0200 Subject: [PATCH 03/15] feat: adds devnet defaults --- .../src/data/devnet-genesis.vkey | 1 + .../src/data/preprod-genesis.vkey | 2 +- .../src/metadata/cip36/validation.rs | 2 +- rust/cardano-blockchain-types/src/network.rs | 24 +++++++++++++++---- 4 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 rust/cardano-blockchain-types/src/data/devnet-genesis.vkey diff --git a/rust/cardano-blockchain-types/src/data/devnet-genesis.vkey b/rust/cardano-blockchain-types/src/data/devnet-genesis.vkey new file mode 100644 index 00000000000..a7530de44eb --- /dev/null +++ b/rust/cardano-blockchain-types/src/data/devnet-genesis.vkey @@ -0,0 +1 @@ +5b33322c3235332c3138362c3230312c3137372c31312c3131372c3133352c3138372c3136372c3138312c3138382c32322c35392c3230362c3130352c3233312c3135302c3231352c33302c37382c3231322c37362c31362c3235322c3138302c37322c3133342c3133372c3234372c3136312c36385d \ No newline at end of file diff --git a/rust/cardano-blockchain-types/src/data/preprod-genesis.vkey b/rust/cardano-blockchain-types/src/data/preprod-genesis.vkey index a7530de44eb..575154ce701 100644 --- a/rust/cardano-blockchain-types/src/data/preprod-genesis.vkey +++ b/rust/cardano-blockchain-types/src/data/preprod-genesis.vkey @@ -1 +1 @@ -5b33322c3235332c3138362c3230312c3137372c31312c3131372c3133352c3138372c3136372c3138312c3138382c32322c35392c3230362c3130352c3233312c3135302c3231352c33302c37382c3231322c37362c31362c3235322c3138302c37322c3133342c3133372c3234372c3136312c36385d \ No newline at end of file +5b3132372c37332c3132342c3136312c362c3133372c3133312c3231332c3230372c3131372c3139382c38352c3137362c3139392c3136322c3234312c36382c3132332c3131392c3134352c31332c3233322c3234332c34392c3232392c322c3234392c3230352c3230352c33392c3233352c34345d \ No newline at end of file diff --git a/rust/cardano-blockchain-types/src/metadata/cip36/validation.rs b/rust/cardano-blockchain-types/src/metadata/cip36/validation.rs index 601d17e2239..6a29f41291a 100644 --- a/rust/cardano-blockchain-types/src/metadata/cip36/validation.rs +++ b/rust/cardano-blockchain-types/src/metadata/cip36/validation.rs @@ -86,7 +86,7 @@ impl Cip36 { let valid = match self.network { Network::Mainnet => network_tag.value() == 1, - Network::Preprod | Network::Preview => network_tag.value() == 0, + Network::Preprod | Network::Preview | Network::Devnet => network_tag.value() == 0, }; // Report invalid network tag if necessary diff --git a/rust/cardano-blockchain-types/src/network.rs b/rust/cardano-blockchain-types/src/network.rs index da1ff94765e..2bf7e0769e2 100644 --- a/rust/cardano-blockchain-types/src/network.rs +++ b/rust/cardano-blockchain-types/src/network.rs @@ -7,7 +7,7 @@ use catalyst_types::conversion::from_saturating; use chrono::{DateTime, Utc}; use pallas::{ ledger::{addresses::Network as PallasNetwork, traverse::wellknown::GenesisValues}, - network::miniprotocols::{MAINNET_MAGIC, PREVIEW_MAGIC, PRE_PRODUCTION_MAGIC}, + network::miniprotocols::{MAINNET_MAGIC, PREVIEW_MAGIC, PRE_PRODUCTION_MAGIC, TESTNET_MAGIC}, }; use tracing::debug; @@ -45,6 +45,8 @@ pub enum Network { Preprod = 1, /// Cardano preview network. Preview = 2, + /// Cardano testnet network. + Devnet = 3 } // Mainnet Defaults. @@ -58,12 +60,12 @@ const DEFAULT_MAINNET_MITHRIL_AGGREGATOR: &str = // Preprod Defaults /// Preprod Default Public Cardano Relay. -const DEFAULT_PREPROD_RELAY: &str = "127.0.0.1:3001"; +const DEFAULT_PREPROD_RELAY: &str = "preprod-node.play.dev.cardano.org:3001"; /// Preprod network Mithril Signature genesis vkey. const DEFAULT_PREPROD_MITHRIL_GENESIS_KEY: &str = include_str!("data/preprod-genesis.vkey"); /// Default Mithril Aggregator to use. const DEFAULT_PREPROD_MITHRIL_AGGREGATOR: &str = - "http://localhost:8080/aggregator"; + "https://aggregator.pre-release-preprod.api.mithril.network/aggregator"; // Preview Defaults /// Preview Default Public Cardano Relay. @@ -74,6 +76,15 @@ const DEFAULT_PREVIEW_MITHRIL_GENESIS_KEY: &str = include_str!("data/preview-gen const DEFAULT_PREVIEW_MITHRIL_AGGREGATOR: &str = "https://aggregator.pre-release-preview.api.mithril.network/aggregator"; +// Devnet Defaults +/// Devnet Default Public Cardano Relay. +const DEFAULT_DEVNET_RELAY: &str = "127.0.0.1:3001"; +/// Preprod network Mithril Signature genesis vkey. +const DEFAULT_DEVNET_MITHRIL_GENESIS_KEY: &str = include_str!("data/preprod-genesis.vkey"); +/// Default Mithril Aggregator to use. +const DEFAULT_DEVNET_MITHRIL_AGGREGATOR: &str = + "http://localhost:8080/aggregator"; + impl Network { /// Get the default Relay for a blockchain network. #[must_use] @@ -82,6 +93,7 @@ impl Network { Network::Mainnet => DEFAULT_MAINNET_RELAY.to_string(), Network::Preprod => DEFAULT_PREPROD_RELAY.to_string(), Network::Preview => DEFAULT_PREVIEW_RELAY.to_string(), + Network::Devnet => DEFAULT_DEVNET_RELAY.to_string(), } } @@ -92,6 +104,7 @@ impl Network { Network::Mainnet => DEFAULT_MAINNET_MITHRIL_AGGREGATOR.to_string(), Network::Preprod => DEFAULT_PREPROD_MITHRIL_AGGREGATOR.to_string(), Network::Preview => DEFAULT_PREVIEW_MITHRIL_AGGREGATOR.to_string(), + Network::Devnet => DEFAULT_DEVNET_MITHRIL_AGGREGATOR.to_string(), } } @@ -102,6 +115,7 @@ impl Network { Network::Mainnet => DEFAULT_MAINNET_MITHRIL_GENESIS_KEY.to_string(), Network::Preprod => DEFAULT_PREPROD_MITHRIL_GENESIS_KEY.to_string(), Network::Preview => DEFAULT_PREVIEW_MITHRIL_GENESIS_KEY.to_string(), + Network::Devnet => DEFAULT_DEVNET_MITHRIL_AGGREGATOR.to_string(), } } @@ -155,6 +169,7 @@ impl Network { Network::Mainnet => GenesisValues::mainnet(), Network::Preprod => GenesisValues::preprod(), Network::Preview => GenesisValues::preview(), + Network::Devnet => GenesisValues::testnet(), } } @@ -215,6 +230,7 @@ impl From for u64 { Network::Mainnet => MAINNET_MAGIC, Network::Preprod => PRE_PRODUCTION_MAGIC, Network::Preview => PREVIEW_MAGIC, + Network::Devnet => TESTNET_MAGIC, } } } @@ -223,7 +239,7 @@ impl From for PallasNetwork { fn from(value: Network) -> Self { match value { Network::Mainnet => PallasNetwork::Mainnet, - Network::Preprod | Network::Preview => PallasNetwork::Testnet, + Network::Preprod | Network::Preview | Network::Devnet => PallasNetwork::Testnet, } } } From 5caf744dd48a020ec0ea0c5e30c01941333abfcf Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Fri, 11 Jul 2025 16:08:04 +0200 Subject: [PATCH 04/15] fix: preprod relay --- rust/cardano-blockchain-types/src/network.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/cardano-blockchain-types/src/network.rs b/rust/cardano-blockchain-types/src/network.rs index 2bf7e0769e2..0eb03a1f222 100644 --- a/rust/cardano-blockchain-types/src/network.rs +++ b/rust/cardano-blockchain-types/src/network.rs @@ -65,7 +65,7 @@ const DEFAULT_PREPROD_RELAY: &str = "preprod-node.play.dev.cardano.org:3001"; const DEFAULT_PREPROD_MITHRIL_GENESIS_KEY: &str = include_str!("data/preprod-genesis.vkey"); /// Default Mithril Aggregator to use. const DEFAULT_PREPROD_MITHRIL_AGGREGATOR: &str = - "https://aggregator.pre-release-preprod.api.mithril.network/aggregator"; + "https://aggregator.release-preprod.api.mithril.network/aggregator"; // Preview Defaults /// Preview Default Public Cardano Relay. From d2a556c8e0ef17feeafb6935b8e7dcfe9ced6498 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Fri, 11 Jul 2025 17:43:25 +0200 Subject: [PATCH 05/15] remove check vkey --- rust/cardano-chain-follower/src/mithril_snapshot_config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/cardano-chain-follower/src/mithril_snapshot_config.rs b/rust/cardano-chain-follower/src/mithril_snapshot_config.rs index 70d5394173c..036c194bf63 100644 --- a/rust/cardano-chain-follower/src/mithril_snapshot_config.rs +++ b/rust/cardano-chain-follower/src/mithril_snapshot_config.rs @@ -491,7 +491,7 @@ fn remove_whitespace(s: &str) -> String { /// Check if a string is an even number of hex digits. fn is_hex(s: &str) -> bool { - s.chars().count() % 2 == 0 && s.chars().all(|c| c.is_ascii_hexdigit()) + s.chars().count() % 2 == 0 //&& s.chars().all(|c| c.is_ascii_hexdigit()) } #[cfg(test)] From e2d91f003377e420af3235590a38c9eae50c13d0 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Mon, 14 Jul 2025 18:25:24 +0200 Subject: [PATCH 06/15] fix devnet genesis --- rust/cardano-blockchain-types/src/network.rs | 4 ++-- rust/cardano-chain-follower/src/mithril_snapshot_config.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/cardano-blockchain-types/src/network.rs b/rust/cardano-blockchain-types/src/network.rs index 0eb03a1f222..4d69b734050 100644 --- a/rust/cardano-blockchain-types/src/network.rs +++ b/rust/cardano-blockchain-types/src/network.rs @@ -80,7 +80,7 @@ const DEFAULT_PREVIEW_MITHRIL_AGGREGATOR: &str = /// Devnet Default Public Cardano Relay. const DEFAULT_DEVNET_RELAY: &str = "127.0.0.1:3001"; /// Preprod network Mithril Signature genesis vkey. -const DEFAULT_DEVNET_MITHRIL_GENESIS_KEY: &str = include_str!("data/preprod-genesis.vkey"); +const DEFAULT_DEVNET_MITHRIL_GENESIS_KEY: &str = include_str!("data/devnet-genesis.vkey"); /// Default Mithril Aggregator to use. const DEFAULT_DEVNET_MITHRIL_AGGREGATOR: &str = "http://localhost:8080/aggregator"; @@ -115,7 +115,7 @@ impl Network { Network::Mainnet => DEFAULT_MAINNET_MITHRIL_GENESIS_KEY.to_string(), Network::Preprod => DEFAULT_PREPROD_MITHRIL_GENESIS_KEY.to_string(), Network::Preview => DEFAULT_PREVIEW_MITHRIL_GENESIS_KEY.to_string(), - Network::Devnet => DEFAULT_DEVNET_MITHRIL_AGGREGATOR.to_string(), + Network::Devnet => DEFAULT_DEVNET_MITHRIL_GENESIS_KEY.to_string(), } } diff --git a/rust/cardano-chain-follower/src/mithril_snapshot_config.rs b/rust/cardano-chain-follower/src/mithril_snapshot_config.rs index 036c194bf63..70d5394173c 100644 --- a/rust/cardano-chain-follower/src/mithril_snapshot_config.rs +++ b/rust/cardano-chain-follower/src/mithril_snapshot_config.rs @@ -491,7 +491,7 @@ fn remove_whitespace(s: &str) -> String { /// Check if a string is an even number of hex digits. fn is_hex(s: &str) -> bool { - s.chars().count() % 2 == 0 //&& s.chars().all(|c| c.is_ascii_hexdigit()) + s.chars().count() % 2 == 0 && s.chars().all(|c| c.is_ascii_hexdigit()) } #[cfg(test)] From 611d854d0ec278d1751a7fe1356fb4f8c5cbef6e Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Tue, 15 Jul 2025 15:06:29 +0200 Subject: [PATCH 07/15] chore: updates pallas branch --- rust/cardano-blockchain-types/Cargo.toml | 4 ++-- rust/cardano-chain-follower/Cargo.toml | 6 +++--- rust/catalyst-types/Cargo.toml | 2 +- rust/rbac-registration/Cargo.toml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rust/cardano-blockchain-types/Cargo.toml b/rust/cardano-blockchain-types/Cargo.toml index a95b1ed6668..ad8361f4924 100644 --- a/rust/cardano-blockchain-types/Cargo.toml +++ b/rust/cardano-blockchain-types/Cargo.toml @@ -18,8 +18,8 @@ crate-type = ["cdylib", "rlib"] 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" } +pallas = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } +# pallas-hardano = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } cbork-utils = { version = "0.0.1", path = "../cbork-utils" } catalyst-types = { version = "0.0.3", path = "../catalyst-types" } diff --git a/rust/cardano-chain-follower/Cargo.toml b/rust/cardano-chain-follower/Cargo.toml index 5a7a4589e64..3754f60bbf3 100644 --- a/rust/cardano-chain-follower/Cargo.toml +++ b/rust/cardano-chain-follower/Cargo.toml @@ -11,9 +11,9 @@ license.workspace = true 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" } -pallas-crypto = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" } +pallas = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } +pallas-hardano = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } +pallas-crypto = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } mithril-client = { version = "0.12.2", default-features = false, features = [ "full", diff --git a/rust/catalyst-types/Cargo.toml b/rust/catalyst-types/Cargo.toml index 545a0130ec8..1317e8b621e 100644 --- a/rust/catalyst-types/Cargo.toml +++ b/rust/catalyst-types/Cargo.toml @@ -24,7 +24,7 @@ hex = "0.4.3" minicbor = { version = "0.25.1", features = ["std"] } num-traits = "0.2.19" orx-concurrent-vec = { version = "3.6.0", features = ["serde"] } -pallas-crypto = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" } +pallas-crypto = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } serde = { version = "1.0.217", features = ["derive", "rc"] } thiserror = "2.0.11" base64-url = "3.0.0" diff --git a/rust/rbac-registration/Cargo.toml b/rust/rbac-registration/Cargo.toml index 3a73027566a..1fd8f6060da 100644 --- a/rust/rbac-registration/Cargo.toml +++ b/rust/rbac-registration/Cargo.toml @@ -33,7 +33,7 @@ oid-registry = "0.7.1" thiserror = "2.0.11" c509-certificate = { version = "0.0.3", path = "../c509-certificate" } -pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" } +pallas = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } cbork-utils = { version = "0.0.1", path = "../cbork-utils" } cardano-blockchain-types = { version = "0.0.3", path = "../cardano-blockchain-types" } catalyst-types = { version = "0.0.3", path = "../catalyst-types" } From a15b4da4ed22c533faf4d297cd735489571397c8 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Tue, 15 Jul 2025 16:01:53 +0200 Subject: [PATCH 08/15] fix Scripthash --- rust/cardano-blockchain-types/src/stake_address.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/cardano-blockchain-types/src/stake_address.rs b/rust/cardano-blockchain-types/src/stake_address.rs index 8c7bcdff9d9..d6bb646cf00 100644 --- a/rust/cardano-blockchain-types/src/stake_address.rs +++ b/rust/cardano-blockchain-types/src/stake_address.rs @@ -51,7 +51,7 @@ impl StakeAddress { #[must_use] pub fn from_stake_cred(network: Network, cred: &conway::StakeCredential) -> Self { match cred { - conway::StakeCredential::Scripthash(h) => Self::new(network, true, (*h).into()), + conway::StakeCredential::ScriptHash(h) => Self::new(network, true, (*h).into()), conway::StakeCredential::AddrKeyhash(h) => Self::new(network, false, (*h).into()), } } From 766511d7d0eb1dd5e2988c2e2b9e831ed29adf9b Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Thu, 17 Jul 2025 11:30:56 +0200 Subject: [PATCH 09/15] chore: update the pallas branch --- rust/cardano-blockchain-types/Cargo.toml | 4 ++-- rust/cardano-blockchain-types/src/stake_address.rs | 2 +- rust/cardano-chain-follower/Cargo.toml | 6 +++--- rust/catalyst-types/Cargo.toml | 2 +- rust/rbac-registration/Cargo.toml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rust/cardano-blockchain-types/Cargo.toml b/rust/cardano-blockchain-types/Cargo.toml index ad8361f4924..abf9216d440 100644 --- a/rust/cardano-blockchain-types/Cargo.toml +++ b/rust/cardano-blockchain-types/Cargo.toml @@ -18,8 +18,8 @@ crate-type = ["cdylib", "rlib"] workspace = true [dependencies] -pallas = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } -# pallas-hardano = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } +pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values" } +# pallas-hardano = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values" } cbork-utils = { version = "0.0.1", path = "../cbork-utils" } catalyst-types = { version = "0.0.3", path = "../catalyst-types" } diff --git a/rust/cardano-blockchain-types/src/stake_address.rs b/rust/cardano-blockchain-types/src/stake_address.rs index d6bb646cf00..8c7bcdff9d9 100644 --- a/rust/cardano-blockchain-types/src/stake_address.rs +++ b/rust/cardano-blockchain-types/src/stake_address.rs @@ -51,7 +51,7 @@ impl StakeAddress { #[must_use] pub fn from_stake_cred(network: Network, cred: &conway::StakeCredential) -> Self { match cred { - conway::StakeCredential::ScriptHash(h) => Self::new(network, true, (*h).into()), + conway::StakeCredential::Scripthash(h) => Self::new(network, true, (*h).into()), conway::StakeCredential::AddrKeyhash(h) => Self::new(network, false, (*h).into()), } } diff --git a/rust/cardano-chain-follower/Cargo.toml b/rust/cardano-chain-follower/Cargo.toml index 3754f60bbf3..d304521964c 100644 --- a/rust/cardano-chain-follower/Cargo.toml +++ b/rust/cardano-chain-follower/Cargo.toml @@ -11,9 +11,9 @@ license.workspace = true workspace = true [dependencies] -pallas = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } -pallas-hardano = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } -pallas-crypto = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } +pallas = {version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values" } +pallas-hardano = {version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values" } +pallas-crypto = {version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values" } mithril-client = { version = "0.12.2", default-features = false, features = [ "full", diff --git a/rust/catalyst-types/Cargo.toml b/rust/catalyst-types/Cargo.toml index 1317e8b621e..86e0f63a810 100644 --- a/rust/catalyst-types/Cargo.toml +++ b/rust/catalyst-types/Cargo.toml @@ -24,7 +24,7 @@ hex = "0.4.3" minicbor = { version = "0.25.1", features = ["std"] } num-traits = "0.2.19" orx-concurrent-vec = { version = "3.6.0", features = ["serde"] } -pallas-crypto = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } +pallas-crypto = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values" } serde = { version = "1.0.217", features = ["derive", "rc"] } thiserror = "2.0.11" base64-url = "3.0.0" diff --git a/rust/rbac-registration/Cargo.toml b/rust/rbac-registration/Cargo.toml index 1fd8f6060da..f0938d0d316 100644 --- a/rust/rbac-registration/Cargo.toml +++ b/rust/rbac-registration/Cargo.toml @@ -33,7 +33,7 @@ oid-registry = "0.7.1" thiserror = "2.0.11" c509-certificate = { version = "0.0.3", path = "../c509-certificate" } -pallas = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "feat/testnet-genesis-values" } +pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values" } cbork-utils = { version = "0.0.1", path = "../cbork-utils" } cardano-blockchain-types = { version = "0.0.3", path = "../cardano-blockchain-types" } catalyst-types = { version = "0.0.3", path = "../catalyst-types" } From 8df10ac0f8898a6b6705cf542d70632d4039d218 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Thu, 17 Jul 2025 14:34:10 +0200 Subject: [PATCH 10/15] chore: adds debug lines --- rust/cardano-chain-follower/src/turbo_downloader/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/cardano-chain-follower/src/turbo_downloader/mod.rs b/rust/cardano-chain-follower/src/turbo_downloader/mod.rs index f32155942ac..fa3584446ea 100644 --- a/rust/cardano-chain-follower/src/turbo_downloader/mod.rs +++ b/rust/cardano-chain-follower/src/turbo_downloader/mod.rs @@ -200,7 +200,7 @@ impl DlConfig { resolver.resolve(url, worker) } - /// Builds a `UReq` Agent. + /// Builds a `UReq` Agent. /// /// Because we need multiple clients to prevent all traffic being forced onto a single /// connection when HTTP2 is used, the client can NOT be supplied by the user. @@ -330,8 +330,8 @@ impl ParallelDownloadProcessorInner { .set(RANGE.as_str(), &range_header) .call() .context("GET ranged request failed")?; - // let addr = get_range_response.remote_addr(); - // debug!("Chunk {chunk} from {addr:?}"); + let addr = get_range_response.remote_addr(); + debug!("Chunk {chunk} from {addr:?}"); if get_range_response.status() != StatusCode::PARTIAL_CONTENT { bail!( "Response to range request has an unexpected status code (expected {}, found {})", From f38fc640374d13eb0091dcbfe218a8e5b011c332 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Wed, 6 Aug 2025 19:43:48 +0200 Subject: [PATCH 11/15] fix deps --- rust/cardano-blockchain-types/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/cardano-blockchain-types/Cargo.toml b/rust/cardano-blockchain-types/Cargo.toml index e790c64f446..78c7c99cc9d 100644 --- a/rust/cardano-blockchain-types/Cargo.toml +++ b/rust/cardano-blockchain-types/Cargo.toml @@ -18,7 +18,7 @@ crate-type = ["cdylib", "rlib"] workspace = true [dependencies] -pallas = { version = "0.33.0", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values" } +pallas = { version = "0.33.0", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values", package = "pallas" } # pallas-hardano = { version = "0.33.0", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values" } catalyst-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types-v0.0.5" } cbork-utils = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cbork-utils-v0.0.2" } From 4a5573b566ce42bac5555d3cf76d351d3b8cc9a6 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Thu, 7 Aug 2025 11:16:23 +0200 Subject: [PATCH 12/15] fix deps --- rust/cardano-blockchain-types/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/cardano-blockchain-types/Cargo.toml b/rust/cardano-blockchain-types/Cargo.toml index 78c7c99cc9d..8bf663ed4d7 100644 --- a/rust/cardano-blockchain-types/Cargo.toml +++ b/rust/cardano-blockchain-types/Cargo.toml @@ -20,8 +20,8 @@ workspace = true [dependencies] pallas = { version = "0.33.0", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values", package = "pallas" } # pallas-hardano = { version = "0.33.0", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values" } -catalyst-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types-v0.0.5" } -cbork-utils = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cbork-utils-v0.0.2" } +catalyst-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network" } +cbork-utils = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network" } ouroboros = "0.18.4" From bfe03859406f07f98b2b023748c9928f976b3157 Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Thu, 7 Aug 2025 11:21:59 +0200 Subject: [PATCH 13/15] fix deps --- rust/rbac-registration/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rust/rbac-registration/Cargo.toml b/rust/rbac-registration/Cargo.toml index ad5895939d3..2e1c69e1163 100644 --- a/rust/rbac-registration/Cargo.toml +++ b/rust/rbac-registration/Cargo.toml @@ -32,8 +32,8 @@ uuid = "1.11.0" oid-registry = "0.7.1" thiserror = "2.0.11" -c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "c509-certificate-v0.0.3" } +c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network" } pallas = { version = "0.33.0", git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "test/testnet-genesis-values" } -cbork-utils = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cbork-utils-v0.0.2" } -cardano-blockchain-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-blockchain-types-v0.0.5" } -catalyst-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types-v0.0.5" } +cbork-utils = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network" } +cardano-blockchain-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network" } +catalyst-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network" } From 3569755cf4811085eb4c7ef9bf67499d8f1b891c Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Thu, 7 Aug 2025 11:31:21 +0200 Subject: [PATCH 14/15] fix deps --- rust/cardano-chain-follower/Cargo.toml | 4 ++-- rust/signed_doc/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/cardano-chain-follower/Cargo.toml b/rust/cardano-chain-follower/Cargo.toml index 7ee2d016371..76b64f2eb65 100644 --- a/rust/cardano-chain-follower/Cargo.toml +++ b/rust/cardano-chain-follower/Cargo.toml @@ -20,8 +20,8 @@ mithril-client = { version = "0.12.2", default-features = false, features = [ "num-integer-backend", ] } -cardano-blockchain-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-blockchain-types-v0.0.5" } -catalyst-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types-v0.0.5" } +cardano-blockchain-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network" } +catalyst-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network"} thiserror = "1.0.69" diff --git a/rust/signed_doc/Cargo.toml b/rust/signed_doc/Cargo.toml index 25fb35586c5..743de8c3a85 100644 --- a/rust/signed_doc/Cargo.toml +++ b/rust/signed_doc/Cargo.toml @@ -11,7 +11,7 @@ license.workspace = true workspace = true [dependencies] -catalyst-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types-v0.0.5" } +catalyst-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network"} cbork-utils = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cbork-utils-v0.0.2" } anyhow = "1.0.95" From 889c6d73cbeedbc46e6635730420e76bb91ea51f Mon Sep 17 00:00:00 2001 From: kukkok3 <93382903+kukkok3@users.noreply.github.com> Date: Thu, 7 Aug 2025 11:39:35 +0200 Subject: [PATCH 15/15] fix deps --- rust/cardano-chain-follower/Cargo.toml | 2 +- rust/signed_doc/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/cardano-chain-follower/Cargo.toml b/rust/cardano-chain-follower/Cargo.toml index 76b64f2eb65..5d64289e505 100644 --- a/rust/cardano-chain-follower/Cargo.toml +++ b/rust/cardano-chain-follower/Cargo.toml @@ -65,7 +65,7 @@ test-log = { version = "0.2.16", default-features = false, features = [ "trace", ] } clap = "4.5.23" -rbac-registration = { version = "0.0.6", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "rbac-registration-v0.0.6" } +rbac-registration = { version = "0.0.6", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network" } minicbor = { version = "2.0.0", features = ["alloc","half"]} # Note, these features are for support of features exposed by dependencies. diff --git a/rust/signed_doc/Cargo.toml b/rust/signed_doc/Cargo.toml index 743de8c3a85..ac930eeeb27 100644 --- a/rust/signed_doc/Cargo.toml +++ b/rust/signed_doc/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] catalyst-types = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network"} -cbork-utils = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cbork-utils-v0.0.2" } +cbork-utils = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "test/adds-custom-network" } anyhow = "1.0.95" serde = { version = "1.0.217", features = ["derive"] }