[e2e tests] Feat/multiple addresses types

README.md

@@ -35,7 +35,7 @@ npm install
 
 ```
 artifacts/              # screenshots and (optionally) videos of failed tests
-aut/                    # Place your .apk / .ipa files here
+aut/                    # Place your .apk / .app files here (default: bitkit_e2e.apk, Bitkit.app)
 docker/                 # docker compose regtest based backend for Bitkit wallet
 test/
   ├── specs/            # Test suites (e.g., onboarding.e2e.ts)
@@ -95,6 +95,8 @@ BACKEND=regtest ./scripts/build-ios-sim.sh
 
 > ⚠️ **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`.
 
+**App override:** By default tests use `aut/bitkit_e2e.apk` (Android) and `aut/Bitkit.app` (iOS). Set `AUT_FILENAME` to use a different file in `aut/` (e.g. `AUT_FILENAME=bitkit_rn_regtest.apk`)
+
 ```bash
 # Run all tests on Android (local backend - default)
 npm run e2e:android
@@ -122,6 +124,12 @@ To run a **specific test case**:
 npm run e2e:android -- --mochaOpts.grep "Can pass onboarding correctly"
 ```
 
+To run against a **different app** in `aut/`:
+
+```bash
+AUT_FILENAME=bitkit_rn_regtest.apk npm run e2e:android
+```
+
 ---
 
 ### 🏷️ Tags

docker/bitcoin-cli

@@ -3,13 +3,15 @@
 set -euo pipefail
 
 CLI_NAME="$(basename $0)"
-CLI_DIR="$(dirname "$(readlink -f "$0")")"
-CONTAINER="bitcoind"
+BITCOIN_CONTAINER="bitcoind"
+LND_CONTAINER="lnd"
+LND_DIR="/home/lnd/.lnd"
 RPC_USER=polaruser
 RPC_PASS=polarpass
 RPC_PORT=43782
 
-BASE_COMMAND=(docker compose exec $CONTAINER bitcoin-cli -rpcport=$RPC_PORT -rpcuser=$RPC_USER -rpcpassword=$RPC_PASS)
+BASE_COMMAND=(docker compose exec $BITCOIN_CONTAINER bitcoin-cli -rpcport=$RPC_PORT -rpcuser=$RPC_USER -rpcpassword=$RPC_PASS)
+LNCLI_CMD=(docker compose exec -T $LND_CONTAINER lncli --lnddir "$LND_DIR" --network regtest)
 
 DEFAULT_AMOUNT=0.001
 
@@ -21,9 +23,14 @@ Flags:
     -h, --help                         Show this help message
 Commands:
     fund <amount>                      Fund the wallet
-    mine <amount> [--auto]             Generate a number of blocks
-    send <address> <amount>            Send to address or BIP21 URI
+    mine [count] [--auto]              Generate blocks (default: 1)
+    send [amount] [address] [-m N]     Send to address and optionally mine N blocks (default: 1)
     getInvoice <amount>                Get a new BIP21 URI with a bech32 address
+  LND:
+    getinfo                            Show LND node info (for connectivity debugging)
+    holdinvoice [amount] [-m memo]     Create a hold invoice
+    settleinvoice <preimage>           Reveal a preimage and use it to settle the corresponding invoice
+    cancelinvoice <payment_hash>       Cancels a currently open invoice
 EOF
 }
 
@@ -43,14 +50,7 @@ fi
 if [[ "$command" = "mine" ]]; then
   shift
 
-  if [ -z ${1+x} ]; then
-    echo "Specify the number of blocks to generate."
-    echo "Usage: \`$CLI_NAME $command <amount>\`"
-    exit 1
-  fi
-
   POSITIONAL_ARGS=()
