merge 'main'

.github/workflows/actions/build-upload-mithril-artifact/action.yml

@@ -46,4 +46,6 @@ runs:
           target/release/mithril-client.exe
           target/release/mithril-signer
           target/release/mithril-signer.exe
+          target/release/mithril-relay
+          target/release/mithril-relay.exe
         if-no-files-found: error

.github/workflows/actions/deploy-terraform-infrastructure/action.yml

@@ -17,6 +17,9 @@ inputs:
   cardano_network:
     description: Cardano network name.
     required: true
+  cardano_node_version:
+    description: Cardano node version.
+    required: true
   google_region:
     description: Google Cloud region name.
     required: true
@@ -133,6 +136,7 @@ runs:
       cat > ./env.variables.tfvars << EOF
         environment_prefix                                = "${{ inputs.environment_prefix }}"
         cardano_network                                   = "${{ inputs.cardano_network }}"
+        cardano_image_id                                  = "${{ inputs.cardano_node_version }}"
         google_region                                     = "${{ inputs.google_region }}"
         google_zone                                       = "${{ inputs.google_zone }}"
         google_machine_type                               = "${{ inputs.google_machine_type }}"

.github/workflows/actions/prepare-distribution/action.yml

@@ -58,7 +58,7 @@ runs:
         EOF
 
         cargo metadata --quiet --no-deps | \
-          jq -r '.packages | sort_by(.name) | .[] | select([.name] | inside(["mithrildemo", "mithril-end-to-end"]) | not) | "| \(.name) | `\(.version)` |"' \
+          jq -r '.packages | sort_by(.name) | .[] | select([.name] | inside(["mithrildemo", "mithril-end-to-end", "mithril-relay"]) | not) | "| \(.name) | `\(.version)` |"' \
           >> ./release-notes-addon.txt
         
     - name: Add compatibility table

.github/workflows/ci.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Build Mithril workspace & publish artifacts
         uses: ./.github/workflows/actions/build-upload-mithril-artifact
         with:
-          binaries-build-args: --bin mithril-aggregator --bin mithril-signer --bin mithril-client --features bundle_openssl
+          binaries-build-args: --bin mithril-aggregator --bin mithril-signer --bin mithril-client --bin mithril-relay --features bundle_openssl
           libraries-build-args: --package mithril-stm --package mithril-client
 
       - name: Build Debian packages
@@ -54,6 +54,7 @@ jobs:
           cargo deb --no-build --package mithril-aggregator
           cargo deb --no-build --package mithril-signer
           cargo deb --no-build --package mithril-client-cli
+          cargo deb --no-build --package mithril-relay
       
       - name: Publish Debian packages
         uses: actions/upload-artifact@v3
@@ -219,6 +220,12 @@ jobs:
       matrix:
         era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras) }}
         run_id: [1,2,3]
+        extra_args: [""]
+
+        include:
+          - era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras)[0] }}
+            run_id: 3
+            extra_args: "--use-p2p-network"
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -239,11 +246,12 @@ jobs:
           chmod +x ./bin/mithril-aggregator
           chmod +x ./bin/mithril-client
           chmod +x ./bin/mithril-signer
+          chmod +x ./bin/mithril-relay
           chmod +x ./mithril-end-to-end
           mkdir artifacts
 
       - name: Test
-        run: ./mithril-end-to-end --bin-directory ./bin --work-directory=./artifacts --devnet-scripts-directory=./mithril-test-lab/mithril-devnet --mithril-era=${{ matrix.era }}
+        run: ./mithril-end-to-end --bin-directory ./bin --work-directory=./artifacts --devnet-scripts-directory=./mithril-test-lab/mithril-devnet --mithril-era=${{ matrix.era }} ${{ matrix.extra_args }}
 
       - name: Upload E2E Tests Artifacts
         if:  ${{ failure() }}
@@ -299,7 +307,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        project: [ mithril-aggregator, mithril-client-cli, mithril-signer ]
+        project: [ mithril-aggregator, mithril-client-cli, mithril-signer, mithril-relay ]
 
         include:
           - project: mithril-client-cli
@@ -510,6 +518,7 @@ jobs:
           environment_prefix: ${{ matrix.environment_prefix }}
           environment: ${{ matrix.environment }}
           cardano_network: ${{ matrix.cardano_network }}
+          cardano_node_version: ${{ vars.CARDANO_NODE_VERSION }}
           google_region: ${{ matrix.google_region }}
           google_zone: ${{ matrix.google_zone }}
           google_machine_type: ${{ matrix.google_machine_type }}

.github/workflows/pre-release.yml

@@ -192,6 +192,7 @@ jobs:
           environment_prefix: ${{ matrix.environment_prefix }}
           environment: ${{ matrix.environment }}
           cardano_network: ${{ matrix.cardano_network }}
+          cardano_node_version: ${{ vars.CARDANO_NODE_VERSION }}
           google_region: ${{ matrix.google_region }}
           google_zone: ${{ matrix.google_zone }}
           google_machine_type: ${{ matrix.google_machine_type }}

.github/workflows/release.yml

@@ -134,6 +134,7 @@ jobs:
           environment_prefix: ${{ matrix.environment_prefix }}
           environment: ${{ matrix.environment }}
           cardano_network: ${{ matrix.cardano_network }}
+          cardano_node_version: ${{ vars.CARDANO_NODE_VERSION }}
           google_region: ${{ matrix.google_region }}
           google_zone: ${{ matrix.google_zone }}
           google_machine_type: ${{ matrix.google_machine_type }}