Merge pull request #2833 from oasislabs/kostko/feature/tendermint-0.3…

…2.10 go/consensus/tendermint: Bump Tendermint Core to 0.32.10
oasisprotocol · Apr 10, 2020 · 43baaa6 · 43baaa6
2 parents 47191ec + d3b6335
commit 43baaa6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.changelog/2833.bugfix.md b/.changelog/2833.bugfix.md
@@ -0,0 +1 @@
+go/consensus/tendermint: Bump Tendermint Core to 0.32.10
diff --git a/go/go.mod b/go/go.mod
@@ -2,7 +2,7 @@ module github.com/oasislabs/oasis-core/go
 
 replace (
 	github.com/tendermint/iavl => github.com/oasislabs/iavl v0.12.0-ekiden3
-	github.com/tendermint/tendermint => github.com/oasislabs/tendermint v0.32.8-oasis3
+	github.com/tendermint/tendermint => github.com/oasislabs/tendermint v0.32.10-oasis1
 	golang.org/x/crypto/curve25519 => github.com/oasislabs/ed25519/extra/x25519 v0.0.0-20191022155220-a426dcc8ad5f
 	golang.org/x/crypto/ed25519 => github.com/oasislabs/ed25519 v0.0.0-20191109133925-b197a691e30d
 )

diff --git a/go/go.sum b/go/go.sum
@@ -358,8 +358,8 @@ github.com/oasislabs/iavl v0.12.0-ekiden3 h1:8544fXJb57urhAEpTlIwDBdTJukgpPS/FCS
 github.com/oasislabs/iavl v0.12.0-ekiden3/go.mod h1:B/tMpl5cg7n42n3xYQTCckJzQezoI75jedkc8FOiOF0=
 github.com/oasislabs/safeopen v0.0.0-20200117113835-6aa648f43ff8 h1:KC7dcrx0WEeyAWGAG+vdJjmIW36PUfw1x/LUnHjLm2E=
 github.com/oasislabs/safeopen v0.0.0-20200117113835-6aa648f43ff8/go.mod h1:ABsG2IHM7bpTRIH3EvQ8CZQEBkzuhLxXFxaYApYMB9Y=
-github.com/oasislabs/tendermint v0.32.8-oasis3 h1:vtvlWwTD2YMpQ3OTMWRCIdeEQmHVhJIG+4dhVl6QWz0=
-github.com/oasislabs/tendermint v0.32.8-oasis3/go.mod h1:uxexUd6P+G+Zg1yACNBycfcaV1dPI985r79I+IXP38w=
+github.com/oasislabs/tendermint v0.32.10-oasis1 h1:FWvXGA5TKug7KpjyQ8bu2yoZ10rJyqHia4/l4SAp7Dw=
+github.com/oasislabs/tendermint v0.32.10-oasis1/go.mod h1:uxexUd6P+G+Zg1yACNBycfcaV1dPI985r79I+IXP38w=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		go/consensus/tendermint: Bump Tendermint Core to 0.32.10