Feat/operator restrictions

src/AdvancedOrderEngine.sol

@@ -1,12 +1,19 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.21;
 
+import {EIP712} from "openzeppelin/utils/cryptography/EIP712.sol";
+import {IERC1271} from "openzeppelin/interfaces/IERC1271.sol";
 import {OrderEngine} from "./libraries/OrderEngine.sol";
 import "./AdvancedOrderEngineErrors.sol";
 
-contract AdvancedOrderEngine {
+contract AdvancedOrderEngine is EIP712 {
     using OrderEngine for OrderEngine.Order;
 
+    constructor(
+        string memory name,
+        string memory version
+    ) EIP712(name, version) {}
+
     /**
      * @notice Fills multiple orders by processing the specified orders and clearing prices.
      *
@@ -46,6 +53,32 @@ contract AdvancedOrderEngine {
             revert ZeroFacilitatorTargetAddress(); // TBD: use generic error message i.e. ZeroAddress()
         }
 
+        for (uint256 i; i < orders.length; ) {
+            OrderEngine.Order calldata order = orders[i];
+
+            bytes32 orderHash;
+
+            if (block.timestamp > order.validTill) {
+                revert OrderExpired(orderHash);
+            }
+
+            if (order.buyTokenAmount == 0 || order.sellTokenAmount == 0) {
+                revert ZeroTokenAmounts();
+            }
+
+            if (
+                order.maker == address(0) ||
+                order.buyToken == address(0) ||
+                order.sellToken == address(0)
+            ) {
+                revert ZeroAddress();
+            }
+
+            unchecked {
+                ++i;
+            }
+        }
+
         // Loop start
         // Perform order specific sanity checks
         // Verify signatjures

src/AdvancedOrderEngineErrors.sol

@@ -4,3 +4,6 @@ pragma solidity 0.8.21;
 error ArraysLengthMismatch(uint256 ordersArrLen, uint256 clearingPricesArrLen);
 error ZeroFacilitatorTargetAddress();
 error EmptyOrdersArray();
+error OrderExpired(bytes32 orderHash);
+error ZeroTokenAmounts();
+error ZeroAddress();

src/libraries/OrderEngine.sol

@@ -20,6 +20,26 @@ library OrderEngine {
         bytes predicates;
         bytes preInteraction;
         bytes postInteraction;
-        bytes signature;
     }
+
+    bytes32 public constant ORDER_TYPE_HASH =
+        keccak256(
+            "Order("
+            "uint256 nonce,"
+            "uint256 validTill,"
+            "uint256 sellTokenAmount,"
+            "uint256 buyTokenAmount,"
+            "uint256 feeAmounts,"
+            "address maker,"
+            "address taker,"
+            "address recipient,"
+            "address sellToken,"
+            "address buyToken,"
+            "bool isPartiallyFillable,"
+            "bytes32 extraData,"
+            "bytes predicates,"
+            "bytes preInteraction,"
+            "bytes postInteraction"
+            ")"
+        );
 }