Call setLastHeightChecked() in watchXmrSwap()

Remove old notes and config.
New html template for XMR bids.
Check the mempool for lock spend txid.
Retry sepnding coin B lock tx.
This commit is contained in:
tecnovert
2020-12-06 19:34:56 +02:00
parent 4c200fe8d4
commit 2346858145
21 changed files with 284 additions and 187 deletions

View File

@@ -1,62 +0,0 @@
# Docker Setup
## Build the images
```
$ docker-compose build
```
## Prepare the binaries, coin dirs and settings
```
$ docker run -t --name swap_prepare -v /tmp/coindata:/coindata i_swapclient basicswap-prepare --datadir=/coindata --withcoins=monero --withoutcoins=litecoin
```
Record the mnemonic from the output of the above command.
Remove swap_prepare container (and logs):
```
$ docker rm swap_prepare
```
# Running on windows 10
Work in progress - doesn't work reliably.
Install the latest docker toolbox from:
https://github.com/docker/toolbox/releases
Start docker through the desktop icon, it should open a terminal
Download basicswap
https://github.com/tecnovert/basicswap/archive/master.zip
Extract it.
Navigate to the docker folder.
If you have an existing litecoin chain, copy the contents of your datadir excluding litecoin.conf and any wallets to coindata/litecoin
If your litecoin chain is pruned create a new wallet in the existing datadir to avoid having to resync the chain.
Right click -> properties on the coindata folder, in the security tab make sure all users have 'Modify' rights.
Run the script: dockerbuild.bat
It should open a new terminal window and start building the container.
Once that completes run: dockerup.bat
In the terminal that opened for docker toolbox, find the line:
docker is configured to use the default machine with IP 192.168.99.100
And open the ip address it displays at port 12700 in a browser:
192.168.99.100:12700
Should show some html.
Now go to the view wallets page, and wait for all chains to completely sync.

View File

@@ -7,6 +7,7 @@
## Run Using Docker
Docker must be installed and started:
$ sudo systemctl status docker | grep Active
Should return a line containing `active (running)`
@@ -20,8 +21,8 @@ Create the images:
Prepare the datadir:
Set XMR_RPC_HOST and BASE_XMR_RPC_PORT to a public XMR node or exclude to run a local node.
$ export SWAP_DATADIR=/var/data/coinswaps
$ docker run -e XMR_RPC_HOST="node.xmr.to" -e BASE_XMR_RPC_PORT=18081 -t --name swap_prepare -v $SWAP_DATADIR:/coindata i_swapclient \
$ export COINDATA_PATH=/var/data/coinswaps
$ docker run -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 --withoutcoins=litecoin --htmlhost="0.0.0.0" --xmrrestoreheight=2245107
Record the mnemonic from the output of the above command.
@@ -33,11 +34,19 @@ Remove swap_prepare container (and logs):
Start the container
$ export SWAP_DATADIR=/var/data/coinswaps
$ export COINDATA_PATH=/var/data/coinswaps
$ docker-compose up
Open in browser: `http://localhost:12700`
### Add a coin
$ docker-compose stop
$ export COINDATA_PATH=/var/data/coinswaps
$ docker run -t --name swap_prepare -v $COINDATA_PATH:/coindata i_swapclient basicswap-prepare --datadir=/coindata --addcoin=bitcoin
You can copy an existing pruned datadir (excluding bitcoin.conf and any wallets) over to `$COINDATA_PATH/bitcoin`
## Run Without Docker:

View File

@@ -11,9 +11,8 @@ Features still required (of many):
- Option to lookup data from public explorers / nodes.
- Ability to swap coin-types without running nodes for all coin-types
- More swap protocols
- Method to load mnemonic into Particl.
- Load seeds for other wallets from same mnemonic.
- COIN must be defined per coin.
- Manual method to set wallet seeds from particl mnemonic
- prepare script tries to load seeds automatically, btc versions < 0.21 require a fully synced chain
## Seller first protocol: