OSDN Git Service

allow cancel order charge fee (#558)
authorPaladz <yzhu101@uottawa.ca>
Wed, 11 Nov 2020 09:49:25 +0000 (17:49 +0800)
committerGitHub <noreply@github.com>
Wed, 11 Nov 2020 09:49:25 +0000 (17:49 +0800)
* allow cancel order charge fee

* edit for code review

Co-authored-by: paladz <colt@ColtdeMBP.partners>
application/mov/mov_core.go

index 2980553..7dca133 100644 (file)
@@ -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
 }