Skip to content

Commit 29719ca

Browse files
authored
Merge pull request #2447 from input-output-hk/jpraynaud/2446-upgrade-cardano-10.3.1
Feat: Support Cardano node `10.3.1`
2 parents b9230e9 + 627cf09 commit 29719ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+20437
-54
lines changed

.github/workflows/backward-compatibility.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
description: "Cardano node version used in e2e"
1313
required: true
1414
type: string
15-
default: "10.2.1"
15+
default: "10.3.1"
1616
signed-entity-types:
1717
description: "Signed entity types parameters (discriminants names in an ordered comma separated list)"
1818
required: true
@@ -25,7 +25,7 @@ on:
2525
default: 3
2626
cardano-node-version:
2727
type: string
28-
default: "10.2.1"
28+
default: "10.3.1"
2929
signed-entity-types:
3030
type: string
3131
default: "CardanoTransactions,CardanoStakeDistribution,CardanoDatabase"

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -297,41 +297,41 @@ jobs:
297297
mode: ["std"]
298298
era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras) }}
299299
next_era: [""]
300-
cardano_node_version: ["10.1.3", "10.1.4", "10.2.1"]
300+
cardano_node_version: ["10.2.1", "10.3.1"]
301301
hard_fork_latest_era_at_epoch: [0]
302-
run_id: ["#1", "#2"]
302+
run_id: ["#1", "#2", "#3"]
303303
extra_args: [""]
304304

305305
include:
306306
# Include a test for partial decentralization with leader/follower signer registration and P2P signature registration
307307
- mode: "leader-follower"
308308
era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras)[0] }}
309309
next_era: [""]
310-
cardano_node_version: "10.2.1"
310+
cardano_node_version: "10.3.1"
311311
hard_fork_latest_era_at_epoch: 0
312312
run_id: "#1"
313313
extra_args: "--number-of-aggregators=2 --use-relays --relay-signer-registration-mode=passthrough --relay-signature-registration-mode=p2p"
314314
# Include a test for full dedentralization P2P signer registration and P2P signature registration
315315
- mode: "decentralized"
316316
era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras)[0] }}
317317
next_era: ""
318-
cardano_node_version: "10.1.4"
318+
cardano_node_version: "10.3.1"
319319
hard_fork_latest_era_at_epoch: 0
320320
run_id: "#1"
321321
extra_args: "--number-of-aggregators=2 --use-relays --relay-signer-registration-mode=p2p --relay-signature-registration-mode=p2p"
322322
# Include a test for the era switch without regenesis
323323
- mode: "std"
324324
era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras)[0] }}
325325
next_era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras)[1] }}
326-
cardano_node_version: "10.2.1"
326+
cardano_node_version: "10.3.1"
327327
hard_fork_latest_era_at_epoch: 0
328328
run_id: "#1"
329329
extra_args: ""
330330
# Include a test for the era switch with regenesis
331331
- mode: "std"
332332
era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras)[0] }}
333333
next_era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras)[1] }}
334-
cardano_node_version: "10.2.1"
334+
cardano_node_version: "10.3.1"
335335
hard_fork_latest_era_at_epoch: 0
336336
run_id: "#1"
337337
extra_args: "--mithril-era-regenesis-on-switch"

