@@ -914,28 +914,26 @@ start-demo:
914914 export GENESIS_DIR=state-demo
915915 export KEY_DIR=state-demo/ envs/ custom
916916 export DATA_DIR=state-demo/ rundir
917-
918- export CARDANO_NODE_SOCKET_PATH=" $STATEDIR/node-demo.socket"
919- export TESTNET_MAGIC=42
920-
921- export NUM_GENESIS_KEYS=3
922- export POOL_NAMES=" sp-1 sp-2 sp-3"
923917 export STAKE_POOL_DIR=state-demo/ groups/ stake-pools
924-
925918 export BULK_CREDS=state-demo/ bulk.creds.all.json
926919 export PAYMENT_KEY=state-demo/ envs/ custom/ utxo-keys/ rich-utxo
927-
928- export UNSTABLE=true
929- export UNSTABLE_LIB=true
930- export USE_ENCRYPTION=true
931- export USE_DECRYPTION=true
932- export USE_NODE_CONFIG_BP=false
933- export DEBUG=true
934-
935- export SECURITY_PARAM=8
936- export SLOT_LENGTH=100
920+ export CARDANO_NODE_SOCKET_PATH=" $STATEDIR/node-demo.socket"
937921 export START_TIME=$(date --utc + " %Y-%m-%dT%H:%M:%SZ" --date " now + 30 seconds" )
938922
923+ [ -z " ${NUM_GENESIS_KEYS:-}" ] && export NUM_GENESIS_KEYS=3
924+ [ -z " ${TESTNET_MAGIC:-}" ] && export TESTNET_MAGIC=42
925+ [ -z " ${POOL_MARGIN:-}" ] && export POOL_MARGIN=" 0.5"
926+ [ -z " ${POOL_NAMES:-}" ] && export POOL_NAMES=" sp-1 sp-2 sp-3"
927+ [ -z " ${UNSTABLE:-}" ] && export UNSTABLE=true
928+ [ -z " ${UNSTABLE_LIB:-}" ] && export UNSTABLE_LIB=true
929+ [ -z " ${USE_ENCRYPTION:-}" ] && export USE_ENCRYPTION=true
930+ [ -z " ${USE_DECRYPTION:-}" ] && export USE_DECRYPTION=true
931+ [ -z " ${USE_NODE_CONFIG_BP:-}" ] && export USE_NODE_CONFIG_BP=false
932+ [ -z " ${DEBUG:-}" ] && export DEBUG=true
933+ [ -z " ${SECURITY_PARAM:-}" ] && export SECURITY_PARAM=8
934+ [ -z " ${SLOT_LENGTH:-}" ] && export SLOT_LENGTH=1000
935+ [ -z " ${FIXED_DELAY_SECS:-}" ] && export FIXED_DELAY_SECS=10
936+
939937 if [ " ${USE_CREATE_TESTNET_DATA:-false}" = true ]; then
940938 ERA_CMD=" conway" \
941939 nix run .#job-gen-custom-node-config-data
@@ -964,7 +962,7 @@ start-demo:
964962 NODE_TOPOLOGY=" $DATA_DIR/topology.json" \
965963 SOCKET_PATH=" $STATEDIR/node-demo.socket" \
966964 nohup setsid nix run .#run-cardano-node &> "$STATEDIR/node-demo.log" & echo $! > "$STATEDIR/node-demo.pid" &
967- just set-default-cardano-env demo " " " $PPID"
965+ just set-default-cardano-env demo " $TESTNET_MAGIC " " $PPID"
968966 echo " Sleeping 30 seconds until $(date -d @$(($(date +%s) + 30)))"
969967 sleep 30
970968 echo
@@ -984,8 +982,8 @@ start-demo:
984982 POOL_RELAY_PORT=3001 \
985983 ERA_CMD=" alonzo" \
986984 nix run .#job-register-stake-pools
987- echo " Sleeping 10 seconds until $(date -d @$(($(date +%s) + 10 )))"
988- sleep 10
985+ echo " Sleeping $FIXED_DELAY_SECS seconds until $(date -d @$(($(date +%s) + $FIXED_DELAY_SECS )))"
986+ sleep " $FIXED_DELAY_SECS"
989987 echo
990988
991989 WAIT_FOR_TIP() {
@@ -994,7 +992,7 @@ start-demo:
994992 EPOCH=" $1"
995993
996994 while true ; do
997- [ " $(jq -re " .$TYPE" <<< " $(just query-tip demo)" )" = " $TARGET" ] && break;
995+ [ " $(jq -re " .$TYPE" <<< " $(just query-tip demo " $TESTNET_MAGIC" )" )" = " $TARGET" ] && break;
998996 sleep 2
999997 done
1000998 }
@@ -1007,7 +1005,7 @@ start-demo:
10071005 echo
10081006
10091007 echo " Forking to babbage in epoch 1..."
1010- just query-tip demo
1008+ just query-tip demo " $TESTNET_MAGIC"
10111009 MAJOR_VERSION=7 \
10121010 ERA_CMD=" alonzo" \
10131011 nix run .#job-update-proposal-hard-fork
@@ -1016,7 +1014,7 @@ start-demo:
10161014 echo
10171015
10181016 echo " Forking to babbage (intra-era) in epoch 2..."
1019- just query-tip demo
1017+ just query-tip demo " $TESTNET_MAGIC"
10201018 MAJOR_VERSION=8 \
10211019 ERA_CMD=" babbage" \
10221020 nix run .#job-update-proposal-hard-fork
@@ -1025,15 +1023,15 @@ start-demo:
10251023 echo
10261024
10271025 echo " Forking to conway in epoch 3..."
1028- just query-tip demo
1026+ just query-tip demo " $TESTNET_MAGIC"
10291027 MAJOR_VERSION=9 \
10301028 ERA_CMD=" babbage" \
10311029 nix run .#job-update-proposal-hard-fork
10321030 echo " Sleeping until epoch conway"
10331031 WAIT_FOR_TIP " era" " Conway"
10341032 echo
10351033
1036- just query-tip demo
1034+ just query-tip demo " $TESTNET_MAGIC"
10371035 echo
10381036 echo " Finished sequence..."
10391037 echo
@@ -1104,7 +1102,7 @@ start-demo-ng:
11041102 NODE_TOPOLOGY=" $DATA_DIR/topology.json" \
11051103 SOCKET_PATH=" $STATEDIR/node-demo.socket" \
11061104 nohup setsid nix run .#run-cardano-node &> "$STATEDIR/node-demo.log" & echo $! > "$STATEDIR/node-demo.pid" &
1107- just set-default-cardano-env demo " " " $PPID"
1105+ just set-default-cardano-env demo " $TESTNET_MAGIC " " $PPID"
11081106 echo " Sleeping 30 seconds until $(date -d @$(($(date +%s) + 30)))"
11091107 sleep 30
11101108 echo
0 commit comments