diff --git a/dev/local-environment-dynamic/configurations/cardano/config-pool1.json b/dev/local-environment-dynamic/configurations/cardano/config-pool1.json index f133f44c52..8f18a53d05 100644 --- a/dev/local-environment-dynamic/configurations/cardano/config-pool1.json +++ b/dev/local-environment-dynamic/configurations/cardano/config-pool1.json @@ -28,46 +28,51 @@ "TestShelleyHardForkAtEpoch": 0, "TestBabbageHardForkAtEpoch": 0, "TestConwayHardForkAtEpoch": 0, - "TraceAcceptPolicy": true, - "TraceBlockFetchClient": false, - "TraceBlockFetchDecisions": false, - "TraceBlockFetchProtocol": false, - "TraceBlockFetchProtocolSerialised": false, - "TraceBlockFetchServer": false, - "TraceChainDb": true, - "TraceChainSyncBlockServer": false, - "TraceChainSyncClient": false, - "TraceChainSyncHeaderServer": false, - "TraceChainSyncProtocol": false, - "TraceConnectionManager": true, - "TraceDNSResolver": true, - "TraceDNSSubscription": true, - "TraceDiffusionInitialization": true, - "TraceErrorPolicy": true, - "TraceForge": true, - "TraceHandshake": true, - "TraceInboundGovernor": true, - "TraceIpSubscription": true, - "TraceLedgerPeers": true, - "TraceLocalChainSyncProtocol": false, - "TraceLocalConnectionManager": true, - "TraceLocalErrorPolicy": true, - "TraceLocalHandshake": true, - "TraceLocalRootPeers": true, - "TraceLocalTxSubmissionProtocol": false, - "TraceLocalTxSubmissionServer": false, - "TraceMempool": true, - "TraceMux": false, - "TracePeerSelection": true, - "TracePeerSelectionActions": true, - "TracePublicRootPeers": true, - "TraceServer": true, - "TraceTxInbound": false, - "TraceTxOutbound": false, - "TraceTxSubmissionProtocol": false, - "TracingVerbosity": "NormalVerbosity", + + "TraceOptions": { + "TracingVerbosity": { "verbosity": "NormalVerbosity" }, + "TraceAcceptPolicy": { "isOn": true }, + "TraceBlockFetchClient": { "isOn": false }, + "TraceBlockFetchDecisions": { "isOn": false }, + "TraceBlockFetchProtocol": { "isOn": false }, + "TraceBlockFetchProtocolSerialised": { "isOn": false }, + "TraceBlockFetchServer": { "isOn": false }, + "TraceChainDb": { "isOn": true }, + "TraceChainSyncBlockServer": { "isOn": false }, + "TraceChainSyncClient": { "isOn": false }, + "TraceChainSyncHeaderServer": { "isOn": false }, + "TraceChainSyncProtocol": { "isOn": false }, + "TraceConnectionManager": { "isOn": true }, + "TraceDNSResolver": { "isOn": true }, + "TraceDNSSubscription": { "isOn": true }, + "TraceDiffusionInitialization": { "isOn": true }, + "TraceErrorPolicy": { "isOn": true }, + "TraceForge": { "isOn": true }, + "TraceHandshake": { "isOn": true }, + "TraceInboundGovernor": { "isOn": true }, + "TraceIpSubscription": { "isOn": true }, + "TraceLedgerPeers": { "isOn": true }, + "TraceLocalChainSyncProtocol": { "isOn": false }, + "TraceLocalConnectionManager": { "isOn": true }, + "TraceLocalErrorPolicy": { "isOn": true }, + "TraceLocalHandshake": { "isOn": true }, + "TraceLocalRootPeers": { "isOn": true }, + "TraceLocalTxSubmissionProtocol": { "isOn": false }, + "TraceLocalTxSubmissionServer": { "isOn": false }, + "TraceMempool": { "isOn": true }, + "TraceMux": { "isOn": false }, + "TracePeerSelection": { "isOn": true }, + "TracePeerSelectionActions": { "isOn": true }, + "TracePublicRootPeers": { "isOn": true }, + "TraceServer": { "isOn": true }, + "TraceTxInbound": { "isOn": false }, + "TraceTxOutbound": { "isOn": false }, + "TraceTxSubmissionProtocol": { "isOn": false } + }, + "TurnOnLogMetrics": true, "TurnOnLogging": true, + "defaultBackends": [ "KatipBK" ], @@ -83,6 +88,7 @@ 12798 ], "minSeverity": "Info", + "options": { "mapBackends": { "cardano.node.metrics": [ @@ -98,11 +104,13 @@ } } }, + "rotation": { "rpKeepFilesNum": 10, "rpLogLimitBytes": 5000000, "rpMaxAgeHours": 24 }, + "setupBackends": [ "KatipBK" ], @@ -114,4 +122,4 @@ "scRotation": null } ] -} \ No newline at end of file +} diff --git a/dev/local-environment-dynamic/configurations/cardano/entrypoint.sh b/dev/local-environment-dynamic/configurations/cardano/entrypoint.sh index 37d356eb69..91e3a558cb 100644 --- a/dev/local-environment-dynamic/configurations/cardano/entrypoint.sh +++ b/dev/local-environment-dynamic/configurations/cardano/entrypoint.sh @@ -131,7 +131,7 @@ for i in $(seq 1 $NUM_REGISTERED_NODES_TO_PROCESS); do fi echo "[LOG] Generating Stake keys for registered-$i in $NODE_SPECIFIC_KEYS_DIR..." - cardano-cli shelley stake-address key-gen \ + cardano-cli latest stake-address key-gen \ --verification-key-file "${NODE_SPECIFIC_KEYS_DIR}/stake.vkey" \ --signing-key-file "${NODE_SPECIFIC_KEYS_DIR}/stake.skey" if [ $? -ne 0 ]; then @@ -147,7 +147,7 @@ registered_node_stake_addresses=() # Array to store stake addresses for i in $(seq 1 $NUM_REGISTERED_NODES_TO_PROCESS); do NODE_SPECIFIC_KEYS_DIR="/shared/node-keys/registered-${i}/keys" echo "[LOG] Generating stake address for registered-$i in $NODE_SPECIFIC_KEYS_DIR..." - node_stake_address=$(cardano-cli shelley stake-address build \ + node_stake_address=$(cardano-cli latest stake-address build \ --stake-verification-key-file "${NODE_SPECIFIC_KEYS_DIR}/stake.vkey" \ --testnet-magic 42) @@ -372,8 +372,8 @@ echo "[LOG] Waiting 45 seconds for the main transaction to process and be confir sleep 45 echo "[LOG] Querying and saving the first UTXO details for new address to /shared/genesis.utxo:" -# Query UTXOs and extract the first UTXO key from JSON format -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 +cardano-cli latest query utxo --testnet-magic 42 --address "${new_address}" | /busybox awk -F'"' '/#/ {gsub(":", "", $2); print $2; exit}' > /shared/genesis.utxo + cp /shared/genesis.utxo /runtime-values/genesis.utxo echo "[LOG] Created /shared/genesis.utxo with value: $(cat /shared/genesis.utxo)" @@ -690,7 +690,8 @@ if [ "$NUM_REGISTERED_NODES_TO_PROCESS" -gt 0 ]; then elif [ "$batch_num" -lt "$num_batches" ]; then echo "[WARN] Batch $batch_num: No usable change output created. Attempting to find a new UTXO at $new_address for the next batch." sleep 5 - 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}') + new_input_utxo_candidate=$(cardano-cli latest query utxo --address "$new_address" --testnet-magic 42 | /busybox awk 'NR>2 {print $1"#"$2; exit}') + if [ -n "$new_input_utxo_candidate" ]; then current_batch_input_utxo="$new_input_utxo_candidate" echo "[LOG] Batch $batch_num: Found new input UTXO for next batch: $current_batch_input_utxo" diff --git a/dev/local-environment-dynamic/configurations/cardano/topology-pool1.json b/dev/local-environment-dynamic/configurations/cardano/topology-pool1.json index 5bf5ecaab2..d1e885b89c 100644 --- a/dev/local-environment-dynamic/configurations/cardano/topology-pool1.json +++ b/dev/local-environment-dynamic/configurations/cardano/topology-pool1.json @@ -1,9 +1,14 @@ { - "localRoots": [], - "publicRoots": [ + "localRoots": [ { - "accessPoints": [], - "advertise": false + "accessPoints": [ + { "address": "127.0.0.1", "port": 32000 } + ], + "advertise": false, + "hotValency": 1, + "coldValency": 1 } - ] + ], + "publicRoots": [], + "useLedgerAfterSlot": 0 } diff --git a/dev/local-environment-dynamic/configurations/genesis/shelley/genesis.json b/dev/local-environment-dynamic/configurations/genesis/shelley/genesis.json index 49a65fc0df..dfd37051da 100644 --- a/dev/local-environment-dynamic/configurations/genesis/shelley/genesis.json +++ b/dev/local-environment-dynamic/configurations/genesis/shelley/genesis.json @@ -49,7 +49,7 @@ "rho": 0.0022, "tau": 0.05 }, - "securityParam": 5, + "securityParam": 10, "slotLength": 1, "slotsPerKESPeriod": 129600, "staking": { diff --git a/dev/local-environment-dynamic/setup.sh b/dev/local-environment-dynamic/setup.sh index 36cbc77f3d..e93d90d4e1 100755 --- a/dev/local-environment-dynamic/setup.sh +++ b/dev/local-environment-dynamic/setup.sh @@ -5,10 +5,10 @@ NUM_PERMISSIONED_NODES_TO_PROCESS=5 NUM_REGISTERED_NODES_TO_PROCESS=5 PARTNER_CHAINS_NODE_IMAGE="ghcr.io/input-output-hk/partner-chains/partner-chains-node-unstable:latest" -CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.1.4" +CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.4.1" DBSYNC_IMAGE="ghcr.io/intersectmbo/cardano-db-sync:13.6.0.5" OGMIOS_IMAGE="cardanosolutions/ogmios:v6.12.0" -POSTGRES_IMAGE="postgres:17.2" +POSTGRES_IMAGE="postgres:latest" display_banner() { cat <<'EOF' diff --git a/dev/local-environment/configurations/cardano/config-pool1.json b/dev/local-environment/configurations/cardano/config-pool1.json index f133f44c52..8f18a53d05 100644 --- a/dev/local-environment/configurations/cardano/config-pool1.json +++ b/dev/local-environment/configurations/cardano/config-pool1.json @@ -28,46 +28,51 @@ "TestShelleyHardForkAtEpoch": 0, "TestBabbageHardForkAtEpoch": 0, "TestConwayHardForkAtEpoch": 0, - "TraceAcceptPolicy": true, - "TraceBlockFetchClient": false, - "TraceBlockFetchDecisions": false, - "TraceBlockFetchProtocol": false, - "TraceBlockFetchProtocolSerialised": false, - "TraceBlockFetchServer": false, - "TraceChainDb": true, - "TraceChainSyncBlockServer": false, - "TraceChainSyncClient": false, - "TraceChainSyncHeaderServer": false, - "TraceChainSyncProtocol": false, - "TraceConnectionManager": true, - "TraceDNSResolver": true, - "TraceDNSSubscription": true, - "TraceDiffusionInitialization": true, - "TraceErrorPolicy": true, - "TraceForge": true, - "TraceHandshake": true, - "TraceInboundGovernor": true, - "TraceIpSubscription": true, - "TraceLedgerPeers": true, - "TraceLocalChainSyncProtocol": false, - "TraceLocalConnectionManager": true, - "TraceLocalErrorPolicy": true, - "TraceLocalHandshake": true, - "TraceLocalRootPeers": true, - "TraceLocalTxSubmissionProtocol": false, - "TraceLocalTxSubmissionServer": false, - "TraceMempool": true, - "TraceMux": false, - "TracePeerSelection": true, - "TracePeerSelectionActions": true, - "TracePublicRootPeers": true, - "TraceServer": true, - "TraceTxInbound": false, - "TraceTxOutbound": false, - "TraceTxSubmissionProtocol": false, - "TracingVerbosity": "NormalVerbosity", + + "TraceOptions": { + "TracingVerbosity": { "verbosity": "NormalVerbosity" }, + "TraceAcceptPolicy": { "isOn": true }, + "TraceBlockFetchClient": { "isOn": false }, + "TraceBlockFetchDecisions": { "isOn": false }, + "TraceBlockFetchProtocol": { "isOn": false }, + "TraceBlockFetchProtocolSerialised": { "isOn": false }, + "TraceBlockFetchServer": { "isOn": false }, + "TraceChainDb": { "isOn": true }, + "TraceChainSyncBlockServer": { "isOn": false }, + "TraceChainSyncClient": { "isOn": false }, + "TraceChainSyncHeaderServer": { "isOn": false }, + "TraceChainSyncProtocol": { "isOn": false }, + "TraceConnectionManager": { "isOn": true }, + "TraceDNSResolver": { "isOn": true }, + "TraceDNSSubscription": { "isOn": true }, + "TraceDiffusionInitialization": { "isOn": true }, + "TraceErrorPolicy": { "isOn": true }, + "TraceForge": { "isOn": true }, + "TraceHandshake": { "isOn": true }, + "TraceInboundGovernor": { "isOn": true }, + "TraceIpSubscription": { "isOn": true }, + "TraceLedgerPeers": { "isOn": true }, + "TraceLocalChainSyncProtocol": { "isOn": false }, + "TraceLocalConnectionManager": { "isOn": true }, + "TraceLocalErrorPolicy": { "isOn": true }, + "TraceLocalHandshake": { "isOn": true }, + "TraceLocalRootPeers": { "isOn": true }, + "TraceLocalTxSubmissionProtocol": { "isOn": false }, + "TraceLocalTxSubmissionServer": { "isOn": false }, + "TraceMempool": { "isOn": true }, + "TraceMux": { "isOn": false }, + "TracePeerSelection": { "isOn": true }, + "TracePeerSelectionActions": { "isOn": true }, + "TracePublicRootPeers": { "isOn": true }, + "TraceServer": { "isOn": true }, + "TraceTxInbound": { "isOn": false }, + "TraceTxOutbound": { "isOn": false }, + "TraceTxSubmissionProtocol": { "isOn": false } + }, + "TurnOnLogMetrics": true, "TurnOnLogging": true, + "defaultBackends": [ "KatipBK" ], @@ -83,6 +88,7 @@ 12798 ], "minSeverity": "Info", + "options": { "mapBackends": { "cardano.node.metrics": [ @@ -98,11 +104,13 @@ } } }, + "rotation": { "rpKeepFilesNum": 10, "rpLogLimitBytes": 5000000, "rpMaxAgeHours": 24 }, + "setupBackends": [ "KatipBK" ], @@ -114,4 +122,4 @@ "scRotation": null } ] -} \ No newline at end of file +} diff --git a/dev/local-environment/configurations/cardano/entrypoint.sh b/dev/local-environment/configurations/cardano/entrypoint.sh index b2ad707587..d1b2901a9b 100644 --- a/dev/local-environment/configurations/cardano/entrypoint.sh +++ b/dev/local-environment/configurations/cardano/entrypoint.sh @@ -170,17 +170,17 @@ echo $new_address > /shared/FUNDED_ADDRESS echo "Created /shared/FUNDED_ADDRESS with value: $new_address" echo "Querying and saving the first UTXO details for node-4 address to /shared/node4.utxo:" -cardano-cli latest query utxo --testnet-magic 42 --address "${node4_address}" | /busybox awk 'NR>2 { print $1 "#" $2; exit }' > /shared/node4.utxo +cardano-cli latest query utxo --testnet-magic 42 --address "${node4_address}" | /busybox awk -F'"' '/^[[:space:]]*"/ {print $2; exit}' > /shared/node4.utxo echo "UTXO details for node-4 saved in /shared/node4.utxo." cat /shared/node4.utxo echo "Querying and saving the first UTXO details for node-5 address to /shared/node5.utxo:" -cardano-cli latest query utxo --testnet-magic 42 --address "${node5_address}" | /busybox awk 'NR>2 { print $1 "#" $2; exit }' > /shared/node5.utxo +cardano-cli latest query utxo --testnet-magic 42 --address "${node5_address}" | /busybox awk -F'"' '/^[[:space:]]*"/ {print $2; exit}' > /shared/node5.utxo echo "UTXO details for node-5 saved in /shared/node5.utxo." cat /shared/node5.utxo echo "Querying and saving the first UTXO details for new address to /shared/genesis.utxo:" -cardano-cli latest query utxo --testnet-magic 42 --address "${new_address}" | /busybox awk 'NR>2 { print $1 "#" $2; exit }' > /shared/genesis.utxo +cardano-cli latest query utxo --testnet-magic 42 --address "${new_address}" | /busybox awk -F'"' '/^[[:space:]]*"/ {print $2; exit}' > /shared/genesis.utxo cat /shared/genesis.utxo > /runtime-values/genesis.utxo cat /shared/genesis.utxo diff --git a/dev/local-environment/configurations/cardano/topology-pool1.json b/dev/local-environment/configurations/cardano/topology-pool1.json index 5bf5ecaab2..d1e885b89c 100644 --- a/dev/local-environment/configurations/cardano/topology-pool1.json +++ b/dev/local-environment/configurations/cardano/topology-pool1.json @@ -1,9 +1,14 @@ { - "localRoots": [], - "publicRoots": [ + "localRoots": [ { - "accessPoints": [], - "advertise": false + "accessPoints": [ + { "address": "127.0.0.1", "port": 32000 } + ], + "advertise": false, + "hotValency": 1, + "coldValency": 1 } - ] + ], + "publicRoots": [], + "useLedgerAfterSlot": 0 } diff --git a/dev/local-environment/configurations/genesis/shelley/genesis.json b/dev/local-environment/configurations/genesis/shelley/genesis.json index 933e173965..f42ee29735 100644 --- a/dev/local-environment/configurations/genesis/shelley/genesis.json +++ b/dev/local-environment/configurations/genesis/shelley/genesis.json @@ -49,7 +49,7 @@ "rho": 0.0022, "tau": 0.05 }, - "securityParam": 5, + "securityParam": 10, "slotLength": 1, "slotsPerKESPeriod": 129600, "staking": { diff --git a/dev/local-environment/setup.sh b/dev/local-environment/setup.sh index 074ad03c99..16ea393a44 100755 --- a/dev/local-environment/setup.sh +++ b/dev/local-environment/setup.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash PARTNER_CHAINS_NODE_IMAGE="ghcr.io/input-output-hk/partner-chains/partner-chains-node-unstable:latest" -CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.1.4" +CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.4.1" DBSYNC_IMAGE="ghcr.io/intersectmbo/cardano-db-sync:13.6.0.4" -OGMIOS_IMAGE="cardanosolutions/ogmios:v6.11.0" -POSTGRES_IMAGE="postgres:17.2" +OGMIOS_IMAGE="cardanosolutions/ogmios:v6.12.0" +POSTGRES_IMAGE="postgres:latest" TESTS_IMAGE="python:3.12-slim" display_banner() {