fix: local-environment-dynamic env var changes

Author: skylar-simoncelli

dev/local-environment-dynamic/configurations/partner-chains-setup/entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+mkdir -p /runtime-values
+
 cp /usr/local/bin/partner-chains-node /partner-chains-node
 echo "Using Partner Chains node version:"
 ./partner-chains-node --version
@@ -49,24 +51,33 @@ echo "Generating addresses.json file..."
     --genesis-utxo $GENESIS_UTXO \
 > addresses.json
 
-export COMMITTEE_CANDIDATE_ADDRESS=$(jq -r '.addresses.CommitteeCandidateValidator' addresses.json)
+cp addresses.json /runtime-values/addresses.json
+
+export COMMITTEE_CANDIDATE_ADDRESS=$(jq -r '.addresses.CommitteeCandidateValidator' /runtime-values/addresses.json)
 echo "Committee candidate address: $COMMITTEE_CANDIDATE_ADDRESS"
 
-export D_PARAMETER_POLICY_ID=$(jq -r '.policyIds.DParameter' addresses.json)
+export D_PARAMETER_POLICY_ID=$(jq -r '.policyIds.DParameter' /runtime-values/addresses.json)
 echo "D parameter policy ID: $D_PARAMETER_POLICY_ID"
 
-export PERMISSIONED_CANDIDATES_POLICY_ID=$(jq -r '.policyIds.PermissionedCandidates' addresses.json)
+export PERMISSIONED_CANDIDATES_POLICY_ID=$(jq -r '.policyIds.PermissionedCandidates' /runtime-values/addresses.json)
 echo "Permissioned candidates policy ID: $PERMISSIONED_CANDIDATES_POLICY_ID"
 
 echo "Setting values for NATIVE_TOKEN_POLICY_ID, NATIVE_TOKEN_ASSET_NAME, and ILLIQUID_SUPPLY_VALIDATOR_ADDRESS for chain-spec creation"
-export ILLIQUID_SUPPLY_VALIDATOR_ADDRESS=$(jq -r '.addresses.IlliquidCirculationSupplyValidator' addresses.json)
+export ILLIQUID_SUPPLY_VALIDATOR_ADDRESS=$(jq -r '.addresses.IlliquidCirculationSupplyValidator' /runtime-values/addresses.json)
 echo "Illiquid Circulation Supply Validator address: $ILLIQUID_SUPPLY_VALIDATOR_ADDRESS"
+export ILLIQUID_CIRCULATION_SUPPLY_VALIDATOR_ADDRESS=$(echo $ILLIQUID_SUPPLY_VALIDATOR_ADDRESS)
 export NATIVE_TOKEN_POLICY_ID="1fab25f376bc49a181d03a869ee8eaa3157a3a3d242a619ca7995b2b"
 export NATIVE_TOKEN_ASSET_NAME="52657761726420746f6b656e"
 
-export GOVERNED_MAP_VALIDATOR_ADDRESS=$(jq -r '.addresses.GovernedMapValidator' addresses.json)
+export BRIDGE_TOKEN_POLICY_ID=$(echo $NATIVE_TOKEN_POLICY_ID)
+export BRIDGE_TOKEN_ASSET_NAME=$(echo $NATIVE_TOKEN_ASSET_NAME)
+
+echo "$NATIVE_TOKEN_POLICY_ID" > /runtime-values/NATIVE_TOKEN_POLICY_ID
+echo "$NATIVE_TOKEN_ASSET_NAME" > /runtime-values/NATIVE_TOKEN_ASSET_NAME
+
+export GOVERNED_MAP_VALIDATOR_ADDRESS=$(jq -r '.addresses.GovernedMapValidator' /runtime-values/addresses.json)
 echo "Governed Map Validator Address: $GOVERNED_MAP_VALIDATOR_ADDRESS"
-export GOVERNED_MAP_POLICY_ID=$(jq -r '.policyIds.GovernedMap' addresses.json)
+export GOVERNED_MAP_POLICY_ID=$(jq -r '.policyIds.GovernedMap' /runtime-values/addresses.json)
 echo "Governed Map Policy ID: $GOVERNED_MAP_POLICY_ID"
 
 echo "Inserting D parameter..."
