Merge pull request #485 from binance-chain/partialcancel

Partial cancel caused an error log when calc fee
bnb-chain · Mar 9, 2019 · 97282fe · 97282fe
2 parents 831c69e + 7b0e6f9
commit 97282fe
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/plugins/dex/order/handler.go b/plugins/dex/order/handler.go
@@ -183,10 +183,13 @@ func handleCancelOrder(
 	if sdkError != nil {
 		return sdkError.Result()
 	}
-	acc := keeper.am.GetAccount(ctx, msg.Sender)
-	fee := keeper.FeeManager.CalcFixedFee(acc.GetCoins(), transfer.eventType, transfer.inAsset, keeper.engines)
-	acc.SetCoins(acc.GetCoins().Minus(fee.Tokens))
-	keeper.am.SetAccount(ctx, acc)
+	fee := common.Fee{}
+	if !transfer.FeeFree() {
+		acc := keeper.am.GetAccount(ctx, msg.Sender)
+		fee = keeper.FeeManager.CalcFixedFee(acc.GetCoins(), transfer.eventType, transfer.inAsset, keeper.engines)
+		acc.SetCoins(acc.GetCoins().Minus(fee.Tokens))
+		keeper.am.SetAccount(ctx, acc)
+	}
 
 	// this is done in memory! we must not run this block in checktx or simulate!
 	if ctx.IsDeliverTx() {