Skip to content

Commit 6b37c1e

Browse files
jpraynaudjpraynaud
authored
Merge pull request #1034 from input-output-hk/jpraynaud/fix-qa-issues
Fix QA issues
2 parents d357e91 + 12f7461 commit 6b37c1e

19 files changed

+48
-54
lines changed

‎docs/root/manual/getting-started/run-mithril-devnet.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ The nodes will be queried every `1s` and will display as below
329329
=====================================================================
330330

331331
=====================================================================
332-
-- docker-compose logs --tail=5
332+
-- docker compose logs --tail=5
333333
=====================================================================
334334
Attaching to artifacts_mithril-signer-node-pool1_1, artifacts_mithril-signer-node-pool2_1, artifacts_mithril-aggregator_1
335335
mithril-aggregator_1 | {"msg":"Epoch computation is not final and needs to be fixed: 4","v":0,"name":"slog-rs","level":40,"time":"2022-07-05T11:29:32.726760492Z","hostname":"ba17593540ac","pid":1}

‎docs/versioned_docs/version-maintained/manual/getting-started/run-mithril-devnet.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ The nodes will be queried every `1s` and will display as below
329329
=====================================================================
330330

331331
=====================================================================
332-
-- docker-compose logs --tail=5
332+
-- docker compose logs --tail=5
333333
=====================================================================
334334
Attaching to artifacts_mithril-signer-node-pool1_1, artifacts_mithril-signer-node-pool2_1, artifacts_mithril-aggregator_1
335335
mithril-aggregator_1 | {"msg":"Epoch computation is not final and needs to be fixed: 4","v":0,"name":"slog-rs","level":40,"time":"2022-07-05T11:29:32.726760492Z","hostname":"ba17593540ac","pid":1}

‎mithril-explorer/components/CertificateModal/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export default function CertificateModal(props) {
6565
{certificate.genesis_signature !== ""
6666
?
6767
<div>
68-
This is the chain Genesis Certificate, since it&aops;s manually created it doesn&apos;t contain any
68+
This is the chain Genesis Certificate, since it&apos;s manually created it doesn&apos;t contain any
6969
Signers.
7070
</div>
7171
: certificate.metadata.signers.length === 0

‎mithril-explorer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mithril-explorer",
3-
"version": "0.2.6",
3+
"version": "0.2.7",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",

‎mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,5 @@ services:
9191

9292
networks:
9393
default:
94-
external:
95-
name: mithril_network
94+
name: mithril_network
95+
external: true

‎mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,5 @@ services:
8989

9090
networks:
9191
default:
92-
external:
93-
name: mithril_network
92+
name: mithril_network
93+
external: true

‎mithril-infra/assets/docker/docker-compose-monitoring.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@ services:
8686

8787
networks:
8888
default:
89-
external:
90-
name: mithril_network
89+
name: mithril_network
90+
external: true

‎mithril-infra/assets/docker/docker-compose-reverse-proxy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ services:
2222

2323
networks:
2424
default:
25-
external:
26-
name: mithril_network
25+
name: mithril_network
26+
external: true

‎mithril-infra/assets/docker/docker-compose-signer-unverified-alone.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ services:
3535

3636
networks:
3737
default:
38-
external:
39-
name: mithril_network
38+
name: mithril_network
39+
external: true

‎mithril-infra/assets/docker/docker-compose-signer-unverified-norelay.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,5 @@ services:
7373

7474
networks:
7575
default:
76-
external:
77-
name: mithril_network
76+
name: mithril_network
77+
external: true

‎mithril-infra/assets/docker/docker-compose-signer-unverified.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,5 @@ services:
8383

8484
networks:
8585
default:
86-
external:
87-
name: mithril_network
86+
name: mithril_network
87+
external: true

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,5 +152,5 @@ services:
152152

153153
networks:
154154
default:
155-
external:
156-
name: mithril_network
155+
name: mithril_network
156+
external: true

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,5 +162,5 @@ services:
162162

163163
networks:
164164
default:
165-
external:
166-
name: mithril_network
165+
name: mithril_network
166+
external: true

‎mithril-infra/assets/infra.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.2
1+
0.1.3

‎mithril-infra/mithril.aggregator.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ EOT
5858
"export AUTH_USER_PASSWORD=$(htpasswd -nb ${var.mithril_aggregator_auth_username} ${var.mithril_aggregator_auth_password})",
5959
"export CURRENT_UID=$(id -u)",
6060
"export DOCKER_GID=$(getent group docker | cut -d: -f3)",
61-
"docker-compose -f /home/curry/docker/docker-compose-aggregator-${local.mithril_aggregator_type}.yaml --profile all up -d",
61+
"docker compose -f /home/curry/docker/docker-compose-aggregator-${local.mithril_aggregator_type}.yaml --profile all up -d",
6262
]
6363
}
6464
}

