From c5c2b9601f02747d50e70f54a71f40270a659956 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Sun, 5 Aug 2018 14:14:56 -0400
Subject: [PATCH] update changelog and version

---
 CHANGELOG.md         | 39 +++++++++++++++++++++++++++++++++++++++
 CHANGELOG_PENDING.md | 30 ------------------------------
 Makefile             |  2 +-
 version/version.go   |  6 +++---
 4 files changed, 43 insertions(+), 34 deletions(-)
 delete mode 100644 CHANGELOG_PENDING.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2bda54cf..957e749a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,44 @@
 # Changelog
 
+## 0.23.0
+
+*August 5th, 2018*
+
+This release includes a breaking upgrade to the p2p encryption and some minor
+breaking changes in the ABCI. A few more changes are still coming to the Header, ABCI,
+and validator set handling to better support light clients, BFT time, and
+upgrades. Most notably, validator set changes will be delayed by one block (see
+[#1815]).
+
+BREAKING CHANGES:
+- [abci] Changed time format from int64 to google.protobuf.Timestamp
+- [abci] Changed Validators to LastCommitInfo in RequestBeginBlock
+- [abci] Removed Fee from ResponseDeliverTx and ResponseCheckTx
+- [p2p] Remove salsa and ripemd primitives, in favor of using chacha as a stream cipher, and hkdf
+- [tools] Removed `make ensure_deps` in favor of `make get_vendor_deps`
+- [types] CanonicalTime uses nanoseconds instead of clipping to ms
+    - breaks serialization/signing of all messages with a timestamp
+
+FEATURES:
+- [tools] Added `make check_dep`
+    - ensures gopkg.lock is synced with gopkg.toml
+    - ensures no branches are used in the gopkg.toml
+
+IMPROVEMENTS:
+- [blockchain] Improve fast-sync logic
+    - tweak params
+    - only process one block at a time to avoid starving
+- [common] bit array functions which take in another parameter are now thread safe
+- [crypto] Switch hkdfchachapoly1305 to xchachapoly1305
+- [p2p] begin connecting to peers as soon a seed node provides them to you ([#2093](https://github.com/tendermint/tendermint/issues/2093))
+
+BUG FIXES:
+- [common] Safely handle cases where atomic write files already exist [#2109](https://github.com/tendermint/tendermint/issues/2109)
+- [privval] fix a deadline for accepting new connections in socket private
+  validator.
+- [p2p] Allow startup if a configured seed node's IP can't be resolved ([#1716](https://github.com/tendermint/tendermint/issues/1716))
+- [node] Fully exit when CTRL-C is pressed even if consensus state panics [#2072](https://github.com/tendermint/tendermint/issues/2072)
+
 ## 0.22.8
 
 *July 26th, 2018*
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
deleted file mode 100644
index a1d9985ab..000000000
--- a/CHANGELOG_PENDING.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Pending
-
-BREAKING CHANGES:
-- [types] CanonicalTime uses nanoseconds instead of clipping to ms
-    - breaks serialization/signing of all messages with a timestamp
-- [abci] Removed Fee from ResponseDeliverTx and ResponseCheckTx
-- [tools] Removed `make ensure_deps` in favor of `make get_vendor_deps`
-- [p2p] Remove salsa and ripemd primitives, in favor of using chacha as a stream cipher, and hkdf
-- [abci] Changed time format from int64 to google.protobuf.Timestamp
-- [abci] Changed Validators to LastCommitInfo in RequestBeginBlock
-
-FEATURES:
-- [tools] Added `make check_dep`
-    - ensures gopkg.lock is synced with gopkg.toml
-    - ensures no branches are used in the gopkg.toml
-
-IMPROVEMENTS:
-- [blockchain] Improve fast-sync logic
-    - tweak params
-    - only process one block at a time to avoid starving
-- [crypto] Switch hkdfchachapoly1305 to xchachapoly1305
-- [common] bit array functions which take in another parameter are now thread safe
-- [p2p] begin connecting to peers as soon a seed node provides them to you ([#2093](https://github.com/tendermint/tendermint/issues/2093))
-
-BUG FIXES:
-- [common] Safely handle cases where atomic write files already exist [#2109](https://github.com/tendermint/tendermint/issues/2109)
-- [privval] fix a deadline for accepting new connections in socket private
-  validator.
-- [p2p] Allow startup if a configured seed node's IP can't be resolved ([#1716](https://github.com/tendermint/tendermint/issues/1716))
-- [node] Fully exit when CTRL-C is pressed even if consensus state panics [#2072](https://github.com/tendermint/tendermint/issues/2072)
diff --git a/Makefile b/Makefile
index 45703c84b..22e928861 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ BUILD_FLAGS = -ldflags "-X github.com/tendermint/tendermint/version.GitCommit=`g
 
 all: check build test install
 
-check: check_tools ensure_deps
+check: check_tools get_vendor_deps
 
 
 ########################################
diff --git a/version/version.go b/version/version.go
index 85b1f1918..04880cfe0 100644
--- a/version/version.go
+++ b/version/version.go
@@ -3,14 +3,14 @@ package version
 // Version components
 const (
 	Maj = "0"
-	Min = "22"
-	Fix = "8"
+	Min = "23"
+	Fix = "0"
 )
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.22.8"
+	Version = "0.23.0"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string