From 33af8ee7e8e598ac8e8f3616ed60f132bcbc193e Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Sun, 20 May 2018 10:35:19 -0400 Subject: [PATCH 1/3] update to tm v0.19.5 --- CHANGELOG.md | 6 ++++++ Gopkg.lock | 24 ++++++++++++------------ Gopkg.toml | 6 +++++- client/tx/search.go | 7 +++++-- version/version.go | 4 ++-- 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c0bb7fb..f687a805b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.17.2 + +*May 20, 2018* + +Update to Tendermint v0.19.5 (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 index 1bb4ec31a..1f5a44412 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -11,7 +11,7 @@ branch = "master" name = "github.com/btcsuite/btcd" packages = ["btcec"] - revision = "675abc5df3c5531bc741b56a765e35623459da6d" + revision = "1432d294a5b055c297457c25434efbf13384cc46" [[projects]] name = "github.com/davecgh/go-spew" @@ -82,7 +82,7 @@ branch = "master" name = "github.com/golang/snappy" packages = ["."] - revision = "553a641470496b2327abcac10b36396bd98e45c9" + revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a" [[projects]] name = "github.com/gorilla/context" @@ -146,8 +146,8 @@ [[projects]] name = "github.com/magiconair/properties" packages = ["."] - revision = "c3beff4c2358b44d0493c7dda585e7db7ff28ae6" - version = "v1.7.6" + revision = "c2353362d570a7bfa228149c62842019201cfb71" + version = "v1.8.0" [[projects]] name = "github.com/mattn/go-isatty" @@ -203,8 +203,8 @@ [[projects]] name = "github.com/spf13/cobra" packages = ["."] - revision = "a1f051bc3eba734da4772d60e2d677f47cf93ef4" - version = "v0.0.2" + revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" + version = "v0.0.3" [[projects]] branch = "master" @@ -250,7 +250,7 @@ "leveldb/table", "leveldb/util" ] - revision = "9637fa0b2f0db13c99d899b91007edb7df4610b7" + revision = "e6d6b529196422703d54ff5c40e79809ec2020b3" [[projects]] name = "github.com/tendermint/abci" @@ -341,8 +341,8 @@ "types/priv_validator", "version" ] - revision = "19ccd1842fe5efffcc2ff32e6cfc127ca0cd1f9b" - version = "v0.19.4-rc0" + revision = "0a9dc9f875c5ed870473be8541ea25a4451a2081" + version = "v0.19.5-rc0" [[projects]] name = "github.com/tendermint/tmlibs" @@ -376,7 +376,7 @@ "ripemd160", "salsa20/salsa" ] - revision = "2fc4c88bf43f0ea5ea305eae2b7af24b2cc93287" + revision = "1a580b3eff7814fc9b40602fd35256c63b50f491" [[projects]] branch = "master" @@ -390,7 +390,7 @@ "internal/timeseries", "trace" ] - revision = "2491c5de3490fced2f6cff376127c667efeed857" + revision = "57065200b4b034a1c8ad54ff77069408c2218ae6" [[projects]] branch = "master" @@ -457,6 +457,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "8c37fee3e6d3034b865c68185f4796223fe53b1b0ee4a305adbee5f53c50bfce" + inputs-digest = "63ff18162a6af4204ffa7348af0999fbdd92b4c219562e58d19603410aa4a01a" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 13060b061..fb2d8efad 100644 --- 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-rc0" [[override]] name = "github.com/tendermint/tmlibs" diff --git a/client/tx/search.go b/client/tx/search.go index 3e3b1daa6..527661626 100644 --- 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 index 76b0370a4..ea365bda9 100644 --- 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 = "" From 9cd44d17b1633172e6f634b587ae0d1e843013e9 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Sun, 20 May 2018 16:49:02 -0400 Subject: [PATCH 2/3] update tendermint --- Gopkg.lock | 6 +++--- Gopkg.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 1f5a44412..37a32820c 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -341,8 +341,8 @@ "types/priv_validator", "version" ] - revision = "0a9dc9f875c5ed870473be8541ea25a4451a2081" - version = "v0.19.5-rc0" + revision = "018e096748bafe1d2d1e69b909e4158f3b26f6b2" + version = "v0.19.5-rc1" [[projects]] name = "github.com/tendermint/tmlibs" @@ -457,6 +457,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "63ff18162a6af4204ffa7348af0999fbdd92b4c219562e58d19603410aa4a01a" + inputs-digest = "7540d2ecdb5d7d5084ab4e6132e929bbd501bd6add3006d8f08a6b2c127e0c7d" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index fb2d8efad..5480bc03f 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -74,7 +74,7 @@ [[constraint]] name = "github.com/tendermint/tendermint" - version = "0.19.5-rc0" + version = "0.19.5-rc1" [[override]] name = "github.com/tendermint/tmlibs" From 5b7b76fbd9196f739a5772be817eef0717e8aba6 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Sun, 20 May 2018 16:56:41 -0400 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f687a805b..7b0853dc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ *May 20, 2018* -Update to Tendermint v0.19.5 (bound the mempool and some rpcs, improve logging) +Update to Tendermint v0.19.5 (reduce WAL use, bound the mempool and some rpcs, improve logging) ## 0.17.1 (May 17, 2018)