From ac957fb8358c418afb456b2e8861ad3cfeae23a4 Mon Sep 17 00:00:00 2001
From: Daniil Lashin <danil-lashin@yandex.ru>
Date: Tue, 20 Nov 2018 12:39:22 +0300
Subject: [PATCH] Update Tendermint

---
 CHANGELOG.md       | 11 +++++++++++
 Gopkg.lock         | 14 +++++++-------
 Gopkg.toml         |  2 +-
 version/version.go |  4 ++--
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae0871215..3dc456223 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.7.4
+*Nov 20th, 2018*
+
+BUG FIXES
+
+- [tendermint] "Send failed" is logged at debug level instead of error
+- [tendermint] Set connection config properly instead of always using default
+- [tendermint] Seed mode fixes:
+   - Only disconnect from inbound peers
+   - Use FlushStop instead of Sleep to ensure all messages are sent before disconnecting
+
 ## 0.7.3
 *Nov 18th, 2018*
 
diff --git a/Gopkg.lock b/Gopkg.lock
index 86772aba6..0fd898ec2 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -18,7 +18,6 @@
   revision = "67e573d211ace594f1366b4ce9d39726c4b19bd0"
 
 [[projects]]
-  branch = "master"
   digest = "1:d574810a99a766018d4532cc96dc4e7ddf51a66715f2e16d0a8fcc8be0b502a6"
   name = "github.com/danil-lashin/iavl"
   packages = ["."]
@@ -234,14 +233,16 @@
   version = "v0.8.0"
 
 [[projects]]
-  digest = "1:c1a04665f9613e082e1209cf288bf64f4068dcd6c87a64bf1c4ff006ad422ba0"
+  digest = "1:26663fafdea73a38075b07e8e9d82fc0056379d2be8bb4e13899e8fda7c7dd23"
   name = "github.com/prometheus/client_golang"
   packages = [
     "prometheus",
+    "prometheus/internal",
     "prometheus/promhttp",
   ]
   pruneopts = "UT"
-  revision = "ae27198cdd90bf12cd134ad79d1366a6cf49f632"
+  revision = "abad2d1bd44235a26707c172eab6bca5bf2dbad3"
+  version = "v0.9.1"
 
 [[projects]]
   branch = "master"
@@ -371,7 +372,7 @@
   version = "v0.14.1"
 
 [[projects]]
-  digest = "1:72cbe16a871dabb7852919835eda05fe4695349fb050e921281d1b90dd4c854e"
+  digest = "1:a13720e23c8709cb6bf7626580f1f546485860f5e58df2fb95a0dfe300d97ec2"
   name = "github.com/tendermint/tendermint"
   packages = [
     "abci/client",
@@ -396,7 +397,6 @@
     "libs/clist",
     "libs/common",
     "libs/db",
-    "libs/errors",
     "libs/events",
     "libs/fail",
     "libs/flowrate",
@@ -426,8 +426,8 @@
     "version",
   ]
   pruneopts = "UT"
-  revision = "d5a05eccba18b772439f57e91ddad54091aab952"
-  version = "v0.26.2"
+  revision = "22dcc92232cd04ce7381043e09d85dd536ae3b96"
+  version = "v0.26.3"
 
 [[projects]]
   digest = "1:1fdfa9436cc1c11afbdbfb56549e9201a92db0b0a0b7bef0797e7b68c9e8791f"
diff --git a/Gopkg.toml b/Gopkg.toml
index 5a9883ce9..7a4b5f545 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -47,7 +47,7 @@
 
 [[constraint]]
   name = "github.com/tendermint/tendermint"
-  version = "=0.26.2"
+  version = "=0.26.3"
 
 [[constraint]]
   branch = "v1"
diff --git a/version/version.go b/version/version.go
index cc09bc10f..552bba8ed 100755
--- a/version/version.go
+++ b/version/version.go
@@ -4,12 +4,12 @@ package version
 const (
 	Maj = "0"
 	Min = "7"
-	Fix = "3"
+	Fix = "4"
 )
 
 var (
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.7.3"
+	Version = "0.7.4"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string