diff --git a/Gopkg.lock b/Gopkg.lock
index cbbe4ffe8..a2c7c07b6 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -647,8 +647,8 @@
   source = "https://github.com/irisnet/iavl.git"
 
 [[projects]]
-  branch = "irisnet/v0.27.0-dev1-iris"
-  digest = "1:0be8656e9d8eb385caa0f30b71158126b6b4294a3c8fb6f0eb5aab350bd74712"
+  branch = "irisnet/v0.27.0-iris"
+  digest = "1:3f99f19e5edfd0d3b9cbfd6e687be1d02af05f84e3d0c7fb2c861ac1739bfae8"
   name = "github.com/tendermint/tendermint"
   packages = [
     "abci/client",
@@ -713,7 +713,7 @@
     "version",
   ]
   pruneopts = "UT"
-  revision = "9dd2007de1363fa77f11f71d30b59e747d2c3d99"
+  revision = "b31a2e724c0b0df951d792c16c69f0c539783dcc"
   source = "https://github.com/irisnet/tendermint.git"
 
 [[projects]]
diff --git a/Gopkg.toml b/Gopkg.toml
index 9355de3e7..0c7dff41d 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -33,7 +33,7 @@
 [[override]]
   name = "github.com/tendermint/tendermint"
   source = "https://github.com/irisnet/tendermint.git"
-  branch = "irisnet/v0.27.0-dev1-iris"
+  branch = "irisnet/v0.27.0-iris"
 
 [[constraint]]
   name = "github.com/emicklei/proto"
diff --git a/app/v0/protocol_v0.go b/app/v0/protocol_v0.go
index a84a5f444..073ae5599 100644
--- a/app/v0/protocol_v0.go
+++ b/app/v0/protocol_v0.go
@@ -191,7 +191,8 @@ func (p *ProtocolVersion0) configRouters() {
 		AddRoute("service", service.NewHandler(p.serviceKeeper)).
 		AddRoute("guardian", guardian.NewHandler(p.guardianKeeper))
 	p.queryRouter.
-		AddRoute("gov", gov.NewQuerier(p.govKeeper))
+		AddRoute("gov", gov.NewQuerier(p.govKeeper)).
+		AddRoute("stake", stake.NewQuerier(p.StakeKeeper, p.cdc))
 }
 
 // configure all Stores
diff --git a/modules/mock/baseapp/replay.go b/modules/mock/baseapp/replay.go
deleted file mode 100644
index af8ada573..000000000
--- a/modules/mock/baseapp/replay.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package baseapp
-
-import (
-	"fmt"
-	"github.com/irisnet/irishub/server"
-	"github.com/spf13/viper"
-	bc "github.com/tendermint/tendermint/blockchain"
-	tmcli "github.com/tendermint/tendermint/libs/cli"
-	dbm "github.com/tendermint/tendermint/libs/db"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/node"
-	sm "github.com/tendermint/tendermint/state"
-)
-
-func Replay(logger log.Logger) int64 {
-	ctx := server.NewDefaultContext()
-	ctx.Config.RootDir = viper.GetString(tmcli.HomeFlag)
-	dbContext := node.DBContext{"state", ctx.Config}
-	dbType := dbm.DBBackendType(dbContext.Config.DBBackend)
-	stateDB := dbm.NewDB(dbContext.ID, dbType, dbContext.Config.DBDir())
-
-	blockDBContext := node.DBContext{"blockstore", ctx.Config}
-	blockStoreDB := dbm.NewDB(blockDBContext.ID, dbType, dbContext.Config.DBDir())
-	blockStore := bc.NewBlockStore(blockStoreDB)
-
-	defer func() {
-		stateDB.Close()
-		blockStoreDB.Close()
-	}()
-
-	curState := sm.LoadState(stateDB)
-	preState := sm.LoadPreState(stateDB)
-	if curState.LastBlockHeight == preState.LastBlockHeight {
-		panic(fmt.Errorf("there is no block now, can't replay"))
-	}
-	var loadHeight int64
-	if blockStore.Height() == curState.LastBlockHeight {
-		logger.Info(fmt.Sprintf("blockstore height equals to current state height %d", curState.LastBlockHeight))
-		logger.Info("Just reset state DB to last height")
-		sm.SaveState(stateDB, preState)
-		loadHeight = preState.LastBlockHeight
-	} else if blockStore.Height() == curState.LastBlockHeight+1 {
-		logger.Info(fmt.Sprintf("blockstore height %d, current state height %d", blockStore.Height(), curState.LastBlockHeight))
-		logger.Info(fmt.Sprintf("Retreat block %d in block store and reset state DB to last height", blockStore.Height()))
-		blockStore.RetreatLastBlock()
-		sm.SaveState(stateDB, preState)
-		loadHeight = preState.LastBlockHeight
-	} else {
-		panic(fmt.Errorf("tendermint block store height should be at most one ahead of the its state height"))
-	}
-
-	return loadHeight
-}