Merge pull request #1030 from cosmos/bucky/tm-0.19.5

ebuchman · web-flow · commit 187be1a5df81 · 2018-05-20T17:02:35.000-04:00
Bucky/tm 0.19.5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.17.2
+
+*May 20, 2018*
+
+Update to Tendermint v0.19.5 (reduce WAL use, bound the mempool and some rpcs, improve logging)
+
 ## 0.17.1 (May 17, 2018)
 
 Update to Tendermint v0.19.4 (fixes a consensus bug and improves logging)
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -60,6 +60,10 @@
   name = "github.com/tendermint/go-crypto"
   version = "~0.6.2"
 
+[[override]]
+  name = "github.com/tendermint/go-wire"
+  version = "0.7.3"
+
 [[constraint]]
   name = "github.com/tendermint/go-amino"
   version = "~0.9.9"
@@ -70,7 +74,7 @@
 
 [[constraint]]
   name = "github.com/tendermint/tendermint"
-  version = "0.19.4-rc0"
+  version = "0.19.5-rc1"
 
 [[override]]
   name = "github.com/tendermint/tmlibs"
diff --git a/client/tx/search.go b/client/tx/search.go
@@ -61,12 +61,15 @@ func searchTx(ctx context.CoreContext, cdc *wire.Codec, tags []string) ([]byte,
 	}
 
 	prove := !viper.GetBool(client.FlagTrustNode)
-	res, err := node.TxSearch(query, prove)
+	// TODO: take these as args
+	page := 0
+	perPage := 100
+	res, err := node.TxSearch(query, prove, page, perPage)
 	if err != nil {
 		return nil, err
 	}
 
-	info, err := formatTxResults(cdc, res)
+	info, err := formatTxResults(cdc, res.Txs)
 	if err != nil {
 		return nil, err
 	}
diff --git a/version/version.go b/version/version.go
@@ -7,9 +7,9 @@ package version
 
 const Maj = "0"
 const Min = "17"
-const Fix = "1"
+const Fix = "2"
 
-const Version = "0.17.1"
+const Version = "0.17.2"
 
 // GitCommit set by build flags
 var GitCommit = ""

Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,15 @@ func searchTx(ctx context.CoreContext, cdc *wire.Codec, tags []string) ([]byte,`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`prove := !viper.GetBool(client.FlagTrustNode)`
`64`		`- res, err := node.TxSearch(query, prove)`
	`64`	`+ // TODO: take these as args`
	`65`	`+ page := 0`
	`66`	`+ perPage := 100`
	`67`	`+ res, err := node.TxSearch(query, prove, page, perPage)`
`65`	`68`	`if err != nil {`
`66`	`69`	`return nil, err`
`67`	`70`	`}`
`68`	`71`
`69`		`- info, err := formatTxResults(cdc, res)`
	`72`	`+ info, err := formatTxResults(cdc, res.Txs)`
`70`	`73`	`if err != nil {`
`71`	`74`	`return nil, err`
`72`	`75`	`}`