.github/workflows/test-docker-distribution.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
description: The url of the archive of the Cardano binaries
2626
required: true
2727
type: string
28-
default: https://github.com/IntersectMBO/cardano-node/releases/download/10.2.1/cardano-node-10.2.1-linux.tar.gz
28+
default: https://github.com/IntersectMBO/cardano-node/releases/download/10.3.1/cardano-node-10.3.1-linux.tar.gz
2929
dry_run:
3030
description: Dry run will not push the Docker images to the registry
3131
required: true

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ As a minor extension, we have adopted a slightly different versioning convention
1515
- Without this option, only final immutable files are downloaded and the ledger state must be computed from the genesis block.
1616
- The `--include-ancillary` option requires the usage of an **ancillary verification key** (`--ancillary-verification-key` or `ANCILLARY_VERIFICATION_KEY`) which is specified in the [Networks configuration](https://mithril.network/doc/manual/getting-started/network-configurations) page.
1717

18+
- Support for `Cardano node` `10.3.1` in the signer and the aggregator.
19+
1820
- Support for ancillary files signature for _Cardano node database_ and _Cardano node database v2_ certification with IOG key.
1921

2022
- Add `with_origin_tag` function to the Mithril client library to record the origin of client requests.

Cargo.lock

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

docs/website/root/manual/develop/run-mithril-devnet.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ You should see the following information displayed:
107107
>> Artifacts Directory[env::ARTIFACTS_DIR]: artifacts
108108
>> Cardano Full nodes [env::NUM_FULL_NODES]: 1
109109
>> Cardano SPO nodes [env::NUM_POOL_NODES]: 2
110-
>> Cardano Node Version [env::CARDANO_NODE_VERSION]: 10.2.1
110+
>> Cardano Node Version [env::CARDANO_NODE_VERSION]: 10.3.1
111111
>> Cardano Network Magic [env::NETWORK_MAGIC]: 42
112112
>> Cardano Hard Fork Babbage At Epoch [env::HARD_FORK_BABBAGE_AT_EPOCH]: 0
113113
>> Cardano Hard Fork Conway At Epoch [env::HARD_FORK_CONWAY_AT_EPOCH]: 0
@@ -126,7 +126,7 @@ generated genesis with: 3 genesis keys, 2 non-delegating UTxO keys, 2 stake pool
126126
>> Start Cardano network
127127
cardano-cli 10.1.1.0 - linux-x86_64 - ghc-8.10
128128
git rev 01bda2e2cb0a70cd95067d696dbb44665f1d680a
129-
cardano-node 10.2.1 - linux-x86_64 - ghc-8.10
129+
cardano-node 10.3.1 - linux-x86_64 - ghc-8.10
130130
git rev 01bda2e2cb0a70cd95067d696dbb44665f1d680a
131131
>> Starting Cardano node 'node-full1'
132132
>> Starting Cardano node 'node-pool1'
@@ -191,7 +191,7 @@ Signer 2 pool1y3pxhtqytcwy3mmnawqf2ej0x9sz5frkkwkz6scfqmzyyw8u38v Certified Po
191191
>> Bootstrap the Genesis certificate
192192
{"msg":"Started","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.953666896Z","hostname":"c993b6b764f2","pid":1,"node_version":"0.5.110+e2fa1e0","run_mode":"dev"}
193193
{Genesis bootstrap for test only!
194-
"msg":"BOOTSTRAP GENESIS command","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.95394937Z","hostname":"c993b6b764f2","pid":1,"config":"Configuration { environment: Production, cardano_cli_path: \"/app/bin/cardano-cli\", cardano_node_socket_path: \"/data/ipc/node.sock\", cardano_node_version: \"10.2.1\", network_magic: Some(42), network: \"devnet\", chain_observer_type: Pallas, protocol_parameters: ProtocolParameters { k: 5, m: 100, phi_f: 0.65 }, snapshot_uploader_type: Local, snapshot_bucket_name: None, snapshot_use_cdn_domain: false, server_ip: \"0.0.0.0\", server_port: 8080, run_interval: 1000, db_directory: \"/data/db\", snapshot_directory: \".\", data_stores_directory: \"/data/mithril/aggregator/stores\", genesis_verification_key: \"5b33322c3235332c3138362c3230312c3137372c31312c3131372c3133352c3138372c3136372c3138312c3138382c32322c35392c3230362c3130352c3233312c3135302c3231352c33302c37382c3231322c37362c31362c3235322c3138302c37322c3133342c3133372c3234372c3136312c36385d\", reset_digests_cache: false, disable_digests_cache: false, store_retention_limit: None, era_reader_adapter_type: Bootstrap, era_reader_adapter_params: None, signed_entity_types: None, snapshot_compression_algorithm: Zstandard, zstandard_parameters: None, cexplorer_pools_url: None, signer_importer_run_interval: 720, allow_unparsable_block: false, cardano_transactions_prover_cache_pool_size: 10, cardano_transactions_database_connection_pool_size: 10, cardano_transactions_signing_config: CardanoTransactionsSigningConfig { security_parameter: BlockNumber(3000), step: BlockNumber(120) }, cardano_transactions_prover_max_hashes_allowed_by_request: 100, cardano_transactions_block_streamer_max_roll_forwards_per_poll: 10000, enable_metrics_server: false, metrics_server_ip: \"0.0.0.0\", metrics_server_port: 9090, persist_usage_report_interval_in_seconds: 10 }"}
194+
"msg":"BOOTSTRAP GENESIS command","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.95394937Z","hostname":"c993b6b764f2","pid":1,"config":"Configuration { environment: Production, cardano_cli_path: \"/app/bin/cardano-cli\", cardano_node_socket_path: \"/data/ipc/node.sock\", cardano_node_version: \"10.3.1\", network_magic: Some(42), network: \"devnet\", chain_observer_type: Pallas, protocol_parameters: ProtocolParameters { k: 5, m: 100, phi_f: 0.65 }, snapshot_uploader_type: Local, snapshot_bucket_name: None, snapshot_use_cdn_domain: false, server_ip: \"0.0.0.0\", server_port: 8080, run_interval: 1000, db_directory: \"/data/db\", snapshot_directory: \".\", data_stores_directory: \"/data/mithril/aggregator/stores\", genesis_verification_key: \"5b33322c3235332c3138362c3230312c3137372c31312c3131372c3133352c3138372c3136372c3138312c3138382c32322c35392c3230362c3130352c3233312c3135302c3231352c33302c37382c3231322c37362c31362c3235322c3138302c37322c3133342c3133372c3234372c3136312c36385d\", reset_digests_cache: false, disable_digests_cache: false, store_retention_limit: None, era_reader_adapter_type: Bootstrap, era_reader_adapter_params: None, signed_entity_types: None, snapshot_compression_algorithm: Zstandard, zstandard_parameters: None, cexplorer_pools_url: None, signer_importer_run_interval: 720, allow_unparsable_block: false, cardano_transactions_prover_cache_pool_size: 10, cardano_transactions_database_connection_pool_size: 10, cardano_transactions_signing_config: CardanoTransactionsSigningConfig { security_parameter: BlockNumber(3000), step: BlockNumber(120) }, cardano_transactions_prover_max_hashes_allowed_by_request: 100, cardano_transactions_block_streamer_max_roll_forwards_per_poll: 10000, enable_metrics_server: false, metrics_server_ip: \"0.0.0.0\", metrics_server_port: 9090, persist_usage_report_interval_in_seconds: 10 }"}
195195
{"msg":"Opening SQLite connection","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.954098066Z","hostname":"c993b6b764f2","pid":1,"src":"ConnectionBuilder","path":"/data/mithril/aggregator/stores/aggregator.sqlite3"}
196196
{"msg":"Enabling SQLite Write Ahead Log journal mode","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.954185725Z","hostname":"c993b6b764f2","pid":1,"src":"ConnectionBuilder"}
197197
{"msg":"Enabling SQLite foreign key support","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.954483371Z","hostname":"c993b6b764f2","pid":1,"src":"ConnectionBuilder"}
@@ -332,7 +332,7 @@ The networks will be queried every second and will display:
332332
"http://0.0.0.0:8080/aggregator/artifact/snapshot/4c7b06dd2bef1416391b92a46dae7d2f606ced2954b628f844b021ba5b52b15f/download"
333333
],
334334
"compression_algorithm": "zstandard",
335-
"cardano_node_version": "10.2.1"
335+
"cardano_node_version": "10.3.1"
336336
},
337337
{
338338
"digest": "b98b25f505401e967df1012a4c13385290db15d157d0292e9f8290bd9933a66e",
@@ -349,7 +349,7 @@ The networks will be queried every second and will display:
349349
"http://0.0.0.0:8080/aggregator/artifact/snapshot/b98b25f505401e967df1012a4c13385290db15d157d0292e9f8290bd9933a66e/download"
350350
],
351351
"compression_algorithm": "zstandard",
352-
"cardano_node_version": "10.2.1"
352+
"cardano_node_version": "10.3.1"
353353
}
354354
]
355355

