From 41bc371a1d801e780a4c7f7ab9094fdbfd2491e7 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jun 2017 15:20:32 +0200
Subject: [PATCH] Update dependencies, set merkleeyes logger

---
 CHANGELOG.md                   |  8 ++++++--
 cmd/basecoin/commands/start.go |  2 ++
 glide.lock                     | 10 +++++-----
 glide.yaml                     |  4 ++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b32a976b7f..979a46f78a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,9 @@ IMPROVEMENTS:
   - `basecoin start` supports all flags that `tendermint node` does, such as
   `--rpc.laddr`, `--p2p.seeds`, and `--p2p.skip_upnp`
   - fully supports `--log_level` and `--trace` for logger configuration
+  - merkleeyes no longers spams the logs... unless you want it
+    - Example: `basecoin start --log_level="merkleeyes:info,state:info,*:error"`
+    - Example: `basecoin start --log_level="merkleeyes:debug,state:info,*:error"`
 - basecli
   - `basecli query account` accepts hex account address with or without `0x`
   prefix
@@ -19,8 +22,9 @@ IMPROVEMENTS:
   not just `tcp://localhost:46657`
   - gives error message when running commands on an unitialized chain, rather
   than some unintelligable panic
-  - Add `--genesis` to init
-  - Example: `basecli init --node=localhost:46657 --genesis=$HOME/.basecoin/genesis.json`
+  - Add `--genesis` to init to specify chain-id and validator hash
+    - Example: `basecli init --node=localhost:46657 --genesis=$HOME/.basecoin/genesis.json`
+
 
 
 ## 0.6.0 (June 22, 2017)
diff --git a/cmd/basecoin/commands/start.go b/cmd/basecoin/commands/start.go
index bbcc3d84a7..31211bd7a8 100644
--- a/cmd/basecoin/commands/start.go
+++ b/cmd/basecoin/commands/start.go
@@ -10,6 +10,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/tendermint/abci/server"
+	eyesApp "github.com/tendermint/merkleeyes/app"
 	eyes "github.com/tendermint/merkleeyes/client"
 	"github.com/tendermint/tmlibs/cli"
 	cmn "github.com/tendermint/tmlibs/common"
@@ -54,6 +55,7 @@ func startCmd(cmd *cobra.Command, args []string) error {
 	// Connect to MerkleEyes
 	var eyesCli *eyes.Client
 	if meyes == "local" {
+		eyesApp.SetLogger(logger.With("module", "merkleeyes"))
 		eyesCli = eyes.NewLocalClient(path.Join(rootDir, "data", "merkleeyes.db"), EyesCacheSize)
 	} else {
 		var err error
diff --git a/glide.lock b/glide.lock
index b8eed3c062..1cd5d3d1e7 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 0075efad18304d9958e655550e042eb4cbeaf78ba5fbebc5f2c5bf0b2a48910b
-updated: 2017-06-26T21:33:20.786071254+02:00
+hash: d1fc759f7cf229e425b79fef4194108cc4f9fb23ddf74def180d490b84e1d4a4
+updated: 2017-06-27T15:15:05.105303358+02:00
 imports:
 - name: github.com/bgentry/speakeasy
   version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
@@ -132,7 +132,7 @@ imports:
   - data
   - data/base58
 - name: github.com/tendermint/light-client
-  version: bf3063db6253fc2e9a837eda38de4a26da299bcb
+  version: 720e61c10add1d2ee9efb7d436f383370017f817
   subpackages:
   - certifiers
   - certifiers/client
@@ -144,13 +144,13 @@ imports:
   - commands/txs
   - proofs
 - name: github.com/tendermint/merkleeyes
-  version: ce7de05896f560ddcc9207f65fea9901835dd238
+  version: 7740a2467874556edb01e7275ff11386b8c0e25d
   subpackages:
   - app
   - client
   - iavl
 - name: github.com/tendermint/tendermint
-  version: e4caf96bcb1ab80fc3b5dca4c9a8f0648653929b
+  version: 3065059da7bb57714f08c7a6fcb97e4b36be0194
   subpackages:
   - blockchain
   - cmd/tendermint/commands
diff --git a/glide.yaml b/glide.yaml
index 233ff148a7..91c38c5ec5 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -30,12 +30,12 @@ import:
   - commands/txs
   - proofs
 - package: github.com/tendermint/merkleeyes
-  version: develop
+  version: feature/26-add-logger
   subpackages:
   - client
   - iavl
 - package: github.com/tendermint/tendermint
-  version: feature/554-embed-commands
+  version: develop
   subpackages:
   - config
   - node