validate order in cancelLimitOrder()

consenlabs · Jul 1, 2022 · 3ebb1ef · 3ebb1ef
1 parent eeb8f5b
commit 3ebb1ef
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/contracts/LimitOrder.sol b/contracts/LimitOrder.sol
@@ -490,7 +490,8 @@ contract LimitOrder is ILimitOrder, BaseLibEIP712, SignatureValidator, Reentranc
             cancelledOrder.takerTokenAmount = 0;
 
             bytes32 cancelledOrderHash = getEIP712Hash(LimitOrderLibEIP712._getOrderStructHash(cancelledOrder));
-            require(isValidSignature(_order.maker, cancelledOrderHash, bytes(""), _cancelOrderMakerSig), "LimitOrder: Cancel request is not signed by maker");
+            // validate order and check cancel signature
+            _validateOrder(cancelledOrder, cancelledOrderHash, _cancelOrderMakerSig);
         }
 
         // Set cancelled state to storage

diff --git a/contracts/test/forkMainnet/LimitOrder.t.sol b/contracts/test/forkMainnet/LimitOrder.t.sol
@@ -1107,11 +1107,32 @@ contract LimitOrderTest is StrategySharedSetup {
         zeroOrder.takerTokenAmount = 0;
 
         bytes memory cancelPayload = _genCancelLimitOrderPayload(DEFAULT_ORDER, _signOrder(userPrivateKey, zeroOrder, SignatureValidator.SignatureType.EIP712));
-        vm.expectRevert("LimitOrder: Cancel request is not signed by maker");
+        vm.expectRevert("LimitOrder: Order is not signed by maker");
         vm.prank(user, user); // Only EOA
         userProxy.toLimitOrder(cancelPayload);
     }
 
+    function testCannotCancelExpiredOrder() public {
+        LimitOrderLibEIP712.Order memory expiredOrder = DEFAULT_ORDER;
+        expiredOrder.expiry = 0;
+
+        bytes memory payload = _genCancelLimitOrderPayload(DEFAULT_ORDER, _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");
+        userProxy.toLimitOrder(payload);
+    }
+
     /*********************************
      *             Helpers           *
      *********************************/