implement fixes to fixes

ProjectOpenSea · Mar 9, 2024 · 762fdde · 762fdde
1 parent 4240dc6
commit 762fdde
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 73 deletions.
diff --git a/reference/lib/ReferenceReentrancyGuard.sol b/reference/lib/ReferenceReentrancyGuard.sol
@@ -10,9 +10,9 @@ import {
 } from "seaport-types/src/interfaces/ReentrancyErrors.sol";
 
 import {
-    _ENTERED_AND_ACCEPTING_NATIVE_TOKENS,
-    _ENTERED,
-    _NOT_ENTERED
+    _ENTERED_AND_ACCEPTING_NATIVE_TOKENS_SSTORE,
+    _ENTERED_SSTORE,
+    _NOT_ENTERED_SSTORE
 } from "seaport-types/src/lib/ConsiderationConstants.sol";
 
 /**
@@ -33,15 +33,15 @@ contract ReferenceReentrancyGuard is
      */
     constructor() {
         // Initialize the reentrancy guard in a cleared state.
-        _reentrancyGuard = _NOT_ENTERED;
+        _reentrancyGuard = _NOT_ENTERED_SSTORE;
     }
 
     /**
      * @dev Modifier to check that the sentinel value for the reentrancy guard
      *      is not currently set by a previous call.
      */
     modifier notEntered() {
-        if (_reentrancyGuard != _NOT_ENTERED) {
+        if (_reentrancyGuard != _NOT_ENTERED_SSTORE) {
             revert NoReentrantCalls();
         }
 
@@ -56,19 +56,19 @@ contract ReferenceReentrancyGuard is
      *                           be received during execution or not.
      */
     modifier nonReentrant(bool acceptNativeTokens) {
-        if (_reentrancyGuard != _NOT_ENTERED) {
+        if (_reentrancyGuard != _NOT_ENTERED_SSTORE) {
             revert NoReentrantCalls();
         }
 
         if (acceptNativeTokens) {
-            _reentrancyGuard = _ENTERED_AND_ACCEPTING_NATIVE_TOKENS;
+            _reentrancyGuard = _ENTERED_AND_ACCEPTING_NATIVE_TOKENS_SSTORE;
         } else {
-            _reentrancyGuard = _ENTERED;
+            _reentrancyGuard = _ENTERED_SSTORE;
         }
 
         _;
 
-        _reentrancyGuard = _NOT_ENTERED;
+        _reentrancyGuard = _NOT_ENTERED_SSTORE;
     }
 
     /**
@@ -77,7 +77,7 @@ contract ReferenceReentrancyGuard is
      */
     function _assertAcceptingNativeTokens() internal view {
         // Ensure that the reentrancy guard is not currently set.
-        if (_reentrancyGuard != _ENTERED_AND_ACCEPTING_NATIVE_TOKENS) {
+        if (_reentrancyGuard != _ENTERED_AND_ACCEPTING_NATIVE_TOKENS_SSTORE) {
             revert InvalidMsgValue(msg.value);
         }
     }

diff --git a/src/core/lib/BasicOrderFulfiller.sol b/src/core/lib/BasicOrderFulfiller.sol
@@ -24,7 +24,7 @@ import {
     AdditionalRecipient_size_shift,
     AdditionalRecipient_size,
     BasicOrder_additionalRecipients_data_cdPtr,
-    BasicOrder_additionalRecipients_length_cdPtr,
+    BasicOrder_addlRecipients_length_cdPtr,
     BasicOrder_basicOrderType_cdPtr,
     BasicOrder_common_params_size,
     BasicOrder_considerationAmount_cdPtr,
@@ -474,7 +474,7 @@ contract BasicOrderFulfiller is OrderValidator {
 
             // Ensure consideration array length isn't less than total original.
             if lt(
-                calldataload(BasicOrder_additionalRecipients_length_cdPtr),
+                calldataload(BasicOrder_addlRecipients_length_cdPtr),
                 calldataload(BasicOrder_totalOriginalAdditionalRecipients_cdPtr)
             ) {
                 // Store left-padded selector with push4 (reduces bytecode),
@@ -567,7 +567,7 @@ contract BasicOrderFulfiller is OrderValidator {
                 // This variable will later be repurposed to track the total
                 // original additional recipients instead of the total supplied.
                 let totalAdditionalRecipients :=
-                    calldataload(BasicOrder_additionalRecipients_length_cdPtr)
+                    calldataload(BasicOrder_addlRecipients_length_cdPtr)
 
                 // Calculate pointer to length of OrderFulfilled consideration
                 // array. Note that this is based on total original additional
@@ -753,7 +753,7 @@ contract BasicOrderFulfiller is OrderValidator {
 
                 // Overwrite length to length of the additionalRecipients array.
                 totalAdditionalRecipients :=
-                    calldataload(BasicOrder_additionalRecipients_length_cdPtr)
+                    calldataload(BasicOrder_addlRecipients_length_cdPtr)
 
                 for { } lt(i, totalAdditionalRecipients) { i := add(i, 1) } {
                     // Retrieve calldata pointer for additional recipient.
@@ -1046,7 +1046,7 @@ contract BasicOrderFulfiller is OrderValidator {
                     OrderFulfilled_baseSize,
                     mul(
                         calldataload(
-                            BasicOrder_additionalRecipients_length_cdPtr
+                            BasicOrder_addlRecipients_length_cdPtr
                         ),
                         ReceivedItem_size
                     )
@@ -1250,7 +1250,7 @@ contract BasicOrderFulfiller is OrderValidator {
             totalAdditionalRecipientsDataSize :=
                 shl(
                     AdditionalRecipient_size_shift,
-                    calldataload(BasicOrder_additionalRecipients_length_cdPtr)
+                    calldataload(BasicOrder_addlRecipients_length_cdPtr)
                 )
         }
 
@@ -1391,7 +1391,7 @@ contract BasicOrderFulfiller is OrderValidator {
             totalAdditionalRecipientsDataSize :=
                 shl(
                     AdditionalRecipient_size_shift,
-                    calldataload(BasicOrder_additionalRecipients_length_cdPtr)
+                    calldataload(BasicOrder_addlRecipients_length_cdPtr)
                 )
         }
 

diff --git a/src/core/lib/ConsiderationEncoder.sol b/src/core/lib/ConsiderationEncoder.sol
@@ -7,7 +7,7 @@ import {
     authorizeOrder_selector_offset,
     authorizeOrder_selector,
     authorizeOrder_zoneParameters_offset,
-    BasicOrder_additionalRecipients_length_cdPtr,
+    BasicOrder_addlRecipients_length_cdPtr,
     BasicOrder_common_params_size,
     BasicOrder_consideration_offset_from_offer,
     BasicOrder_offerer_cdPtr,
@@ -632,7 +632,7 @@ contract ConsiderationEncoder {
 
             // Retrieve the length of additional recipients.
             uint256 additionalRecipientsLength = CalldataPointer.wrap(
-                BasicOrder_additionalRecipients_length_cdPtr
+                BasicOrder_addlRecipients_length_cdPtr
             ).readUint256();
 
             // Derive size of offer and consideration data.