From c3ea9f6552af0ddf52e7e576ba873ccd564603b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Husiaty=C5=84ski?= Date: Wed, 9 Jan 2019 12:55:33 +0100 Subject: [PATCH] Tendermint upgrade (#266) * tendermint upgraded to 0.27.4 Tendermint is upgraded to 0.27.4. This change introduce a regression in weave/store/iavl package. * Upgrade to iavl v0.12 for breaking ReverseIterator change * update genesis for compliance with tendermint 0.27.4 Upgrade of tendermint to version 0.27.4 requires update of the genesis file in order to work again. * upgrade tendermint version in tests --- .travis.yml | 2 +- Gopkg.lock | 59 +++++++++++---------------- Gopkg.toml | 6 +-- cmd/bnsd/client/testdata/genesis.json | 9 ++-- cmd/bnsd/client/testdata/wallets.json | 8 +++- 5 files changed, 41 insertions(+), 43 deletions(-) diff --git a/.travis.yml b/.travis.yml index 742a1bef..f78743e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ go: env: - GORACE="halt_on_error=1" BUILD_VERSION=$(echo ${TRAVIS_COMMIT} | cut -c 1-10) - TM_VERSION=v0.25.0 + TM_VERSION=v0.27.4 FORCE_TM_TEST=1 install: diff --git a/Gopkg.lock b/Gopkg.lock index 355d0c55..9596ef61 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -33,13 +33,6 @@ revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" version = "v1.1.1" -[[projects]] - digest = "1:c7644c73a3d23741fdba8a99b1464e021a224b7e205be497271a8003a15ca41b" - name = "github.com/ebuchman/fail-test" - packages = ["."] - pruneopts = "UT" - revision = "95f809107225be108efcf10a3509e4ea6ceef3c4" - [[projects]] digest = "1:fdf5169073fb0ad6dc12a70c249145e30f4058647bea25f0abd48b6d9f228a11" name = "github.com/go-kit/kit" @@ -232,14 +225,16 @@ version = "v1.0.0" [[projects]] - digest = "1:c1a04665f9613e082e1209cf288bf64f4068dcd6c87a64bf1c4ff006ad422ba0" + digest = "1:93a746f1060a8acbcf69344862b2ceced80f854170e1caae089b2834c5fbf7f4" name = "github.com/prometheus/client_golang" packages = [ "prometheus", + "prometheus/internal", "prometheus/promhttp", ] pruneopts = "UT" - revision = "ae27198cdd90bf12cd134ad79d1366a6cf49f632" + revision = "505eaef017263e299324067d40ca2c48f6a2cf50" + version = "v0.9.2" [[projects]] branch = "master" @@ -281,6 +276,14 @@ pruneopts = "UT" revision = "e2704e165165ec55d062f5919b4b29494e9fa790" +[[projects]] + digest = "1:b0c25f00bad20d783d259af2af8666969e2fc343fa0dc9efe52936bbd67fb758" + name = "github.com/rs/cors" + packages = ["."] + pruneopts = "UT" + revision = "9a47f48565a795472d43519dd49aac781f3034fb" + version = "v1.6.0" + [[projects]] digest = "1:cc1c574c9cb5e99b123888c12b828e2d19224ab6c2244bda34647f230bf33243" name = "github.com/smartystreets/assertions" @@ -354,35 +357,23 @@ revision = "e5840949ff4fff0c56f9b6a541e22b63581ea9df" [[projects]] - branch = "master" - digest = "1:087aaa7920e5d0bf79586feb57ce01c35c830396ab4392798112e8aae8c47722" - name = "github.com/tendermint/ed25519" - packages = [ - ".", - "edwards25519", - "extra25519", - ] - pruneopts = "UT" - revision = "d8387025d2b9d158cf4efb07e7ebf814bcce2057" - -[[projects]] - digest = "1:2c971a45c89ca2ccc735af50919cdee05fbdc54d4bf50625073693300e31ead8" + digest = "1:ad9c4c1a4e7875330b1f62906f2830f043a23edb5db997e3a5ac5d3e6eadf80a" name = "github.com/tendermint/go-amino" packages = ["."] pruneopts = "UT" - revision = "faa6e731944e2b7b6a46ad202902851e8ce85bee" - version = "v0.12.0" + revision = "dc14acf9ef15f85828bfbc561ed9dd9d2a284885" + version = "v0.14.1" [[projects]] - digest = "1:53397098d6acb7613358683cc84ae59281a60c6033f0bff62fa8d3f279c6c430" + digest = "1:e1cc8dd891e64aab63b0c09f2f12456cbe2cd9cbd9d96dfae3281245f05c2428" name = "github.com/tendermint/iavl" packages = ["."] pruneopts = "UT" - revision = "3acc91fb8811db2c5409a855ae1f8e441fe98e2d" - version = "v0.11.0" + revision = "de0740903a67b624d887f9055d4c60175dcfa758" + version = "v0.12.0" [[projects]] - digest = "1:762ad42ae1b83714c78c2285826574c58f4ed712d05562076dd188e75cf38563" + digest = "1:34acd7597c3f233b3d5ba00a11be81e9e46c5ba525d9f71a10159ec5fa2ee128" name = "github.com/tendermint/tendermint" packages = [ "abci/client", @@ -407,8 +398,8 @@ "libs/clist", "libs/common", "libs/db", - "libs/errors", "libs/events", + "libs/fail", "libs/flowrate", "libs/log", "libs/pubsub", @@ -424,7 +415,6 @@ "rpc/core", "rpc/core/types", "rpc/grpc", - "rpc/lib", "rpc/lib/client", "rpc/lib/server", "rpc/lib/types", @@ -438,8 +428,8 @@ "version", ] pruneopts = "UT" - revision = "0c9c3292c918617624f6f3fbcd95eceade18bcd5" - version = "v0.25.0" + revision = "1e1ca15bccedc16c2452c73745c3c2b5df91ae96" + version = "v0.27.4" [[projects]] digest = "1:b97247853a9ddc82f593fbacff672b8cae8ae82d7bb9b91436098328703c476c" @@ -453,8 +443,7 @@ version = "v0.9.0" [[projects]] - branch = "master" - digest = "1:64523cd58deb8387038f0461d5f2600b9332edf215ac5eb5859bec7b042bc560" + digest = "1:b6621a5e9003d7d809993d49217a841d27ef85b4bc0459115d3fd1f8c1518999" name = "golang.org/x/crypto" packages = [ "chacha20poly1305", @@ -471,7 +460,7 @@ "salsa20/salsa", ] pruneopts = "UT" - revision = "e84da0312774c21d64ee2317962ef669b27ffb41" + revision = "505ab145d0a99da450461ae2c1a9f6cd10d1f447" [[projects]] digest = "1:d36f55a999540d29b6ea3c2ea29d71c76b1d9853fdcd3e5c5cb4836f2ba118f1" diff --git a/Gopkg.toml b/Gopkg.toml index 35ae9662..70d19729 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -44,15 +44,15 @@ required = ["github.com/gogo/protobuf/protoc-gen-gogofaster"] [[override]] name = "github.com/tendermint/tendermint" - version = "=0.25.0" + version = "=0.27.4" [[constraint]] name = "github.com/tendermint/iavl" - version = "=0.11.0" + version = "~0.12.0" [[override]] name = "github.com/tendermint/go-amino" - version = "0.12.0-rc0" + version = "~0.14.1" [prune] go-tests = true diff --git a/cmd/bnsd/client/testdata/genesis.json b/cmd/bnsd/client/testdata/genesis.json index 0c167726..b7cb7893 100644 --- a/cmd/bnsd/client/testdata/genesis.json +++ b/cmd/bnsd/client/testdata/genesis.json @@ -33,12 +33,15 @@ }, "chain_id": "test-chain-KqKNbF", "consensus_params": { - "block_size_params": { + "block_size": { "max_bytes": "22020096", "max_gas": "-1" }, - "evidence_params": { + "evidence": { "max_age": "100000" + }, + "validator": { + "pub_key_types": ["ed25519"] } }, "genesis_time": "2018-10-31T22:04:57.909689Z", @@ -53,4 +56,4 @@ "name": "" } ] -} \ No newline at end of file +} diff --git a/cmd/bnsd/client/testdata/wallets.json b/cmd/bnsd/client/testdata/wallets.json index a739ac7b..d21f092b 100644 --- a/cmd/bnsd/client/testdata/wallets.json +++ b/cmd/bnsd/client/testdata/wallets.json @@ -8,5 +8,11 @@ "address": "d4821fd051696273d09e1fbad0ebe5b5060787a7", "name": "bert" } - ] + ], + "consensus_params": { + "block_size": { + "max_bytes": "22020096", + "max_gas": "-1" + } + } }