@@ -564,7 +564,7 @@ You will see more information about the snapshot:
564564
+-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
565565
| Size | 2323485648 |
566566
+-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
567-
| Cardano node version | 10.2.1 |
567+
| Cardano node version | 10.3.1 |
568568
+-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
569569
| Location | https://storage.googleapis.com/cdn.aggregator.testing-preview.api.mithril.network/preview-e539-i10787.db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667.tar.zst |
570570
+-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -592,9 +592,9 @@ You will see that the certificate chain is validated to ensure the issued certif
592592
5/5 - Verifying the cardano db signature…
593593
Cardano db 'db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667' has been unpacked and successfully checked against Mithril multi-signature contained in the certificate.
594594

595-
Files in the directory '/home/mithril/data/testnet/db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667/db' can be used to run a Cardano node with version >= 10.2.1.
595+
Files in the directory '/home/mithril/data/testnet/db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667/db' can be used to run a Cardano node with version >= 10.3.1.
596596

597597
If you are using Cardano Docker image, you can restore a Cardano Node with:
598598

599-
docker run -v cardano-node-ipc:/ipc -v cardano-node-data:/data --mount type=bind,source="/home/mithril/data/testnet/db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667/db",target=/data/db/ -e NETWORK=preview ghcr.io/intersectmbo/cardano-node:10.2.1
599+
docker run -v cardano-node-ipc:/ipc -v cardano-node-data:/data --mount type=bind,source="/home/mithril/data/testnet/db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667/db",target=/data/db/ -e NETWORK=preview ghcr.io/intersectmbo/cardano-node:10.3.1
600600
```

docs/website/root/manual/getting-started/bootstrap-cardano-node.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ You will see more information about the snapshot:
434434
+-----------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
435435
| Size | 3.14 GiB |
436436
+-----------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
437-
| Cardano node version | 10.2.1 |
437+
| Cardano node version | 10.3.1 |
438438
+-----------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
439439
| Location | https://storage.googleapis.com/cdn.aggregator.pre-release-preview.api.mithril.network/cardano-immutable-files-full/preview-e916-i18323.a1b5e6f43521fd9c5f55e3d6bf27dc4a62f43980681cb67e28cc40582a0d1974.tar.zst |
440440
+-----------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -477,19 +477,19 @@ You will see that the selected snapshot archive has been downloaded locally unpa
477477
5/5 - Verifying the cardano db signature…
478478
Cardano db 'a1b5e6f43521fd9c5f55e3d6bf27dc4a62f43980681cb67e28cc40582a0d1974' has been unpacked and successfully checked against Mithril multi-signature contained in the certificate.
479479
480-
Files in the directory 'db' can be used to run a Cardano node with version >= 10.2.1.
480+
Files in the directory 'db' can be used to run a Cardano node with version >= 10.3.1.
481481
482482
If you are using Cardano Docker image, you can restore a Cardano Node with:
483483
484-
docker run -v cardano-node-ipc:/ipc -v cardano-node-data:/data --mount type=bind,source="/home/mithril/data/testnet/a1b5e6f43521fd9c5f55e3d6bf27dc4a62f43980681cb67e28cc40582a0d1974/db",target=/data/db/ -e NETWORK=preview ghcr.io/intersectmbo/cardano-node:10.2.1
484+
docker run -v cardano-node-ipc:/ipc -v cardano-node-data:/data --mount type=bind,source="/home/mithril/data/testnet/a1b5e6f43521fd9c5f55e3d6bf27dc4a62f43980681cb67e28cc40582a0d1974/db",target=/data/db/ -e NETWORK=preview ghcr.io/intersectmbo/cardano-node:10.3.1
485485
```
486486
487487
### Step 5: Launch a Cardano node from the restored Cardano DB snapshot
488488
489489
Launch an empty Cardano node and make it live in minutes!
490490
491491
```bash
492-
docker run -v cardano-node-ipc:/ipc -v cardano-node-data:/data --mount type=bind,source="$(pwd)/data/testnet/$SNAPSHOT_DIGEST/db",target=/data/db/ -e NETWORK=$CARDANO_NETWORK ghcr.io/intersectmbo/cardano-node:10.2.1
492+
docker run -v cardano-node-ipc:/ipc -v cardano-node-data:/data --mount type=bind,source="$(pwd)/data/testnet/$SNAPSHOT_DIGEST/db",target=/data/db/ -e NETWORK=$CARDANO_NETWORK ghcr.io/intersectmbo/cardano-node:10.3.1
493493
```
494494
495495
You will see the Cardano node start by validating the files ingested from the snapshot archive. Then, it will synchronize with the other network nodes and start adding blocks:

