Merge branch 'main' into fix/fallback-expired-ln-to-onchain

Author: piotr-iohk

.gitignore

@@ -4,4 +4,5 @@ aut
 node_modules
 docker/lnd
 artifacts
-WARP.md
+WARP.md
+.ai

AGENTS.md

@@ -46,33 +46,54 @@ Notes:
 
 ## Running Tests
 
+**Important:** The `BACKEND` env var controls which infrastructure the tests use for deposits/mining:
+
+- `BACKEND=local` (default) — Uses local docker stack (Bitcoin RPC on localhost:18443, Electrum on localhost:60001). Requires `bitkit-docker` running locally.
+- `BACKEND=regtest` — Uses Blocktank API over the internet (remote regtest infrastructure).
+
+**The `BACKEND` must match how the app was built:**
+
+- Apps built with `BACKEND=local` connect to localhost electrum → run tests with `BACKEND=local`
+- Apps built with `BACKEND=regtest` connect to remote electrum → run tests with `BACKEND=regtest`
+
 ```bash
-# Android
+# Android (local backend - default)
 npm run e2e:android
 
+# Android (regtest backend - for apps built with BACKEND=regtest)
+BACKEND=regtest npm run e2e:android
+
 # iOS
 npm run e2e:ios
+BACKEND=regtest npm run e2e:ios
 ```
 
 Run a single spec:
 
 ```bash
 npm run e2e:android -- --spec ./test/specs/onboarding.e2e.ts
+BACKEND=regtest npm run e2e:android -- --spec ./test/specs/migration.e2e.ts
 ```
 
 Run by tag:
 
 ```bash
 npm run e2e:android -- --mochaOpts.grep "@backup"
+BACKEND=regtest npm run e2e:android -- --mochaOpts.grep "@migration"
 ```
 
 ## CI Helper Scripts
 
 These wrap the `npm run e2e:*` commands and capture logs/artifacts:
 
 ```bash
+# Local backend (default)
 ./ci_run_android.sh
 ./ci_run_ios.sh
+
+# Regtest backend
+BACKEND=regtest ./ci_run_android.sh
+BACKEND=regtest ./ci_run_ios.sh
 ```
 
 ## Practical Tips

README.md

@@ -59,6 +59,9 @@ If you have `bitkit-e2e-tests`, `bitkit-android`, and `bitkit-ios` checked out i
 # Legacy RN Android (builds ../bitkit and copies APK to ./aut/bitkit_rn_regtest.apk)
 ./scripts/build-rn-android-apk.sh
 
+# Legacy RN iOS simulator (builds ../bitkit and copies app to ./aut/bitkit_rn_regtest_ios.app)
+./scripts/build-rn-ios-sim.sh
+
 # iOS (builds ../bitkit-ios and copies IPA to ./aut/bitkit_e2e.ipa)
 ./scripts/build-ios-sim.sh
 ```
@@ -73,6 +76,9 @@ BACKEND=regtest ./scripts/build-android-apk.sh
 # Legacy RN Android
 BACKEND=regtest ./scripts/build-rn-android-apk.sh
 
+# Legacy RN iOS simulator
+BACKEND=regtest ./scripts/build-rn-ios-sim.sh
+
 # iOS
 BACKEND=local ./scripts/build-ios-sim.sh
 BACKEND=regtest ./scripts/build-ios-sim.sh
@@ -82,18 +88,34 @@ BACKEND=regtest ./scripts/build-ios-sim.sh
 
 ### 🧪 Running tests
 
+**Important:** The `BACKEND` environment variable controls which infrastructure the tests use for blockchain operations (deposits, mining blocks):
+
+| Backend                   | Infrastructure                                                                   | When to use                       |
+| ------------------------- | -------------------------------------------------------------------------------- | --------------------------------- |
+| `BACKEND=local` (default) | Local docker stack (Bitcoin RPC on localhost:18443, Electrum on localhost:60001) | Apps built with `BACKEND=local`   |
+| `BACKEND=regtest`         | Blocktank API over the internet (remote regtest)                                 | Apps built with `BACKEND=regtest` |
+
+> ⚠️ **The `BACKEND` must match how the app was built.** If the app connects to remote electrum, use `BACKEND=regtest`. If it connects to localhost, use `BACKEND=local`.
+
 ```bash