-
   auto=false
 
   while [[ $# -gt 0 ]]; do
@@ -72,7 +72,9 @@ if [[ "$command" = "mine" ]]; then
 
   set -- "${POSITIONAL_ARGS[@]}"
 
-  # default to 5 seconds
+  # Default to 1 block if not specified
+  count=${1:-1}
+  # Default to 5 seconds interval for auto mode
   interval=${2:-5}
 
   if $auto; then
@@ -83,7 +85,7 @@ if [[ "$command" = "mine" ]]; then
       sleep $interval
     done
   else
-    "${BASE_COMMAND[@]}" -generate "$@"
+    "${BASE_COMMAND[@]}" -generate "$count"
   fi
 
   exit
@@ -93,31 +95,59 @@ fi
 if [[ "$command" = "send" ]]; then
   shift
 
+  mine_blocks=0
+  POSITIONAL_ARGS=()
+
+  while [[ $# -gt 0 ]]; do
+    case $1 in
+      -m|--mine)
+        # Check if next arg is a number
+        if [[ "${2:-}" =~ ^[0-9]+$ ]]; then
+          mine_blocks="$2"
+          shift 2
+        else
+          mine_blocks=1
+          shift
+        fi
+        ;;
+      *)
+        POSITIONAL_ARGS+=("$1")
+        shift
+        ;;
+    esac
+  done
+
+  set -- "${POSITIONAL_ARGS[@]}"
+
   if [ -z ${1+x} ]; then
     read -p "Enter a BIP21 URI or address: " uri
     echo
-  else
-    uri="$1"
-  fi
-
-  if [ -z ${2+x} ]; then
     amount=$DEFAULT_AMOUNT
   else
-    amount="$2"
+    amount="$1"
+    if [ -z ${2+x} ]; then
+      read -p "Enter a BIP21 URI or address: " uri
+      echo
+    else
+      uri="$2"
+    fi
   fi
 
-  protocol=$(echo "${uri%%:*}")
+  protocol="${uri%%:*}"
 
   if [[ "$protocol" == "bitcoin" ]]; then
-    # BIP21 URI
-    # Remove the protocol
-    url_no_protocol=$(echo "${uri/$protocol/}" | cut -d":" -f2-)
-
-    address=$(echo $url_no_protocol | grep "?" | cut -d"/" -f1 | rev | cut -d"?" -f2- | rev || echo $url_no_protocol)
-    uri_amount=$(echo $url_no_protocol | cut -d'?' -f 2 | cut -d'=' -f 2 | cut -d'&' -f 1)
-
-    if echo "$uri_amount" | grep -qE '^[0-9]*\.?[0-9]+$'; then
-      amount=$uri_amount
+    # BIP21 URI: bitcoin:address?amount=X&message=Y&...
+    url_no_protocol="${uri#bitcoin:}"
+
+    # Extract address (everything before ?)
+    address="${url_no_protocol%%\?*}"
+
+    # Extract amount if present (look for amount= parameter specifically)
+    if [[ "$url_no_protocol" == *"?"* ]]; then
+      query_string="${url_no_protocol#*\?}"
+      if [[ "$query_string" =~ (^|&)amount=([0-9]*\.?[0-9]+) ]]; then
+        amount="${BASH_REMATCH[2]}"
+      fi
     fi
   else
     address=$uri
@@ -128,6 +158,12 @@ if [[ "$command" = "send" ]]; then
   echo "Sent $amount BTC to $address"
   echo "Transaction ID: $tx_id"
 
+  # Mine blocks if requested
+  if [[ $mine_blocks -gt 0 ]]; then
+    "${BASE_COMMAND[@]}" -generate "$mine_blocks"
+    echo "Mined $mine_blocks block(s)"
+  fi
+
   exit
 fi
 
@@ -154,6 +190,100 @@ if [[ "$command" = "getInvoice" ]]; then
   exit
 fi
 
+# Show LND node info (LND)
+if [[ "$command" = "getinfo" ]]; then
+  "${LNCLI_CMD[@]}" getinfo
+  exit
+fi
+
+# Create a hold invoice (LND)
+if [[ "$command" = "holdinvoice" ]]; then
+  shift
+
+  amount=""
+  memo=""
+
+  while [[ $# -gt 0 ]]; do
+    case $1 in
+      -m|--memo)
+        memo="${2:-}"
+        shift 2
+        ;;
+      -*)
+        echo "Unknown option $1"
+        exit 1
+        ;;
+      *)
+        if [[ "$1" =~ ^[0-9]+$ ]]; then
+          amount="$1"
+        fi
+        shift
+        ;;
+    esac
+  done
+
+  preimage=$(openssl rand -hex 32)
+  hash=$(echo -n "$preimage" | xxd -r -p | openssl dgst -sha256 | awk '{print $2}')
+
+  if [[ -n "$amount" ]]; then
+    result=$("${LNCLI_CMD[@]}" addholdinvoice --amt "$amount" --memo "$memo" "$hash" 2>&1) || true
+  else
+    result=$("${LNCLI_CMD[@]}" addholdinvoice --memo "$memo" "$hash" 2>&1) || true
+  fi
+
+  payment_request=$(echo "$result" | jq -r '.payment_request // empty' 2>/dev/null) || payment_request=""
+  if [ -z "$payment_request" ]; then
+    payment_request=$(echo "$result" | sed -n 's/.*"payment_request"[^:]*:[^"]*"\([^"]*\)".*/\1/p') || payment_request=""
+  fi
+
+  if [ -n "$payment_request" ]; then
+    echo "Hold invoice created:"
+    echo ""
+    echo "$payment_request"
+    echo ""
+    echo "Hash: $hash"
+    echo "Preimage: $preimage"
+    echo ""
+
+    if command -v pbcopy &>/dev/null; then
+      echo "$payment_request" | pbcopy
+      echo "Invoice copied to clipboard."
+    fi
+  else
+    echo "${result:-LND command produced no output}"
+    exit 1
+  fi
+
+  exit
+fi
+
+# Settle a hold invoice (LND)
+if [[ "$command" = "settleinvoice" ]]; then
+  shift
+
+  if [ -z ${1+x} ]; then
+    echo "Usage: $CLI_NAME settleinvoice <preimage_hex>"
+    exit 1
+  fi
+
+  preimage="$1"
+  "${LNCLI_CMD[@]}" settleinvoice "$preimage"
+  exit
+fi
+
+# Cancel a hold invoice (LND)
+if [[ "$command" = "cancelinvoice" ]]; then
+  shift
+
+  if [ -z ${1+x} ]; then
+    echo "Usage: $CLI_NAME cancelinvoice <payment_hash>"
+    exit 1
+  fi
+
+  "${LNCLI_CMD[@]}" cancelinvoice "$1"
+  exit
+fi
+
 # Show usage information for this CLI
 if [[ "$command" = "--help" ]] || [[ "$command" = "-h" ]]; then
   show_help

docs/mainnet-nightly.md

@@ -31,7 +31,7 @@ The private companion repository (`bitkit-nightly`) is responsible for running t
 To execute native E2E tests from an external orchestrator:
 
 - set platform/backend env vars expected by WDIO and helpers
-- provide app artifact at `aut/bitkit_e2e.apk` (or `NATIVE_APK_PATH`)
+- provide app artifact in `aut/` — default `bitkit_e2e.apk` (Android) / `Bitkit.app` (iOS). Override with `AUT_FILENAME` (e.g. `bitkit_rn_regtest.apk`)
 - provide all secrets required by the selected tag(s)
 - pass grep/tag filters via CLI args, not by editing spec files
 

scripts/build-rn-android-apk.sh

@@ -29,7 +29,7 @@ if [[ -z "${ENV_FILE:-}" ]]; then
   if [[ "$BACKEND" == "regtest" ]]; then
     ENV_FILE=".env.development.template"
   else
-    ENV_FILE=".env.development"
+    ENV_FILE=".env.test.template"
   fi
 fi
 

scripts/build-rn-ios-sim.sh

@@ -29,7 +29,7 @@ if [[ -z "${ENV_FILE:-}" ]]; then
   if [[ "$BACKEND" == "regtest" ]]; then
     ENV_FILE=".env.development.template"
   else
-    ENV_FILE=".env.development"
+    ENV_FILE=".env.test.template"
   fi
 fi