From a2f5855d8e04a7f0bee5e070717c454ac730a034 Mon Sep 17 00:00:00 2001
From: Christopher Goes <cwgoes@protonmail.ch>
Date: Thu, 10 May 2018 21:55:51 +0200
Subject: [PATCH] Add tags for declare & edit candidacy txs

---
 CHANGELOG.md       | 2 +-
 x/stake/handler.go | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a04650813d..f574667110 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,7 +31,7 @@ FEATURES:
 * Add (non-proof) subspace query helper functions 
 * Add more staking query functions: candidates, delegator-bonds
 * Bank module now tags transactions with sender/recipient for indexing & later retrieval
-* Stake module now tags transactions with delegator/candidate for delegation & unbonding
+* Stake module now tags transactions with delegator/candidate for delegation & unbonding, and candidate info for declare candidate / edit candidacy
 
 BUG FIXES
 * Gaia now uses stake, ported from github.com/cosmos/gaia
diff --git a/x/stake/handler.go b/x/stake/handler.go
index c3e76888ef..8d3bbb8b80 100644
--- a/x/stake/handler.go
+++ b/x/stake/handler.go
@@ -97,13 +97,15 @@ func handleMsgDeclareCandidacy(ctx sdk.Context, msg MsgDeclareCandidacy, k Keepe
 
 	candidate := NewCandidate(msg.CandidateAddr, msg.PubKey, msg.Description)
 	k.setCandidate(ctx, candidate)
+	tags := sdk.NewTags("action", []byte("declareCandidacy"), "candidate", msg.CandidateAddr.Bytes(), "moniker", []byte(msg.Description.Moniker), "identity", []byte(msg.Description.Identity))
 
 	// move coins from the msg.Address account to a (self-bond) delegator account
 	// the candidate account and global shares are updated within here
-	tags, err := delegate(ctx, k, msg.CandidateAddr, msg.Bond, candidate)
+	delegateTags, err := delegate(ctx, k, msg.CandidateAddr, msg.Bond, candidate)
 	if err != nil {
 		return err.Result()
 	}
+	tags = tags.AppendTags(delegateTags)
 	return sdk.Result{
 		Tags: tags,
 	}
@@ -130,7 +132,10 @@ func handleMsgEditCandidacy(ctx sdk.Context, msg MsgEditCandidacy, k Keeper) sdk
 	candidate.Description.Details = msg.Description.Details
 
 	k.setCandidate(ctx, candidate)
-	return sdk.Result{}
+	tags := sdk.NewTags("action", []byte("editCandidacy"), "candidate", msg.CandidateAddr.Bytes(), "moniker", []byte(msg.Description.Moniker), "identity", []byte(msg.Description.Identity))
+	return sdk.Result{
+		Tags: tags,
+	}
 }
 
 func handleMsgDelegate(ctx sdk.Context, msg MsgDelegate, k Keeper) sdk.Result {