‎mithril-infra/mithril.monitoring.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ EOT
4343
"export LOGGING_DRIVER='${var.mithril_container_logging_driver}'",
4444
"export PROMETHEUS_HOST=${local.prometheus_host}",
4545
"export AUTH_USER_PASSWORD=$(htpasswd -nb ${var.prometheus_auth_username} ${var.prometheus_auth_password})",
46-
"docker-compose -f /home/curry/docker/docker-compose-monitoring.yaml --profile all up -d",
46+
"docker compose -f /home/curry/docker/docker-compose-monitoring.yaml --profile all up -d",
4747
]
4848
}
4949
}

‎mithril-infra/mithril.reverse-proxy.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ resource "null_resource" "mithril_reverse_proxy" {
2828
"export LOGGING_DRIVER='${var.mithril_container_logging_driver}'",
2929
"export CURRENT_UID=$(id -u)",
3030
"export DOCKER_GID=$(getent group docker | cut -d: -f3)",
31-
"docker-compose -f /home/curry/docker/docker-compose-reverse-proxy.yaml --profile all up -d",
31+
"docker compose -f /home/curry/docker/docker-compose-reverse-proxy.yaml --profile all up -d",
3232
]
3333
}
3434
}

‎mithril-infra/mithril.signer.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ EOT
8989
"export LOGGING_DRIVER='${var.mithril_container_logging_driver}'",
9090
"export CURRENT_UID=$(id -u)",
9191
"export DOCKER_GID=$(getent group docker | cut -d: -f3)",
92-
"docker-compose -p $SIGNER_ID -f /home/curry/docker/docker-compose-signer-${each.value.type}.yaml --profile all up -d",
92+
"docker compose -p $SIGNER_ID -f /home/curry/docker/docker-compose-signer-${each.value.type}.yaml --profile all up -d",
9393
]
9494
}
9595
}

‎mithril-test-lab/mithril-devnet/devnet-mkfiles.sh

+21-27
Original file line numberDiff line numberDiff line change
@@ -731,11 +731,19 @@ cat >> query-mithril.sh <<EOF
731731
AGGREGATOR_API_ENDPOINT="http://0.0.0.0:8080/aggregator"
732732
733733
echo ">> Query pending certificate"
734-
curl -s \${AGGREGATOR_API_ENDPOINT}/certificate-pending | jq .
734+
curl -sL \${AGGREGATOR_API_ENDPOINT}/certificate-pending | jq .
735735
echo
736736
737-
echo ">> Query snapshots"
738-
curl -s \${AGGREGATOR_API_ENDPOINT}/snapshots | jq '.[:2]'
737+
echo ">> Query latest certificates"
738+
curl -sL \${AGGREGATOR_API_ENDPOINT}/certificates | jq '.[:2]'
739+
echo
740+
741+
echo ">> Query latest mithril stake distributions"
742+
curl -sL \${AGGREGATOR_API_ENDPOINT}/artifact/mithril-stake-distributions | jq '.[:2]'
743+
echo
744+
745+
echo ">> Query latest snapshots"
746+
curl -sL \${AGGREGATOR_API_ENDPOINT}/artifact/snapshots | jq '.[:2]'
739747
echo
740748
741749
EOF
@@ -746,7 +754,7 @@ cat >> query-cardano.sh <<EOF
746754
echo ">> Query chain tip"
747755
CARDANO_NODE_SOCKET_PATH=node-bft1/ipc/node.sock ./cardano-cli query tip \\
748756
--cardano-mode \\
749-
--testnet-magic ${NETWORK_MAGIC}
757+
--testnet-magic ${NETWORK_MAGIC} | jq .
750758
751759
echo
752760
echo ">> Query whole utxo"
@@ -765,7 +773,7 @@ echo
765773
echo ">> Query stake distribution"
766774
CARDANO_NODE_SOCKET_PATH=node-bft1/ipc/node.sock ./cardano-cli query stake-snapshot --all-stake-pools \\
767775
--cardano-mode \\
768-
--testnet-magic ${NETWORK_MAGIC}
776+
--testnet-magic ${NETWORK_MAGIC} | jq .
769777
echo
770778
771779
EOF
@@ -1272,7 +1280,7 @@ if [ -z "\${MITHRIL_IMAGE_ID}" ]; then
12721280
cd mithril-signer && make docker-build > /dev/null && cd ..
12731281
cd $PWD
12741282
fi
1275-
docker-compose rm -f
1283+
12761284
if [ -z "\${MITHRIL_IMAGE_ID}" ]; then
12771285
export MITHRIL_AGGREGATOR_IMAGE="mithril/mithril-aggregator"
12781286
export MITHRIL_CLIENT_IMAGE="mithril/mithril-client"
@@ -1282,7 +1290,8 @@ else
12821290
export MITHRIL_CLIENT_IMAGE="ghcr.io/input-output-hk/mithril-client:\${MITHRIL_IMAGE_ID}"
12831291
export MITHRIL_SIGNER_IMAGE="ghcr.io/input-output-hk/mithril-signer:\${MITHRIL_IMAGE_ID}"
12841292
fi
1285-
docker-compose -f docker-compose.yaml --profile mithril up --remove-orphans --force-recreate -d --no-build
1293+
docker compose rm -f
1294+
docker compose -f docker-compose.yaml --profile mithril up --remove-orphans --force-recreate -d --no-build
12861295
12871296
echo ">> List of Mithril signers"
12881297
echo --------,--------------------------------------------------------,----------------------------------- | column -t -s,
@@ -1312,7 +1321,7 @@ do
13121321
done
13131322
13141323
echo ">> Bootstrap the Genesis certificate"
1315-
docker-compose -f docker-compose.yaml --profile mithril-genesis run mithril-aggregator-genesis
1324+
docker compose -f docker-compose.yaml --profile mithril-genesis run mithril-aggregator-genesis
13161325
13171326
EOF
13181327
chmod u+x start-mithril.sh
@@ -1333,40 +1342,25 @@ else
13331342
export MITHRIL_CLIENT_IMAGE="ghcr.io/input-output-hk/mithril-client:\${MITHRIL_IMAGE_ID}"
13341343
export MITHRIL_SIGNER_IMAGE="ghcr.io/input-output-hk/mithril-signer:\${MITHRIL_IMAGE_ID}"
13351344
fi
1336-
docker-compose -f docker-compose.yaml --profile mithril down
1345+
docker compose -f docker-compose.yaml --profile mithril down
13371346
EOF
13381347
chmod u+x stop.sh
13391348

