Standardize deployment env and deployer handling
This commit is contained in:
@@ -8,12 +8,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "$SCRIPT_DIR/../lib/init.sh"
|
||||
PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||
|
||||
# Load environment
|
||||
if [ -f "$PROJECT_ROOT/.env" ]; then
|
||||
source "$PROJECT_ROOT/.env"
|
||||
fi
|
||||
|
||||
RPC_URL="${RPC_URL:-http://localhost:8545}"
|
||||
RPC_URL="${RPC_URL:-}"
|
||||
PRIVATE_KEY="${PRIVATE_KEY:-}"
|
||||
|
||||
# CCIP Configuration
|
||||
@@ -29,19 +24,37 @@ DEPLOY_BRIDGES="${DEPLOY_BRIDGES:-true}"
|
||||
WETH9_ADDRESS="${WETH9_ADDRESS:-}"
|
||||
WETH10_ADDRESS="${WETH10_ADDRESS:-}"
|
||||
|
||||
if [ -z "$PRIVATE_KEY" ]; then
|
||||
echo "Error: PRIVATE_KEY environment variable not set"
|
||||
cd "$PROJECT_ROOT"
|
||||
# Load .env via dotenv (RPC CR/LF trim). Fallback: raw source.
|
||||
if [[ -f "$SCRIPT_DIR/../lib/deployment/dotenv.sh" ]]; then
|
||||
# shellcheck disable=SC1090
|
||||
source "$SCRIPT_DIR/../lib/deployment/dotenv.sh"
|
||||
load_deployment_env --repo-root "${PROJECT_ROOT:-$REPO_ROOT}"
|
||||
elif [[ -n "${PROJECT_ROOT:-}" && -f "$PROJECT_ROOT/.env" ]]; then
|
||||
set -a
|
||||
# shellcheck disable=SC1090
|
||||
source "$PROJECT_ROOT/.env"
|
||||
set +a
|
||||
elif [[ -n "${REPO_ROOT:-}" && -f "$REPO_ROOT/.env" ]]; then
|
||||
set -a
|
||||
# shellcheck disable=SC1090
|
||||
source "$REPO_ROOT/.env"
|
||||
set +a
|
||||
fi
|
||||
|
||||
RPC_URL="${RPC_URL:-${RPC_URL_138:-${CHAIN138_RPC_URL:-http://localhost:8545}}}"
|
||||
|
||||
if ! require_private_key_env; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$DEPLOY_BRIDGES" = "true" ]; then
|
||||
if [ -z "$CCIP_ROUTER" ]; then
|
||||
echo "Error: CCIP_ROUTER environment variable not set (required for bridge deployment)"
|
||||
echo "ERROR: CCIP_ROUTER not available. Set it in smom-dbis-138/.env or repo .env." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$CCIP_FEE_TOKEN" ]; then
|
||||
echo "Error: CCIP_FEE_TOKEN environment variable not set (required for bridge deployment)"
|
||||
echo "ERROR: CCIP_FEE_TOKEN not available. Set it in smom-dbis-138/.env or repo .env." >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
@@ -68,24 +81,6 @@ if [ -n "$WETH10_ADDRESS" ]; then
|
||||
fi
|
||||
echo "========================================="
|
||||
|
||||
cd "$PROJECT_ROOT"
|
||||
# Load .env via dotenv (RPC CR/LF trim). Fallback: raw source.
|
||||
if [[ -f "$SCRIPT_DIR/../lib/deployment/dotenv.sh" ]]; then
|
||||
# shellcheck disable=SC1090
|
||||
source "$SCRIPT_DIR/../lib/deployment/dotenv.sh"
|
||||
load_deployment_env --repo-root "${PROJECT_ROOT:-$REPO_ROOT}"
|
||||
elif [[ -n "${PROJECT_ROOT:-}" && -f "$PROJECT_ROOT/.env" ]]; then
|
||||
set -a
|
||||
# shellcheck disable=SC1090
|
||||
source "$PROJECT_ROOT/.env"
|
||||
set +a
|
||||
elif [[ -n "${REPO_ROOT:-}" && -f "$REPO_ROOT/.env" ]]; then
|
||||
set -a
|
||||
# shellcheck disable=SC1090
|
||||
source "$REPO_ROOT/.env"
|
||||
set +a
|
||||
fi
|
||||
|
||||
# Export environment variables for Foundry
|
||||
export PRIVATE_KEY
|
||||
export CCIP_ROUTER
|
||||
@@ -117,4 +112,3 @@ echo "2. Configure bridge destinations:"
|
||||
echo " ./scripts/deployment/configure-weth9-bridge.sh"
|
||||
echo " ./scripts/deployment/configure-weth10-bridge.sh"
|
||||
echo "3. Test cross-chain transfers"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user