Skip to content

Commit de400f4

Browse files
skylar-simoncelliskylar-simoncelli
authored
Revert "feat: local-environment cardano-node version upgrade 10.1.4 > 10.4.1" (#960)
1 parent 158bd80 commit de400f4

File tree

10 files changed

+103
-130
lines changed

10 files changed

+103
-130
lines changed

‎dev/local-environment-dynamic/configurations/cardano/config-pool1.json

Lines changed: 39 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -28,51 +28,46 @@
2828
"TestShelleyHardForkAtEpoch": 0,
2929
"TestBabbageHardForkAtEpoch": 0,
3030
"TestConwayHardForkAtEpoch": 0,
31-
32-
"TraceOptions": {
33-
"TracingVerbosity": { "verbosity": "NormalVerbosity" },
34-
"TraceAcceptPolicy": { "isOn": true },
35-
"TraceBlockFetchClient": { "isOn": false },
36-
"TraceBlockFetchDecisions": { "isOn": false },
37-
"TraceBlockFetchProtocol": { "isOn": false },
38-
"TraceBlockFetchProtocolSerialised": { "isOn": false },
39-
"TraceBlockFetchServer": { "isOn": false },
40-
"TraceChainDb": { "isOn": true },
41-
"TraceChainSyncBlockServer": { "isOn": false },
42-
"TraceChainSyncClient": { "isOn": false },
43-
"TraceChainSyncHeaderServer": { "isOn": false },
44-
"TraceChainSyncProtocol": { "isOn": false },
45-
"TraceConnectionManager": { "isOn": true },
46-
"TraceDNSResolver": { "isOn": true },
47-
"TraceDNSSubscription": { "isOn": true },
48-
"TraceDiffusionInitialization": { "isOn": true },
49-
"TraceErrorPolicy": { "isOn": true },
50-
"TraceForge": { "isOn": true },
51-
"TraceHandshake": { "isOn": true },
52-
"TraceInboundGovernor": { "isOn": true },
53-
"TraceIpSubscription": { "isOn": true },
54-
"TraceLedgerPeers": { "isOn": true },
55-
"TraceLocalChainSyncProtocol": { "isOn": false },
56-
"TraceLocalConnectionManager": { "isOn": true },
57-
"TraceLocalErrorPolicy": { "isOn": true },
58-
"TraceLocalHandshake": { "isOn": true },
59-
"TraceLocalRootPeers": { "isOn": true },
60-
"TraceLocalTxSubmissionProtocol": { "isOn": false },
61-
"TraceLocalTxSubmissionServer": { "isOn": false },
62-
"TraceMempool": { "isOn": true },
63-
"TraceMux": { "isOn": false },
64-
"TracePeerSelection": { "isOn": true },
65-
"TracePeerSelectionActions": { "isOn": true },
66-
"TracePublicRootPeers": { "isOn": true },
67-
"TraceServer": { "isOn": true },
68-
"TraceTxInbound": { "isOn": false },
69-
"TraceTxOutbound": { "isOn": false },
70-
"TraceTxSubmissionProtocol": { "isOn": false }
71-
},
72-
31+
"TraceAcceptPolicy": true,
32+
"TraceBlockFetchClient": false,
33+
"TraceBlockFetchDecisions": false,
34+
"TraceBlockFetchProtocol": false,
35+
"TraceBlockFetchProtocolSerialised": false,
36+
"TraceBlockFetchServer": false,
37+
"TraceChainDb": true,
38+
"TraceChainSyncBlockServer": false,
39+
"TraceChainSyncClient": false,
40+
"TraceChainSyncHeaderServer": false,
41+
"TraceChainSyncProtocol": false,
42+
"TraceConnectionManager": true,
43+
"TraceDNSResolver": true,
44+
"TraceDNSSubscription": true,
45+
"TraceDiffusionInitialization": true,
46+
"TraceErrorPolicy": true,
47+
"TraceForge": true,
48+
"TraceHandshake": true,
49+
"TraceInboundGovernor": true,
50+
"TraceIpSubscription": true,
51+
"TraceLedgerPeers": true,
52+
"TraceLocalChainSyncProtocol": false,
53+
"TraceLocalConnectionManager": true,
54+
"TraceLocalErrorPolicy": true,
55+
"TraceLocalHandshake": true,
56+
"TraceLocalRootPeers": true,
57+
"TraceLocalTxSubmissionProtocol": false,
58+
"TraceLocalTxSubmissionServer": false,
59+
"TraceMempool": true,
60+
"TraceMux": false,
61+
"TracePeerSelection": true,
62+
"TracePeerSelectionActions": true,
63+
"TracePublicRootPeers": true,
64+
"TraceServer": true,
65+
"TraceTxInbound": false,
66+
"TraceTxOutbound": false,
67+
"TraceTxSubmissionProtocol": false,
68+
"TracingVerbosity": "NormalVerbosity",
7369
"TurnOnLogMetrics": true,
7470
"TurnOnLogging": true,
75-
7671
"defaultBackends": [
7772
"KatipBK"
7873
],
@@ -88,7 +83,6 @@
8883
12798
8984
],
9085
"minSeverity": "Info",
91-
9286
"options": {
9387
"mapBackends": {
9488
"cardano.node.metrics": [
@@ -104,13 +98,11 @@
10498
}
10599
}
106100
},
107-
108101
"rotation": {
109102
"rpKeepFilesNum": 10,
110103
"rpLogLimitBytes": 5000000,
111104
"rpMaxAgeHours": 24
112105
},
113-
114106
"setupBackends": [
115107
"KatipBK"
116108
],
@@ -122,4 +114,4 @@
122114
"scRotation": null
123115
}
124116
]
125-
}
117+
}

