Merge pull request #1985 from input-output-hk/jpraynaud/1984-fix-infra-configuration-signer

Fix: topology computation of the Cardano nodes of the signers in infra

Author: jpraynaud

mithril-infra/README.md

@@ -69,8 +69,8 @@ terraform apply --var-file=env.$DEPLOY_ENVIRONMENT.tfvars
 You should see this output from terraform:
 
 ```bash
-aggregator_endpoint = "https://aggregator.***.api.mithril.network/aggregator"
-api_subdomain = "***.api.mithril.network."
+aggregator_endpoint = "https://aggregator.**.api.mithril.network/aggregator"
+api_subdomain = "**.api.mithril.network."
 external-ip = "35.195.148.171"
 google_project = "mithril"
 name_servers = tolist([
@@ -154,14 +154,14 @@ In order to retire a stake pool:
 
 - Retire a stake poool with `retire-stake-pool.sh`
 
-| Script                      | Description                                                          | Usage                                                                                                                                  |
-| --------------------------- | -------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
-| `create-keys.sh`            | Script for creating keys for a Cardano pool (SPO)                    | `./tools/pool/create-keys.sh`                                                                                                          |
-| `query-stake-pool.sh`       | Script for querying info about a Cardano pool (SPO)                  | `./tools/pool/query-stake-pool.sh`                                                                                                     |
-| `register-stake-address.sh` | Script for registering stake address of a Cardano pool (SPO)         | `TX_IN=***YOUR_TX_IN*** ./tools/pool/register-stake-address.sh`                                                                        |
-| `register-stake-pool.sh`    | Script for registering a Cardano stake pool (SPO)                    | `TX_IN=***YOUR_TX_IN*** SIGNER_DOMAIN=***YOUR_SIGNER_DOMAIN_NAME*** POOL_TICKER=***YOUR_TICKER*** ./tools/pool/register-stake-pool.sh` |
-| `renew-opcert.sh`           | Script for renewing Operational Certificate for a Cardano pool (SPO) | `./tools/pool/renew-opcert.sh`                                                                                                         |
-| `retire-stake-pool.sh`      | Script for retiring a Cardano pool (SPO)                             | `TX_IN=***YOUR_TX_IN*** VALUE_OUT=***YOUR_VALUE_OUT*** ./tools/pool/retire-stake-pool.sh`                                              |
+| Script                      | Description                                                          | Usage                                                                                                                                                               |
+| --------------------------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `create-keys.sh`            | Script for creating keys for a Cardano pool (SPO)                    | `GENESIS_FILE=**YOUR_GENESIS_FILE** ./tools/pool/create-keys.sh`                                                                                                    |
+| `query-stake-pool.sh`       | Script for querying info about a Cardano pool (SPO)                  | `./tools/pool/query-stake-pool.sh`                                                                                                                                  |
+| `register-stake-address.sh` | Script for registering stake address of a Cardano pool (SPO)         | `TX_IN=**YOUR_TX_IN** ./tools/pool/register-stake-address.sh`                                                                                                       |
+| `register-stake-pool.sh`    | Script for registering a Cardano stake pool (SPO)                    | `GENESIS_FILE=**YOUR_GENESIS_FILE** TX_IN=**YOUR_TX_IN** SIGNER_DOMAIN=**YOUR_SIGNER_DOMAIN_NAME** POOL_TICKER=**YOUR_TICKER** ./tools/pool/register-stake-pool.sh` |
+| `renew-opcert.sh`           | Script for renewing Operational Certificate for a Cardano pool (SPO) | `./tools/pool/renew-opcert.sh`                                                                                                                                      |
+| `retire-stake-pool.sh`      | Script for retiring a Cardano pool (SPO)                             | `TX_IN=**YOUR_TX_IN** VALUE_OUT=**YOUR_VALUE_OUT** ./tools/pool/retire-stake-pool.sh`                                                                               |
 
 ### Genesis
 
@@ -245,7 +245,7 @@ sqlite3 data/$NETWORK/mithril-aggregator/mithril/stores/aggregator.sqlite3 "SELE
 Run the following Rust snippet (see below)
 
 ### Update the current genesis certificate of the aggregator database
-./tools/genesis/update-genesis-certificate.sh $NETWORK mithril-aggregator ***YOUR_UPDATED_CERTIFICATE_HASH*** '***YOUR_UPDATED_JSON_CERTIFICATE***'
+./tools/genesis/update-genesis-certificate.sh $NETWORK mithril-aggregator **YOUR_UPDATED_CERTIFICATE_HASH** '**YOUR_UPDATED_JSON_CERTIFICATE**'
 ```
 
 Snippet code to re-compute a valid genesis certificate:
