diff --git a/.github/workflows/actions/deploy-terraform-infrastructure/action.yml b/.github/workflows/actions/deploy-terraform-infrastructure/action.yml index dc2f1252b26..6cf79e3f1bc 100644 --- a/.github/workflows/actions/deploy-terraform-infrastructure/action.yml +++ b/.github/workflows/actions/deploy-terraform-infrastructure/action.yml @@ -79,6 +79,9 @@ inputs: mithril_aggregator_zstandard_parameters_workers: description: Mithril aggregator snapshot zstandard number of workers. required: false + mithril_aggregator_cexplorer_pools_url: + description: CExplorer url of the list of pools that is used by the mithril aggregator. + required: false prometheus_auth_username: description: Prometheus metrics endpoint username. required: false @@ -152,6 +155,7 @@ runs: mithril_aggregator_snapshot_compression_algorithm = "${{ inputs.mithril_aggregator_snapshot_compression_algorithm }}" mithril_aggregator_zstandard_parameters_level = "${{ inputs.mithril_aggregator_zstandard_parameters_level }}" mithril_aggregator_zstandard_parameters_workers = "${{ inputs.mithril_aggregator_zstandard_parameters_workers }}" + mithril_aggregator_cexplorer_pools_url = "${{ inputs.mithril_aggregator_cexplorer_pools_url }}" prometheus_auth_username = "${{ inputs.prometheus_auth_username }}" prometheus_auth_password = "${{ inputs.prometheus_auth_password }}" prometheus_ingest_host = "${{ inputs.prometheus_ingest_host }}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a42b2cfdece..b508bff4350 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -483,6 +483,7 @@ jobs: mithril_aggregator_snapshot_compression_algorithm: ${{ vars.AGGREGATOR_SNAPSHOT_COMPRESSION_ALGORITHM }} mithril_aggregator_zstandard_parameters_level: ${{ vars.AGGREGATOR_SNAPSHOT_ZSTANDARD_LEVEL }} mithril_aggregator_zstandard_parameters_workers: ${{ vars.AGGREGATOR_SNAPSHOT_ZSTANDARD_WORKERS }} + mithril_aggregator_cexplorer_pools_url: ${{ vars.AGGREGATOR_CEXPLORER_POOLS_URL }} prometheus_auth_username: ${{ secrets.PROMETHEUS_AUTH_USERNAME }} prometheus_auth_password: ${{ secrets.PROMETHEUS_AUTH_PASSWORD }} prometheus_ingest_host: ${{ vars.PROMETHEUS_INGEST_HOST }} diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 5c0a8627e99..2746ca2efb5 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -208,6 +208,7 @@ jobs: mithril_aggregator_snapshot_compression_algorithm: ${{ vars.AGGREGATOR_SNAPSHOT_COMPRESSION_ALGORITHM }} mithril_aggregator_zstandard_parameters_level: ${{ vars.AGGREGATOR_SNAPSHOT_ZSTANDARD_LEVEL }} mithril_aggregator_zstandard_parameters_workers: ${{ vars.AGGREGATOR_SNAPSHOT_ZSTANDARD_WORKERS }} + mithril_aggregator_cexplorer_pools_url: ${{ vars.AGGREGATOR_CEXPLORER_POOLS_URL }} prometheus_auth_username: ${{ secrets.PROMETHEUS_AUTH_USERNAME }} prometheus_auth_password: ${{ secrets.PROMETHEUS_AUTH_PASSWORD }} prometheus_ingest_host: ${{ vars.PROMETHEUS_INGEST_HOST }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1011a533fca..56868935933 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -197,6 +197,7 @@ jobs: mithril_aggregator_snapshot_compression_algorithm: ${{ vars.AGGREGATOR_SNAPSHOT_COMPRESSION_ALGORITHM }} mithril_aggregator_zstandard_parameters_level: ${{ vars.AGGREGATOR_SNAPSHOT_ZSTANDARD_LEVEL }} mithril_aggregator_zstandard_parameters_workers: ${{ vars.AGGREGATOR_SNAPSHOT_ZSTANDARD_WORKERS }} + mithril_aggregator_cexplorer_pools_url: ${{ vars.AGGREGATOR_CEXPLORER_POOLS_URL }} prometheus_auth_username: ${{ secrets.PROMETHEUS_AUTH_USERNAME }} prometheus_auth_password: ${{ secrets.PROMETHEUS_AUTH_PASSWORD }} prometheus_ingest_host: ${{ vars.PROMETHEUS_INGEST_HOST }} diff --git a/mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml b/mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml index 3d9bc79d289..6ea1683e3bc 100644 --- a/mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml +++ b/mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml @@ -71,6 +71,7 @@ services: - SERVER_PORT=8080 - ERA_READER_ADAPTER_TYPE=${ERA_READER_ADAPTER_TYPE} - ERA_READER_ADAPTER_PARAMS=${ERA_READER_ADAPTER_PARAMS} + - CEXPLORER_POOLS_URL=${CEXPLORER_POOLS_URL} volumes: - ../data/${NETWORK}/mithril-aggregator/mithril:/mithril-aggregator/mithril - ../data/${NETWORK}/mithril-aggregator/cardano/db:/db diff --git a/mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml b/mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml index 55325b76151..d0aea82316c 100644 --- a/mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml +++ b/mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml @@ -71,6 +71,7 @@ services: - SERVER_PORT=8080 - ERA_READER_ADAPTER_TYPE=${ERA_READER_ADAPTER_TYPE} - ERA_READER_ADAPTER_PARAMS=${ERA_READER_ADAPTER_PARAMS} + - CEXPLORER_POOLS_URL=${CEXPLORER_POOLS_URL} volumes: - ../data/${NETWORK}/mithril-aggregator/mithril:/mithril-aggregator/mithril - ../data/${NETWORK}/mithril-aggregator/cardano/db:/db diff --git a/mithril-infra/assets/infra.version b/mithril-infra/assets/infra.version index 45263abbac5..f1f123210a4 100644 --- a/mithril-infra/assets/infra.version +++ b/mithril-infra/assets/infra.version @@ -1 +1 @@ -0.1.13 \ No newline at end of file +0.1.14 \ No newline at end of file diff --git a/mithril-infra/mithril.aggregator.tf b/mithril-infra/mithril.aggregator.tf index 6db0a81b0a2..b353265078b 100644 --- a/mithril-infra/mithril.aggregator.tf +++ b/mithril-infra/mithril.aggregator.tf @@ -58,6 +58,7 @@ EOT "export ERA_READER_ADAPTER_TYPE='${var.mithril_era_reader_adapter_type}'", "export ERA_READER_ADAPTER_PARAMS=$(jq -nc --arg address $(wget -q -O - ${var.mithril_era_reader_address_url}) --arg verification_key $(wget -q -O - ${var.mithril_era_reader_verification_key_url}) '{\"address\": $address, \"verification_key\": $verification_key}')", "export ERA_READER_SECRET_KEY='${var.mithril_era_reader_secret_key}'", + "export CEXPLORER_POOLS_URL='${var.mithril_aggregator_cexplorer_pools_url}'", "export LOGGING_DRIVER='${var.mithril_container_logging_driver}'", "export AUTH_USER_PASSWORD=$(htpasswd -nb ${var.mithril_aggregator_auth_username} ${var.mithril_aggregator_auth_password})", "export CURRENT_UID=$(id -u)", diff --git a/mithril-infra/variables.tf b/mithril-infra/variables.tf index 9c4679d6b12..d099769ff97 100644 --- a/mithril-infra/variables.tf +++ b/mithril-infra/variables.tf @@ -208,6 +208,12 @@ variable "mithril_aggregator_auth_password" { default = "" } +variable "mithril_aggregator_cexplorer_pools_url" { + type = string + description = "The CExplorer url of the list of pools that is used by the mithril aggregator" + default = "" +} + variable "prometheus_auth_username" { type = string description = "The username for authentication on local prometheus endpoint"