Skip to content

Add devnet choose nodes to start #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 21, 2022
Merged

Add devnet choose nodes to start #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90a1255
Update files generator
jpraynaud Jun 17, 2022
cff32b8
Update start script
jpraynaud Jun 17, 2022
67d6ca7
Update README
jpraynaud Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions mithril-test-lab/mithril-devnet/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ chmod u+x *.sh
# Run devnet with 1 BFT node and 2 SPO nodes (with remote docker images)
MITHRIL_IMAGE_ID=main-c9213ca ./devnet-run.sh

# Run devnet with Cardano nodes only
NODES=cardano ./devnet-run.sh

# Run devnet with Mithril nodes only
NODES=mithril ./devnet-run.sh

# Logs devnet
./devnet-log.sh

Expand All @@ -49,8 +55,8 @@ MITHRIL_IMAGE_ID=main-c9213ca ./devnet-run.sh
# Stop devnet
./devnet-stop.sh

# Visusalize devnet
./devnet-stop.sh
# Visualize devnet
./devnet-visualize.sh
```

## One step run with custom configuration
Expand All @@ -68,8 +74,8 @@ ROOT=artifacts ./devnet-query.sh
# Stop devnet
ROOT=artifacts ./devnet-stop.sh

# Visusalize devnet
ROOT=artifacts ./devnet-stop.sh
# Visualize devnet
ROOT=artifacts ./devnet-visualize.sh
```

## Step by step run with custom configuration
Expand All @@ -86,8 +92,11 @@ rm -rf ${ROOT} && ./devnet-mkfiles.sh ${ROOT} ${NUM_BFT_NODES} ${NUM_POOL_NODES}
# Change directory
cd ${ROOT}

# Start devnet
./start.sh
# Start devnet Cardano nodes
./start-cardano.sh

# Start devnet Mithril nodes
./start-mithril.sh

# Query devnet
./query.sh
Expand All @@ -103,7 +112,6 @@ cd ${ROOT}

```bash
# Example of artifacts
tree artifacts
artifacts
├── activate.sh
├── addresses
Expand Down Expand Up @@ -181,7 +189,8 @@ artifacts
│ ├── topology.json
│ └── tx
├── query.sh
├── start.sh
├── start-cardano.sh
├── start-mithril.sh
└── stop.sh
```

Expand Down
40 changes: 21 additions & 19 deletions mithril-test-lab/mithril-devnet/devnet-mkfiles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ echo cd ${ROOT}
echo
echo "To start the nodes, in separate terminals use:"
echo
cat >> start.sh <<EOF
cat >> start-cardano.sh <<EOF
echo ">> Start Cardano network"
killall cardano-node

Expand All @@ -882,7 +882,7 @@ for NODE in ${BFT_NODES}; do
EOF
chmod u+x ${NODE}/start-node.sh

cat >> start.sh <<EOF
cat >> start-cardano.sh <<EOF
echo ">> Starting Cardano node '${NODE}'"
./${NODE}/start-node.sh &

Expand All @@ -907,28 +907,15 @@ for NODE in ${POOL_NODES}; do
EOF
chmod u+x ${NODE}/start-node.sh

cat >> start.sh <<EOF
cat >> start-cardano.sh <<EOF
echo ">> Starting Cardano node '${NODE}'"
./${NODE}/start-node.sh &

EOF

done

cat >> start.sh <<EOF
if [ -z "\${MITHRIL_IMAGE_ID}" ]; then
echo ">> Build Mithril node Docker images"
PWD=$(pwd)
cd ../../../
echo ">>>> Building Mithril Aggregator node Docker image"
cd mithril-aggregator && make docker-build > /dev/null && cd ..
echo ">>>> Building Mithril Client node Docker image"
cd mithril-client && make docker-build > /dev/null && cd ..
echo ">>>> Building Mithril Signer node Docker image"
cd mithril-signer && make docker-build > /dev/null && cd ..
cd $PWD
fi

cat >> start-cardano.sh <<EOF
echo ">> Wait for Cardano network to be ready"
while true
do
Expand All @@ -946,8 +933,23 @@ done

echo ">> Activate Cardano pools"
./activate.sh ${ROOT}
EOF
chmod u+x start-cardano.sh

cat >> start-mithril.sh <<EOF
echo ">> Start Mithril network"
if [ -z "\${MITHRIL_IMAGE_ID}" ]; then
echo ">> Build Mithril node Docker images"
PWD=$(pwd)
cd ../../../
echo ">>>> Building Mithril Aggregator node Docker image"
cd mithril-aggregator && make docker-build > /dev/null && cd ..
echo ">>>> Building Mithril Client node Docker image"
cd mithril-client && make docker-build > /dev/null && cd ..
echo ">>>> Building Mithril Signer node Docker image"
cd mithril-signer && make docker-build > /dev/null && cd ..
cd $PWD
fi
docker-compose rm -f
if [ -z "\${MITHRIL_IMAGE_ID}" ]; then
MITHRIL_AGGREGATOR_IMAGE="mithril/mithril-aggregator"
Expand All @@ -960,7 +962,7 @@ else
fi
MITHRIL_AGGREGATOR_IMAGE=\${MITHRIL_AGGREGATOR_IMAGE} MITHRIL_CLIENT_IMAGE=\${MITHRIL_CLIENT_IMAGE} MITHRIL_SIGNER_IMAGE=\${MITHRIL_SIGNER_IMAGE} docker-compose -f docker-compose.yaml --profile mithril up --remove-orphans --force-recreate -d --no-build
EOF
chmod u+x start.sh
chmod u+x start-mithril.sh

cat >> stop.sh <<EOF
echo ">> Stop Cardano network"
Expand Down Expand Up @@ -1020,7 +1022,7 @@ echo ./activate.sh .
echo
echo "Or do all at once with:"
echo
echo ./start.sh
echo "./start-cardano.sh && ./start-mithril.sh"
echo
echo "Then query the devnet:"
echo
Expand Down
30 changes: 22 additions & 8 deletions mithril-test-lab/mithril-devnet/devnet-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ fi
if [ -z "${NUM_POOL_NODES}" ]; then
NUM_POOL_NODES="2"
fi

if [ -z "${NODES}" ]; then
NODES="*"
fi

# Bootstrap devnet
echo "====================================================================="
Expand All @@ -26,10 +28,22 @@ echo
# Change directory
cd ${ROOT}

# Start devnet
echo "====================================================================="
echo " Start Mithril/Cardano devnet"
echo "====================================================================="
echo
./start.sh
echo
# Start devnet Mithril nodes
if [ "${NODES}" = "mithril" ] || [ "${NODES}" = "*" ]; then
echo "====================================================================="
echo " Start Mithril nodes"
echo "====================================================================="
echo
./start-mithril.sh
echo
fi

# Start devnet Cardano nodes
if [ "${NODES}" = "cardano" ] || [ "${NODES}" = "*" ]; then
echo "====================================================================="
echo " Start Cardano nodes"
echo "====================================================================="
echo
./start-cardano.sh
echo
fi