Merge branch 'order-hotfix'

doc/release-notes-0.1.3.md

@@ -0,0 +1,33 @@
+JoinMarket 0.1.3:
+
+  <https://github.com/joinmarket-org/joinmarket/releases/tag/v0.1.3>
+
+This is a minor bugfix release. Please update immediately.
+
+For detailed release notes, see the most recent major release [notes](https://github.com/joinmarket-org/joinmarket/tree/master/doc/release-notes.md).
+
+Please report bugs using the issue tracker at github:
+
+  <https://github.com/joinmarket-org/joinmarket/issues>
+
+Upgrading and downgrading
+=========================
+
+There is no binary component of the installation yet supported. If you have already
+installed libsodium and Python, you will not need to re-install anything, but
+only update the joinmarket source code.
+
+Be sure to update your joinmarket.cfg file by moving or deleting it and recreating
+it on first startup.
+
+Notable changes
+===============
+
+Fixing a race condition that allowed makers to get a higher amount of the takers
+coins as fees than advertised.
+
+
+0.1.3 Change log
+=================
+
+- `508d65f` fix for race condition involving orders

doc/release-notes.md

@@ -1,6 +1,6 @@
-Joinmarket 0.1.2:
+JoinMarket 0.1.3:
 
-  <https://github.com/joinmarket-org/joinmarket/releases/tag/v0.1.1>
+  <https://github.com/joinmarket-org/joinmarket/releases/tag/v0.1.3>
 
 This is a minor bugfix release. Please update immediately.
 
@@ -23,24 +23,11 @@ it on first startup.
 Notable changes
 ===============
 
-Preventing anybody being able to crash all bots by sending an invalid message
+Fixing a race condition that allowed makers to get a higher amount of the takers
+coins as fees than advertised.
 
-Returning the alert system to JoinMarket after it was mistakenly removed in a refactor
 
-------------------------------------
-
-See [400](https://github.com/joinmarket-org/joinmarket/issues/400)
-Anybody announcing a command to cancel an order without an order id would cause 
-all bots to crash
-This fix prevents that.
-
-
-0.1.1 Change log
+0.1.3 Change log
 =================
 
-- #398 `fb624cc` fix crash caused by malformed cancel message
-- #401 `6eac518` put back joinmarket alerts and core alerts
-- #387 `77ef4b4` clump coins differently in yieldgenerator to increase privacy
-- #397 `6ced862` fix issue 395 about accidental negative fees in yieldgenerator deluxe
-- #392 `00ef236` fix issue #392
-
+- `508d65f` fix for race condition involving orders

joinmarket/configure.py

@@ -72,7 +72,7 @@ def __getitem__(self, key):
 
 # todo: same as above.  decide!!!
 global_singleton = AttributeDict()
-global_singleton.JM_VERSION = 3
+global_singleton.JM_VERSION = 4
 global_singleton.nickname = None
 global_singleton.DUST_THRESHOLD = 2730
 global_singleton.bc_interface = None