Merge pull request #457 from axic/unused-params

Revert on dirty bits (unused item parameters)
ProjectOpenSea · Jun 8, 2022 · 5eb8906 · 5eb8906
2 parents 256c420 + 00a8285
commit 5eb8906
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/contracts/conduit/Conduit.sol b/contracts/conduit/Conduit.sol
@@ -194,6 +194,10 @@ contract Conduit is ConduitInterface, TokenTransferrer {
     function _transfer(ConduitTransfer calldata item) internal {
         // Determine the transfer method based on the respective item type.
         if (item.itemType == ConduitItemType.ERC20) {
+            if (item.identifier != 0) {
+               revert UnusedItemParameters();
+            }
+
             // Transfer ERC20 token. Note that item.identifier is ignored and
             // therefore ERC20 transfer items are potentially malleable — this
             // check should be performed by the calling channel if a constraint

diff --git a/contracts/interfaces/TokenTransferrerErrors.sol b/contracts/interfaces/TokenTransferrerErrors.sol
@@ -17,6 +17,13 @@ interface TokenTransferrerErrors {
      */
     error MissingItemAmount();
 
+    /**
+     * @dev Revert with an error when attempting to fulfill an order where an
+     *      item has the unused parameters, this includes token and identifier
+     *      for native transfers and identifier for ERC20 transfers.
+     */
+    error UnusedItemParameters();
+
     /**
      * @dev Revert with an error when an ERC20, ERC721, or ERC1155 token
      *      transfer reverts.

diff --git a/contracts/lib/BasicOrderFulfiller.sol b/contracts/lib/BasicOrderFulfiller.sol
@@ -171,6 +171,10 @@ contract BasicOrderFulfiller is OrderValidator {
 
         // Transfer tokens based on the route.
         if (additionalRecipientsItemType == ItemType.NATIVE) {
+            if ((uint160(parameters.considerationToken) | parameters.considerationIdentifier) != 0) {
+                revert UnusedItemParameters();
+            }
+
             _transferIndividual721Or1155Item(
                 offeredItemType,
                 parameters.offerToken,

diff --git a/contracts/lib/Executor.sol b/contracts/lib/Executor.sol
@@ -52,9 +52,17 @@ contract Executor is Verifiers, TokenTransferrer {
     ) internal {
         // If the item type indicates Ether or a native token...
         if (item.itemType == ItemType.NATIVE) {
+            if ((uint160(item.token) | item.identifier) != 0) {
+                revert UnusedItemParameters();
+            }
+
             // transfer the native tokens to the recipient.
             _transferEth(item.recipient, item.amount);
         } else if (item.itemType == ItemType.ERC20) {
+            if (item.identifier != 0) {
+                revert UnusedItemParameters();
+            }
+
             // Transfer ERC20 tokens from the source to the recipient.
             _transferERC20(
                 item.token,