Merge pull request #1901 from irisnet/release0.15

Release version v0.15.1

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.15.1
+
+*Aug 22th, 2019*
+
+### Application
+* [\#1895](https://github.com/irisnet/irishub/issues/1895) Run tendermint cleanupFunc before Exit
+* [\#1897](https://github.com/irisnet/irishub/issues/1897) Fix possible panic on exporting genesis file
+
 ## 0.15.0
 
 *Aug 20th, 2019*

app/v1/distribution/genesis.go

@@ -14,9 +14,6 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) {
 	}
 	keeper.SetParams(ctx, data.Params)
 
-	if !data.FeePool.ValPool.IsZero() {
-		panic(fmt.Sprintf("Global validator pool(%s) is not zero", data.FeePool.ValPool.ToString()))
-	}
 	keeper.SetGenesisFeePool(ctx, data.FeePool)
 
 	for _, vdi := range data.ValidatorDistInfos {

app/v1/distribution/keeper/keeper.go

@@ -54,9 +54,12 @@ func (k Keeper) GetFeePool(ctx sdk.Context) (feePool types.FeePool) {
 
 // set the global fee pool distribution info
 func (k Keeper) SetGenesisFeePool(ctx sdk.Context, feePool types.FeePool) {
-	//coins, _ := feePool.CommunityPool.TruncateDecimal()
-	//k.bankKeeper.IncreaseLoosenToken(ctx, coins)
-	//feePool.CommunityPool = types.NewDecCoins(coins)
+	if !feePool.ValPool.IsZero() {
+		coins, _ := feePool.ValPool.TruncateDecimal()
+		k.bankKeeper.IncreaseLoosenToken(ctx, coins)
+		feePool.ValPool = types.NewDecCoins(coins)
+	}
+
 	store := ctx.KVStore(k.storeKey)
 	b := k.cdc.MustMarshalBinaryLengthPrefixed(feePool)
 	store.Set(FeePoolKey, b)

app/v1/export.go

@@ -2,7 +2,6 @@ package v1
 
 import (
 	"encoding/json"
-	"fmt"
 
 	"github.com/irisnet/irishub/app/protocol"
 	"github.com/irisnet/irishub/app/v1/asset"
@@ -121,11 +120,6 @@ func (p *ProtocolV1) prepForZeroHeightGenesis(ctx sdk.Context) {
 	if !feePool.TotalValAccum.Accum.IsZero() {
 		panic("unexpected leftover validator accum")
 	}
-	bondDenom := p.StakeKeeper.BondDenom()
-	if !feePool.ValPool.AmountOf(bondDenom).IsZero() {
-		panic(fmt.Sprintf("unexpected leftover validator pool coins: %v",
-			feePool.ValPool.AmountOf(bondDenom).String()))
-	}
 
 	// reset fee pool height, save fee pool
 	feePool.TotalValAccum = distr.NewTotalAccum(0)

lite/swagger-ui/swagger.yaml

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

server/util.go

@@ -210,14 +210,17 @@ func TrapSignal(cleanupFunc func()) {
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
 		sig := <-sigs
+		if cleanupFunc != nil {
+			cleanupFunc()
+		}
+		exitCode := 128
 		switch sig {
-		case syscall.SIGTERM:
-			defer cleanupFunc()
-			os.Exit(128 + int(syscall.SIGTERM))
 		case syscall.SIGINT:
-			defer cleanupFunc()
-			os.Exit(128 + int(syscall.SIGINT))
+			exitCode += int(syscall.SIGINT)
+		case syscall.SIGTERM:
+			exitCode += int(syscall.SIGTERM)
 		}
+		os.Exit(exitCode)
 	}()
 }
 

version/version.go

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