Merge branch 'master' into marko/remove-apphash

state/indexer/block/kv/kv.go

@@ -469,9 +469,10 @@ func (idx *BlockerIndexer) indexEvents(batch dbm.Batch, events []abci.Event, typ
 
 			// index iff the event specified index:true and it's not a reserved event
 			compositeKey := fmt.Sprintf("%s.%s", event.Type, string(attr.Key))
-			if compositeKey == types.TxHashKey || compositeKey == types.TxHeightKey {
+			if compositeKey == types.BlockHeightKey {
 				return fmt.Errorf("event type and attribute key \"%s\" is reserved; please use a different key", compositeKey)
 			}
+
 			if attr.GetIndex() {
 				key, err := eventKey(compositeKey, typ, string(attr.Value), height)
 				if err != nil {

state/txindex/indexer_service.go

@@ -79,7 +79,7 @@ func (is *IndexerService) OnStart() error {
 			if err := is.blockIdxr.Index(eventDataHeader); err != nil {
 				is.Logger.Error("failed to index block", "height", height, "err", err)
 			} else {
-				is.Logger.Error("indexed block", "height", height)
+				is.Logger.Info("indexed block", "height", height)
 			}
 
 			if err = is.txIdxr.AddBatch(batch); err != nil {