Merge pull request #50 from consenlabs/v5.3.0-PVE002

validate order in cancelLimitOrder()

Author: charlesjhongc

contracts/LimitOrder.sol

@@ -485,6 +485,10 @@ contract LimitOrder is ILimitOrder, BaseLibEIP712, SignatureValidator, Reentranc
      * Cancel limit order
      */
     function cancelLimitOrder(LimitOrderLibEIP712.Order calldata _order, bytes calldata _cancelOrderMakerSig) external override onlyUserProxy nonReentrant {
+        require(_order.expiry > uint64(block.timestamp), "LimitOrder: Order is expired");
+        bytes32 orderHash = getEIP712Hash(LimitOrderLibEIP712._getOrderStructHash(_order));
+        bool isCancelled = LibOrderStorage.getStorage().orderHashToCancelled[orderHash];
+        require(!isCancelled, "LimitOrder: Order is cancelled already");
         {
             LimitOrderLibEIP712.Order memory cancelledOrder = _order;
             cancelledOrder.takerTokenAmount = 0;
@@ -494,9 +498,7 @@ contract LimitOrder is ILimitOrder, BaseLibEIP712, SignatureValidator, Reentranc
         }
 
         // Set cancelled state to storage
-        bytes32 orderHash = getEIP712Hash(LimitOrderLibEIP712._getOrderStructHash(_order));
         LibOrderStorage.getStorage().orderHashToCancelled[orderHash] = true;
-
         emit OrderCancelled(orderHash, _order.maker);
     }
 

contracts/test/forkMainnet/LimitOrder.t.sol

@@ -1112,6 +1112,28 @@ contract LimitOrderTest is StrategySharedSetup {
         userProxy.toLimitOrder(cancelPayload);
     }
 
+    function testCannotCancelExpiredOrder() public {
+        LimitOrderLibEIP712.Order memory expiredOrder = DEFAULT_ORDER;
+        expiredOrder.expiry = 0;
+
+        bytes memory payload = _genCancelLimitOrderPayload(expiredOrder, _signOrder(userPrivateKey, expiredOrder, SignatureValidator.SignatureType.EIP712));
+        vm.expectRevert("LimitOrder: Order is expired");
+        vm.prank(user, user); // Only EOA
+        userProxy.toLimitOrder(payload);
+    }
+
+    function testCannotCancelTwice() public {
+        LimitOrderLibEIP712.Order memory zeroOrder = DEFAULT_ORDER;
+        zeroOrder.takerTokenAmount = 0;
+
+        bytes memory payload = _genCancelLimitOrderPayload(DEFAULT_ORDER, _signOrder(makerPrivateKey, zeroOrder, SignatureValidator.SignatureType.EIP712));
+        vm.prank(user, user); // Only EOA
+        userProxy.toLimitOrder(payload);
+        vm.expectRevert("LimitOrder: Order is cancelled already");
+        vm.prank(user, user); // Only EOA
+        userProxy.toLimitOrder(payload);
+    }
+
     /*********************************
      *             Helpers           *
      *********************************/