From 7c2f133b3e273423c9d9abdd8d4865ac0575184b Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Thu, 15 Mar 2018 10:01:19 -0700
Subject: [PATCH] Fixes https://github.com/cosmos/cosmos-sdk/issues/532

---
 Gopkg.lock                   | 6 +++---
 Gopkg.toml                   | 2 +-
 examples/basecoin/app/app.go | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 85efc9791ed5..61a7eaafa245 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -331,7 +331,7 @@
   revision = "cd2ba4aa7f95e16fe99570260ad58415e7ad4660"
 
 [[projects]]
-  branch = "jae/dbprefix"
+  branch = "develop"
   name = "github.com/tendermint/tmlibs"
   packages = [
     "autofile",
@@ -346,7 +346,7 @@
     "pubsub",
     "pubsub/query"
   ]
-  revision = "1e04b4c1c770bee4935a8de5b3eb503be8c0b70a"
+  revision = "d289c9286e816a37336289a75752752a751bc918"
 
 [[projects]]
   branch = "master"
@@ -451,6 +451,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "f6dc05aa0f653420fa5e567ed624529b01542d73daf5f8d03c4140b94cd10330"
+  inputs-digest = "3d1aebf798b51882ed5281b0ca0a3766c32cdb08592de57dd3d574a4b3e67987"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 0a35deebea7a..1cbd701e214f 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -82,7 +82,7 @@
   name = "github.com/tendermint/tendermint"
 
 [[override]]
-  branch = "jae/dbprefix"
+  branch = "develop"
   name = "github.com/tendermint/tmlibs"
 
 [prune]
diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go
index 77816ba40ce7..a80690b54ea6 100644
--- a/examples/basecoin/app/app.go
+++ b/examples/basecoin/app/app.go
@@ -63,9 +63,7 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB) *BasecoinApp {
 	// initialize BaseApp
 	app.SetTxDecoder(app.txDecoder)
 	app.SetInitChainer(app.initChainer)
-	// TODO: mounting multiple stores is broken
-	// https://github.com/cosmos/cosmos-sdk/issues/532
-	app.MountStoresIAVL(app.capKeyMainStore) // , app.capKeyIBCStore)
+	app.MountStoresIAVL(app.capKeyMainStore, app.capKeyIBCStore)
 	app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper))
 	err := app.LoadLatestVersion(app.capKeyMainStore)
 	if err != nil {