From e8676921f726c55212e6fcc9dedc469c15df5734 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Wed, 21 Feb 2018 19:52:42 +0100
Subject: [PATCH] Basecoind start works with upgraded tendermint

---
 baseapp/baseapp.go                      |  2 --
 examples/basecoin/cmd/basecoind/main.go | 10 +++++-----
 examples/gaia/gaiad/main.go             | 16 ++++++++++++----
 glide.lock                              |  8 ++++----
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index 70b1d299f..1b1b4da87 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -236,8 +236,6 @@ func (app *BaseApp) InitChain(req abci.RequestInitChain) (res abci.ResponseInitC
 	// NOTE: we don't commit, but BeginBlock for block 1
 	// starts from this deliverState
 
-	// TODO: d00d, tendermint sends nil, until that is fixed, we gotta
-	// read in the genesis file ourselves here
 	res = app.initChainer(ctx, req)
 	// TODO: handle error https://github.com/cosmos/cosmos-sdk/issues/468
 
diff --git a/examples/basecoin/cmd/basecoind/main.go b/examples/basecoin/cmd/basecoind/main.go
index fdb2b5e9d..44ea00fbb 100644
--- a/examples/basecoin/cmd/basecoind/main.go
+++ b/examples/basecoin/cmd/basecoind/main.go
@@ -49,18 +49,18 @@ func defaultOptions(args []string) (json.RawMessage, error) {
 	return json.RawMessage(opts), nil
 }
 
-func generateApp(rootDir string, logger log.Logger) abci.Application {
+func generateApp(rootDir string, logger log.Logger) (abci.Application, error) {
 	db, err := dbm.NewGoLevelDB("basecoin", rootDir)
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		return nil, err
 	}
 	bapp := app.NewBasecoinApp(logger, db)
-	return bapp
+	return bapp, nil
 }
 
 func main() {
-	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "main")
+	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).
+		With("module", "main")
 
 	basecoindCmd.AddCommand(
 		server.InitCmd(defaultOptions, logger),
diff --git a/examples/gaia/gaiad/main.go b/examples/gaia/gaiad/main.go
index fb5c0b20f..0c4c49eec 100644
--- a/examples/gaia/gaiad/main.go
+++ b/examples/gaia/gaiad/main.go
@@ -7,7 +7,9 @@ import (
 
 	"github.com/spf13/cobra"
 
+	abci "github.com/tendermint/abci/types"
 	"github.com/tendermint/tmlibs/cli"
+	"github.com/tendermint/tmlibs/log"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/server"
@@ -46,14 +48,20 @@ func defaultOptions(args []string) (json.RawMessage, error) {
 	return json.RawMessage(opts), nil
 }
 
-func main() {
+func generateApp(rootDir string, logger log.Logger) (abci.Application, error) {
 	// TODO: set this to something real
 	app := new(baseapp.BaseApp)
+	return app, nil
+}
+
+func main() {
+	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).
+		With("module", "main")
 
 	gaiadCmd.AddCommand(
-		server.InitCmd(defaultOptions, app.Logger),
-		server.StartCmd(app, app.Logger),
-		server.UnsafeResetAllCmd(app.Logger),
+		server.InitCmd(defaultOptions, logger),
+		server.StartCmd(generateApp, logger),
+		server.UnsafeResetAllCmd(logger),
 		version.VersionCmd,
 	)
 
diff --git a/glide.lock b/glide.lock
index d5db865da..e7ef79fa7 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
 hash: 89fd2ad769c283b6b29b02b84dd6459a40a47de5dfdfb15d7ced95d53ee9ec18
-updated: 2018-02-21T12:53:23.608467+01:00
+updated: 2018-02-21T19:39:16.798141851+01:00
 imports:
 - name: github.com/btcsuite/btcd
   version: 50de9da05b50eb15658bb350f6ea24368a111ab7
@@ -105,7 +105,7 @@ imports:
   - leveldb/table
   - leveldb/util
 - name: github.com/tendermint/abci
-  version: 68592f4d8ee34e97db94b7a7976b1309efdb7eb9
+  version: c960c5275617ef141c92c3d7fc65a396c97662df
   subpackages:
   - client
   - example/code
@@ -129,7 +129,7 @@ imports:
 - name: github.com/tendermint/iavl
   version: 1a59ec0c82dc940c25339dd7c834df5cb76a95cb
 - name: github.com/tendermint/tendermint
-  version: b24792244d6d03be5a566fd48572743faf3c02e0
+  version: 4a63409d5c72a36eee49c962b060fd0063958bda
   subpackages:
   - blockchain
   - cmd/tendermint/commands
@@ -166,7 +166,7 @@ imports:
   - version
   - wire
 - name: github.com/tendermint/tmlibs
-  version: 1b9b5652a199ab0be2e781393fb275b66377309d
+  version: a0f652dc2e131be86fc8d9e4e2beec9831a8a6ec
   subpackages:
   - autofile
   - cli