‎dev/local-environment-dynamic/configurations/cardano/entrypoint.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ for i in $(seq 1 $NUM_REGISTERED_NODES_TO_PROCESS); do
131131
fi
132132

133133
echo "[LOG] Generating Stake keys for registered-$i in $NODE_SPECIFIC_KEYS_DIR..."
134-
cardano-cli latest stake-address key-gen \
134+
cardano-cli shelley stake-address key-gen \
135135
--verification-key-file "${NODE_SPECIFIC_KEYS_DIR}/stake.vkey" \
136136
--signing-key-file "${NODE_SPECIFIC_KEYS_DIR}/stake.skey"
137137
if [ $? -ne 0 ]; then
@@ -147,7 +147,7 @@ registered_node_stake_addresses=() # Array to store stake addresses
147147
for i in $(seq 1 $NUM_REGISTERED_NODES_TO_PROCESS); do
148148
NODE_SPECIFIC_KEYS_DIR="/shared/node-keys/registered-${i}/keys"
149149
echo "[LOG] Generating stake address for registered-$i in $NODE_SPECIFIC_KEYS_DIR..."
150-
node_stake_address=$(cardano-cli latest stake-address build \
150+
node_stake_address=$(cardano-cli shelley stake-address build \
151151
--stake-verification-key-file "${NODE_SPECIFIC_KEYS_DIR}/stake.vkey" \
152152
--testnet-magic 42)
153153

@@ -372,8 +372,8 @@ echo "[LOG] Waiting 45 seconds for the main transaction to process and be confir
372372
sleep 45
373373

374374
echo "[LOG] Querying and saving the first UTXO details for new address to /shared/genesis.utxo:"
375-
cardano-cli latest query utxo --testnet-magic 42 --address "${new_address}" | /busybox awk -F'"' '/#/ {gsub(":", "", $2); print $2; exit}' > /shared/genesis.utxo
376-
375+
# Query UTXOs and extract the first UTXO key from JSON format
376+
cardano-cli latest query utxo --testnet-magic 42 --address "${new_address}" --out-file /dev/stdout | /busybox grep -o '"[a-f0-9]\{64\}#[0-9]\+":' | head -1 | /busybox sed 's/"//g' | /busybox sed 's/://g' > /shared/genesis.utxo
377377
cp /shared/genesis.utxo /runtime-values/genesis.utxo
378378
echo "[LOG] Created /shared/genesis.utxo with value: $(cat /shared/genesis.utxo)"
379379

@@ -690,8 +690,7 @@ if [ "$NUM_REGISTERED_NODES_TO_PROCESS" -gt 0 ]; then
690690
elif [ "$batch_num" -lt "$num_batches" ]; then
691691
echo "[WARN] Batch $batch_num: No usable change output created. Attempting to find a new UTXO at $new_address for the next batch."
692692
sleep 5
693-
new_input_utxo_candidate=$(cardano-cli latest query utxo --address "$new_address" --testnet-magic 42 | /busybox awk 'NR>2 {print $1"#"$2; exit}')
694-
693+
new_input_utxo_candidate=$(cardano-cli latest query utxo --address "$new_address" --testnet-magic 42 | /busybox grep lovelace | /busybox sort -k3 -nr | head -1 | /busybox awk '{print $1"#"$2}')
695694
if [ -n "$new_input_utxo_candidate" ]; then
696695
current_batch_input_utxo="$new_input_utxo_candidate"
697696
echo "[LOG] Batch $batch_num: Found new input UTXO for next batch: $current_batch_input_utxo"

‎dev/local-environment-dynamic/configurations/cardano/topology-pool1.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
{
2-
"localRoots": [
2+
"localRoots": [],
3+
"publicRoots": [
34
{
4-
"accessPoints": [
5-
{ "address": "127.0.0.1", "port": 32000 }
6-
],
7-
"advertise": false,
8-
"hotValency": 1,
9-
"coldValency": 1
5+
"accessPoints": [],
6+
"advertise": false
107
}
11-
],
12-
"publicRoots": [],
13-
"useLedgerAfterSlot": 0
8+
]
149
}

‎dev/local-environment-dynamic/configurations/genesis/shelley/genesis.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"rho": 0.0022,
5050
"tau": 0.05
5151
},
52-
"securityParam": 10,
52+
"securityParam": 5,
5353
"slotLength": 1,
5454
"slotsPerKESPeriod": 129600,
5555
"staking": {

‎dev/local-environment-dynamic/setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ NUM_PERMISSIONED_NODES_TO_PROCESS=5
55
NUM_REGISTERED_NODES_TO_PROCESS=5
66

77
PARTNER_CHAINS_NODE_IMAGE="ghcr.io/input-output-hk/partner-chains/partner-chains-node-unstable:latest"
8-
CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.4.1"
8+
CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.1.4"
99
DBSYNC_IMAGE="ghcr.io/intersectmbo/cardano-db-sync:13.6.0.5"
1010
OGMIOS_IMAGE="cardanosolutions/ogmios:v6.12.0"
11-
POSTGRES_IMAGE="postgres:latest"
11+
POSTGRES_IMAGE="postgres:17.2"
1212

1313
display_banner() {
1414
cat <<'EOF'

‎dev/local-environment/configurations/cardano/config-pool1.json

Lines changed: 39 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -28,51 +28,46 @@
2828
"TestShelleyHardForkAtEpoch": 0,
2929
"TestBabbageHardForkAtEpoch": 0,
3030
"TestConwayHardForkAtEpoch": 0,
31-
32-
"TraceOptions": {
33-
"TracingVerbosity": { "verbosity": "NormalVerbosity" },
34-
"TraceAcceptPolicy": { "isOn": true },
35-
"TraceBlockFetchClient": { "isOn": false },
36-
"TraceBlockFetchDecisions": { "isOn": false },
37-
"TraceBlockFetchProtocol": { "isOn": false },
38-
"TraceBlockFetchProtocolSerialised": { "isOn": false },
39-
"TraceBlockFetchServer": { "isOn": false },
40-
"TraceChainDb": { "isOn": true },
41-
"TraceChainSyncBlockServer": { "isOn": false },
42-
"TraceChainSyncClient": { "isOn": false },
43-
"TraceChainSyncHeaderServer": { "isOn": false },
44-
"TraceChainSyncProtocol": { "isOn": false },
45-
"TraceConnectionManager": { "isOn": true },
46-
"TraceDNSResolver": { "isOn": true },
47-
"TraceDNSSubscription": { "isOn": true },
48-
"TraceDiffusionInitialization": { "isOn": true },
49-
"TraceErrorPolicy": { "isOn": true },
50-
"TraceForge": { "isOn": true },
51-
"TraceHandshake": { "isOn": true },
52-
"TraceInboundGovernor": { "isOn": true },
53-
"TraceIpSubscription": { "isOn": true },
54-
"TraceLedgerPeers": { "isOn": true },
55-
"TraceLocalChainSyncProtocol": { "isOn": false },
56-
"TraceLocalConnectionManager": { "isOn": true },
57-
"TraceLocalErrorPolicy": { "isOn": true },
58-
"TraceLocalHandshake": { "isOn": true },
59-
"TraceLocalRootPeers": { "isOn": true },
60-
"TraceLocalTxSubmissionProtocol": { "isOn": false },
61-
"TraceLocalTxSubmissionServer": { "isOn": false },
62-
"TraceMempool": { "isOn": true },
63-
"TraceMux": { "isOn": false },
64-
"TracePeerSelection": { "isOn": true },
65-
"TracePeerSelectionActions": { "isOn": true },
66-
"TracePublicRootPeers": { "isOn": true },
67-
"TraceServer": { "isOn": true },
68-
"TraceTxInbound": { "isOn": false },
69-
"TraceTxOutbound": { "isOn": false },
70-
"TraceTxSubmissionProtocol": { "isOn": false }
71-
},
72-
31+
"TraceAcceptPolicy": true,
32+
"TraceBlockFetchClient": false,
33+
"TraceBlockFetchDecisions": false,
34+
"TraceBlockFetchProtocol": false,
35+
"TraceBlockFetchProtocolSerialised": false,
36+
"TraceBlockFetchServer": false,
37+
"TraceChainDb": true,
38+
"TraceChainSyncBlockServer": false,
39+
"TraceChainSyncClient": false,
40+
"TraceChainSyncHeaderServer": false,
41+
"TraceChainSyncProtocol": false,
42+
"TraceConnectionManager": true,
43+
"TraceDNSResolver": true,
44+
"TraceDNSSubscription": true,
45+
"TraceDiffusionInitialization": true,
46+
"TraceErrorPolicy": true,
47+
"TraceForge": true,
48+
"TraceHandshake": true,
49+
"TraceInboundGovernor": true,
50+
"TraceIpSubscription": true,
51+
"TraceLedgerPeers": true,
52+
"TraceLocalChainSyncProtocol": false,
53+
"TraceLocalConnectionManager": true,
54+
"TraceLocalErrorPolicy": true,
55+
"TraceLocalHandshake": true,
56+
"TraceLocalRootPeers": true,
57+
"TraceLocalTxSubmissionProtocol": false,
58+
"TraceLocalTxSubmissionServer": false,
59+
"TraceMempool": true,
60+
"TraceMux": false,
61+
"TracePeerSelection": true,
62+
"TracePeerSelectionActions": true,
63+
"TracePublicRootPeers": true,
64+
"TraceServer": true,
65+
"TraceTxInbound": false,
66+
"TraceTxOutbound": false,
67+
"TraceTxSubmissionProtocol": false,
68+
"TracingVerbosity": "NormalVerbosity",
7369
"TurnOnLogMetrics": true,
7470
"TurnOnLogging": true,
75-
7671
"defaultBackends": [
7772
"KatipBK"
7873
],
@@ -88,7 +83,6 @@
8883
12798
8984
],
9085
"minSeverity": "Info",
91-
9286
"options": {
9387
"mapBackends": {
9488
"cardano.node.metrics": [
@@ -104,13 +98,11 @@
10498
}
10599
}
106100
},
107-
108101
"rotation": {
109102
"rpKeepFilesNum": 10,
110103
"rpLogLimitBytes": 5000000,
111104
"rpMaxAgeHours": 24
112105
},
113-
114106
"setupBackends": [
115107
"KatipBK"
116108
],
@@ -122,4 +114,4 @@
122114
"scRotation": null
123115
}
124116
]
125-
}
117+
}

