Fix Merge pull request #319

consensus/replay.go

@@ -100,7 +100,9 @@ func (cs *ConsensusState) catchupReplay(csHeight int) error {
 
 	// Search for height marker
 	gr, found, err = cs.wal.group.Search("#HEIGHT: ", makeHeightSearchFunc(csHeight))
-	if err != nil {
+	if err == io.EOF {
+		return nil
+	} else if err != nil {
 		return err
 	}
 	if !found {

consensus/replay_test.go

@@ -116,7 +116,7 @@ func toPV(pv PrivValidator) *types.PrivValidator {
 
 func setupReplayTest(thisCase *testCase, nLines int, crashAfter bool) (*ConsensusState, chan interface{}, string, string) {
 	fmt.Println("-------------------------------------")
-	log.Notice(Fmt("Starting replay test of %d lines of WAL. Crash after = %v", nLines, crashAfter))
+	log.Notice(Fmt("Starting replay test %v (of %d lines of WAL). Crash after = %v", thisCase.name, nLines, crashAfter))
 
 	lineStep := nLines
 	if crashAfter {

glide.lock

@@ -78,7 +78,7 @@ imports:
 - name: github.com/tendermint/go-merkle
   version: bfc4afe28c7a50045d4d1eb043e67460f8a51a4f
 - name: github.com/tendermint/go-p2p
-  version: f173a17ed3e9b341d480b36e5041819c8a5b8350
+  version: 67963ab800a72e91fecfb954e489b21aa906171a
   subpackages:
   - upnp
 - name: github.com/tendermint/go-rpc
@@ -94,7 +94,7 @@ imports:
   subpackages:
   - term
 - name: github.com/tendermint/tmsp
-  version: 3742e35e6db5dcd7596aac9f661b46f5699ebec8
+  version: 40448a3897dc870cc8e57a41a1e2872e976de539
   subpackages:
   - client
   - example/counter

state/execution.go

@@ -264,6 +264,7 @@ func (s *State) CommitStateUpdateMempool(proxyAppConn proxy.AppConnConsensus, bl
 
 	// Set the state's new AppHash
 	s.AppHash = res.Data
+	s.AppHashIsStale = false
 
 	// Update mempool.
 	mempool.Update(block.Height, block.Txs)

types/block.go

@@ -151,7 +151,6 @@ func (b *Block) StringShort() string {
 
 type Header struct {
 	ChainID        string    `json:"chain_id"`
-	Version        string    `json:"version"` // TODO:
 	Height         int       `json:"height"`
 	Time           time.Time `json:"time"`
 	NumTxs         int       `json:"num_txs"` // XXX: Can we get rid of this?