-# Run all tests on Android
+# Run all tests on Android (local backend - default)
 npm run e2e:android
 
+# Run all tests on Android (regtest backend)
+BACKEND=regtest npm run e2e:android
+
 # Run all tests on iOS
 npm run e2e:ios
+BACKEND=regtest npm run e2e:ios
 ```
 
 To run a **specific test file**:
 
 ```bash
 npm run e2e:android -- --spec ./test/specs/onboarding.e2e.ts
+
+# With regtest backend
+BACKEND=regtest npm run e2e:android -- --spec ./test/specs/migration.e2e.ts
 ```
 
 To run a **specific test case**:
@@ -142,19 +164,25 @@ These helper scripts wrap the regular `npm run e2e:*` commands and add CI-friend
 The Android script will:
 
 - Clear and capture `adb logcat` output into `./artifacts/logcat.txt`.
-- Reverse the regtest port (`60001`).
+- Reverse the regtest port (`60001`) for local backend.
 - Run the Android E2E tests.
 - Forward any arguments directly to Mocha/WebdriverIO.
 
 **Usage examples:**
 
 ```bash
-# Run all Android tests (with logcat capture)
+# Run all Android tests with local backend (default)
 ./ci_run_android.sh
 
+# Run all Android tests with regtest backend (for apps built with BACKEND=regtest)
+BACKEND=regtest ./ci_run_android.sh
+
 # Run only @backup tests
 ./ci_run_android.sh --mochaOpts.grep "@backup"
 
+# Run migration tests (typically need regtest backend for RN app)
+BACKEND=regtest ./ci_run_android.sh --mochaOpts.grep "@migration"
+
 # Run backup OR onboarding OR onchain tests
 ./ci_run_android.sh --mochaOpts.grep "@backup|@onboarding|@onchain"
 
