Merge pull request #1430 from input-output-hk/jpraynaud/1410-upgrade-cardano-node-8-7-3

jpraynaud · web-flow · commit 19a00095678a · 2024-01-15T16:03:00.000+01:00
Upgrade Cardano node to `8.7.3`
diff --git a/.github/workflows/test-docker-distribution.yml b/.github/workflows/test-docker-distribution.yml
@@ -18,7 +18,7 @@ on:
         description: The url of the archive of the Cardano binaries
         required: true
         type: string
-        default: https://github.com/input-output-hk/cardano-node/releases/download/8.1.2/cardano-node-8.1.2-linux.tar.gz
+        default: https://github.com/input-output-hk/cardano-node/releases/download/8.7.3/cardano-node-8.7.3-linux.tar.gz
       dry_run:
         description: Dry run will not push the Docker images to the registry
         required: true
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/website/root/manual/getting-started/bootstrap-cardano-node.md b/docs/website/root/manual/getting-started/bootstrap-cardano-node.md
@@ -281,7 +281,7 @@ You will see more information about the snapshot:
 +-----------------------+-------------------------------------------------------------------------------------------------------------------------------+
 | Location 1            | https://storage.googleapis.com/mithril-release-preprod-…aa11b0e2ccf737d4f5def8b0a9f2245eded2b4ec4be876f7bd64deddcbbf.tar.gz   |
 +-----------------------+-------------------------------------------------------------------------------------------------------------------------------+
-| Cardano node version  | 8.1.2                                                                                                                         |
+| Cardano node version  | 8.7.3                                                                                                                         |
 +-----------------------+-------------------------------------------------------------------------------------------------------------------------------+
 | Created               | 2023-05-31T14:02:40.150189810Z                                                                                                |
 +-----------------------+-------------------------------------------------------------------------------------------------------------------------------+
diff --git a/docs/website/root/manual/getting-started/run-signer-node.md b/docs/website/root/manual/getting-started/run-signer-node.md
@@ -77,7 +77,7 @@ Note that this guide works on a Linux machine only.
   * Read rights on the `Database` folder (specified by the `--database-path` setting of the **Cardano node**)
   * Read and write rights on the `Inter Process Communication` file (typically defined by the `CARDANO_NODE_SOCKET_PATH` environment variable used to launch the **Cardano node**)
 
