Update Tendermint and bump version

MinterTeam · Oct 24, 2018 · 8ea94d8 · 8ea94d8
1 parent 7cbb2d9
commit 8ea94d8
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 49 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -47,11 +47,11 @@
 
 [[constraint]]
   name = "github.com/danil-lashin/iavl"
-  branch = "master"
+  branch = "develop"
 
 [[constraint]]
   name = "github.com/tendermint/tendermint"
-  version = "=v0.25.1-rc0"
+  branch = "develop"
 
 [[constraint]]
   branch = "v1"

diff --git a/api/api.go b/api/api.go
@@ -31,7 +31,7 @@ var (
 
 const (
 	SimultReqLimit = 100
-	LimitPerClient = 100
+	LimitPerClient = 300
 	LimitWindow    = 1 * time.Minute
 )
 

diff --git a/api/block.go b/api/block.go
@@ -113,9 +113,7 @@ func Block(w http.ResponseWriter, r *http.Request) {
 
 	precommits, _ := cdc.MarshalJSON(block.Block.LastCommit.Precommits)
 
-	encodedBlock, _ := cdc.MarshalBinary(block)
-
-	size := len(encodedBlock)
+	size := len(cdc.MustMarshalBinaryLengthPrefixed(block))
 
 	var eventsRaw []byte
 

diff --git a/config/config.go b/config/config.go
@@ -7,6 +7,7 @@ import (
 	tmConfig "github.com/tendermint/tendermint/config"
 	"os"
 	"path/filepath"
+	"time"
 )
 
 var (
@@ -57,17 +58,16 @@ func DefaultConfig() *Config {
 	cfg.Mempool.CacheSize = 100000
 	cfg.Mempool.WalPath = "tmdata/mempool.wal"
 	cfg.Mempool.Recheck = true
-	cfg.Mempool.RecheckEmpty = true
 	cfg.Mempool.Size = 10000
 
 	cfg.Consensus.WalPath = "tmdata/cs.wal/wal"
-	cfg.Consensus.TimeoutPropose = 2000
-	cfg.Consensus.TimeoutProposeDelta = 500
-	cfg.Consensus.TimeoutPrevote = 1000
-	cfg.Consensus.TimeoutPrevoteDelta = 500
-	cfg.Consensus.TimeoutPrecommit = 1000
-	cfg.Consensus.TimeoutPrecommitDelta = 500
-	cfg.Consensus.TimeoutCommit = 4500
+	cfg.Consensus.TimeoutPropose = 2 * time.Second
+	cfg.Consensus.TimeoutProposeDelta = 500 * time.Millisecond
+	cfg.Consensus.TimeoutPrevote = 1 * time.Second
+	cfg.Consensus.TimeoutPrevoteDelta = 500 * time.Millisecond
+	cfg.Consensus.TimeoutPrecommit = 1 * time.Second
+	cfg.Consensus.TimeoutPrecommitDelta = 500 * time.Millisecond
+	cfg.Consensus.TimeoutCommit = 4500 * time.Millisecond
 
 	cfg.PrivValidator = "config/priv_validator.json"
 

diff --git a/config/toml.go b/config/toml.go
@@ -158,7 +158,7 @@ addr_book_file = "{{ js .P2P.AddrBook }}"
 addr_book_strict = {{ .P2P.AddrBookStrict }}
 
 # Time to wait before flushing messages out on the connection, in ms
-flush_throttle_timeout = {{ .P2P.FlushThrottleTimeout }}
+flush_throttle_timeout = "{{ .P2P.FlushThrottleTimeout }}"
 
 # Maximum number of inbound peers
 max_num_inbound_peers = {{ .P2P.MaxNumInboundPeers }}
@@ -191,7 +191,6 @@ private_peer_ids = "{{ .P2P.PrivatePeerIDs }}"
 [mempool]
 
 recheck = {{ .Mempool.Recheck }}
-recheck_empty = {{ .Mempool.RecheckEmpty }}
 broadcast = {{ .Mempool.Broadcast }}
 wal_dir = "{{ js .Mempool.WalPath }}"
 

diff --git a/core/minter/minter.go b/core/minter/minter.go
@@ -378,7 +378,7 @@ func (app *Blockchain) getCurrentValidators() abciTypes.ValidatorUpdates {
 
 	var vals abciTypes.ValidatorUpdates
 
-	err := cdc.UnmarshalBinary(result, &vals)
+	err := cdc.UnmarshalBinaryLengthPrefixed(result, &vals)
 
 	if err != nil {
 		panic(err)
@@ -388,7 +388,7 @@ func (app *Blockchain) getCurrentValidators() abciTypes.ValidatorUpdates {
 }
 
 func (app *Blockchain) saveCurrentValidators(vals abciTypes.ValidatorUpdates) {
-	data, err := cdc.MarshalBinary(vals)
+	data, err := cdc.MarshalBinaryLengthPrefixed(vals)
 
 	if err != nil {
 		panic(err)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.4"
 services:
   minter:
-    image: minterteam/minter:0.5.2
+    image: minterteam/minter:0.6.0
     volumes:
       - ~/.minter:/minter
     ports:

diff --git a/eventsdb/eventsdb.go b/eventsdb/eventsdb.go
@@ -109,7 +109,7 @@ func (db *EventsDB) FlushEvents(height int64) error {
 	}
 
 	events := db.getEvents(height)
-	bytes, err := cdc.MarshalBinary(events)
+	bytes, err := cdc.MarshalBinaryLengthPrefixed(events)
 
 	if err != nil {
 		return err
@@ -135,7 +135,7 @@ func (db *EventsDB) LoadEvents(height int64) Events {
 	}
 
 	var decoded Events
-	err := cdc.UnmarshalBinary(data, &decoded)
+	err := cdc.UnmarshalBinaryLengthPrefixed(data, &decoded)
 
 	if err != nil {
 		panic(err)

diff --git a/version/version.go b/version/version.go
@@ -3,13 +3,13 @@ package version
 // Version components
 const (
 	Maj = "0"
-	Min = "5"
-	Fix = "2"
+	Min = "6"
+	Fix = "0"
 )
 
 var (
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.5.2"
+	Version = "0.6.0"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string