merged with main

.github/workflows/release-chain-prometheus-exporter.yml

@@ -0,0 +1,60 @@
+name: Publish Docker image for chain-prometheus-exporter to DockerHub
+
+on:
+  push:
+    tags:
+      - 'chain-prometheus-exporter/*.*.*'
+
+  workflow_dispatch:
+
+env:
+  REGISTRY: docker.io
+  SERVICE_NAME: chain-prometheus-exporter
+  RUST_VERSION: rust:1.76-buster
+
+jobs:
+  publish-docker-image:
+    runs-on: ubuntu-latest
+    environment: release-unprivileged
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Extract version tag from Cargo.toml manifest
+        id: meta
+        run: |
+          VERSION=$(yq .package.version ${{ env.SERVICE_NAME }}/Cargo.toml)
+          FULL_IMAGE_TAG="${{ env.REGISTRY }}/concordium/${{ env.SERVICE_NAME }}:$VERSION"
+          echo "::notice FULL_IMAGE_TAG=${FULL_IMAGE_TAG}"
+          # Make sure the image does not exist. Abort if we can retrieve any metadata.
+          if docker manifest inspect $FULL_IMAGE_TAG > /dev/null; then
+            echo "::error $FULL_IMAGE_TAG already exists"
+            exit 1
+          elif [ ! "${{ github.ref_name }}" = "${{ env.SERVICE_NAME }}/$VERSION" ]; then
+             echo "::error ${{ github.ref_name }} does not match ${{ env.SERVICE_NAME }}/${VERSION}."
+             exit 1
+          else
+             # Store the full image tag into a tag variable for the following step.
+             echo "tag=${FULL_IMAGE_TAG}" > "$GITHUB_OUTPUT"
+          fi
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ${{ env.SERVICE_NAME }}/scripts/build.Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tag }}
+          build-args: |
+            build_image=${{ env.RUST_VERSION }}

.github/workflows/release-kpi-tracker.yml