@@ -256,7 +256,7 @@ Snippet code to re-compute a valid genesis certificate:
 fn update_genesis_certificate() {
     use crate::entities::Certificate;
 
-    let certificate_json = "***YOUR_GENESIS_CERTIFICATE***";
+    let certificate_json = "**YOUR_GENESIS_CERTIFICATE**";
     let mut certificate: Certificate = serde_json::from_str(certificate_json).unwrap();
     certificate.beacon.epoch -= 1;
     certificate.hash = certificate.compute_hash();

mithril-infra/assets/docker/docker-compose-signer-verified-norelay.yaml

@@ -122,7 +122,6 @@ services:
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/db/block-producer:/mithril-signer-${SIGNER_ID}/cardano/db
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/pool:/mithril-signer-${SIGNER_ID}/cardano/pool
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/ipc:/ipc
-      - ./cardano-configurations/network/${NETWORK}:/config
     command: ["-vvv"]
     depends_on:
       cardano-node-signer-block-producer:

mithril-infra/assets/docker/docker-compose-signer-verified-p2p.yaml

@@ -122,7 +122,6 @@ services:
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/db/block-producer:/mithril-signer-${SIGNER_ID}/cardano/db
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/pool:/mithril-signer-${SIGNER_ID}/cardano/pool
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/ipc:/ipc
-      - ./cardano-configurations/network/${NETWORK}:/config
     command: ["-vvv"]
     depends_on:
       cardano-node-signer-block-producer:

mithril-infra/assets/docker/docker-compose-signer-verified.yaml

@@ -132,7 +132,6 @@ services:
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/db/block-producer:/mithril-signer-${SIGNER_ID}/cardano/db
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/pool:/mithril-signer-${SIGNER_ID}/cardano/pool
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/ipc:/ipc
-      - ./cardano-configurations/network/${NETWORK}:/config
     command: ["-vvv"]
     depends_on:
       cardano-node-signer-block-producer:

mithril-infra/assets/infra.version

@@ -1 +1 @@
-0.3.2
+0.3.3

mithril-infra/assets/tools/pool/_prelude.sh

@@ -42,14 +42,6 @@ fi
 POOL_ARTIFACTS_DIR=/pool
 POOL_ARTIFACTS_DIR_PREFIX=./data/${NETWORK}/${SIGNER_NODE}/cardano
 POOL_WWW_DIR=/www
-GENESIS_FILE=/home/curry/docker/cardano-configurations/network/${NETWORK}/genesis/shelley.json
 if [ -z "${AMOUNT_STAKED}" ]; then
     AMOUNT_STAKED=1000000000
 fi
-
-# Compute transaction input if needed
-#if [ -z "${TX_IN}" ]; then 
-#  TX_IN=$(CARDANO_CLI_CMD query utxo  \
-#            --testnet-magic $NETWORK_MAGIC \
-#            --address $(cat ${POOL_ARTIFACTS_DIR_PREFIX}${POOL_ARTIFACTS_DIR}/payment.addr) | tail -n 1  | awk '{print $1;}')#1
-#fi

mithril-infra/assets/tools/pool/create-keys.sh

@@ -6,6 +6,11 @@
 # Import prelude
 . $(dirname -- "$0")/_prelude.sh
 
+if [ -z "${GENESIS_FILE}" ]; then
+    echo Missing environment variable: GENESIS_FILE
+    exit 1
+fi
+
 # Create keys and addresses
 ## Create payment keypair
 CARDANO_CLI_CMD address key-gen \

mithril-infra/assets/tools/pool/register-stake-pool.sh

@@ -6,6 +6,11 @@
 # Import prelude
 . $(dirname -- "$0")/_prelude.sh
 
+if [ -z "${GENESIS_FILE}" ]; then
+    echo Missing environment variable: GENESIS_FILE
+    exit 1
+fi
+
 # Check if all env vars are set
 if [ -z "${TX_IN}" ]; then
     echo Missing environment variable: TX_IN

mithril-infra/mithril.signer.tf

@@ -43,25 +43,18 @@ resource "null_resource" "mithril_signer" {
       "mkdir -p /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/mithril/snapshots",
       "echo -n ${local.mithril_signers_relay_cardano_port[each.key]} > /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/cardano/pool/port",
       <<-EOT
-# Setup cardano node block producer topology
-cat /home/curry/docker/cardano-configurations/network/${var.cardano_network}/cardano-node/topology.json | jq 'del(.publicRoots[0].accessPoints[0:])' | jq '.localRoots[0].accessPoints[0] |= . + { "address": "${google_compute_address.mithril-external-address.address}", "port": ${local.mithril_signers_relay_cardano_port[each.key]}}' > /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/cardano/pool/topology-block-producer.json
-
-# Setup cardano node relay topology
-cat /home/curry/docker/cardano-configurations/network/${var.cardano_network}/cardano-node/topology.json | jq '.localRoots[0].accessPoints[0] |= . + { "address": "${google_compute_address.mithril-external-address.address}", "port": ${local.mithril_signers_block_producer_cardano_port[each.key]}}' > /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/cardano/pool/topology-relay.json
-EOT
-      ,
-      <<-EOT
 set -e
 # Setup cardano node configuration
 CARDANO_NODE_EXACT_VERSION="${var.cardano_image_id}"
 CARDANO_NODE_MINOR_VERSION=$(echo $CARDANO_NODE_EXACT_VERSION | cut -d. -f1,2)
 CARDANO_NODE_VERSIONS="$CARDANO_NODE_EXACT_VERSION $CARDANO_NODE_MINOR_VERSION"
 SIGNER_TYPES="full relay block-producer"
 for SIGNER_TYPE in $SIGNER_TYPES; do
-  # Copy the cardano node configuration files to the signer (exact version, and fallback to minor version)
+  # Copy the cardano node configuration files to the signer and setup topology files (exact version, and fallback to minor version of the Cardano node)
   FOUND_CONFIGURATION=false
   for CARDANO_NODE_VERSION in $CARDANO_NODE_VERSIONS; do
     if [ -d "/home/curry/docker/cardano/config/$CARDANO_NODE_VERSION/${var.cardano_network}" ]; then 
+      # Copy the configuration files to the signer
       SIGNER_TYPE_CONFIG_DIRECTORY=/home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/cardano/config/$SIGNER_TYPE
       rm -rf $SIGNER_TYPE_CONFIG_DIRECTORY
       mkdir -p $SIGNER_TYPE_CONFIG_DIRECTORY
@@ -70,6 +63,13 @@ for SIGNER_TYPE in $SIGNER_TYPES; do
       cat $SIGNER_TYPE_CONFIG_DIRECTORY/${var.cardano_network}/cardano-node/config.json | jq ".hasPrometheus[0] |= \"cardano-node-$SIGNER_TYPE-signer-${each.key}\"" > $SIGNER_TYPE_CONFIG_DIRECTORY/${var.cardano_network}/cardano-node/config.json.new
       rm -f $SIGNER_TYPE_CONFIG_DIRECTORY/${var.cardano_network}/cardano-node/config.json
       mv $SIGNER_TYPE_CONFIG_DIRECTORY/${var.cardano_network}/cardano-node/config.json.new $SIGNER_TYPE_CONFIG_DIRECTORY/${var.cardano_network}/cardano-node/config.json
+      
+      # Setup cardano node block producer topology
+      cat /home/curry/docker/cardano/config/$CARDANO_NODE_VERSION/${var.cardano_network}/cardano-node/topology.json | jq 'del(.bootstrapPeers)' | jq 'del(.useLedgerAfterSlot)' | jq '.localRoots[0].accessPoints[0] |= . + { "address": "${google_compute_address.mithril-external-address.address}", "port": ${local.mithril_signers_relay_cardano_port[each.key]}}' > /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/cardano/pool/topology-block-producer.json
+
+      # Setup cardano node relay topology
+      cat /home/curry/docker/cardano/config/$CARDANO_NODE_VERSION/${var.cardano_network}/cardano-node/topology.json > /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/cardano/pool/topology-relay.json
+
       FOUND_CONFIGURATION=true
       break
     fi