Merge pull request ProjectOpenSea#525 from naps62/ref-update

0age · web-flow · commit 7d2c4642c0bb · 2022-06-18T06:31:17.000-07:00
Updates reference implementation to match ProjectOpenSea#474
diff --git a/reference/lib/ReferenceAssertions.sol b/reference/lib/ReferenceAssertions.sol
@@ -95,23 +95,27 @@ contract ReferenceAssertions is
 
     /**
      * @dev Internal pure function to validate calldata offsets for dynamic
-     *      types in BasicOrderParameters. This ensures that functions using the
-     *      calldata object normally will be using the same data as optimized
-     *      functions. Note that no parameters are supplied as all basic order
-     *      functions use the same calldata encoding.
+     *      types in BasicOrderParameters and other parameters. This ensures
+     *      that functions using the calldata object normally will be using the
+     *      same data as the assembly functions and that values that are bound
+     *      to a given range are within that range. Note that no parameters are
+     *      supplied as all basic order functions use the same calldata
+     *      encoding.
      */
-    function _assertValidBasicOrderParameterOffsets() internal pure {
+    function _assertValidBasicOrderParameters() internal pure {
         /*
          * Checks:
          * 1. Order parameters struct offset == 0x20
          * 2. Additional recipients arr offset == 0x200
          * 3. Signature offset == 0x240 + (recipients.length * 0x40)
+         * 4. BasicOrderType between 0 and 23 (i.e. < 24)
          */
         // Declare a boolean designating basic order parameter offset validity.
         bool validOffsets = (abi.decode(msg.data[4:36], (uint256)) == 32 &&
             abi.decode(msg.data[548:580], (uint256)) == 576 &&
             abi.decode(msg.data[580:612], (uint256)) ==
-            608 + 64 * abi.decode(msg.data[612:644], (uint256)));
+            608 + 64 * abi.decode(msg.data[612:644], (uint256))) &&
+            abi.decode(msg.data[292:324], (uint256)) < 24;
 
         // Revert with an error if basic order parameter offsets are invalid.
         if (!validOffsets) {
diff --git a/reference/lib/ReferenceBasicOrderFulfiller.sol b/reference/lib/ReferenceBasicOrderFulfiller.sol
@@ -580,7 +580,7 @@ contract ReferenceBasicOrderFulfiller is ReferenceOrderValidator {
         // Verify that calldata offsets for all dynamic types were produced by
         // default encoding. This is only required on the optimized contract,
         // but is included here to maintain parity.
-        _assertValidBasicOrderParameterOffsets();
+        _assertValidBasicOrderParameters();
 
         // Ensure supplied consideration array length is not less than original.
         _assertConsiderationLengthIsNotLessThanOriginalConsiderationLength(
