Skip to content

fix(scripts): unify jq usage with -r and single quotes for consistency #3371

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
mkoura merged 1 commit into from
Mar 18, 2026
Merged

fix(scripts): unify jq usage with -r and single quotes for consistency #3371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 27 additions & 27 deletions .github/node_upgrade_pytest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ elif [ "$1" = "step2" ]; then

export UPGRADE_TESTS_STEP=2

NETWORK_MAGIC="$(jq '.networkMagic' "$STATE_CLUSTER/shelley/genesis.json")"
NETWORK_MAGIC="$(jq -r '.networkMagic' "$STATE_CLUSTER/shelley/genesis.json")"
export NETWORK_MAGIC

# add binaries saved in step1 to the PATH
Expand Down Expand Up @@ -139,11 +139,11 @@ elif [ "$1" = "step2" ]; then
fi

# use the original Byron, Shelley and Dijkstra genesis files
BYRON_GENESIS_HASH="$(jq -r ".ByronGenesisHash" "$STATE_CLUSTER/config-bft1.json")"
SHELLEY_GENESIS_HASH="$(jq -r ".ShelleyGenesisHash" "$STATE_CLUSTER/config-bft1.json")"
BYRON_GENESIS_HASH="$(jq -r '.ByronGenesisHash' "$STATE_CLUSTER/config-bft1.json")"
SHELLEY_GENESIS_HASH="$(jq -r '.ShelleyGenesisHash' "$STATE_CLUSTER/config-bft1.json")"
# hashes of the original alonzo and conway genesis files
CONWAY_GENESIS_STEP1_HASH="$(jq -r ".ConwayGenesisHash" "$STATE_CLUSTER/config-bft1.json")"
ALONZO_GENESIS_STEP1_HASH="$(jq -r ".AlonzoGenesisHash" "$STATE_CLUSTER/config-bft1.json")"
CONWAY_GENESIS_STEP1_HASH="$(jq -r '.ConwayGenesisHash' "$STATE_CLUSTER/config-bft1.json")"
ALONZO_GENESIS_STEP1_HASH="$(jq -r '.AlonzoGenesisHash' "$STATE_CLUSTER/config-bft1.json")"
# hashes of genesis files that were potentially replaced
ALONZO_GENESIS_HASH="$(cardano-cli latest genesis hash --genesis \
"$STATE_CLUSTER/shelley/genesis.alonzo.json")"
Expand Down Expand Up @@ -174,14 +174,14 @@ elif [ "$1" = "step2" ]; then
--arg alonzo_file "$selected_alonzo_file" \
--arg alonzo_hash "$selected_alonzo_hash" \
--arg conway_file "$selected_conway_file" \
--arg conway_hash "$selected_conway_hash" \
'.ByronGenesisHash = $byron_hash
--arg conway_hash "$selected_conway_hash" '
.ByronGenesisHash = $byron_hash
| .ShelleyGenesisHash = $shelley_hash
| .AlonzoGenesisFile = $alonzo_file
| .AlonzoGenesisHash = $alonzo_hash
| .ConwayGenesisFile = $conway_file
| .ConwayGenesisHash = $conway_hash' \
"$conf" > "$STATE_CLUSTER/$fname"
| .ConwayGenesisHash = $conway_hash
' "$conf" > "$STATE_CLUSTER/$fname"
done

# run the pool3 with the original cardano-node binary
Expand Down Expand Up @@ -281,7 +281,7 @@ elif [ "$1" = "step3" ]; then

export UPGRADE_TESTS_STEP=3

NETWORK_MAGIC="$(jq '.networkMagic' "$STATE_CLUSTER/shelley/genesis.json")"
NETWORK_MAGIC="$(jq -r '.networkMagic' "$STATE_CLUSTER/shelley/genesis.json")"
export NETWORK_MAGIC

# re-generate config and topology files
Expand All @@ -294,11 +294,11 @@ elif [ "$1" = "step3" ]; then
cp -f "$WORKDIR"/dry_config_step3/state-cluster0/topology-*.json "$STATE_CLUSTER"

