From 48cffeba695f3b0676df97db4a7bd40dd3bdfb97 Mon Sep 17 00:00:00 2001
From: Gorka <gorka@aquigorka.com>
Date: Fri, 20 Mar 2026 15:21:41 -0300
Subject: [PATCH 1/2] Generate e2e/.env from up.sh and fix SAC deploy error

up.sh now writes contract IDs, provider URL, and keys to e2e/.env so
the E2E test works without knowing the provider-platform repo path.
This fixes E2E on machines using non-default repo locations (BASE_DIR).

Also fixed SAC deploy failing under set -e when the contract already
exists on a persistent Stellar network.
---
 .gitignore    |  1 +
 e2e/config.ts |  7 ++++---
 up.sh         | 23 ++++++++++++++++++++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9684184..395f1d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.pid
 *.log
+e2e/.env
diff --git a/e2e/config.ts b/e2e/config.ts
index df496c8..bd418ad 100644
--- a/e2e/config.ts
+++ b/e2e/config.ts
@@ -33,15 +33,16 @@ function loadEnvFile(path: string): Record<string, string> {
 }
 
 export function loadConfig(): Config {
-  // In Docker: env vars are set by docker-compose, contract IDs come from /config/contracts.env
-  // Locally: everything comes from the provider-platform .env file
+  // Priority: Docker contracts.env > local e2e/.env > provider-platform .env
   const contractsEnv = loadEnvFile("/config/contracts.env");
 
+  const localEnv = loadEnvFile(new URL("./.env", import.meta.url).pathname);
+
   const providerPlatformPath = Deno.env.get("PROVIDER_PLATFORM_PATH") ??
     `${Deno.env.get("HOME")}/repos/provider-platform`;
   const providerEnv = loadEnvFile(`${providerPlatformPath}/.env`);
 
-  const env = { ...providerEnv, ...contractsEnv };
+  const env = { ...providerEnv, ...localEnv, ...contractsEnv };
 
   const networkPassphrase = Deno.env.get("STELLAR_NETWORK_PASSPHRASE") ??
     "Standalone Network ; February 2017";
diff --git a/up.sh b/up.sh
index 54d3a8d..b3297c2 100755
--- a/up.sh
+++ b/up.sh
@@ -160,14 +160,16 @@ WASM_DIR="target/wasm32v1-none/release"
 [ -f "$WASM_DIR/privacy_channel.wasm" ] || error "privacy_channel.wasm not found"
 
 info "Deploying native XLM SAC (Stellar Asset Contract)..."
-TOKEN_ID=$(stellar contract asset deploy \
+if TOKEN_ID=$(stellar contract asset deploy \
   --asset native \
   --network local \
-  --source-account "$ACCT_ADMIN") || {
+  --source-account "$ACCT_ADMIN" 2>/dev/null); then
+  info "SAC deployed"
+else
   # SAC may already be deployed (shared network) — fetch its ID
   TOKEN_ID=$(stellar contract asset id --asset native --network local)
   warn "SAC already deployed: $TOKEN_ID"
-}
+fi
 info "XLM SAC:         $TOKEN_ID"
 
 info "Deploying channel-auth contract..."
@@ -408,6 +410,21 @@ for i in $(seq 1 10); do
   sleep 1
 done
 
+# ============================================================
+# Generate E2E config
+# ============================================================
+
+cat > "$SCRIPT_DIR/e2e/.env" <<EOF
+# Generated by local-dev/up.sh on $(date -u +%Y-%m-%dT%H:%M:%SZ)
+CHANNEL_CONTRACT_ID=$CHANNEL_ID
+CHANNEL_AUTH_ID=$AUTH_ID
+CHANNEL_ASSET_CONTRACT_ID=$TOKEN_ID
+PROVIDER_URL=http://localhost:$PROVIDER_PORT
+PROVIDER_SK=$PROVIDER_SK
+STELLAR_RPC_URL=http://localhost:${STELLAR_RPC_PORT}/soroban/rpc
+EOF
+info "E2E config written to e2e/.env"
+
 # ============================================================
 echo ""
 echo "========================================"

From 9a0bb90125d38f834c9359c31be230dc0952bd2b Mon Sep 17 00:00:00 2001
From: Gorka <gorka@aquigorka.com>
Date: Fri, 20 Mar 2026 15:28:51 -0300
Subject: [PATCH 2/2] Fix PROVIDER_URL not being read from e2e/.env

providerUrl was only checked from Deno.env (process env), not from
the merged env map. The PROVIDER_URL written by up.sh to e2e/.env
was silently ignored, falling back to port 3000.
---
 e2e/config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/e2e/config.ts b/e2e/config.ts
index bd418ad..22efb40 100644
--- a/e2e/config.ts
+++ b/e2e/config.ts
@@ -51,7 +51,8 @@ export function loadConfig(): Config {
   const horizonUrl = rpcUrl.replace("/soroban/rpc", "");
   const friendbotUrl = Deno.env.get("FRIENDBOT_URL") ??
     "http://localhost:8000/friendbot";
-  const providerUrl = Deno.env.get("PROVIDER_URL") ??
+  const providerUrl = env["PROVIDER_URL"] ??
+    Deno.env.get("PROVIDER_URL") ??
     `http://localhost:${env["PORT"] ?? "3000"}`;
 
   const channelContractId = (env["CHANNEL_CONTRACT_ID"] ??