Consider partially filled orders invalid by enforcing that the remain…

…ingFillableAmount = fillableAmount
0xProject · Aug 2, 2019 · 560ec9d · 560ec9d
1 parent beaa983
commit 560ec9d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/zeroex/order_validator.go b/zeroex/order_validator.go
@@ -381,7 +381,10 @@ func (o *OrderValidator) BatchValidate(rawSignedOrders []*SignedOrder, areNewOrd
 						})
 						continue
 					case OSFillable:
-						if fillableTakerAssetAmount.Cmp(big.NewInt(0)) == 0 {
+						remainingTakerAssetAmount := big.NewInt(0).Sub(signedOrder.TakerAssetAmount, orderInfo.OrderTakerAssetFilledAmount)
+						// If `fillableTakerAssetAmount` != `remainingTakerAssetAmount`, the order is partially fillable. We consider
+						// partially fillable orders as invalid
+						if fillableTakerAssetAmount.Cmp(remainingTakerAssetAmount) != 0 {
 							validationResults.Rejected = append(validationResults.Rejected, &RejectedOrderInfo{
 								OrderHash:   orderHash,
 								SignedOrder: signedOrder,

diff --git a/zeroex/orderwatch/order_watcher.go b/zeroex/orderwatch/order_watcher.go
@@ -622,7 +622,6 @@ func (w *Watcher) generateOrderEventsIfChanged(hashToOrderWithTxHashes map[commo
 		} else if oldFillableAmount.Cmp(big.NewInt(0)) == 1 && !oldAmountIsMoreThenNewAmount {
 			// The order is now fillable for more then it was before. E.g.:
 			// 1. A fill txn reverted (block-reorg)
-			// 2. Traders added missing balance/allowance increasing the order's fillability
 			orderEvent := &zeroex.OrderEvent{
 				OrderHash:                acceptedOrderInfo.OrderHash,
 				SignedOrder:              order.SignedOrder,