From 68a0b3f95b331e04efabff9817fd60b8c1ce3b28 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 15 May 2018 22:42:29 -0400
Subject: [PATCH] version bump. add roadmap back. minor fixes

---
 CHANGELOG.md        |  2 ++
 ROADMAP.md          | 23 +++++++++++++++++++++++
 p2p/pex/addrbook.go |  2 +-
 p2p/switch.go       |  2 +-
 version/version.go  |  4 ++--
 5 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 ROADMAP.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9de1aa29..1c1b47b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## 0.19.4 (TBD)
+
 ## 0.19.3 (May 14th, 2018)
 
 FEATURES
diff --git a/ROADMAP.md b/ROADMAP.md
new file mode 100644
index 00000000..60c28433
--- /dev/null
+++ b/ROADMAP.md
@@ -0,0 +1,23 @@
+# Roadmap
+
+BREAKING CHANGES:
+- Better support for injecting randomness
+- Upgrade consensus for more real-time use of evidence
+
+FEATURES:
+- Use the chain as its own CA for nodes and validators
+- Tooling to run multiple blockchains/apps, possibly in a single process
+- State syncing (without transaction replay)
+- Add authentication and rate-limitting to the RPC
+
+IMPROVEMENTS:
+- Improve subtleties around mempool caching and logic
+- Consensus optimizations:
+	- cache block parts for faster agreement after round changes
+	- propagate block parts rarest first
+- Better testing of the consensus state machine (ie. use a DSL)
+- Auto compiled serialization/deserialization code instead of go-wire reflection
+
+BUG FIXES:
+- Graceful handling/recovery for apps that have non-determinism or fail to halt
+- Graceful handling/recovery for violations of safety, or liveness
diff --git a/p2p/pex/addrbook.go b/p2p/pex/addrbook.go
index 4408c3b9..dc51761f 100644
--- a/p2p/pex/addrbook.go
+++ b/p2p/pex/addrbook.go
@@ -186,7 +186,7 @@ func (a *addrBook) RemoveAddress(addr *p2p.NetAddress) {
 	if ka == nil {
 		return
 	}
-	a.Logger.Info("Remove address from book", "addr", ka.Addr, "ID", ka.ID)
+	a.Logger.Info("Remove address from book", "addr", ka.Addr, "ID", ka.ID())
 	a.removeFromAllBuckets(ka)
 }
 
diff --git a/p2p/switch.go b/p2p/switch.go
index bccae393..f62e5f99 100644
--- a/p2p/switch.go
+++ b/p2p/switch.go
@@ -565,7 +565,7 @@ func (sw *Switch) addPeer(pc peerConn) error {
 	if sw.nodeKey.ID() == peerID {
 		addr := peerNodeInfo.NetAddress()
 
-		// remove the given address from the address book if we're added it earlier
+		// remove the given address from the address book if we added it earlier
 		sw.addrBook.RemoveAddress(addr)
 
 		// add the given address to the address book to avoid dialing ourselves
diff --git a/version/version.go b/version/version.go
index c7d1d03a..67d46ea3 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,13 +4,13 @@ package version
 const (
 	Maj = "0"
 	Min = "19"
-	Fix = "3"
+	Fix = "4"
 )
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.19.3"
+	Version = "0.19.4-dev"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string