From 3868ee95ba426b26519d1e03db95252e0bb2712a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Mon, 4 Nov 2024 17:30:07 +0100 Subject: [PATCH 1/2] chore: upgrade to Cradano '10.1.2' --- .github/workflows/ci.yml | 2 +- .github/workflows/test-docker-distribution.yml | 2 +- CHANGELOG.md | 2 +- .../root/manual/getting-started/bootstrap-cardano-node.md | 8 ++++---- .../root/manual/getting-started/run-mithril-devnet.md | 6 +++--- mithril-aggregator/Dockerfile | 2 +- mithril-aggregator/Dockerfile.ci | 2 +- mithril-infra/variables.tf | 2 +- mithril-signer/Dockerfile | 2 +- mithril-signer/Dockerfile.ci | 2 +- mithril-test-lab/mithril-devnet/mkfiles/mkfiles-init.sh | 2 +- mithril-test-lab/mithril-end-to-end/src/main.rs | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14a36f416e..6e66a56b56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -290,7 +290,7 @@ jobs: mode: ["std"] era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras) }} next_era: [""] - cardano_node_version: ["9.1.1", "9.2.1", "10.1.1"] + cardano_node_version: ["9.1.1", "9.2.1", "10.1.2"] hard_fork_latest_era_at_epoch: [0] run_id: ["#1", "#2"] extra_args: [""] diff --git a/.github/workflows/test-docker-distribution.yml b/.github/workflows/test-docker-distribution.yml index 7c5a747ad9..1b7e3979e2 100644 --- a/.github/workflows/test-docker-distribution.yml +++ b/.github/workflows/test-docker-distribution.yml @@ -25,7 +25,7 @@ on: description: The url of the archive of the Cardano binaries required: true type: string - default: https://github.com/IntersectMBO/cardano-node/releases/download/10.1.1/cardano-node-10.1.1-linux.tar.gz + default: https://github.com/IntersectMBO/cardano-node/releases/download/10.1.2/cardano-node-10.1.2-linux.tar.gz dry_run: description: Dry run will not push the Docker images to the registry required: true diff --git a/CHANGELOG.md b/CHANGELOG.md index f38a62fbec..44716116bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ As a minor extension, we have adopted a slightly different versioning convention - Deprecate `protocol` and `next_protocol` in favor of `signer_registration_protocol` in the `/epoch-settings` route. -- Support for `Cardano node` `10.1.1` in the signer and the aggregator. +- Support for `Cardano node` `10.1.2` in the signer and the aggregator. - Crates versions: diff --git a/docs/website/root/manual/getting-started/bootstrap-cardano-node.md b/docs/website/root/manual/getting-started/bootstrap-cardano-node.md index ef0d94b163..9c12353f79 100644 --- a/docs/website/root/manual/getting-started/bootstrap-cardano-node.md +++ b/docs/website/root/manual/getting-started/bootstrap-cardano-node.md @@ -436,7 +436,7 @@ You will see more information about the snapshot: +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Size | 2323485648 | +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Cardano node version | 10.1.1 | +| Cardano node version | 10.1.2 | +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Location | https://storage.googleapis.com/cdn.aggregator.testing-preview.api.mithril.network/preview-e539-i10787.db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667.tar.zst | +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -464,11 +464,11 @@ You will see that the selected snapshot archive has been downloaded locally, unp 5/5 - Verifying the cardano db signature… Cardano db 'db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667' has been unpacked and successfully checked against Mithril multi-signature contained in the certificate. - Files in the directory '/home/mithril/data/testnet/db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667/db' can be used to run a Cardano node with version >= 10.1.1. + Files in the directory '/home/mithril/data/testnet/db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667/db' can be used to run a Cardano node with version >= 10.1.2. If you are using Cardano Docker image, you can restore a Cardano Node with: - 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.1.1 + 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.1.2 ``` ### Step 5: Launch a Cardano node from the restored Cardano DB snapshot @@ -476,7 +476,7 @@ Cardano db 'db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667' ha Launch an empty Cardano node and make it live in minutes! ```bash -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.1.1 +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.1.2 ``` 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: diff --git a/docs/website/root/manual/getting-started/run-mithril-devnet.md b/docs/website/root/manual/getting-started/run-mithril-devnet.md index c06fc4590a..cf3cb998bf 100644 --- a/docs/website/root/manual/getting-started/run-mithril-devnet.md +++ b/docs/website/root/manual/getting-started/run-mithril-devnet.md @@ -486,7 +486,7 @@ You will see more information about the snapshot: +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Size | 2323485648 | +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Cardano node version | 10.1.1 | +| Cardano node version | 10.1.2 | +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Location | https://storage.googleapis.com/cdn.aggregator.testing-preview.api.mithril.network/preview-e539-i10787.db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667.tar.zst | +-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -514,9 +514,9 @@ You will see that the certificate chain is validated to ensure the issued certif 5/5 - Verifying the cardano db signature… Cardano db 'db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667' has been unpacked and successfully checked against Mithril multi-signature contained in the certificate. - Files in the directory '/home/mithril/data/testnet/db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667/db' can be used to run a Cardano node with version >= 10.1.1. + Files in the directory '/home/mithril/data/testnet/db5f50a060d4b813125c4263b700ecc96e5d8c8710f0430e5c80d2f0fa79b667/db' can be used to run a Cardano node with version >= 10.1.2. If you are using Cardano Docker image, you can restore a Cardano Node with: - 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.1.1 + 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.1.2 ``` diff --git a/mithril-aggregator/Dockerfile b/mithril-aggregator/Dockerfile index f06d002175..8824c813cc 100644 --- a/mithril-aggregator/Dockerfile +++ b/mithril-aggregator/Dockerfile @@ -35,7 +35,7 @@ RUN /app/target/release/mithril-aggregator --version FROM debian:11-slim # Args -ARG CARDANO_NODE_VERSION=10.1.1 +ARG CARDANO_NODE_VERSION=10.1.2 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 ARG EMBED-CARDANO-CLI=0 diff --git a/mithril-aggregator/Dockerfile.ci b/mithril-aggregator/Dockerfile.ci index f0653f2641..3e4e6a5222 100644 --- a/mithril-aggregator/Dockerfile.ci +++ b/mithril-aggregator/Dockerfile.ci @@ -14,7 +14,7 @@ RUN mkdir -p /app/bin RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && apt-get clean && rm -rf /var/lib/apt/lists/* # Install cardano-cli -ARG CARDANO_NODE_VERSION=10.1.1 +ARG CARDANO_NODE_VERSION=10.1.2 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 ARG EMBED-CARDANO-CLI=0 RUN if [ "$EMBED-CARDANO-CLI" = 1 ] ; then \ diff --git a/mithril-infra/variables.tf b/mithril-infra/variables.tf index 1f1a141043..9aaa2ca1a1 100644 --- a/mithril-infra/variables.tf +++ b/mithril-infra/variables.tf @@ -141,7 +141,7 @@ locals { variable "cardano_image_id" { type = string description = "The Cardano image tag of service to deploy" - default = "10.1.1" + default = "10.1.2" } variable "cardano_image_registry" { diff --git a/mithril-signer/Dockerfile b/mithril-signer/Dockerfile index 8f714067d9..19e6009f53 100644 --- a/mithril-signer/Dockerfile +++ b/mithril-signer/Dockerfile @@ -36,7 +36,7 @@ RUN /app/target/release/mithril-signer --version FROM debian:11-slim # Args -ARG CARDANO_NODE_VERSION=10.1.1 +ARG CARDANO_NODE_VERSION=10.1.2 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 ARG EMBED-CARDANO-CLI=0 diff --git a/mithril-signer/Dockerfile.ci b/mithril-signer/Dockerfile.ci index 5341626717..148402a23d 100644 --- a/mithril-signer/Dockerfile.ci +++ b/mithril-signer/Dockerfile.ci @@ -14,7 +14,7 @@ RUN mkdir -p /app/bin RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && apt-get clean && rm -rf /var/lib/apt/lists/* # Install cardano-cli -ARG CARDANO_NODE_VERSION=10.1.1 +ARG CARDANO_NODE_VERSION=10.1.2 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 ARG EMBED-CARDANO-CLI=0 # Install cardano-cli diff --git a/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-init.sh b/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-init.sh index 06761c5f94..89ccdfc002 100644 --- a/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-init.sh +++ b/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-init.sh @@ -9,7 +9,7 @@ esac # Cardano node version if [ -z "${CARDANO_NODE_VERSION}" ]; then - CARDANO_NODE_VERSION="10.1.1" + CARDANO_NODE_VERSION="10.1.2" fi if [ -z "${CARDANO_NODE_VERSION_RELEASE}" ]; then CARDANO_NODE_VERSION_RELEASE=$(echo "${CARDANO_NODE_VERSION}" | cut -d'-' -f1) diff --git a/mithril-test-lab/mithril-end-to-end/src/main.rs b/mithril-test-lab/mithril-end-to-end/src/main.rs index 426c0b480d..da51824c8c 100644 --- a/mithril-test-lab/mithril-end-to-end/src/main.rs +++ b/mithril-test-lab/mithril-end-to-end/src/main.rs @@ -61,7 +61,7 @@ pub struct Args { cardano_epoch_length: f64, /// Cardano node version - #[clap(long, default_value = "10.1.1")] + #[clap(long, default_value = "10.1.2")] cardano_node_version: String, /// Epoch at which hard fork to the latest Cardano era will be made (starts with the latest era by default) From 5c0374dba0fa0f4c8166e4572ea8106af5ce78c4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Raynaud Date: Tue, 5 Nov 2024 11:35:10 +0100 Subject: [PATCH 2/2] chore: bump crates versions - 'mithril-aggregator' from '0.5.100' to '0.5.101' - 'mithril-signer' from '0.2.208' to '0.2.209' - 'mithril-end-to-end' from '0.4.46' to '0.4.47' - 'mithril-infra' from '0.3.7' to '0.3.8' - 'mithril-devnet' from '0.4.4' to '0.4.5'. --- Cargo.lock | 6 +++--- mithril-aggregator/Cargo.toml | 2 +- mithril-infra/assets/infra.version | 2 +- mithril-signer/Cargo.toml | 2 +- mithril-test-lab/mithril-devnet/VERSION | 2 +- mithril-test-lab/mithril-end-to-end/Cargo.toml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ec4bd4be78..9596fc4b94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3588,7 +3588,7 @@ dependencies = [ [[package]] name = "mithril-aggregator" -version = "0.5.100" +version = "0.5.101" dependencies = [ "anyhow", "async-trait", @@ -3816,7 +3816,7 @@ dependencies = [ [[package]] name = "mithril-end-to-end" -version = "0.4.46" +version = "0.4.47" dependencies = [ "anyhow", "async-recursion", @@ -3903,7 +3903,7 @@ dependencies = [ [[package]] name = "mithril-signer" -version = "0.2.208" +version = "0.2.209" dependencies = [ "anyhow", "async-trait", diff --git a/mithril-aggregator/Cargo.toml b/mithril-aggregator/Cargo.toml index e951a60a94..c00a8fdebc 100644 --- a/mithril-aggregator/Cargo.toml +++ b/mithril-aggregator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mithril-aggregator" -version = "0.5.100" +version = "0.5.101" description = "A Mithril Aggregator server" authors = { workspace = true } edition = { workspace = true } diff --git a/mithril-infra/assets/infra.version b/mithril-infra/assets/infra.version index 0f82685331..6678432209 100644 --- a/mithril-infra/assets/infra.version +++ b/mithril-infra/assets/infra.version @@ -1 +1 @@ -0.3.7 +0.3.8 diff --git a/mithril-signer/Cargo.toml b/mithril-signer/Cargo.toml index 9f04e277d9..bf68e2f064 100644 --- a/mithril-signer/Cargo.toml +++ b/mithril-signer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mithril-signer" -version = "0.2.208" +version = "0.2.209" description = "A Mithril Signer" authors = { workspace = true } edition = { workspace = true } diff --git a/mithril-test-lab/mithril-devnet/VERSION b/mithril-test-lab/mithril-devnet/VERSION index 6f2743d65d..0bfccb0804 100644 --- a/mithril-test-lab/mithril-devnet/VERSION +++ b/mithril-test-lab/mithril-devnet/VERSION @@ -1 +1 @@ -0.4.4 +0.4.5 diff --git a/mithril-test-lab/mithril-end-to-end/Cargo.toml b/mithril-test-lab/mithril-end-to-end/Cargo.toml index 41d52e0953..03a783d253 100644 --- a/mithril-test-lab/mithril-end-to-end/Cargo.toml +++ b/mithril-test-lab/mithril-end-to-end/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mithril-end-to-end" -version = "0.4.46" +version = "0.4.47" authors = { workspace = true } edition = { workspace = true } documentation = { workspace = true }