From 8259df43999b540ccfe87067124533cd607cb487 Mon Sep 17 00:00:00 2001
From: tecnovert <tecnovert@tecnovert.net>
Date: Wed, 3 Nov 2021 23:20:19 +0200
Subject: [PATCH] doc: Simplify Windows install notes.

---
 .gitattributes         |  4 ++++
 basicswap/basicswap.py |  2 ++
 doc/install.md         | 36 ++++++++++++++++--------------------
 3 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..c073171
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+
+# Ensure Docker related files always have unix (LF) line endings.
+Dockerfile      eol=lf
+docker/*        eol=lf
diff --git a/basicswap/basicswap.py b/basicswap/basicswap.py
index 551738f..cd92685 100644
--- a/basicswap/basicswap.py
+++ b/basicswap/basicswap.py
@@ -3278,6 +3278,8 @@ class BasicSwap(BaseApp):
         # assert(self.mxDB.locked())
         self.log.debug('checkForSpends %s', coin_type)
 
+        # TODO: Check for spends on watchonly txns where possible
+
         if 'have_spent_index' in self.coin_clients[coin_type] and self.coin_clients[coin_type]['have_spent_index']:
             # TODO: batch getspentinfo
             for o in c['watched_outputs']:
diff --git a/doc/install.md b/doc/install.md
index cc4dc18..8682479 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -8,9 +8,9 @@
 
 Docker must be installed and started:
 
-    $ sudo systemctl status docker | grep Active
+    $ docker -v
 
-Should return a line containing `active (running)`
+Should return a line containing `Docker version`...
 
 
 #### Create the images:
@@ -27,7 +27,7 @@ Adjust `--withcoins` and `--withoutcoins` as desired, eg: `--withcoins=monero,bi
 
     $ export COINDATA_PATH=/var/data/coinswaps
     $ docker run --rm -e XMR_RPC_HOST="node.xmr.to" -e BASE_XMR_RPC_PORT=18081 -t --name swap_prepare -v $COINDATA_PATH:/coindata i_swapclient \
-    basicswap-prepare --datadir=/coindata --withcoins=monero --htmlhost="0.0.0.0" --xmrrestoreheight=2245107
+    basicswap-prepare --datadir=/coindata --withcoins=monero --htmlhost="0.0.0.0" --xmrrestoreheight=2485205
 
 **Record the mnemonic from the output of the above command.**
 
@@ -57,35 +57,31 @@ You can copy an existing pruned datadir (excluding bitcoin.conf and any wallets)
 Remove any existing wallets after copying over a pruned chain or the Bitcoin daemon won't start.
 
 
-## Windows
-
-Install Git:
-
-    https://gitforwindows.org/
-
-Right click in the directory you want the source code and select 'Git Bash Here':
 
-    $ git clone https://github.com/tecnovert/basicswap.git
+## Windows
 
-Setup Docker Desktop on the WSL 2 backend.
+#### Setup WSL 2 and Docker Desktop
 [docs.docker.com/docker-for-windows/wsl](https://docs.docker.com/docker-for-windows/wsl/)
 
-Launch the docker commands through a WSL terminal.
 
+Open a wsl terminal
+Windows key + R -> "wsl" -> Enter
 
-Open cmd-prompt with windows key + R -> "cmd" -> Enter
 
-    > wsl
+Install Git:
 
-Go to the directory containing the source code:
+    $ sudo apt update
+    $ sudo apt install git
 
-    cd /mnt/c/tmp/basicswap/docker/
 
-It's significantly faster to keep COINDATA_PATH in the linux filesystem.
-You can access it from the windows side at: `\\wsl$\Ubuntu-20.04`
+Download the BasicSwap code:
+
+    $ git clone https://github.com/tecnovert/basicswap.git
+    $ cd basicswap/docker/
 
-    export COINDATA_PATH=/home/$USER/coinswaps
 
+It's significantly faster to set COINDATA_PATH in the linux filesystem.
+You can access it from the windows side at: `\\wsl$\Ubuntu`
 
 Continue from the [Run Using Docker](#run-using-docker) section.