Merge pull request #1976 from irisnet/release0.15

R4R: Release version v0.15.2

Author: zhangyelong

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*

app/app.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/irisnet/irishub/app/protocol"
-	"github.com/irisnet/irishub/app/v0"
-	"github.com/irisnet/irishub/app/v1"
+	v0 "github.com/irisnet/irishub/app/v0"
+	v1 "github.com/irisnet/irishub/app/v1"
 	"github.com/irisnet/irishub/codec"
 	"github.com/irisnet/irishub/modules/auth"
 	"github.com/irisnet/irishub/store"
@@ -61,13 +61,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

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())
 }

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

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
 :::
 
 ## 服务器配置要求

lite/swagger-ui/swagger.yaml

@@ -4,7 +4,7 @@ info:
   description: >-
     A REST interface for state queries, transaction generation and
     broadcast.
-  version: "0.15.1"
+  version: "0.15.2"
   title: IRISLCD Swagger-UI
   termsOfService: 'https://www.irisnet.org'
   contact:

version/version.go

@@ -10,7 +10,7 @@ import (
 
 // Version - Iris Version
 const ProtocolVersion = 1
-const Version = "0.15.1"
+const Version = "0.15.2"
 
 // GitCommit set by build flags
 var GitCommit = ""