Merge PR #4467: Revert Gas Bug

cosmos · Jun 1, 2019 · f783cb7 · f783cb7
1 parent 80234ba
commit f783cb7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.34.7
+
+### Bug Fixes
+
+#### SDK
+
+* Fix gas consumption bug in `Undelegate` preventing the ability to sync from
+genesis. 
+
 ## 0.34.6
 
 ### Bug Fixes

diff --git a/x/staking/keeper/delegation.go b/x/staking/keeper/delegation.go
@@ -597,10 +597,10 @@ func (k Keeper) Undelegate(
 			return completionTime, err
 		}
 
+		balance := sdk.NewCoin(k.BondDenom(ctx), returnAmount)
+
 		// no need to create the ubd object just complete now
 		if completeNow {
-			balance := sdk.NewCoin(k.BondDenom(ctx), returnAmount)
-
 			// track undelegation only when remaining or truncated shares are non-zero
 			if !balance.IsZero() {
 				if _, err := k.bankKeeper.UndelegateCoins(ctx, delAddr, sdk.Coins{balance}); err != nil {