Merge pull request #1986 from irisnet/vincent/master-cherry-pick

R4R: Merge all v0.15.2 commits
irisnet · Sep 16, 2019 · d7974f4 · d7974f4
2 parents f8a36e3 + d83993d
commit d7974f4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.15.2
+
+*Sep 11th, 2019*
+
+### Application
+* [\#1940](https://github.com/irisnet/irishub/pull/1940) Do not update gov params when network not equal mainnet
+* [\#1945](https://github.com/irisnet/irishub/pull/1945) Fix protocol loading on replay-last-block
+
 ## 0.15.1
 
 *Aug 22th, 2019*

diff --git a/app/app.go b/app/app.go
@@ -62,13 +62,6 @@ func NewIrisApp(logger log.Logger, db dbm.DB, config *cfg.InstrumentationConfig,
 	if viper.GetBool(FlagReplay) {
 		lastHeight := Replay(app.Logger)
 		err = app.LoadVersion(lastHeight, protocol.KeyMain, true)
-
-		// If reset to another protocol version, should reload Protocol and reset txDecoder
-		loaded, current := app.Engine.LoadCurrentProtocol(app.GetKVStore(protocol.KeyMain))
-		if !loaded {
-			cmn.Exit(fmt.Sprintf("Your software doesn't support the required protocol (version %d)!", current))
-		}
-		app.BaseApp.txDecoder = auth.DefaultTxDecoder(app.Engine.GetCurrentProtocol().GetCodec())
 	} else {
 		err = app.LoadLatestVersion(protocol.KeyMain)
 	} // app is now sealed

diff --git a/app/v1/gov/keeper.go b/app/v1/gov/keeper.go
@@ -832,5 +832,8 @@ func (keeper Keeper) HasReachedTheMaxProposalNum(ctx sdk.Context, p ProposalLeve
 }
 
 func (keeper Keeper) Init(ctx sdk.Context) {
+	if sdk.NetworkType != sdk.Mainnet {
+		return
+	}
 	keeper.SetParamSet(ctx, DefaultParams())
 }
diff --git a/docs/software/How-to-install-irishub.md b/docs/software/How-to-install-irishub.md
@@ -2,10 +2,10 @@
 
 ## Latest Version
 
-The Latest version of IRIShub is [v0.15.1](https://github.com/irisnet/irishub/releases/latest)
+The Latest version of IRIShub is [v0.15.2](https://github.com/irisnet/irishub/releases/latest)
 
 ::: tip
-Please replace <latest_iris_version> below with v0.15.1
+Please replace <latest_iris_version> below with v0.15.2
 :::
 
 ## Configure Your Server

diff --git a/docs/zh/software/How-to-install-irishub.md b/docs/zh/software/How-to-install-irishub.md
@@ -2,10 +2,10 @@
 
 ## 最新版本
 
-当前IRIShub最新版本为 [v0.15.1](https://github.com/irisnet/irishub/releases/latest)
+当前IRIShub最新版本为 [v0.15.2](https://github.com/irisnet/irishub/releases/latest)
 
 ::: tip
-请将下文中的 <latest_iris_version> 替换为 v0.15.1
+请将下文中的 <latest_iris_version> 替换为 v0.15.2
 :::
 
 ## 服务器配置要求