@@ -317,6 +328,7 @@ for ((i=1; i<=NUM_PERMISSIONED_NODES_TO_PROCESS; i++)); do
 
     cat <<EOF >> initial_validators.json
     [
+        "$validator_id",
         "$validator_id",
         {
             "aura": "$aura_ss58",
@@ -336,6 +348,7 @@ if [ "$NUM_PERMISSIONED_NODES_TO_PROCESS" -eq 0 ] && [ "$NUM_REGISTERED_NODES_TO
 
     cat <<EOF >> initial_validators.json
     [
+        "$validator_id",
         "$validator_id",
         {
             "aura": "$aura_ss58",
@@ -349,8 +362,9 @@ fi
 echo "]" >> initial_validators.json
 
 # Update chain-spec.json with initial validators
-jq --slurpfile validators initial_validators.json '.genesis.runtimeGenesis.config.session.initialValidators = $validators[0]' chain-spec.json > chain-spec.json.tmp
+jq --slurpfile validators initial_validators.json '.genesis.runtimeGenesis.config.session.keys = $validators[0]' chain-spec.json > chain-spec.json.tmp
 mv chain-spec.json.tmp chain-spec.json
+rm initial_validators.json # Clean up temporary file
 
 echo "Configuring Initial Authorities with SS58 Public Key ID..."
 echo "[" > initial_authorities.json

dev/local-environment-dynamic/envrc

@@ -1,35 +1,59 @@
+#!/usr/bin/env bash
+
 SCRIPT_DIR=$(dirname "$_")
 SHARED_DIR="$SCRIPT_DIR/data/shared"
-DOT_ENV="$SCRIPT_DIR/.env"
-SHELLEY_GENESIS_FILE="$SCRIPT_DIR/configurations/genesis/shelley/genesis.json"
-TIMESTAMP_FILE="$SCRIPT_DIR/runtime-values/MC__FIRST_EPOCH_TIMESTAMP_MILLIS"
-PC_GENESIS_UTXO_FILE="$SCRIPT_DIR/runtime-values/genesis.utxo"
 
-if ! [ -f "$DOT_ENV" ]; then
-    echo "$DOT_ENV file missing!"
-elif ! [ -f "$TIMESTAMP_FILE" ]; then
-    echo "Timestamp file $TIMESTAMP_FILE missing!";
-elif ! [ -f "$SHELLEY_GENESIS_FILE" ]; then
-    echo "Shelley genesis file $SHELLEY_GENESIS_FILE missing!"
-else
+DOT_ENV="$SCRIPT_DIR/.env"
+if [ -f "$DOT_ENV" ]; then
     source "$DOT_ENV"
 
     export DB_SYNC_POSTGRES_CONNECTION_STRING="postgres://postgres:$POSTGRES_PASSWORD@localhost:$POSTGRES_PORT/cexplorer"
-    export CARDANO_DATA_SOURCE="db-sync"
+else
+    echo "$DOT_ENV file missing!"
+fi
 
-    export BLOCK_STABILITY_MARGIN=0
-    export MC__FIRST_EPOCH_NUMBER=0
-    export MC__FIRST_SLOT_NUMBER=0
-    export MC__FIRST_EPOCH_TIMESTAMP_MILLIS=$(cat $TIMESTAMP_FILE)
+RUNTIME_VALUES="$SCRIPT_DIR/runtime-values"
+for VAR in NATIVE_TOKEN_POLICY_ID NATIVE_TOKEN_ASSET_NAME MC__FIRST_EPOCH_TIMESTAMP_MILLIS; do
+    if [ -f "$RUNTIME_VALUES/$VAR" ]; then
+        echo "$VAR"=$(cat "$RUNTIME_VALUES/$VAR" )
+        export "$VAR"=$(cat "$RUNTIME_VALUES/$VAR" )
+    else
+        echo "Couldn't load value for environment variable $VAR"
+    fi
+done
 
+SHELLEY_GENESIS_FILE="$SCRIPT_DIR/configurations/genesis/shelley/genesis.json"
+if [ -f "$SHELLEY_GENESIS_FILE" ]; then
     export MC__SLOT_DURATION_MILLIS=$(jq '.slotLength * 1000' $SHELLEY_GENESIS_FILE)
     export MC__EPOCH_DURATION_MILLIS=$(jq '.epochLength * 1000' $SHELLEY_GENESIS_FILE)
     export CARDANO_SECURITY_PARAMETER=$(jq '.securityParam' $SHELLEY_GENESIS_FILE)
     export CARDANO_ACTIVE_SLOTS_COEFF=$(jq '.activeSlotsCoeff' $SHELLEY_GENESIS_FILE)
+else
+    echo "Shelley genesis file $SHELLEY_GENESIS_FILE missing!"
+fi
 
-    if [ -f "$PC_GENESIS_UTXO_FILE" ]; then
-        export GENESIS_UTXO=$(cat $PC_GENESIS_UTXO_FILE)
-    else
-        echo "Partner Chain genesis file $PC_GENESIS_UTXO_FILE not present"
-    fi
+export CARDANO_DATA_SOURCE="db-sync"
+
+export BLOCK_STABILITY_MARGIN=0
+export MC__FIRST_EPOCH_NUMBER=0
+export MC__FIRST_SLOT_NUMBER=0
+
+PC_GENESIS_UTXO_FILE="$RUNTIME_VALUES/genesis.utxo"
+if [ -f "$PC_GENESIS_UTXO_FILE" ]; then
+    export GENESIS_UTXO=$(cat $PC_GENESIS_UTXO_FILE)
+else
+    echo "Partner Chain genesis file $PC_GENESIS_UTXO_FILE not present"
+fi
+
+ADDRESSES_FILE="$RUNTIME_VALUES/addresses.json"
+if [ -f "$ADDRESSES_FILE" ]; then
+    export COMMITTEE_CANDIDATE_ADDRESS=$(jq -r '.addresses.CommitteeCandidateValidator' "$ADDRESSES_FILE")
+    export D_PARAMETER_POLICY_ID=$(jq -r '.policyIds.DParameter' "$ADDRESSES_FILE")
+    export PERMISSIONED_CANDIDATES_POLICY_ID=$(jq -r '.policyIds.PermissionedCandidates' "$ADDRESSES_FILE")
+    export ILLIQUID_SUPPLY_VALIDATOR_ADDRESS=$(jq -r '.addresses.IlliquidCirculationSupplyValidator' "$ADDRESSES_FILE")
+    export ILLIQUID_CIRCULATION_SUPPLY_VALIDATOR_ADDRESS=$(echo $ILLIQUID_SUPPLY_VALIDATOR_ADDRESS)
+    export GOVERNED_MAP_VALIDATOR_ADDRESS=$(jq -r '.addresses.GovernedMapValidator' "$ADDRESSES_FILE")
+    export GOVERNED_MAP_POLICY_ID=$(jq -r '.policyIds.GovernedMap' "$ADDRESSES_FILE")
+else
+    echo "Addresses file not found: $ADDRESSES_FILE"
 fi

dev/local-environment-dynamic/setup.sh

@@ -694,7 +694,7 @@ create_docker_compose() {
       POSTGRES_DB: cexplorer
       POSTGRES_MULTIPLE_DATABASES: cexplorer
     volumes:
-      - postgres-data-${i}:/var/lib/postgresql/data
+      - postgres-data-${i}:/var/lib/postgresql
       - ./configurations/postgres/entrypoint.sh:/usr/local/bin/custom-entrypoint.sh
       - ./configurations/postgres/init.sh:/docker-entrypoint-initdb.d/init.sh
     ports:
@@ -819,6 +819,8 @@ parse_arguments() {
 main() {
     parse_arguments "$@"
 
+    mkdir -p runtime-values
+
     if [ "$non_interactive" -eq 1 ]; then
         echo -e "Running in non-interactive mode with default settings...\n"
         backup_files "non-interactive"