@@ -177,9 +205,12 @@ The iOS helper mirrors the Android workflow but tailors it for the Apple Simulat
 **Usage examples:**
 
 ```bash
-# Run all iOS tests (with simulator log capture)
+# Run all iOS tests with local backend (default)
 ./ci_run_ios.sh
 
+# Run all iOS tests with regtest backend
+BACKEND=regtest ./ci_run_ios.sh
+
 # Run only @onboarding-tagged tests
 ./ci_run_ios.sh --mochaOpts.grep "@onboarding"
 

scripts/build-rn-android-apk.sh

@@ -17,7 +17,7 @@ set -euo pipefail
 E2E_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 RN_ROOT="$(cd "$E2E_ROOT/../bitkit" && pwd)"
 
-BUILD_TYPE="${1:-debug}"
+BUILD_TYPE="${1:-release}"
 BACKEND="${BACKEND:-regtest}"
 
 if [[ "$BUILD_TYPE" != "debug" && "$BUILD_TYPE" != "release" ]]; then
@@ -27,7 +27,7 @@ fi
 
 if [[ -z "${ENV_FILE:-}" ]]; then
   if [[ "$BACKEND" == "regtest" ]]; then
-    ENV_FILE=".env.test.template"
+    ENV_FILE=".env.development.template"
   else
     ENV_FILE=".env.development"
   fi

scripts/build-rn-ios-sim.sh

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# Build the legacy Bitkit RN iOS simulator app from ../bitkit and copy into aut/
+#
+# Inputs/roots:
+# - E2E root: this repo (bitkit-e2e-tests)
+# - RN root: ../bitkit (resolved relative to this script)
+#
+# Output:
+# - Copies .app -> aut/bitkit_rn_regtest_ios.app
+#
+# Usage:
+#   ./scripts/build-rn-ios-sim.sh [debug|release]
+#   BACKEND=regtest ./scripts/build-rn-ios-sim.sh
+#   ENV_FILE=.env.test.template ./scripts/build-rn-ios-sim.sh
+set -euo pipefail
+
+E2E_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+RN_ROOT="$(cd "$E2E_ROOT/../bitkit" && pwd)"
+
+BUILD_TYPE="${1:-release}"
+BACKEND="${BACKEND:-regtest}"
+
+if [[ "$BUILD_TYPE" != "debug" && "$BUILD_TYPE" != "release" ]]; then
+  echo "ERROR: Unsupported build type: $BUILD_TYPE (expected debug|release)" >&2
+  exit 1
+fi
+
+if [[ -z "${ENV_FILE:-}" ]]; then
+  if [[ "$BACKEND" == "regtest" ]]; then
+    ENV_FILE=".env.development.template"
+  else
+    ENV_FILE=".env.development"
+  fi
+fi
+
+if [[ ! -f "$RN_ROOT/$ENV_FILE" ]]; then
+  echo "ERROR: Env file not found: $RN_ROOT/$ENV_FILE" >&2
+  exit 1
+fi
+
+echo "Building RN iOS simulator app (BACKEND=$BACKEND, ENV_FILE=$ENV_FILE, BUILD_TYPE=$BUILD_TYPE)..."
+
+pushd "$RN_ROOT" >/dev/null
+if [[ -f .env ]]; then
+  cp .env .env.bak
+fi
+cp "$ENV_FILE" .env
+E2E_TESTS=true yarn "e2e:build:ios-$BUILD_TYPE"
+if [[ -f .env.bak ]]; then
+  mv .env.bak .env
+else
+  rm -f .env
+fi
+popd >/dev/null
+
+if [[ "$BUILD_TYPE" == "debug" ]]; then
+  IOS_CONFIG="Debug"
+else
+  IOS_CONFIG="Release"
+fi
+
+APP_PATH="$RN_ROOT/ios/build/Build/Products/${IOS_CONFIG}-iphonesimulator/bitkit.app"
+if [[ ! -d "$APP_PATH" ]]; then
+  echo "ERROR: iOS .app not found at: $APP_PATH" >&2
+  exit 1
+fi
+
+OUT="$E2E_ROOT/aut"
+mkdir -p "$OUT"
+OUT_APP="$OUT/bitkit_rn_${BACKEND}_ios.app"
+rm -rf "$OUT_APP"
+cp -R "$APP_PATH" "$OUT_APP"
+echo "RN iOS simulator app copied to: $OUT_APP"

scripts/mine-blocks.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Mine blocks on regtest via Blocktank API
+#
+# Usage:
+#   ./scripts/mine-blocks.sh [count]
+#
+# Examples:
+#   ./scripts/mine-blocks.sh       # mines 1 block
+#   ./scripts/mine-blocks.sh 6     # mines 6 blocks
+#
+
+set -e
+
+COUNT="${1:-1}"
+BLOCKTANK_URL="${BLOCKTANK_URL:-https://api.stag0.blocktank.to/blocktank/api/v2}"
+ENDPOINT="${BLOCKTANK_URL}/regtest/chain/mine"
+
+echo "→ Mining ${COUNT} block(s) via Blocktank..."
+
+RESPONSE=$(curl -s -w "\n%{http_code}" -X POST "$ENDPOINT" \
+  -H "Content-Type: application/json" \
+  -d "{\"count\": ${COUNT}}")
+
+HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
+BODY=$(echo "$RESPONSE" | sed '$d')
+
+if [ "$HTTP_CODE" -ge 200 ] && [ "$HTTP_CODE" -lt 300 ]; then
+  echo "✓ Mined ${COUNT} block(s)"
+else
+  echo "✗ Failed to mine blocks: HTTP $HTTP_CODE"
+  echo "$BODY"
+  exit 1
+fi