From d4765546a94161c663dcbeb7ed5bfd3f89290b32 Mon Sep 17 00:00:00 2001
From: Alessio Treglia <alessio@tendermint.com>
Date: Tue, 14 May 2019 16:13:18 +0100
Subject: [PATCH] Cherry Pick PR #4336: Fix AppendTags usage error

---
 CHANGELOG.md         | 10 ++++++++++
 x/staking/handler.go |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f4cd13b8b58..62685c1cb21a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## 0.34.5
 
+### Bug Fixes
+
+#### SDK
+
+* [\#4273](https://github.com/cosmos/cosmos-sdk/issues/4273) Fix usage of `AppendTags` in x/staking/handler.go
+
+### Improvements
+
+#### Gaia CLI
+
 * [#4345](https://github.com/cosmos/cosmos-sdk/pull/4345) Update `ledger-cosmos-go`
 to v0.10.3.
 
diff --git a/x/staking/handler.go b/x/staking/handler.go
index 7da83cec2e5b..aa39618c50c9 100644
--- a/x/staking/handler.go
+++ b/x/staking/handler.go
@@ -59,8 +59,8 @@ func EndBlocker(ctx sdk.Context, k keeper.Keeper) ([]abci.ValidatorUpdate, sdk.T
 			continue
 		}
 
-		resTags.AppendTags(sdk.NewTags(
-			tags.Action, ActionCompleteUnbonding,
+		resTags = resTags.AppendTags(sdk.NewTags(
+			tags.Action, tags.ActionCompleteUnbonding,
 			tags.Delegator, dvPair.DelegatorAddress.String(),
 			tags.SrcValidator, dvPair.ValidatorAddress.String(),
 		))
@@ -75,7 +75,7 @@ func EndBlocker(ctx sdk.Context, k keeper.Keeper) ([]abci.ValidatorUpdate, sdk.T
 			continue
 		}
 
-		resTags.AppendTags(sdk.NewTags(
+		resTags = resTags.AppendTags(sdk.NewTags(
 			tags.Action, tags.ActionCompleteRedelegation,
 			tags.Delegator, dvvTriplet.DelegatorAddress.String(),
 			tags.SrcValidator, dvvTriplet.ValidatorSrcAddress.String(),