‎dev/local-environment/configurations/cardano/entrypoint.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,17 +170,17 @@ echo $new_address > /shared/FUNDED_ADDRESS
170170
echo "Created /shared/FUNDED_ADDRESS with value: $new_address"
171171

172172
echo "Querying and saving the first UTXO details for node-4 address to /shared/node4.utxo:"
173-
cardano-cli latest query utxo --testnet-magic 42 --address "${node4_address}" | /busybox awk -F'"' '/^[[:space:]]*"/ {print $2; exit}' > /shared/node4.utxo
173+
cardano-cli latest query utxo --testnet-magic 42 --address "${node4_address}" | /busybox awk 'NR>2 { print $1 "#" $2; exit }' > /shared/node4.utxo
174174
echo "UTXO details for node-4 saved in /shared/node4.utxo."
175175
cat /shared/node4.utxo
176176

177177
echo "Querying and saving the first UTXO details for node-5 address to /shared/node5.utxo:"
178-
cardano-cli latest query utxo --testnet-magic 42 --address "${node5_address}" | /busybox awk -F'"' '/^[[:space:]]*"/ {print $2; exit}' > /shared/node5.utxo
178+
cardano-cli latest query utxo --testnet-magic 42 --address "${node5_address}" | /busybox awk 'NR>2 { print $1 "#" $2; exit }' > /shared/node5.utxo
179179
echo "UTXO details for node-5 saved in /shared/node5.utxo."
180180
cat /shared/node5.utxo
181181