13401349
cat >> log-mithril.sh <<EOF
13411350
#!/usr/bin/env bash
13421351
1343-
SEPARATOR="====================================================================="
1344-
1345-
if [ -z "\${MITHRIL_IMAGE_ID}" ]; then
1346-
export MITHRIL_AGGREGATOR_IMAGE="mithril/mithril-aggregator"
1347-
export MITHRIL_CLIENT_IMAGE="mithril/mithril-client"
1348-
export MITHRIL_SIGNER_IMAGE="mithril/mithril-signer"
1349-
else
1350-
export MITHRIL_AGGREGATOR_IMAGE="ghcr.io/input-output-hk/mithril-aggregator:\${MITHRIL_IMAGE_ID}"
1351-
export MITHRIL_CLIENT_IMAGE="ghcr.io/input-output-hk/mithril-client:\${MITHRIL_IMAGE_ID}"
1352-
export MITHRIL_SIGNER_IMAGE="ghcr.io/input-output-hk/mithril-signer:\${MITHRIL_IMAGE_ID}"
1353-
fi
1352+
SEPARATOR="---------------------------------------------------------------------"
13541353
13551354
# Mithril nodes logs
1356-
echo \${SEPARATOR}
1357-
echo '-- ' docker-compose logs --tail="\${LINES}"
1358-
echo \${SEPARATOR}
1359-
docker-compose logs --tail="\${LINES}"
1360-
echo
1361-
echo \${SEPARATOR}
1355+
docker ps --format='{{.Names}}' | grep "mithril" | sort -n | xargs -i sh -c 'echo '\${SEPARATOR}' && echo docker logs -n '\${LINES}' {} && echo '\${SEPARATOR}' && docker logs -n '\${LINES}' {} && echo '\${SEPARATOR}' && echo'
13621356
13631357
EOF
13641358
chmod u+x log-mithril.sh
13651359

13661360
cat >> log-cardano.sh <<EOF
13671361
#!/usr/bin/env bash
13681362
1369-
SEPARATOR="====================================================================="
1363+
SEPARATOR="---------------------------------------------------------------------"
13701364
13711365
# Cardano nodes logs
13721366
find . -type f -print | grep "node.log" | sort -n | xargs -i sh -c 'echo '\${SEPARATOR}' && echo tail -n '\${LINES}' {} && echo '\${SEPARATOR}' && tail -n '\${LINES}' {} && echo '\${SEPARATOR}' && echo'

0 commit comments

Comments
 (0)