Merge pull request #2649 from bandprotocol/update-export

chain: add commission check before withdrawing commission when export
bandprotocol · Sep 17, 2020 · f8dffa3 · f8dffa3
2 parents 7b2e8f3 + d1952fc
commit f8dffa3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG_UNRELEASED.md b/CHANGELOG_UNRELEASED.md
@@ -12,6 +12,8 @@
 
 ### Chain (Non-consensus)
 
+- (bugs) [\#2649](https://github.com/bandprotocol/bandchain/pull/2649) Add commission check before withdraw when export
+
 ### Yoda
 
 ### Emitter & Flusher

diff --git a/chain/app/export.go b/chain/app/export.go
@@ -60,6 +60,10 @@ func (app *BandApp) prepForZeroHeightGenesis(ctx sdk.Context, jailWhiteList []st
 
 	// withdraw all validator commission
 	app.StakingKeeper.IterateValidators(ctx, func(_ int64, val staking.ValidatorI) (stop bool) {
+		accumCommission := app.DistrKeeper.GetValidatorAccumulatedCommission(ctx, val.GetOperator())
+		if accumCommission.IsZero() {
+			return false
+		}
 		_, err := app.DistrKeeper.WithdrawValidatorCommission(ctx, val.GetOperator())
 		if err != nil {
 			log.Fatal(err)