Standardize deployment env and deployer handling

scripts/deployment/deploy-mainnet-tether-mirror.sh

@@ -8,46 +8,31 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "$SCRIPT_DIR/../../" && pwd)"
 
 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
+elif [[ -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
-
-# Source environment variables
-if [ -f .env ]; then
-    source .env
-else
-    echo "❌ Error: .env file not found"
-    exit 1
 fi
 
 # Check required variables
-if [ -z "$PRIVATE_KEY" ]; then
-    echo "❌ Error: PRIVATE_KEY not set in .env"
+if ! require_private_key_env; then
     exit 1
 fi
 
 if [ -z "$ETHEREUM_MAINNET_RPC" ]; then
-    echo "❌ Error: ETHEREUM_MAINNET_RPC not set in .env"
+    echo "ERROR: ETHEREUM_MAINNET_RPC not available. Set it in smom-dbis-138/.env or repo .env." >&2
     exit 1
 fi
 
 # Get deployer address
-DEPLOYER=$(cast wallet address $PRIVATE_KEY 2>/dev/null || echo "")
+DEPLOYER="$(derive_deployer_address || true)"
 if [ -z "$DEPLOYER" ]; then
-    echo "❌ Error: Could not derive deployer address from PRIVATE_KEY"
+    echo "ERROR: Could not derive DEPLOYER_ADDRESS from PRIVATE_KEY." >&2
     exit 1
 fi
 
@@ -87,7 +72,7 @@ echo "=== Deploying MainnetTether ==="
 LOG_FILE="/tmp/mainnet_tether_deploy.log"
 forge script script/DeployMainnetTether.s.sol \
     --rpc-url "$ETHEREUM_MAINNET_RPC" \
-    --private-key $PRIVATE_KEY \
+    --private-key "$PRIVATE_KEY" \
     --broadcast \
     --verify \
     --via-ir \
@@ -121,7 +106,7 @@ echo "=== Deploying TransactionMirror ==="
 LOG_FILE="/tmp/transaction_mirror_deploy.log"
 forge script script/DeployTransactionMirror.s.sol \
     --rpc-url "$ETHEREUM_MAINNET_RPC" \
-    --private-key $PRIVATE_KEY \
+    --private-key "$PRIVATE_KEY" \
     --broadcast \
     --verify \
     --via-ir \
@@ -171,4 +156,3 @@ if [ -n "$MAINNET_TETHER" ] && [ -n "$TRANSACTION_MIRROR" ]; then
 else
     echo "⚠️  Deployment incomplete - check logs for details"
 fi
-