seasharp/basicswap_miserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: Simplify Windows install notes.

Browse Source
This commit is contained in:
tecnovert 2021-11-03 23:20:19 +02:00
parent 1d6f55b8b9
commit 8259df4399
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored Normal file
View File

@ -0,0 +1,4 @@
# Ensure Docker related files always have unix (LF) line endings.
Dockerfile eol=lf
docker/* eol=lf

2
basicswap/basicswap.py
View File

@ -3278,6 +3278,8 @@ class BasicSwap(BaseApp):
# assert(self.mxDB.locked()) # assert(self.mxDB.locked())
self.log.debug('checkForSpends %s', coin_type) 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']: if 'have_spent_index' in self.coin_clients[coin_type] and self.coin_clients[coin_type]['have_spent_index']:
# TODO: batch getspentinfo # TODO: batch getspentinfo
for o in c['watched_outputs']: for o in c['watched_outputs']:

42
doc/install.md
View File

@ -8,9 +8,9 @@
Docker must be installed and started: 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: #### Create the images:
@ -27,7 +27,7 @@ Adjust `--withcoins` and `--withoutcoins` as desired, eg: `--withcoins=monero,bi
$ export COINDATA_PATH=/var/data/coinswaps $ 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 \ $ 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.** **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. Remove any existing wallets after copying over a pruned chain or the Bitcoin daemon won't start.
## Windows ## Windows
#### Setup WSL 2 and Docker Desktop
[docs.docker.com/docker-for-windows/wsl](https://docs.docker.com/docker-for-windows/wsl/)
Open a wsl terminal
Windows key + R -> "wsl" -> Enter
Install Git: Install Git:
https://gitforwindows.org/ $ sudo apt update
$ sudo apt install git
Right click in the directory you want the source code and select 'Git Bash Here':
Download the BasicSwap code:
$ git clone https://github.com/tecnovert/basicswap.git $ git clone https://github.com/tecnovert/basicswap.git
$ cd basicswap/docker/
Setup Docker Desktop on the WSL 2 backend.
[docs.docker.com/docker-for-windows/wsl](https://docs.docker.com/docker-for-windows/wsl/)
Launch the docker commands through a WSL terminal.
Open cmd-prompt with windows key + R -> "cmd" -> Enter It's significantly faster to set COINDATA_PATH in the linux filesystem.
You can access it from the windows side at: `\\wsl$\Ubuntu`
> wsl
Go to the directory containing the source code:
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`
export COINDATA_PATH=/home/$USER/coinswaps
Continue from the [Run Using Docker](#run-using-docker) section. Continue from the [Run Using Docker](#run-using-docker) section.