From aed1ca89aa8793628dfaa1102e7cd90c7fb59896 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 10 Jul 2018 12:20:22 -0400 Subject: [PATCH 1/3] update dep --- Gopkg.lock | 25 ++++++++++++------------- Gopkg.toml | 6 +++--- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 8794539880..cfb830b641 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -29,13 +29,13 @@ branch = "master" name = "github.com/btcsuite/btcd" packages = ["btcec"] - revision = "86fed781132ac890ee03e906e4ecd5d6fa180c64" + revision = "fdfc19097e7ac6b57035062056f5b7b4638b8898" [[projects]] branch = "master" name = "github.com/btcsuite/btcutil" packages = ["bech32"] - revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4" + revision = "ab6388e0c60ae4834a1f57511e20c17b5f78be4b" [[projects]] name = "github.com/davecgh/go-spew" @@ -137,7 +137,6 @@ ".", "hcl/ast", "hcl/parser", - "hcl/printer", "hcl/scanner", "hcl/strconv", "hcl/token", @@ -208,13 +207,13 @@ version = "v1.0.0" [[projects]] + branch = "master" name = "github.com/prometheus/client_golang" packages = [ "prometheus", "prometheus/promhttp" ] - revision = "c5b7fccd204277076155f10851dad72b76a49317" - version = "v0.8.0" + revision = "ae27198cdd90bf12cd134ad79d1366a6cf49f632" [[projects]] branch = "master" @@ -314,7 +313,7 @@ "leveldb/table", "leveldb/util" ] - revision = "0d5a0ceb10cf9ab89fdd744cc8c50a83134f6697" + revision = "c4c61651e9e37fa117f53c5a906d3b63090d8445" [[projects]] branch = "master" @@ -335,8 +334,8 @@ [[projects]] name = "github.com/tendermint/iavl" packages = ["."] - revision = "9e5dc3e61f70b285bb25414452d47aca1ff34c1d" - version = "v0.8.2-rc0" + revision = "35f66e53d9b01e83b30de68b931f54b2477a94c9" + version = "v0.9.2" [[projects]] name = "github.com/tendermint/tendermint" @@ -395,8 +394,8 @@ "types", "version" ] - revision = "5923b6288fe8ce9581936ee97c2bf9cf9c02c2f4" - version = "v0.22.0-rc2" + revision = "5ff65274b84ea905787a48512cc3124385bddf2f" + version = "v0.22.2" [[projects]] name = "github.com/zondax/ledger-goclient" @@ -434,13 +433,13 @@ "netutil", "trace" ] - revision = "ed29d75add3d7c4bf7ca65aac0c6df3d1420216f" + revision = "292b43bbf7cb8d35ddf40f8d5100ef3837cced3f" [[projects]] branch = "master" name = "golang.org/x/sys" packages = ["unix"] - revision = "151529c776cdc58ddbe7963ba9af779f3577b419" + revision = "1b2967e3c290b7c545b3db0deeda16e9be4f98a2" [[projects]] name = "golang.org/x/text" @@ -507,6 +506,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "13ad2a57b6942729e2d08b5c37810d62108aa64a335a4822fcff1ad992c0662b" + inputs-digest = "25f7ff2ef90e336bf69362a555ef21fb575dc808e892309a9e6b583e7b61fb2f" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 0a4d3b2f17..7ece2301a3 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -58,11 +58,11 @@ [[constraint]] name = "github.com/tendermint/iavl" - version = "=v0.8.2-rc0" + version = "=v0.9.2" -[[constraint]] +[[override]] name = "github.com/tendermint/tendermint" - version = "=0.22.0-rc2" + version = "=0.22.2" [[constraint]] name = "github.com/bartekn/go-bip39" From d226f1d62ef517183c405cd15c138a9ba5759325 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 10 Jul 2018 12:20:29 -0400 Subject: [PATCH 2/3] changelog, version --- CHANGELOG.md | 4 ++-- version/version.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 879eaacb0b..cb372e1fd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,14 @@ ## 0.20.0 -*TBD* +*July 10th, 2018* BREAKING CHANGES * msg.GetSignBytes() returns sorted JSON (by key) * msg.GetSignBytes() field changes * `msg_bytes` -> `msgs` * `fee_bytes` -> `fee` -* Update Tendermint to v0.22.0 +* Update Tendermint to v0.22.2 * Default ports changed from 466xx to 266xx * Amino JSON uses type names instead of prefix bytes * ED25519 addresses are the first 20-bytes of the SHA256 of the raw 32-byte diff --git a/version/version.go b/version/version.go index 4966455689..b9de4f9916 100644 --- a/version/version.go +++ b/version/version.go @@ -5,7 +5,7 @@ const Maj = "0" const Min = "20" const Fix = "0" -const Version = "0.20.0-dev" +const Version = "0.20.0" // GitCommit set by build flags var GitCommit = "" From 080dd5b97a90005cac0c730a81fd1d6864b9fd3e Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 10 Jul 2018 15:00:00 -0400 Subject: [PATCH 3/3] update protobuf to 1.1.0 --- Gopkg.lock | 10 ++++++---- Gopkg.toml | 9 ++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index cfb830b641..a98a7c86a8 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -103,8 +103,8 @@ "ptypes/duration", "ptypes/timestamp" ] - revision = "925541529c1fa6821df4e44ce2723319eb2be768" - version = "v1.0.0" + revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" + version = "v1.1.0" [[projects]] branch = "master" @@ -137,6 +137,7 @@ ".", "hcl/ast", "hcl/parser", + "hcl/printer", "hcl/scanner", "hcl/strconv", "hcl/token", @@ -463,9 +464,10 @@ version = "v0.3.0" [[projects]] + branch = "master" name = "google.golang.org/genproto" packages = ["googleapis/rpc/status"] - revision = "7fd901a49ba6a7f87732eb344f6e3c5b19d1b200" + revision = "e92b116572682a5b432ddd840aeaba2a559eeff1" [[projects]] name = "google.golang.org/grpc" @@ -506,6 +508,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "25f7ff2ef90e336bf69362a555ef21fb575dc808e892309a9e6b583e7b61fb2f" + inputs-digest = "33d51b55781a1579d2fde1bba70077b49c5804862ea56c72136f013c8498e0c6" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 7ece2301a3..bdc0faa344 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -28,9 +28,9 @@ name = "github.com/bgentry/speakeasy" version = "~0.1.0" -[[constraint]] +[[override]] name = "github.com/golang/protobuf" - version = "~1.0.0" + version = "=1.1.0" [[constraint]] name = "github.com/mattn/go-isatty" @@ -72,11 +72,6 @@ name = "github.com/zondax/ledger-goclient" revision = "065cbf938a16f20335c40cfe180f9cd4955c6a5a" -# this got updated and broke, so locked to an old working commit ... -[[override]] - name = "google.golang.org/genproto" - revision = "7fd901a49ba6a7f87732eb344f6e3c5b19d1b200" - [prune] go-tests = true unused-packages = true