mithril-aggregator/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mithril-aggregator"
3-
version = "0.7.42"
3+
version = "0.7.43"
44
description = "A Mithril Aggregator server"
55
authors = { workspace = true }
66
edition = { workspace = true }

mithril-aggregator/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN /app/target/release/mithril-aggregator --version
3535
FROM debian:12-slim
3636

3737
# Args
38-
ARG CARDANO_NODE_VERSION=10.2.1
38+
ARG CARDANO_NODE_VERSION=10.3.1
3939
ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/$CARDANO_NODE_VERSION/cardano-node-$CARDANO_NODE_VERSION-linux.tar.gz
4040
ARG EMBED-CARDANO-CLI=0
4141

mithril-aggregator/Dockerfile.ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN mkdir -p /app/bin
1414
RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && apt-get clean && rm -rf /var/lib/apt/lists/*
1515

1616
# Install cardano-cli
17-
ARG CARDANO_NODE_VERSION=10.2.1
17+
ARG CARDANO_NODE_VERSION=10.3.1
1818
ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/$CARDANO_NODE_VERSION/cardano-node-$CARDANO_NODE_VERSION-linux.tar.gz
1919
ARG EMBED-CARDANO-CLI=0
2020
RUN if [ "$EMBED-CARDANO-CLI" = 1 ] ; then \

0 commit comments

Comments
 (0)