diff --git a/joinmarket/README.md b/joinmarket/README.md index 4c843f2..7f39fdf 100644 --- a/joinmarket/README.md +++ b/joinmarket/README.md @@ -48,7 +48,13 @@ This needs to be done at every new login. $ source jmvenv/bin/activate $ cd scripts ``` + `Tips`: the commands can be run as one line if joined by `&&` + (meaning continue to run if successful): + `cd joinmarket-clientserver && source jmvenv/bin/activate && cd scripts` + + The previously run commands can be easly searched from the prompt by pressing + `CTRL+R` thanks to the [command line fuzzy finder](https://github.com/junegunn/fzf) ### Generate a wallet * Using the JoinMarket wallet: https://github.com/JoinMarket-Org/joinmarket/wiki/Using-the-JoinMarket-internal-wallet @@ -113,9 +119,11 @@ This needs to be done at every new login. ### Check the transaction history -* use the wallet tool: +* use the wallet tool: `(jmvenv) $ python wallet-tool.py wallet.jmdat history` + add `-v 4` to the end of the commadn for a more detailed list. + * View the log of the transactions of the Yield Generator: `$ cat ~/joinmarket-clientserver/scripts/logs/yigen-statement.csv` * Monitor continously with: @@ -127,19 +135,59 @@ This needs to be done at every new login. `$ sudo apt install tmux` * Start: `$ tmux` + * Work in the terminal as described above. Find a basic introduction at https://www.ocf.berkeley.edu/~ckuehl/tmux/ * If the terminal is disconnected the processes in tmux keep running (as it is running on the Blitz) and can be returned to * when logged in after a disconnection run: `$ tmux a` -to pick up where left off + to pick up where left off + +### Make JoinMarket communicate behind Tor + +* Activate Tor in the SERVICE menu of the RaspiBlitz if not running already +* Edit the `joinmarket.cfg` + `$ nano joinmarket.cfg` +* Comment out the clearnet communication channels (place a `#` on the front of the line - means it wont be used by the script): + + ``` + [MESSAGING:server1] + #host = irc.cyberguerrilla.org + + ... + + [MESSAGING:server2] + #host = irc.darkscience.net + ``` +* Uncomment (remove the `#` from front of) the entries related for Tor: + ``` + #for tor + host = epynixtbonxn4odv34z4eqnlamnpuwfz6uwmsamcqd62si7cbix5hqad.onion + socks5 = true + + ... + + #for tor + host = darksci3bfoka7tw.onion + socks5 = true + + ``` ### Resources: -* Latest codebase: -* Installation instructions: +* Latest codebase: + -* Tmux will be included in the next release of the RaspiBlitz: +* Installation instructions: + -* Discuss JoinMarket usage on the RaspiBlitz in +* Tmux will be included in the next release of the RaspiBlitz: + -* More links and info in 6102bitcoin/CoinJoin-Research: https://github.com/6102bitcoin/CoinJoin-Research/blob/master/CoinJoin_Implementations/11_JoinMarket-JoinMarket-Org/summary.md \ No newline at end of file +* Discuss JoinMarket usage on the RaspiBlitz in + + +* More links and info in 6102bitcoin/CoinJoin-Research: +https://github.com/6102bitcoin/CoinJoin-Research/blob/master/CoinJoin_Implementations/11_JoinMarket-JoinMarket-Org/summary.md + +* Check the guide for the RaspiBolt by @kristapsk: +https://github.com/kristapsk/raspibolt-extras/blob/master/joinmarket.md \ No newline at end of file