Standardize deployment env and deployer handling

scripts/deployment/deploy-ccip-router.sh

@@ -9,35 +9,13 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/init.sh"
 PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
 
-# Load environment variables
-if [ -f "$PROJECT_ROOT/.env" ]; then
-    source "$PROJECT_ROOT/.env"
-fi
-
 # Configuration
-RPC_URL="${RPC_URL:-http://localhost:8545}"
+RPC_URL="${RPC_URL:-}"
 PRIVATE_KEY="${PRIVATE_KEY:-}"
 FEE_TOKEN="${FEE_TOKEN:-}" # LINK token address
 BASE_FEE="${BASE_FEE:-1000000000000000000}" # 1 LINK in wei
 DATA_FEE_PER_BYTE="${DATA_FEE_PER_BYTE:-1000000000000000}" # 0.001 LINK per byte
 
-if [ -z "$PRIVATE_KEY" ]; then
-    echo "Error: PRIVATE_KEY environment variable not set"
-    exit 1
-fi
-
-if [ -z "$FEE_TOKEN" ]; then
-    echo "Error: FEE_TOKEN environment variable not set (LINK token address)"
-    exit 1
-fi
-
-echo "Deploying CCIP Router..."
-echo "RPC URL: $RPC_URL"
-echo "Fee Token: $FEE_TOKEN"
-echo "Base Fee: $BASE_FEE"
-echo "Data Fee Per Byte: $DATA_FEE_PER_BYTE"
-
-# Deploy using Foundry
 cd "$PROJECT_ROOT"
 # Load .env via dotenv (RPC CR/LF trim). Fallback: raw source.
 if [[ -f "$SCRIPT_DIR/../lib/deployment/dotenv.sh" ]]; then
@@ -56,6 +34,22 @@ elif [[ -n "${REPO_ROOT:-}" && -f "$REPO_ROOT/.env" ]]; then
   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 [ -z "$FEE_TOKEN" ]; then
+    echo "ERROR: FEE_TOKEN not available. Set it in smom-dbis-138/.env or repo .env." >&2
+    exit 1
+fi
+
+echo "Deploying CCIP Router..."
+echo "RPC URL: $RPC_URL"
+echo "Fee Token: $FEE_TOKEN"
+echo "Base Fee: $BASE_FEE"
+echo "Data Fee Per Byte: $DATA_FEE_PER_BYTE"
+
 forge script script/DeployCCIPRouter.s.sol \
     --rpc-url "$RPC_URL" \
     --broadcast \