-* Install a recent version of [`cardano-cli`](https://github.com/input-output-hk/cardano-node/releases/tag/8.1.2) (version 8.1.2+).
+* Install a recent version of [`cardano-cli`](https://github.com/input-output-hk/cardano-node/releases/tag/8.7.3) (version 8.7.3+).
 
 * Install a correctly configured Rust toolchain (latest stable version). You can follow the instructions provided [here](https://www.rust-lang.org/learn/get-started).
 
diff --git a/mithril-aggregator/Cargo.toml b/mithril-aggregator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.4.24"
+version = "0.4.25"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-aggregator/Dockerfile b/mithril-aggregator/Dockerfile
@@ -32,7 +32,8 @@ RUN /app/target/release/mithril-aggregator --version
 FROM debian:11-slim
 
 # Args
-ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.2/cardano-node-8.1.2-linux.tar.gz
+ARG CARDANO_NODE_VERSION=8.7.3
+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
 
 # Upgrade
 RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget sqlite3 && rm -rf /var/lib/apt/lists/*
diff --git a/mithril-aggregator/Dockerfile.ci b/mithril-aggregator/Dockerfile.ci
@@ -14,7 +14,8 @@ 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_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.2/cardano-node-8.1.2-linux.tar.gz
+ARG CARDANO_NODE_VERSION=8.7.3
+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
 RUN wget -nv -O cardano-bin.tar.gz $CARDANO_BIN_URL \
     && tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin \
     && /app/bin/cardano-cli --version \
diff --git a/mithril-aggregator/Makefile b/mithril-aggregator/Makefile
@@ -33,7 +33,7 @@ docker-build:
 	cd ../ && docker build -t mithril/mithril-aggregator -f mithril-aggregator/Dockerfile .
 
 docker-build-ci: build
-	cd ../ && docker build -t mithril/mithril-aggregator -f mithril-aggregator/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM .
+	cd ../ && docker build -t mithril/mithril-aggregator -f mithril-aggregator/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM --build-arg CARDANO_NODE_VERSION .
 
 docker-run:
 	docker run --rm -p 8080:8080 --name='mithril-aggregator' mithril/mithril-aggregator serve
diff --git a/mithril-infra/assets/infra.version b/mithril-infra/assets/infra.version
@@ -1 +1 @@
-0.2.3
+0.2.4
diff --git 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     = "8.1.2"
+  default     = "8.7.3"
 }
 
 variable "cardano_configurations_repository_commit" {
diff --git a/mithril-signer/Cargo.toml b/mithril-signer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-signer"
-version = "0.2.100"
+version = "0.2.101"
 description = "A Mithril Signer"
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-signer/Dockerfile b/mithril-signer/Dockerfile
@@ -33,7 +33,8 @@ RUN /app/target/release/mithril-signer --version
 FROM debian:11-slim
 
 # Args
-ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.2/cardano-node-8.1.2-linux.tar.gz
+ARG CARDANO_NODE_VERSION=8.7.3
+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
 
 # Upgrade
 RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget sqlite3 && rm -rf /var/lib/apt/lists/*
diff --git a/mithril-signer/Dockerfile.ci b/mithril-signer/Dockerfile.ci
@@ -14,7 +14,8 @@ 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_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.2/cardano-node-8.1.2-linux.tar.gz
+ARG CARDANO_NODE_VERSION=8.7.3
+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
 RUN wget -nv -O cardano-bin.tar.gz $CARDANO_BIN_URL \
     && tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin \
     && /app/bin/cardano-cli --version \
diff --git a/mithril-signer/Makefile b/mithril-signer/Makefile
@@ -33,7 +33,7 @@ docker-build:
 	cd ../ && docker build -t mithril/mithril-signer -f mithril-signer/Dockerfile .
 
 docker-build-ci: build
-	cd ../ && docker build -t mithril/mithril-signer -f mithril-signer/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM .
+	cd ../ && docker build -t mithril/mithril-signer -f mithril-signer/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM --build-arg CARDANO_NODE_VERSION .
 
 docker-run:
 	docker run --rm --name='mithril-signer' mithril/mithril-signer
diff --git a/mithril-test-lab/mithril-devnet/VERSION b/mithril-test-lab/mithril-devnet/VERSION
@@ -1 +1 @@
-0.2.0
+0.2.1
diff --git a/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-cardano.sh b/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-cardano.sh
@@ -71,8 +71,10 @@ $CARDANO_CLI byron genesis genesis \
 cp $SCRIPT_DIRECTORY/configuration/babbage/alonzo-babbage-test-genesis.json "${ARTIFACTS_DIR_TEMP}/genesis.alonzo.spec.json"
 cp $SCRIPT_DIRECTORY/configuration/babbage/conway-babbage-test-genesis.json "${ARTIFACTS_DIR_TEMP}/genesis.conway.spec.json"
 
-# Fix 8.1.2, to avoid the following error: 'Command failed: genesis create-staked  Error: Error while decoding Shelley genesis at: example/genesis.conway.spec.json Error: Error in $: key "genDelegs" not found'
-mv ${ARTIFACTS_DIR_TEMP}/genesis.conway.spec.json ${ARTIFACTS_DIR_TEMP}/genesis.conway.spec.json.tmp && cat ${ARTIFACTS_DIR_TEMP}/genesis.conway.spec.json.tmp | jq '. += {"genDelegs":{}}' > ${ARTIFACTS_DIR_TEMP}/genesis.conway.spec.json && rm ${ARTIFACTS_DIR_TEMP}/genesis.conway.spec.json.tmp
+if [ "${CARDANO_NODE_VERSION}" = "8.1.2" ]; then
+  # Fix 8.1.2, to avoid the following error: 'Command failed: genesis create-staked  Error: Error while decoding Shelley genesis at: example/genesis.conway.spec.json Error: Error in $: key "genDelegs" not found'
+  mv ${ARTIFACTS_DIR_TEMP}/genesis.conway.spec.json ${ARTIFACTS_DIR_TEMP}/genesis.conway.spec.json.tmp && cat ${ARTIFACTS_DIR_TEMP}/genesis.conway.spec.json.tmp | jq '. += {"genDelegs":{}}' > ${ARTIFACTS_DIR_TEMP}/genesis.conway.spec.json && rm ${ARTIFACTS_DIR_TEMP}/genesis.conway.spec.json.tmp
+fi
 
 cp $SCRIPT_DIRECTORY/configuration/byron/configuration.yaml "${ARTIFACTS_DIR_TEMP}/"
 $SED -i "${ARTIFACTS_DIR_TEMP}/configuration.yaml" \
diff --git a/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-init.sh b/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-init.sh
@@ -1,6 +1,6 @@
 # Cardano node version
 if [ -z "${CARDANO_NODE_VERSION}" ]; then 
-  CARDANO_NODE_VERSION="8.1.2"
+  CARDANO_NODE_VERSION="8.7.3"
 fi
 if [ -z "${CARDANO_BINARY_URL}" ]; then 
   CARDANO_BINARY_URL="https://github.com/input-output-hk/cardano-node/releases/download/${CARDANO_NODE_VERSION}/cardano-node-${CARDANO_NODE_VERSION}-linux.tar.gz"
diff --git a/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-start.sh b/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-start.sh
@@ -133,6 +133,8 @@ if [ -z "\${MITHRIL_IMAGE_ID}" ]; then
   else
     DOCKER_BUILD_CMD="make docker-build"
   fi
+  export CARDANO_NODE_VERSION=${CARDANO_NODE_VERSION}
+  echo ">>>> Docker builder will use Cardano node version: '\$CARDANO_NODE_VERSION'"
   echo ">>>> Docker builder will build images with command: '\$DOCKER_BUILD_CMD'"
   echo ">>>> Building Mithril Aggregator node Docker image"
   cd mithril-aggregator && \$DOCKER_BUILD_CMD && cd ..
diff --git 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.2.32"
+version = "0.2.33"
 authors = { workspace = true }
 edition = { workspace = true }
 documentation = { workspace = true }
diff --git a/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs b/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs
@@ -58,7 +58,7 @@ impl Aggregator {
             ("ERA_READER_ADAPTER_TYPE", "dummy"),
             ("ERA_READER_ADAPTER_PARAMS", &era_reader_adapter_params),
             ("SIGNED_ENTITY_TYPES", &signed_entity_types),
-            ("CARDANO_NODE_VERSION", "8.1.2"),
+            ("CARDANO_NODE_VERSION", "8.7.3"),
             ("CHAIN_OBSERVER_TYPE", aggregator_config.chain_observer_type),
         ]);
         let args = vec![

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ locals {`
`141`	`141`	`variable "cardano_image_id" {`
`142`	`142`	`type = string`
`143`	`143`	`description = "The Cardano image tag of service to deploy"`
`144`		`- default = "8.1.2"`
	`144`	`+ default = "8.7.3"`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`variable "cardano_configurations_repository_commit" {`