Merge #656: Bech32 orderbook

3c96d41 Several tweaks for bech32 orderbook, plus docs (Adam Gibson)
3537b70 Update transaction parameters (Jules Comte)
9e66bc5 Update ob-watcher (Jules Comte)
ab87db2 Create native segwit v0 order type (Jules Comte)
2ae348b Update signature exchange and verification for bech32 (Jules Comte)

README.md

@@ -12,16 +12,16 @@ For a quick introduction to Joinmarket you can watch [this demonstration](https:
 
 ### Wallet features
 
-* Segwit addresses in the backward compatible form (start with `3`)
+* Segwit addresses (native bech32 ('bc1') by default; p2sh wrapped ('3') optionally).
 * Multiple "mixdepths" or pockets (by default 5) for better coin isolation
-* Ability to spend directly, or with coinjoin; export private keys; BIP49 compatible seed (Trezor, Samourai etc.) and mnemonic extension option
+* Ability to spend directly, or with coinjoin; export private keys; BIP84/49 compatible seed (Trezor, Samourai etc.) and mnemonic extension option
 * Fine-grained control over bitcoin transaction fees
 * Basic coin control - can freeze individual utxos to stop them being spent in any transaction
 * Can run sequence of coinjoins in automated form, either auto-generated (see `tumbler.py`) or self-generated sequence.
 * Can specify exact amount of coinjoin (figures from 0.01 to 30.0 btc and higher are practical), can choose time and number of counterparties
 * Can run passively to receive small payouts for taking part in coinjoins (see "Maker" and "yield-generator" in docs)
 * GUI to support Taker role, including tumbler/automated coinjoin sequence.
-* PayJoin - both [BIP78](https://github.com/bitcoin/bips/blob/master/bip-0078.mediawiki) to pay users of other wallets (e.g. merchants), as well as between two JM wallet users. This is a way to boost fungibility/privacy while paying.
+* PayJoin - [BIP78](https://github.com/bitcoin/bips/blob/master/bip-0078.mediawiki) to pay users of other wallets (e.g. merchants), as well as between two compatible wallet users (Joinmarket, Wasabi, others). This is a way to boost fungibility/privacy while paying.
 * Protection from [forced address reuse](https://en.bitcoin.it/wiki/Privacy#Forced_address_reuse) attacks.
 
 ### Quickstart - RECOMMENDED INSTALLATION METHOD (Linux and macOS only)
@@ -62,7 +62,7 @@ If you are new, follow and read the links in the [usage guide](docs/USAGE.md).
 
 If you are running Joinmarket-Qt, you can instead use the [walkthrough](docs/JOINMARKET-QT-GUIDE.md) to start.
 
-If you used the old version of Joinmarket, the notes in the [scripts readme](scripts/README.md) help to understand what has and hasn't changed about the scripts.
+If you used the old version of Joinmarket, the notes in the [scripts readme](scripts/README.md) help to understand what has and hasn't changed about the scripts (warning: this refers to changes from several years ago, so may be slightly outdated).
 
 If you are looking for the available makers, run the [orderbook](docs/orderbook.md).
 

docs/INSTALL.md

@@ -8,14 +8,10 @@
 
 (You can ignore this whole section if starting from scratch).
 
-#### Upgrading to new segwit version (0.3.0+ of this repo)
-
-See [here](SEGWIT-UPGRADE.md).
-
 #### Notes on upgrading versions generally:
 
 If you just want the latest version in a new directory, go to the [releases](https://github.com/AdamISZ/joinmarket-clientserver/releases) page.
-Binary executables are not currently being built; that may change in the future.
+Binary executables (of JoinmarketQt) are currently being built only for Windows, please verify the signature on the .exe file attached to the release.
 
 Otherwise: if you are upgrading from an older version, just update using git: `git pull origin master`,
 or `git fetch; git checkout tags/<tagname>` for a specific tagged release, then rerun the installation
@@ -134,6 +130,9 @@ There are currently two choices for installing on Windows; one, directly install
 
 #### Installation directly on Windows
 
+As per the note above, binaries for JoinmarketQt are being offered with releases as of 0.7.0+.
+This section is for doing a full command line install, on Windows.
+
 First, if you have not done so, install [Python](https://www.python.org/downloads/windows/) - specifically, the latest Python 3 version. Make sure to choose to install `pip` during the installation (it should be included automatically, but you can choose the custom installation option to choose it).
 
 Be sure to choose the option that allows `python` to be in your PATH variable (you are prompted to do this at the end of the install).

docs/JOINMARKET-QT-GUIDE.md

@@ -24,6 +24,7 @@ The github commits to the main repo, above, are signed.
 
   * [Exporting private keys](#export-private-keys)
 
+(*Before starting, note that the screenshots here use testnet p2sh addresses (start with '2'), but by default Joinmarket mainnet addresses are native segwit ('bc1')*).
 
 ### Walkthrough