Skip to content

WIP: feat: support project-level network overrides #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
xavikh wants to merge 1 commit into
base: main
Choose a base branch
from
+42 −8
Draft

WIP: feat: support project-level network overrides #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,16 @@ _ENV_MASK="(KEY|PRIVATE|SECRET|JWT|PASSWORD)"
# --- Public API ---

# Source the network .env symlink into the current shell (public config only)
# If a project-level networks/<name>.env exists AND a library base also exists,
# the project overlay is sourced on top (overrides library values at runtime).
env_load_network() {
_env_require_network || return 1
set -a && source "$_NETWORK_ENV" && set +a
# Apply project-level overlay only when a library base exists
# (project-only networks already point directly to networks/<name>.env)
if [ -f "networks/${NETWORK_NAME}.env" ] && [ -f "lib/just-foundry/networks/${NETWORK_NAME}.env" ]; then
set -a && source "networks/${NETWORK_NAME}.env" && set +a
fi
}

# Source the fully resolved env (network config + secrets) into the current shell
Expand All @@ -29,19 +36,27 @@ env_load() {
env_show() {
_env_require_network || return 1
set -a && source "$_NETWORK_ENV" && set +a
local _project_overlay=""
if [ -f "networks/${NETWORK_NAME}.env" ] && [ -f "lib/just-foundry/networks/${NETWORK_NAME}.env" ]; then
_project_overlay="networks/${NETWORK_NAME}.env"
set -a && source "$_project_overlay" && set +a
fi

echo "Network: $NETWORK_NAME ($CHAIN_ID)"
echo "Verifier: $VERIFIER"
[ -n "$_project_overlay" ] && echo "Overlay: $_project_overlay"
echo ""

if command -v vars &>/dev/null && [ -f .vars.yaml ]; then
local ALLOWED MANIFEST
ALLOWED=$(grep -E '^[A-Z_][A-Z0-9_]*=' "$_NETWORK_ENV" | cut -d= -f1 | tr '\n' '|' | sed 's/|$//')
[ -n "$_project_overlay" ] && ALLOWED="$ALLOWED|$(grep -E '^[A-Z_][A-Z0-9_]*=' "$_project_overlay" | cut -d= -f1 | tr '\n' '|' | sed 's/|$//')"
MANIFEST=$(grep -E '^ *- [A-Z_]' .vars.yaml | sed 's/^ *- //' | sed 's/ .*//' | tr '\n' '|' | sed 's/|$//')
[ -n "$MANIFEST" ] && ALLOWED="$ALLOWED|$MANIFEST"
_env_exports "${NETWORK_NAME:-}" --origin | _env_display_origin "$ALLOWED"
else
_env_display_raw "$_NETWORK_ENV"
[ -n "$_project_overlay" ] && _env_display_raw "$_project_overlay"
_env_display_raw .env
fi
}
Expand All @@ -58,8 +73,12 @@ _env_exports() {
if [[ -n "$profile" ]] && [ -f .vars.yaml ] && grep -qE "^\s+${profile}:" .vars.yaml 2>/dev/null; then
profile_flag="-p $profile"
fi
# Inject the local .env files to vars (if present) and resolve the secrets
(cat "$_NETWORK_ENV"; [ -f .env ] && cat .env || true) | \
# Inject env files into vars: network base, project overlay (if library base exists), root .env
local _network_name
_network_name=$(grep -m1 '^NETWORK_NAME=' "$_NETWORK_ENV" 2>/dev/null | cut -d= -f2 | tr -d '"' || true)
(cat "$_NETWORK_ENV"; \
[ -n "$_network_name" ] && [ -f "networks/${_network_name}.env" ] && [ -f "lib/just-foundry/networks/${_network_name}.env" ] && cat "networks/${_network_name}.env" || true; \
[ -f .env ] && cat .env || true) | \
vars resolve --partial ${profile_flag} "$@"
}

Expand Down
27 changes: 21 additions & 6 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,34 @@ init network="mainnet":
just switch {{network}}
git submodule update --init --recursive

# Select the active network
# Select the active network (checks both library and project networks/)
[group('setup')]
switch network:
#!/usr/bin/env bash
set -euo pipefail
NETWORKS_DIR="lib/just-foundry/networks"
if [ ! -f "$NETWORKS_DIR/{{network}}.env" ]; then
LIB_ENV="lib/just-foundry/networks/{{network}}.env"
PROJECT_ENV="networks/{{network}}.env"
TARGET="lib/just-foundry/.env"
if [ ! -f "$LIB_ENV" ] && [ ! -f "$PROJECT_ENV" ]; then
echo "Error: network '{{network}}' not found."
echo "Available networks: $(ls "$NETWORKS_DIR"/*.env | xargs -I{} basename {} .env | tr '\n' ' ')"
LIB_NETS=$(ls lib/just-foundry/networks/*.env 2>/dev/null | xargs -I{} basename {} .env | tr '\n' ' ')
PRJ_NETS=$(ls networks/*.env 2>/dev/null | xargs -I{} basename {} .env | tr '\n' ' ')
ALL=$(echo "$LIB_NETS $PRJ_NETS" | tr ' ' '\n' | sort -u | tr '\n' ' ')
echo "Available networks: $ALL"
exit 1
fi
ln -sf "networks/{{network}}.env" lib/just-foundry/.env
echo "Using network: {{network}}"
rm -f "$TARGET"
if [ -f "$LIB_ENV" ]; then
ln -sf "networks/{{network}}.env" "$TARGET"
else
ln -sf "../../networks/{{network}}.env" "$TARGET"
fi
# Report overlay status
if [ -f "$LIB_ENV" ] && [ -f "$PROJECT_ENV" ]; then
echo "Using network: {{network}} (with project overrides)"
else
echo "Using network: {{network}}"
fi

# Install Foundry
[group('setup')]
Expand Down