Merge pull request #2060 from irisnet/yelong/resolve-conflicts

R4R: Resolve merge conflicts

go.mod

@@ -33,8 +33,8 @@ require (
 )
 
 replace (
-	github.com/tendermint/iavl => github.com/irisnet/iavl v0.8.2-0.20190905023710-abef11e7f66b
-	github.com/tendermint/tendermint => github.com/irisnet/tendermint v0.28.1-0.20191030084935-cc25237a944f
+	github.com/tendermint/iavl => github.com/irisnet/iavl v0.12.3
+	github.com/tendermint/tendermint => github.com/irisnet/tendermint v0.32.0
 	golang.org/x/crypto => github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5
 )
 

go.sum

@@ -78,10 +78,14 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/irisnet/iavl v0.8.2-0.20190905023710-abef11e7f66b h1:eWPT4ErSsRNoytA3H1LpfpN9gnLY5V1xcNop/au4hDM=
 github.com/irisnet/iavl v0.8.2-0.20190905023710-abef11e7f66b/go.mod h1:qofGh9236iFgVez+gPk7bC+ef5wCw7aIMvAVBK3lT84=
+github.com/irisnet/iavl v0.12.3 h1:AYqI1q/EVAOCWznYx4FtEZIq8x9yPBs9ZA/Rk3zsTDo=
+github.com/irisnet/iavl v0.12.3/go.mod h1:qofGh9236iFgVez+gPk7bC+ef5wCw7aIMvAVBK3lT84=
 github.com/irisnet/tendermint v0.22.3-0.20190905014850-7daf474ce5c0 h1:8n4tArruFdsornnNQirxKsv2Sx1zSCvkv84k3kHfw4s=
 github.com/irisnet/tendermint v0.22.3-0.20190905014850-7daf474ce5c0/go.mod h1:C20fnkXbfqksBfyG2IDD94I+FDimvKNRA08YfUEv4Uw=
 github.com/irisnet/tendermint v0.28.1-0.20191030084935-cc25237a944f h1:b/4iFG4zoJPt0HZwSgso9V21CDI84xAebdQLO92QrzI=
 github.com/irisnet/tendermint v0.28.1-0.20191030084935-cc25237a944f/go.mod h1:36RAXv6V/Ar3H6ofEtmtxU2u80tYRdQh1z51gxoG9Nk=
+github.com/irisnet/tendermint v0.32.0 h1:+NFxoUzVq67LLnAtM8hIkeqTRji3hJOUip+T3/ZHU6A=
+github.com/irisnet/tendermint v0.32.0/go.mod h1:36RAXv6V/Ar3H6ofEtmtxU2u80tYRdQh1z51gxoG9Nk=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U=
 github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ=

version/version.go

@@ -11,7 +11,7 @@ import (
 
 // Version - Iris Version
 const ProtocolVersion = 2
-const Version = "0.16.0-dev"
+const Version = "0.16.0-rc0"
 
 // GitCommit set by build flags
 var GitCommit = ""