Skip to content

Commit ad2ce7b

Browse files
authored
Merge pull request #2862 from input-output-hk/jpraynaud/2833-activate-future-dmq
feat: activate DMQ protocol
2 parents aee9032 + 902e2a0 commit ad2ce7b

File tree

24 files changed

+66
-258
lines changed

24 files changed

+66
-258
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ jobs:
184184

185185
include:
186186
- os: ubuntu-24.04
187-
test-args: --features full,unstable,future_dmq --workspace
187+
test-args: --features full,unstable --workspace
188188
- os: ubuntu-24.04-arm
189-
test-args: --features full,unstable,future_dmq --workspace
189+
test-args: --features full,unstable --workspace
190190
# Exclude nodes not officially supported on Windows and macOS (only mithril-client is supported)
191191
- os: macos-14
192192
test-args: >
@@ -392,6 +392,14 @@ jobs:
392392
extra_args: ["--aggregate-signature-type=Concatenation"]
393393

394394
include:
395+
# Include a test for partial decentralization with leader/follower signer registration and P2P signature registration with fake DMQ node
396+
- mode: "leader-follower"
397+
era: ${{ fromJSON(needs.build-ubuntu.outputs.eras)[0] }}
398+
next_era: [""]
399+
cardano_node_version: "10.5.1"
400+
hard_fork_latest_era_at_epoch: 0
401+
run_id: "#1"
402+
extra_args: "--number-of-aggregators=2 --use-relays --relay-signer-registration-mode=passthrough --relay-signature-registration-mode=p2p --aggregate-signature-type=Concatenation --use-dmq --dmq-node-flavor=fake"
395403
# Include a test for partial decentralization with leader/follower signer registration and P2P signature registration
396404
- mode: "leader-follower"
397405
era: ${{ fromJSON(needs.build-ubuntu.outputs.eras)[0] }}

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ As a minor extension, we have adopted a slightly different versioning convention
2323

2424
- **BREAKING**: Progress bars and spinners of the client CLI are now outputted to stderr instead of stdout.
2525

26+
- Support for DMQ protocol in the signer, aggregator and relay.
27+
2628
- Support for removal of `cardano_transactions_signing_config` from the diffused mithril network configuration.
2729

2830
- Decentralization of the configuration parameters of Mithril networks:

Cargo.lock

Lines changed: 35 additions & 96 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/cardano-node/mithril-cardano-node-chain/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mithril-cardano-node-chain"
3-
version = "0.1.11"
3+
version = "0.1.12"
44
authors.workspace = true
55
documentation.workspace = true
66
edition.workspace = true
@@ -14,11 +14,11 @@ async-trait = { workspace = true }
1414
hex = { workspace = true }
1515
mithril-common = { path = "../../../mithril-common" }
1616
nom = "8.0.0"
17-
pallas-addresses = { version = "0.33.0" }
18-
pallas-codec = { version = "0.33.0" }
19-
pallas-network = { version = "0.33.0" }
20-
pallas-primitives = { version = "0.33.0" }
21-
pallas-traverse = { version = "0.33.0" }
17+
pallas-addresses = { version = "0.34.0" }
18+
pallas-codec = { version = "0.34.0" }
19+
pallas-network = { version = "0.34.0" }
20+
pallas-primitives = { version = "0.34.0" }
21+
pallas-traverse = { version = "0.34.0" }
2222
rand_core = { workspace = true }
2323
serde = { workspace = true }
2424
serde_json = { workspace = true }
@@ -33,7 +33,7 @@ kes-summed-ed25519 = { version = "0.2.1", features = [
3333
"sk_clone_enabled",
3434
] }
3535
mockall = { workspace = true }
36-
pallas-crypto = "0.33.0"
36+
pallas-crypto = "0.34.0"
3737
slog-async = { workspace = true }
3838
slog-term = { workspace = true }
3939
tokio = { workspace = true, features = ["macros"] }

internal/mithril-dmq/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "mithril-dmq"
33
description = "Mechanisms to publish and consume messages of a 'Decentralized Message Queue network' through a DMQ node"
4-
version = "0.1.15"
4+
version = "0.1.16"
55
authors.workspace = true
66
documentation.workspace = true
77
edition.workspace = true
@@ -21,8 +21,8 @@ bincode = { version = "2.0.1" }
2121
blake2 = "0.10.6"
2222
mithril-cardano-node-chain = { path = "../cardano-node/mithril-cardano-node-chain" }
2323
mithril-common = { path = "../../mithril-common" }
24-
pallas-codec = { git = "https://github.com/txpipe/pallas.git", branch = "main" }
25-
pallas-network = { git = "https://github.com/txpipe/pallas.git", branch = "main" }
24+
pallas-codec = { version = "0.34.0" }
25+
pallas-network = { version = "0.34.0" }
2626
serde = { workspace = true }
2727
serde_bytes = "0.11.19"
2828
slog = { workspace = true }

mithril-aggregator/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mithril-aggregator"
3-
version = "0.7.96"
3+
version = "0.8.0"
44
description = "A Mithril Aggregator server"
55
authors = { workspace = true }
66
edition = { workspace = true }
@@ -14,7 +14,6 @@ default = ["jemallocator"]
1414

1515
bundle_tls = ["reqwest/native-tls-vendored"]
1616
jemallocator = ["dep:tikv-jemallocator"]
17-
future_dmq = ["dep:mithril-dmq"]
1817

1918
[dependencies]
2019
anyhow = { workspace = true }
@@ -31,7 +30,7 @@ mithril-cardano-node-chain = { path = "../internal/cardano-node/mithril-cardano-
3130
mithril-cardano-node-internal-database = { path = "../internal/cardano-node/mithril-cardano-node-internal-database" }
3231
mithril-cli-helper = { path = "../internal/mithril-cli-helper" }
3332
mithril-common = { path = "../mithril-common" }
34-
mithril-dmq = { path = "../internal/mithril-dmq", optional = true }
33+
mithril-dmq = { path = "../internal/mithril-dmq" }
3534
mithril-doc = { path = "../internal/mithril-doc" }
3635
mithril-era = { path = "../internal/mithril-era" }
3736
mithril-metric = { path = "../internal/mithril-metric" }

0 commit comments

Comments
 (0)