Merge pull request #810 from HaoyangLiu/develop-stake

Fix stake query bugs and upgrade tendermint to 0.27.0
irisnet · Dec 11, 2018 · 499da01 · 499da01
2 parents 1c5af82 + 06ed77c
commit 499da01
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 58 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git 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
@@ -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