Merge pull request #1356 from irisnet/release0.13

R4R: release version v0.13.0-rc0

Author: HaoyangLiu

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.13.0-rc0
+
+*March 13th, 2019*
+
+- [iris] fix unexpect coin flow if tx is out of gas
+- [iris] Improve error message for insufficient balance
+- [iris] Add pagination params for lcd validators query
+- [iris] Check the validator existence and validator status before getting its pubkey
+- [iris] Reset the init value for metrics
+
+- [tendermint] Fix consensus round issue
+- [tendermint] Fix the bug of update the LRU cache
+- [tendermint] Add maximum msg size in CheckTx
+
+
 ## 0.12.3
 
 *February 27th, 2019*

Gopkg.lock

@@ -32,7 +32,7 @@
 [[override]]
   name = "github.com/tendermint/tendermint"
   source = "https://github.com/irisnet/tendermint.git"
-  version = "=v0.27.3-iris7"
+  version = "=v0.27.3-iris8"
 
 [[constraint]]
   name = "github.com/emicklei/proto"

Gopkg.toml

@@ -80,7 +80,7 @@ func NewIrisApp(logger log.Logger, db dbm.DB, config *cfg.InstrumentationConfig,
 		cmn.Exit(fmt.Sprintf("Your software doesn't support the required protocol (version %d)!", current))
 	}
 	app.BaseApp.txDecoder = auth.DefaultTxDecoder(engine.GetCurrentProtocol().GetCodec())
-
+	engine.GetCurrentProtocol().InitMetrics(app.cms)
 	return app
 }
 

app/app.go

@@ -736,7 +736,7 @@ func (app *BaseApp) runTx(mode RunTxMode, txBytes []byte, tx sdk.Tx) (result sdk
 				result = sdk.ErrInternal(log).Result()
 			}
 		}
-
+		ctx.CoinFlowTags().TagClean()
 		result.GasWanted = gasWanted
 		result.GasUsed = ctx.GasMeter().GasConsumed()
 	}()
@@ -836,8 +836,6 @@ func (app *BaseApp) runTx(mode RunTxMode, txBytes []byte, tx sdk.Tx) (result sdk
 	if result.IsOK() {
 		msCache.Write()
 		ctx.CoinFlowTags().TagWrite()
-	} else {
-		ctx.CoinFlowTags().TagClean()
 	}
 
 	return

app/baseapp.go

@@ -26,4 +26,5 @@ type Protocol interface {
 	Load()
 	Init()
 	GetCodec() *codec.Codec
+	InitMetrics(store sdk.CommitMultiStore) // init metrics
 }

app/protocol/types.go

@@ -102,6 +102,11 @@ func (p *ProtocolV0) GetCodec() *codec.Codec {
 	return p.cdc
 }
 
+func (p *ProtocolV0) InitMetrics(store sdk.CommitMultiStore){
+	p.StakeKeeper.InitMetrics(store.GetKVStore(protocol.KeyStake))
+	p.serviceKeeper.InitMetrics(store.GetKVStore(protocol.KeyService))
+}
+
 func (p *ProtocolV0) configCodec() {
 	p.cdc = MakeCodec()
 }

app/v0/protocol_v0.go

@@ -214,7 +214,26 @@ func delegatorValidatorHandlerFn(cliCtx context.CLIContext, cdc *codec.Codec) ht
 // HTTP request handler to query list of validators
 func validatorsHandlerFn(cliCtx context.CLIContext, cdc *codec.Codec) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		res, err := cliCtx.QueryWithData("custom/stake/validators", nil)
+		err := r.ParseForm()
+		if err != nil {
+			utils.WriteErrorResponse(w, http.StatusBadRequest, sdk.AppendMsgToErr("could not parse query parameters", err.Error()))
+			return
+		}
+		pageStr := r.FormValue("page")
+		sizeStr := r.FormValue("size")
+		params, err := ConvertPaginationParams(pageStr, sizeStr)
+		if err != nil {
+			utils.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
+			return
+		}
+
+		bz, err := cdc.MarshalJSON(params)
+		if err != nil {
+			utils.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
+			return
+		}
+
+		res, err := cliCtx.QueryWithData("custom/stake/validators", bz)
 		if err != nil {
 			utils.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
 			return

client/stake/lcd/query.go

@@ -3,6 +3,7 @@ package lcd
 import (
 	"fmt"
 	"net/http"
+	"strconv"
 
 	"github.com/gorilla/mux"
 	"github.com/irisnet/irishub/client/context"
@@ -315,3 +316,25 @@ func queryValidator(cliCtx context.CLIContext, cdc *codec.Codec, endpoint string
 		utils.PostProcessResponse(w, cdc, res, cliCtx.Indent)
 	}
 }
+
+func ConvertPaginationParams(pageString, sizeString string) (paginationParams sdk.PaginationParams, err error) {
+	page := uint64(0)
+	size := uint16(100)
+	if pageString != "" {
+		page, err = strconv.ParseUint(pageString, 10, 64)
+		if err != nil {
+			err = fmt.Errorf("page '%s' is not a valid uint64", pageString)
+			return paginationParams, err
+		}
+	}
+	if sizeString != "" {
+		sizeUint64, err := strconv.ParseUint(sizeString, 10, 16)
+		if err != nil {
+			err = fmt.Errorf("size '%s' is not a valid uint16", sizeString)
+			return paginationParams, err
+		}
+		size = uint16(sizeUint64)
+	}
+	paginationParams = sdk.NewPaginationParams(page, size)
+	return paginationParams, err
+}

client/stake/lcd/utils.go

@@ -33,7 +33,7 @@ func SearchTxCmd(cdc *codec.Codec) *cobra.Command {
 		Long: strings.TrimSpace(`
 Search for transactions that match exactly the given tags. For example:
 
-$ iriscli query txs --tags '<tag1>:<value1>&<tag2>:<value2>'
+$ iriscli tendermint txs --tags '<tag1>:<value1>&<tag2>:<value2>'
 `),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			tagsStr := viper.GetString(flagTags)