diff --git a/Cargo.lock b/Cargo.lock index 98a8af064af..3bf9e80eb9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3887,7 +3887,7 @@ dependencies = [ [[package]] name = "mithril-aggregator" -version = "0.8.20" +version = "0.8.21" dependencies = [ "anyhow", "async-trait", @@ -4130,7 +4130,7 @@ dependencies = [ [[package]] name = "mithril-client-cli" -version = "0.12.38" +version = "0.12.39" dependencies = [ "anyhow", "async-trait", @@ -4356,7 +4356,7 @@ dependencies = [ [[package]] name = "mithril-relay" -version = "0.2.1" +version = "0.2.2" dependencies = [ "anyhow", "bincode", @@ -4418,7 +4418,7 @@ dependencies = [ [[package]] name = "mithril-signer" -version = "0.3.13" +version = "0.3.14" dependencies = [ "anyhow", "async-trait", diff --git a/mithril-aggregator/Cargo.toml b/mithril-aggregator/Cargo.toml index 7c092eb2ce7..74afd7fe63f 100644 --- a/mithril-aggregator/Cargo.toml +++ b/mithril-aggregator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mithril-aggregator" -version = "0.8.20" +version = "0.8.21" description = "A Mithril Aggregator server" authors = { workspace = true } edition = { workspace = true } diff --git a/mithril-aggregator/Dockerfile.ci b/mithril-aggregator/Dockerfile.ci index f0ff2c30e46..12b2634c289 100644 --- a/mithril-aggregator/Dockerfile.ci +++ b/mithril-aggregator/Dockerfile.ci @@ -7,15 +7,15 @@ FROM $DOCKER_IMAGE_FROM # Build-time platform architecture ARG TARGETARCH +# Upgrade +RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget adduser && apt-get clean && rm -rf /var/lib/apt/lists/* + # Create appuser RUN adduser --no-create-home --disabled-password appuser # Precreate workdir RUN mkdir -p /app/bin -# Upgrade -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.5.1 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 diff --git a/mithril-aggregator/Makefile b/mithril-aggregator/Makefile index 0dddfe0f6d0..48d5794029a 100644 --- a/mithril-aggregator/Makefile +++ b/mithril-aggregator/Makefile @@ -32,6 +32,22 @@ docker-build: cd ../ && docker build -t mithril/mithril-aggregator -f mithril-aggregator/Dockerfile . docker-build-ci: build + # Check that we are on Linux, then build + if [ "$$(uname -s)" != "Linux" ]; then \ + echo "Error: this target only supports Linux"; \ + exit 1; \ + fi; \ + RAW_ARCH=$$(uname -m); \ + if [ "$$RAW_ARCH" = "x86_64" ]; then \ + ARCH="amd64"; \ + elif [ "$$RAW_ARCH" = "aarch64" ]; then \ + ARCH="arm64"; \ + else \ + echo "Error: unsupported architecture $$RAW_ARCH"; \ + exit 1; \ + fi; \ + mkdir -p ./bin-linux-$${ARCH}; \ + cp ../target/release/mithril-aggregator ./bin-linux-$${ARCH}/mithril-aggregator cd ../ && docker build -t mithril/mithril-aggregator -f mithril-aggregator/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM --build-arg CARDANO_NODE_VERSION . docker-run: diff --git a/mithril-aggregator/src/services/certifier/interface.rs b/mithril-aggregator/src/services/certifier/interface.rs index afd559f8791..0570427ba5f 100644 --- a/mithril-aggregator/src/services/certifier/interface.rs +++ b/mithril-aggregator/src/services/certifier/interface.rs @@ -38,7 +38,7 @@ pub enum CertifierServiceError { /// No certificate for this epoch #[error( - "There is an epoch gap between the last certificate epoch ({certificate_epoch:?}) and current epoch ({current_epoch:?})" + "There is an epoch gap between the last certificate epoch ({certificate_epoch:?}) and current epoch ({current_epoch:?}). A leader aggregator must be re-genesis by the owner of the genesis keys, a follower aggregator will automatically catchup with the leader's certificate chain." )] CertificateEpochGap { /// Epoch of the last issued certificate diff --git a/mithril-client-cli/Cargo.toml b/mithril-client-cli/Cargo.toml index ff0d663e7b6..29f0fb26ade 100644 --- a/mithril-client-cli/Cargo.toml +++ b/mithril-client-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mithril-client-cli" -version = "0.12.38" +version = "0.12.39" description = "A Mithril Client" authors = { workspace = true } edition = { workspace = true } diff --git a/mithril-client-cli/Dockerfile.ci b/mithril-client-cli/Dockerfile.ci index d7872b8baf8..40c83fe7328 100644 --- a/mithril-client-cli/Dockerfile.ci +++ b/mithril-client-cli/Dockerfile.ci @@ -7,15 +7,15 @@ FROM $DOCKER_IMAGE_FROM # Build-time platform architecture ARG TARGETARCH +# Upgrade +RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget adduser && apt-get clean && rm -rf /var/lib/apt/lists/* + # Create appuser RUN adduser --disabled-password appuser # Precreate workdir RUN mkdir -p /app/bin -# Upgrade -RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && apt-get clean && rm -rf /var/lib/apt/lists/* - # Copy the executable COPY mithril-client-cli/bin-linux-$TARGETARCH/mithril-client /app/bin/mithril-client diff --git a/mithril-client-cli/Makefile b/mithril-client-cli/Makefile index 0b911074754..376f97a62b1 100644 --- a/mithril-client-cli/Makefile +++ b/mithril-client-cli/Makefile @@ -40,6 +40,22 @@ docker-build: cd ../ && docker build -t mithril/mithril-client -f mithril-client-cli/Dockerfile . docker-build-ci: build + # Check that we are on Linux, then build + if [ "$$(uname -s)" != "Linux" ]; then \ + echo "Error: this target only supports Linux"; \ + exit 1; \ + fi; \ + RAW_ARCH=$$(uname -m); \ + if [ "$$RAW_ARCH" = "x86_64" ]; then \ + ARCH="amd64"; \ + elif [ "$$RAW_ARCH" = "aarch64" ]; then \ + ARCH="arm64"; \ + else \ + echo "Error: unsupported architecture $$RAW_ARCH"; \ + exit 1; \ + fi; \ + mkdir -p ./bin-linux-$${ARCH}; \ + cp ../target/release/mithril-client ./bin-linux-$${ARCH}/mithril-client cd ../ && docker build -t mithril/mithril-client -f mithril-client-cli/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM . docker-run: diff --git a/mithril-relay/Cargo.toml b/mithril-relay/Cargo.toml index 659b8f8d500..9b37b679f2d 100644 --- a/mithril-relay/Cargo.toml +++ b/mithril-relay/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mithril-relay" -version = "0.2.1" +version = "0.2.2" description = "A Mithril relay" authors = { workspace = true } edition = { workspace = true } diff --git a/mithril-relay/Makefile b/mithril-relay/Makefile index 11550574e13..433697c4d57 100644 --- a/mithril-relay/Makefile +++ b/mithril-relay/Makefile @@ -26,6 +26,22 @@ docker-build: cd ../ && docker build -t mithril/mithril-relay -f mithril-relay/Dockerfile . docker-build-ci: build + # Check that we are on Linux, then build + if [ "$$(uname -s)" != "Linux" ]; then \ + echo "Error: this target only supports Linux"; \ + exit 1; \ + fi; \ + RAW_ARCH=$$(uname -m); \ + if [ "$$RAW_ARCH" = "x86_64" ]; then \ + ARCH="amd64"; \ + elif [ "$$RAW_ARCH" = "aarch64" ]; then \ + ARCH="arm64"; \ + else \ + echo "Error: unsupported architecture $$RAW_ARCH"; \ + exit 1; \ + fi; \ + mkdir -p ./bin-linux-$${ARCH}; \ + cp ../target/release/mithril-relay ./bin-linux-$${ARCH}/mithril-relay cd ../ && docker build -t mithril/mithril-relay -f mithril-relay/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM . docker-run: diff --git a/mithril-signer/Cargo.toml b/mithril-signer/Cargo.toml index d46d9681614..bd35c86b617 100644 --- a/mithril-signer/Cargo.toml +++ b/mithril-signer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mithril-signer" -version = "0.3.13" +version = "0.3.14" description = "A Mithril Signer" authors = { workspace = true } edition = { workspace = true } diff --git a/mithril-signer/Dockerfile.ci b/mithril-signer/Dockerfile.ci index 55f13974e33..cac758b5bb1 100644 --- a/mithril-signer/Dockerfile.ci +++ b/mithril-signer/Dockerfile.ci @@ -7,15 +7,15 @@ FROM $DOCKER_IMAGE_FROM # Build-time platform architecture ARG TARGETARCH +# Upgrade +RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget adduser && apt-get clean && rm -rf /var/lib/apt/lists/* + # Create appuser RUN adduser --no-create-home --disabled-password appuser # Precreate workdir RUN mkdir -p /app/bin -# Upgrade -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.5.1 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 diff --git a/mithril-signer/Makefile b/mithril-signer/Makefile index c2ac4e7a43a..6110eeef73b 100644 --- a/mithril-signer/Makefile +++ b/mithril-signer/Makefile @@ -32,6 +32,22 @@ docker-build: cd ../ && docker build -t mithril/mithril-signer -f mithril-signer/Dockerfile . docker-build-ci: build + # Check that we are on Linux, then build + if [ "$$(uname -s)" != "Linux" ]; then \ + echo "Error: this target only supports Linux"; \ + exit 1; \ + fi; \ + RAW_ARCH=$$(uname -m); \ + if [ "$$RAW_ARCH" = "x86_64" ]; then \ + ARCH="amd64"; \ + elif [ "$$RAW_ARCH" = "aarch64" ]; then \ + ARCH="arm64"; \ + else \ + echo "Error: unsupported architecture $$RAW_ARCH"; \ + exit 1; \ + fi; \ + mkdir -p ./bin-linux-$${ARCH}; \ + cp ../target/release/mithril-signer ./bin-linux-$${ARCH}/mithril-signer cd ../ && docker build -t mithril/mithril-signer -f mithril-signer/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM --build-arg CARDANO_NODE_VERSION . docker-run: diff --git a/mithril-test-lab/mithril-devnet/VERSION b/mithril-test-lab/mithril-devnet/VERSION index 5c19aee836d..0809da55316 100644 --- a/mithril-test-lab/mithril-devnet/VERSION +++ b/mithril-test-lab/mithril-devnet/VERSION @@ -1,2 +1,2 @@ -0.4.22 +0.4.23 diff --git a/mithril-test-lab/mithril-devnet/devnet-run.sh b/mithril-test-lab/mithril-devnet/devnet-run.sh index c1ab91ea5bf..970c9ff85e6 100755 --- a/mithril-test-lab/mithril-devnet/devnet-run.sh +++ b/mithril-test-lab/mithril-devnet/devnet-run.sh @@ -31,23 +31,23 @@ echo # Change directory pushd ${ARTIFACTS_DIR} > /dev/null -# Start devnet DMQ nodes -if [[ "${NODES}" = *"dmq"* ]] || [[ "${NODES}" = "*" ]]; then +# Start devnet Cardano nodes +if [[ "${NODES}" = *"cardano"* ]] || [[ "${NODES}" = "*" ]]; then echo "=====================================================================" - echo " Start DMQ nodes" + echo " Start Cardano nodes" echo "=====================================================================" echo - ./start-dmq.sh + ./start-cardano.sh echo fi -# Start devnet Cardano nodes -if [[ "${NODES}" = *"cardano"* ]] || [[ "${NODES}" = "*" ]]; then +# Start devnet DMQ nodes +if [[ "${NODES}" = *"dmq"* ]] || [[ "${NODES}" = "*" ]]; then echo "=====================================================================" - echo " Start Cardano nodes" + echo " Start DMQ nodes" echo "=====================================================================" echo - ./start-cardano.sh + ./start-dmq.sh echo fi diff --git a/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-docker.sh b/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-docker.sh index 6d65fc3a410..4fc96264e6a 100644 --- a/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-docker.sh +++ b/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-docker.sh @@ -128,6 +128,7 @@ cat >> docker-compose.yaml <> docker-compose.yaml <