From 4970ba5686978f41771981375bc2360eb2ced5be Mon Sep 17 00:00:00 2001 From: Paladz Date: Wed, 11 Nov 2020 17:49:25 +0800 Subject: [PATCH] allow cancel order charge fee (#558) * allow cancel order charge fee * edit for code review Co-authored-by: paladz --- application/mov/mov_core.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/application/mov/mov_core.go b/application/mov/mov_core.go index 29805536..7dca1333 100644 --- a/application/mov/mov_core.go +++ b/application/mov/mov_core.go @@ -254,13 +254,9 @@ func calcFeeAmount(matchedTx *types.Tx) (map[bc.AssetID]*matchedTxFee, error) { func validateCancelOrderTx(tx *types.Tx) error { for _, input := range tx.Inputs { - if !segwit.IsP2WMCScript(input.ControlProgram()) { + if segwit.IsP2WMCScript(input.ControlProgram()) && !contract.IsCancelClauseSelector(input) { return errInputProgramMustP2WMCScript } - - if contract.IsTradeClauseSelector(input) { - return errExistTradeInCancelOrderTx - } } return nil } -- 2.11.0