# Copy newly generated config files to the cluster state dir, but use the original genesis files
BYRON_GENESIS_HASH="$(jq -r ".ByronGenesisHash" "$STATE_CLUSTER/config-bft1.json")"
SHELLEY_GENESIS_HASH="$(jq -r ".ShelleyGenesisHash" "$STATE_CLUSTER/config-bft1.json")"
ALONZO_GENESIS_HASH="$(jq -r ".AlonzoGenesisHash" "$STATE_CLUSTER/config-bft1.json")"
CONWAY_GENESIS_HASH="$(jq -r ".ConwayGenesisHash" "$STATE_CLUSTER/config-bft1.json")"
DIJKSTRA_GENESIS_HASH="$(jq -r ".DijkstraGenesisHash" "$STATE_CLUSTER/config-bft1.json")"
BYRON_GENESIS_HASH="$(jq -r '.ByronGenesisHash' "$STATE_CLUSTER/config-bft1.json")"
SHELLEY_GENESIS_HASH="$(jq -r '.ShelleyGenesisHash' "$STATE_CLUSTER/config-bft1.json")"
ALONZO_GENESIS_HASH="$(jq -r '.AlonzoGenesisHash' "$STATE_CLUSTER/config-bft1.json")"
CONWAY_GENESIS_HASH="$(jq -r '.ConwayGenesisHash' "$STATE_CLUSTER/config-bft1.json")"
DIJKSTRA_GENESIS_HASH="$(jq -r '.DijkstraGenesisHash' "$STATE_CLUSTER/config-bft1.json")"
if [ -z "$DIJKSTRA_GENESIS_HASH" ] || [ "$DIJKSTRA_GENESIS_HASH" = "null" ]; then
cp -f "$WORKDIR/dry_config_step3/state-cluster0/shelley/genesis.dijkstra.json" "$STATE_CLUSTER/shelley"
DIJKSTRA_GENESIS_HASH="$(cardano-cli latest genesis hash --genesis \
Expand All @@ -311,13 +311,13 @@ elif [ "$1" = "step3" ]; then
--arg shelley_hash "$SHELLEY_GENESIS_HASH" \
--arg alonzo_hash "$ALONZO_GENESIS_HASH" \
--arg conway_hash "$CONWAY_GENESIS_HASH" \
--arg dijkstra_hash "$DIJKSTRA_GENESIS_HASH" \
'.ByronGenesisHash = $byron_hash
--arg dijkstra_hash "$DIJKSTRA_GENESIS_HASH" '
.ByronGenesisHash = $byron_hash
| .ShelleyGenesisHash = $shelley_hash
| .AlonzoGenesisHash = $alonzo_hash
| .ConwayGenesisHash = $conway_hash
| .DijkstraGenesisHash = $dijkstra_hash' \
"$conf" > "$STATE_CLUSTER/$fname"
| .DijkstraGenesisHash = $dijkstra_hash
' "$conf" > "$STATE_CLUSTER/$fname"
done

# generate ledger peer snapshot using new node version
Expand All @@ -332,15 +332,15 @@ elif [ "$1" = "step3" ]; then
fi

# use the base version snapshot for pool1 and upgrade version snapshot for pool3
jq \
'.localRoots[] += {"trustable": true}
| .peerSnapshotFile = "peer-snapshot-base.json"' \
"$STATE_CLUSTER/topology-pool1.json" > "$STATE_CLUSTER/topology-pool1.tmp.json"
jq '
.localRoots[] += {"trustable": true}
| .peerSnapshotFile = "peer-snapshot-base.json"
' "$STATE_CLUSTER/topology-pool1.json" > "$STATE_CLUSTER/topology-pool1.tmp.json"
mv -f "$STATE_CLUSTER/topology-pool1.tmp.json" "$STATE_CLUSTER/topology-pool1.json"
jq \
'.localRoots[] += {"trustable": true}
| .peerSnapshotFile = "peer-snapshot-upgrade.json"' \
"$STATE_CLUSTER/topology-pool3.json" > "$STATE_CLUSTER/topology-pool3.tmp.json"
jq '
.localRoots[] += {"trustable": true}
| .peerSnapshotFile = "peer-snapshot-upgrade.json"
' "$STATE_CLUSTER/topology-pool3.json" > "$STATE_CLUSTER/topology-pool3.tmp.json"
mv -f "$STATE_CLUSTER/topology-pool3.tmp.json" "$STATE_CLUSTER/topology-pool3.json"

# set `GenesisMode` for nodes that will use the ledger peer snapshot
Expand Down
4 changes: 2 additions & 2 deletions cardano_node_tests/cluster_scripts/testnets/start-cluster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ ln -rs "$STATE_CLUSTER/genesis-shelley.json" "$STATE_CLUSTER/shelley/genesis.jso
ln -rs "$STATE_CLUSTER/genesis-alonzo.json" "$STATE_CLUSTER/shelley/genesis.alonzo.json"
ln -rs "$STATE_CLUSTER/genesis-conway.json" "$STATE_CLUSTER/shelley/genesis.conway.json"

NETWORK_MAGIC="$(jq '.networkMagic' "$STATE_CLUSTER/shelley/genesis.json")"
NETWORK_MAGIC="$(jq -r '.networkMagic' "$STATE_CLUSTER/shelley/genesis.json")"

# edit port numbers in configuration
RELAY1_EKG="%%EKG_PORT_RELAY1%%"
Expand Down Expand Up @@ -229,7 +229,7 @@ if [ -n "${DBSYNC_SCHEMA_DIR:-""}" ]; then

echo "Waiting to make sure db-sync is synced"
for _ in {1..600}; do
node_block="$(cardano-cli query tip --testnet-magic "$NETWORK_MAGIC" | jq '.block')"
node_block="$(cardano-cli query tip --testnet-magic "$NETWORK_MAGIC" | jq -r '.block')"
sleep 5
dbsync_block="$("$SCRIPT_DIR/dbsync_block_no.sh")"
if [ "$node_block" -le "$dbsync_block" ]; then
Expand Down
Loading