Add TotalTx to block header, issue #952

Update state to keep track of this info.
Change function args as needed.
Make NumTx also an int64 for consistency.

state/execution.go

@@ -178,7 +178,8 @@ func (s *State) ValidateBlock(block *types.Block) error {
 
 func (s *State) validateBlock(block *types.Block) error {
 	// Basic block validation.
-	err := block.ValidateBasic(s.ChainID, s.LastBlockHeight, s.LastBlockID, s.LastBlockTime, s.AppHash)
+	err := block.ValidateBasic(s.ChainID, s.LastBlockHeight,
+		s.LastBlockTotalTx, s.LastBlockID, s.LastBlockTime, s.AppHash)
 	if err != nil {
 		return err
 	}

state/execution_test.go

@@ -66,7 +66,9 @@ func makeBlock(height int64, state *State) *types.Block {
 	prevParts := types.PartSetHeader{}
 	valHash := state.Validators.Hash()
 	prevBlockID := types.BlockID{prevHash, prevParts}
-	block, _ := types.MakeBlock(height, chainID, makeTxs(height), new(types.Commit),
-		prevBlockID, valHash, state.AppHash, testPartSize)
+	block, _ := types.MakeBlock(height, chainID,
+		makeTxs(height), state.LastBlockTotalTx,
+		new(types.Commit), prevBlockID, valHash,
+		state.AppHash, testPartSize)
 	return block
 }

state/state.go

@@ -45,11 +45,12 @@ type State struct {
 	// These fields are updated by SetBlockAndValidators.
 	// LastBlockHeight=0 at genesis (ie. block(H=0) does not exist)
 	// LastValidators is used to validate block.LastCommit.
-	LastBlockHeight int64
-	LastBlockID     types.BlockID
-	LastBlockTime   time.Time
-	Validators      *types.ValidatorSet
-	LastValidators  *types.ValidatorSet
+	LastBlockHeight  int64
+	LastBlockTotalTx int64
+	LastBlockID      types.BlockID
+	LastBlockTime    time.Time
+	Validators       *types.ValidatorSet
+	LastValidators   *types.ValidatorSet
 	// When a block returns a validator set change via EndBlock,
 	// the change only applies to the next block.
 	// So, if s.LastBlockHeight causes a valset change,
@@ -113,6 +114,7 @@ func (s *State) Copy() *State {
 	return &State{
 		db:                          s.db,
 		LastBlockHeight:             s.LastBlockHeight,
+		LastBlockTotalTx:            s.LastBlockTotalTx,
 		LastBlockID:                 s.LastBlockID,
 		LastBlockTime:               s.LastBlockTime,
 		Validators:                  s.Validators.Copy(),
@@ -250,16 +252,19 @@ func (s *State) SetBlockAndValidators(header *types.Header, blockPartsHeader typ
 	nextValSet.IncrementAccum(1)
 
 	s.setBlockAndValidators(header.Height,
+		header.NumTxs,
 		types.BlockID{header.Hash(), blockPartsHeader},
 		header.Time,
 		prevValSet, nextValSet)
 
 }
 
-func (s *State) setBlockAndValidators(height int64, blockID types.BlockID, blockTime time.Time,
+func (s *State) setBlockAndValidators(height int64,
+	newTxs int64, blockID types.BlockID, blockTime time.Time,
 	prevValSet, nextValSet *types.ValidatorSet) {
 
 	s.LastBlockHeight = height
+	s.LastBlockTotalTx += newTxs
 	s.LastBlockID = blockID
 	s.LastBlockTime = blockTime
 	s.Validators = nextValSet