182182
echo "Querying and saving the first UTXO details for new address to /shared/genesis.utxo:"
183-
cardano-cli latest query utxo --testnet-magic 42 --address "${new_address}" | /busybox awk -F'"' '/^[[:space:]]*"/ {print $2; exit}' > /shared/genesis.utxo
183+
cardano-cli latest query utxo --testnet-magic 42 --address "${new_address}" | /busybox awk 'NR>2 { print $1 "#" $2; exit }' > /shared/genesis.utxo
184184
cat /shared/genesis.utxo > /runtime-values/genesis.utxo
185185
cat /shared/genesis.utxo
186186

‎dev/local-environment/configurations/cardano/topology-pool1.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
{
2-
"localRoots": [
2+
"localRoots": [],
3+
"publicRoots": [
34
{
4-
"accessPoints": [
5-
{ "address": "127.0.0.1", "port": 32000 }
6-
],
7-
"advertise": false,
8-
"hotValency": 1,
9-
"coldValency": 1
5+
"accessPoints": [],
6+
"advertise": false
107
}
11-
],
12-
"publicRoots": [],
13-
"useLedgerAfterSlot": 0
8+
]
149
}

‎dev/local-environment/configurations/genesis/shelley/genesis.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"rho": 0.0022,
5050
"tau": 0.05
5151
},
52-
"securityParam": 10,
52+
"securityParam": 5,
5353
"slotLength": 1,
5454
"slotsPerKESPeriod": 129600,
5555
"staking": {

‎dev/local-environment/setup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env bash
22

33
PARTNER_CHAINS_NODE_IMAGE="ghcr.io/input-output-hk/partner-chains/partner-chains-node-unstable:latest"
4-
CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.4.1"
4+
CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.1.4"
55
DBSYNC_IMAGE="ghcr.io/intersectmbo/cardano-db-sync:13.6.0.4"
6-
OGMIOS_IMAGE="cardanosolutions/ogmios:v6.12.0"
7-
POSTGRES_IMAGE="postgres:latest"
6+
OGMIOS_IMAGE="cardanosolutions/ogmios:v6.11.0"
7+
POSTGRES_IMAGE="postgres:17.2"
88
TESTS_IMAGE="python:3.12-slim"
99

1010
display_banner() {

0 commit comments

Comments
 (0)