refactor(spartan): unify deployment config sources

Author: spypsy

.github/workflows/deploy-network.yml

@@ -112,11 +112,10 @@ jobs:
 
       - name: Validate inputs
         run: |
-          # Validate network
-          if [[ ! -f "spartan/environments/${{ inputs.network }}.env" ]]; then
-            echo "Error: Environment file not found for network '${{ inputs.network }}'"
+          if [[ ! -f "spartan/environments/networks/${{ inputs.network }}.yml" ]]; then
+            echo "Error: Network YAML not found: spartan/environments/networks/${{ inputs.network }}.yml"
             echo "Available networks:"
-            ls -1 spartan/environments/ | grep -v '\.local\.env$' || echo "No environment files found"
+            ls -1 spartan/environments/networks/
             exit 1
           fi
 
@@ -191,8 +190,9 @@ jobs:
           ./scripts/install_deps.sh
           ./scripts/network_deploy.sh "${{ inputs.network }}"
 
-          # need to source this for CLUSTER
-          source "./environments/${{ inputs.network }}.env"
+          # Source for CLUSTER (prefers YAML loader, falls back to legacy .env).
+          source "./scripts/source_env_basic.sh"
+          source_env_basic "${{ inputs.network }}"
 
           if [ -n "$CLUSTER" ]; then
             echo "cluster=$CLUSTER" >> $GITHUB_OUTPUT

.github/workflows/ensure-funded-environment.yml

@@ -6,54 +6,54 @@ on:
   workflow_call:
     inputs:
       environment:
-        description: 'Environment to fund (e.g., staging-public, next-net, staging-ignition, testnet)'
+        description: "Environment to fund (e.g., staging-public, next-net, staging-ignition, testnet)"
         required: true
         type: string
       low_watermark:
-        description: 'Minimum ETH balance (default: 0.5)'
+        description: "Minimum ETH balance (default: 0.5)"
         required: false
         type: string
-        default: '0.5'
+        default: "0.5"
       high_watermark:
-        description: 'Target ETH balance when funding (default: 1.0)'
+        description: "Target ETH balance when funding (default: 1.0)"
         required: false
         type: string
-        default: '1.0'
+        default: "1.0"
       namespace:
-        description: 'Kubernetes namespace override (e.g., v4-devnet-1). Sets NAMESPACE before sourcing env file.'
+        description: "Kubernetes namespace override (e.g., v4-devnet-1). Sets NAMESPACE before sourcing env file."
         required: false
         type: string
   workflow_dispatch:
     inputs:
       environment:
-        description: 'Environment to fund'
+        description: "Environment to fund"
         required: true
         type: choice
         options:
-        - staging-public
-        - next-net
-        - staging-ignition
-        - testnet
-        - devnet
-        - tps-scenario
+          - staging-public
+          - next-net
+          - staging-ignition
+          - testnet
+          - devnet
+          - tps-scenario
       low_watermark:
-        description: 'Minimum ETH balance'
+        description: "Minimum ETH balance"
         required: false
         type: string
-        default: '0.5'
+        default: "0.5"
       high_watermark:
-        description: 'Target ETH balance when funding'
+        description: "Target ETH balance when funding"
         required: false
         type: string
-        default: '1.0'
+        default: "1.0"
       namespace:
-        description: 'Kubernetes namespace override (e.g., v4-devnet-1)'
+        description: "Kubernetes namespace override (e.g., v4-devnet-1)"
         required: false
         type: string
 
 concurrency:
   group: ensure-funded-environment-${{ inputs.environment }}
-  cancel-in-progress: false  # Don't cancel funding operations
+  cancel-in-progress: false # Don't cancel funding operations
 
 jobs:
   ensure-funded:
@@ -71,10 +71,10 @@ jobs:
       - name: Validate inputs
         run: |
           # Validate environment
-          if [[ ! -f "spartan/environments/${{ inputs.environment }}.env" ]]; then
-            echo "Error: Environment file not found for environment '${{ inputs.environment }}'"
+          if [[ ! -f "spartan/environments/networks/${{ inputs.environment }}.yml" ]]; then
+            echo "Error: Network YAML not found: spartan/environments/networks/${{ inputs.environment }}.yml"
             echo "Available environments:"
-            ls -1 spartan/environments/ | grep -v '\.local\.env$' || echo "No environment files found"
+            ls -1 spartan/environments/networks/
             exit 1
           fi
 

l1-contracts/scripts/load_network_defaults.sh

@@ -20,9 +20,10 @@ fi
 
 # explode(.) resolves YAML anchors (<<: *prodlike inheritance)
 # Output as props, filter comments, normalize spacing
+# Read from .networks.<name>.env (flat env baseline; was .networks.<name> pre-refactor).
 while IFS='=' read -r key value; do
   export "$key"="$value"
-done < <(yq -o=props "explode(.) | .networks.$network | with_entries(select(.key | test(\"^AZTEC_|^ETHEREUM_\")))" "$network_defaults" \
+done < <(yq -o=props "explode(.) | .networks.$network.env | with_entries(select(.key | test(\"^AZTEC_|^ETHEREUM_\")))" "$network_defaults" \
   | grep -v '^#' \
   | grep -v '^$' \
   | sed 's/ = /=/')

spartan/.gitignore

@@ -9,30 +9,8 @@ tfplan
 mnemonic.tmp
 environments/*
 !environments/network-defaults.yml
-!environments/prove-n-tps-fake.env
-!environments/prove-n-tps-real.env
-!environments/ten-tps-short-epoch.env
-!environments/ten-tps-long-epoch.env
-!environments/five-tps-short-epoch.env
-!environments/five-tps-long-epoch.env
-!environments/devnet-next.env
-!environments/devnet.env
-!environments/block-capacity.env
-!environments/next-net.env
-!environments/next-scenario.env
-!environments/scenario.local.env
+!environments/networks/
+!environments/networks/*.yml
 !environments/source-env.sh
-!environments/staging-ignition.env
-!environments/staging-public.env
-!environments/staging.local.env
-!environments/testnet-canary.env
-!environments/testnet.env
-!environments/mainnet.env
-!environments/tps-scenario.env
-!environments/kind-minimal.env
-!environments/kind-provers.env
-!environments/alpha-net.env
-!environments/mbps-pipeline.env
-!environments/bench-10tps.env
 *.tfvars
 !terraform/deploy-external-secrets/*.tfvars