@@ -5,14 +5,17 @@ on:
     tags:
       - kpi-tracker/*.*.*
 
+  workflow_dispatch:
+
 env:
   REGISTRY: docker.io
-  IMAGE_NAME: kpi-tracker
+  SERVICE_NAME: kpi-tracker
+  RUST_VERSION: rust:1.76-bookworm
 
 jobs:
   publish-docker-image:
     runs-on: ubuntu-latest
-    environment: testnet-deployments
+    environment: release-unprivileged
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -28,14 +31,14 @@ jobs:
       - name: Extract version tag from Cargo.toml manifest.
         id: meta
         run: |
-          export VERSION=$(yq .package.version kpi-tracker/Cargo.toml)
-          export FULL_IMAGE_TAG="${{ env.REGISTRY }}/concordium/$IMAGE_NAME:$VERSION"
+          export VERSION=$(yq .package.version ${{ env.SERVICE_NAME }}/Cargo.toml)
+          export FULL_IMAGE_TAG="${{ env.REGISTRY }}/concordium/${{ env.SERVICE_NAME }}:$VERSION"
           echo "::notice FULL_IMAGE_TAG=${FULL_IMAGE_TAG}"
           # Make sure the image does not exist. Abort if we can retrieve any metadata.
           if docker manifest inspect ${FULL_IMAGE_TAG} > /dev/null; then
              echo "::error ${FULL_IMAGE_TAG} already exists"
              exit 1
-          elif [ ! "${{ github.ref_name }}" = "kpi-tracker/${VERSION}" ]; then
+          elif [ ! "${{ github.ref_name }}" = "${{ env.SERVICE_NAME }}/${VERSION}" ]; then
              echo "::error Expected tag ${EXPECTED_TAG} does not match the version ${VERSION}."
              exit 1
           else
@@ -46,7 +49,9 @@ jobs:
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with:
           context: .
-          file: ./kpi-tracker/scripts/Dockerfile
+          file: ./${{ env.SERVICE_NAME }}/scripts/Dockerfile
           push: true
           platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tag }}
+          build-args: |
+            build_image=${{ env.RUST_VERSION }}

.github/workflows/release-notification-server.yml

@@ -15,7 +15,7 @@ env:
 jobs:
   publish-docker-image:
     runs-on: ubuntu-latest
-    environment: release
+    environment: release-unprivileged
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/release-recover-id-object.yml

@@ -15,7 +15,7 @@ env:
 jobs:
   publish-docker-image:
     runs-on: ubuntu-latest
-    environment: release
+    environment: release-unprivileged
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/release-wallet-test-bench.yml

@@ -11,7 +11,7 @@ env:
 jobs:
   publish-docker-image:
     runs-on: ubuntu-latest
-    environment: testnet-deployments
+    environment: release-unprivileged
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

chain-prometheus-exporter/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Unreleased changes
+## 1.2.3
 - Updated the Concordium Rust SDK to support the changes introduced in protocol 7.
 
 ## 1.1.2

chain-prometheus-exporter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chain-prometheus-exporter"
-version = "1.1.2"
+version = "1.2.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

chain-prometheus-exporter/scripts/build.Dockerfile

@@ -1,5 +1,5 @@
-ARG build_image
-ARG base_image
+ARG build_image=rust:1.76-buster
+ARG base_image=debian:buster-slim
 FROM ${build_image} AS build
 
 WORKDIR /build

chain-prometheus-exporter/src/main.rs

@@ -127,7 +127,7 @@ async fn main() -> anyhow::Result<()> {
         tracing::info!("Tracking account {address} with label {label}.");
         let opts = Opts::new(
             format!("{label}_balance"),
-            &format!("Balance of account {address} in microCCD."),
+            format!("Balance of account {address} in microCCD."),
         );
         let gauge: GenericGauge<AtomicU64> = GenericGauge::with_opts(opts)?;
         gauges.push((address, gauge.clone()));

generator/src/generator.rs

@@ -740,13 +740,6 @@ struct RegisterCredentialsInitParams {
     revocation_keys: Vec<CredentialHolderId>,
 }
 
-#[derive(concordium_std::Serial)]
-struct RegisterCredentialParams {
-    credential_info: CredentialInfo,
-    #[concordium(size_length = 2)]
-    auxiliary_data:  Vec<u8>,
-}
-
 impl RegisterCredentialsGenerator {
     pub async fn instantiate(mut client: v2::Client, args: CommonArgs) -> anyhow::Result<Self> {
         // Get the initial nonce.

genesis-creator/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Unreleased changes
+## 0.3.0
 
 - Support genesis data format of protocol version 7.
 - Updated the Concordium Rust SDK to support the changes introduced in protocol 7.

genesis-creator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "genesis-creator"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

genesis-creator/src/lib.rs

@@ -93,8 +93,7 @@ fn crypto_parameters(
 /// Function for creating the genesis identity providers. The arguments are
 /// - idp_out - where to write the identity providers
 /// - cfgs - A vector of configurations, each deciding whether to use an
-///   existing identity provider or
-/// to generate one or more freshly.
+///   existing identity provider or to generate one or more freshly.
 ///
 /// For each generated anonymity revoker, the private identity provider data
 /// will be written to a file. The function returns a in a `anyhow::Result`,
@@ -177,8 +176,7 @@ fn identity_providers(
 /// Function for creating the genesis anonymity revokers. The arguments are
 /// - ars_out - where to write the anonymity revokers
 /// - cfgs - A vector of configurations, each deciding whether to use an
-///   existing anonymity revoker or
-/// to generate one or more freshly.
+///   existing anonymity revoker or to generate one or more freshly.
 ///
 /// For each generated anonymity revoker, the private anonymity revoker data
 /// will be written to a file. The function returns a in a `anyhow::Result`,

id-verifier/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.4.0
+- Updated the Concordium Rust SDK to support the changes introduced in protocol 7.
+
+## 0.3.0
+*Prior versions not kept in changelog.*