Merge pull request #1295 from anna-carroll/anna/lint

fix: run linter
ProjectOpenSea · Jan 4, 2024 · 70a457d · 70a457d
2 parents 0585f2f + bbd6db6
commit 70a457d
Show file tree

Hide file tree

Showing 28 changed files with 149 additions and 70 deletions.
diff --git a/contracts/conduit/Conduit.sol b/contracts/conduit/Conduit.sol
@@ -15,4 +15,6 @@ import { Conduit as CoreConduit } from "seaport-core/src/conduit/Conduit.sol";
  *         approved ERC20/721/1155 tokens to be taken immediately — be extremely
  *         cautious with what conduits you give token approvals to!*
  */
-contract LocalConduit is CoreConduit {}
+contract LocalConduit is CoreConduit {
+
+}
diff --git a/contracts/conduit/ConduitController.sol b/contracts/conduit/ConduitController.sol
@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import { ConduitController as CoreConduitController } from "seaport-core/src/conduit/ConduitController.sol";
+import {
+    ConduitController as CoreConduitController
+} from "seaport-core/src/conduit/ConduitController.sol";
 
 /**
  * @title ConduitController
@@ -10,4 +12,6 @@ import { ConduitController as CoreConduitController } from "seaport-core/src/con
  *         contracts that allow registered callers (or open "channels") to
  *         transfer approved ERC20/721/1155 tokens on their behalf.
  */
-contract LocalConduitController is CoreConduitController {}
+contract LocalConduitController is CoreConduitController {
+
+}
diff --git a/contracts/helpers/TransferHelper.sol b/contracts/helpers/TransferHelper.sol
@@ -1,14 +1,18 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import { IERC721Receiver } from "seaport-types/src/interfaces/IERC721Receiver.sol";
+import {
+    IERC721Receiver
+} from "seaport-types/src/interfaces/IERC721Receiver.sol";
 
 import {
     TransferHelperItem,
     TransferHelperItemsWithRecipient
 } from "seaport-types/src/helpers/TransferHelperStructs.sol";
 
-import { ConduitItemType } from "seaport-types/src/conduit/lib/ConduitEnums.sol";
+import {
+    ConduitItemType
+} from "seaport-types/src/conduit/lib/ConduitEnums.sol";
 
 import {
     ConduitInterface
@@ -18,7 +22,9 @@ import {
     ConduitControllerInterface
 } from "seaport-types/src/interfaces/ConduitControllerInterface.sol";
 
-import { ConduitTransfer } from "seaport-types/src/conduit/lib/ConduitStructs.sol";
+import {
+    ConduitTransfer
+} from "seaport-types/src/conduit/lib/ConduitStructs.sol";
 
 import {
     TransferHelperInterface

diff --git a/contracts/helpers/order-validator/lib/Murky.sol b/contracts/helpers/order-validator/lib/Murky.sol
@@ -35,11 +35,10 @@ contract Murky {
      ********************/
 
     /// ascending sort and concat prior to hashing
-    function _hashLeafPairs(bytes32 left, bytes32 right)
-        internal
-        pure
-        returns (bytes32 _hash)
-    {
+    function _hashLeafPairs(
+        bytes32 left,
+        bytes32 right
+    ) internal pure returns (bytes32 _hash) {
         assembly {
             switch lt(left, right)
             case 0 {
@@ -58,7 +57,9 @@ contract Murky {
      * PROOF GENERATION *
      ********************/
 
-    function _getRoot(uint256[] memory data)
+    function _getRoot(
+        uint256[] memory data
+    )
         internal
         pure
         returns (bytes32 result, ErrorsAndWarnings memory errorsAndWarnings)
@@ -159,7 +160,10 @@ contract Murky {
         }
     }
 
-    function _getProof(uint256[] memory data, uint256 node)
+    function _getProof(
+        uint256[] memory data,
+        uint256 node
+    )
         internal
         pure
         returns (
@@ -316,11 +320,9 @@ contract Murky {
     /**
      * Hashes each element of the input array in place using keccak256
      */
-    function _processInput(uint256[] memory data)
-        private
-        pure
-        returns (bool sorted)
-    {
+    function _processInput(
+        uint256[] memory data
+    ) private pure returns (bool sorted) {
         sorted = true;
 
         // Hash inputs with keccak256
@@ -352,11 +354,9 @@ contract Murky {
         bytes32 hash;
     }
 
-    function _sortUint256ByHash(uint256[] memory values)
-        internal
-        pure
-        returns (uint256[] memory sortedValues)
-    {
+    function _sortUint256ByHash(
+        uint256[] memory values
+    ) internal pure returns (uint256[] memory sortedValues) {
         HashAndIntTuple[] memory toSort = new HashAndIntTuple[](values.length);
         for (uint256 i = 0; i < values.length; i++) {
             toSort[i] = HashAndIntTuple(

diff --git a/contracts/helpers/order-validator/lib/SeaportValidatorHelper.sol b/contracts/helpers/order-validator/lib/SeaportValidatorHelper.sol
@@ -22,7 +22,9 @@ import {
     ContractOffererInterface
 } from "seaport-types/src/interfaces/ContractOffererInterface.sol";
 import { ZoneInterface } from "seaport-types/src/interfaces/ZoneInterface.sol";
-import { GettersAndDerivers } from "seaport-core/src/lib/GettersAndDerivers.sol";
+import {
+    GettersAndDerivers
+} from "seaport-core/src/lib/GettersAndDerivers.sol";
 import {
     SeaportValidatorInterface
 } from "../lib/SeaportValidatorInterface.sol";

diff --git a/contracts/interfaces/ImmutableCreate2FactoryInterface.sol b/contracts/interfaces/ImmutableCreate2FactoryInterface.sol
@@ -93,4 +93,4 @@ interface ImmutableCreate2FactoryInterface {
     function hasBeenDeployed(
         address deploymentAddress
     ) external view returns (bool);
-}
+}
diff --git a/contracts/test/ERC721ReceiverMock.sol b/contracts/test/ERC721ReceiverMock.sol
@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import { IERC721Receiver } from "seaport-types/src/interfaces/IERC721Receiver.sol";
+import {
+    IERC721Receiver
+} from "seaport-types/src/interfaces/IERC721Receiver.sol";
 
 contract ERC721ReceiverMock is IERC721Receiver {
     enum Error {

diff --git a/reference/conduit/ReferenceConduit.sol b/reference/conduit/ReferenceConduit.sol
@@ -5,7 +5,9 @@ import {
     ConduitInterface
 } from "seaport-types/src/interfaces/ConduitInterface.sol";
 
-import { ConduitItemType } from "seaport-types/src/conduit/lib/ConduitEnums.sol";
+import {
+    ConduitItemType
+} from "seaport-types/src/conduit/lib/ConduitEnums.sol";
 
 import {
     ReferenceTokenTransferrer

diff --git a/reference/lib/ReferenceAssertions.sol b/reference/lib/ReferenceAssertions.sol
@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import { OrderParameters } from "seaport-types/src/lib/ConsiderationStructs.sol";
+import {
+    OrderParameters
+} from "seaport-types/src/lib/ConsiderationStructs.sol";
 
 import { ReferenceGettersAndDerivers } from "./ReferenceGettersAndDerivers.sol";
 

diff --git a/reference/lib/ReferenceConsiderationStructs.sol b/reference/lib/ReferenceConsiderationStructs.sol
@@ -1,14 +1,19 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import { ItemType, OrderType } from "seaport-types/src/lib/ConsiderationEnums.sol";
+import {
+    ItemType,
+    OrderType
+} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
 import {
     ReceivedItem,
     SpentItem
 } from "seaport-types/src/lib/ConsiderationStructs.sol";
 
-import { ConduitTransfer } from "seaport-types/src/conduit/lib/ConduitStructs.sol";
+import {
+    ConduitTransfer
+} from "seaport-types/src/conduit/lib/ConduitStructs.sol";
 
 // This file should only be used by the Reference Implementation
 

diff --git a/reference/lib/ReferenceExecutor.sol b/reference/lib/ReferenceExecutor.sol
@@ -1,13 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import { ConduitItemType } from "seaport-types/src/conduit/lib/ConduitEnums.sol";
+import {
+    ConduitItemType
+} from "seaport-types/src/conduit/lib/ConduitEnums.sol";
 
 import {
     ConduitInterface
 } from "seaport-types/src/interfaces/ConduitInterface.sol";
 
-import { ConduitTransfer } from "seaport-types/src/conduit/lib/ConduitStructs.sol";
+import {
+    ConduitTransfer
+} from "seaport-types/src/conduit/lib/ConduitStructs.sol";
 
 import { ItemType } from "seaport-types/src/lib/ConsiderationEnums.sol";
 

diff --git a/reference/lib/ReferenceOrderCombiner.sol b/reference/lib/ReferenceOrderCombiner.sol
@@ -142,14 +142,17 @@ contract ReferenceOrderCombiner is
         returns (bool[] memory availableOrders, Execution[] memory executions)
     {
         // Validate orders, apply amounts, & determine if they use conduits.
-        (bytes32[] memory orderHashes, bool containsNonOpen) = _validateOrdersAndPrepareToFulfill(
-            advancedOrders,
-            ordersToExecute,
-            criteriaResolvers,
-            false, // Signifies that invalid orders should NOT revert.
-            maximumFulfilled,
-            recipient
-        );
+        (
+            bytes32[] memory orderHashes,
+            bool containsNonOpen
+        ) = _validateOrdersAndPrepareToFulfill(
+                advancedOrders,
+                ordersToExecute,
+                criteriaResolvers,
+                false, // Signifies that invalid orders should NOT revert.
+                maximumFulfilled,
+                recipient
+            );
 
         // Execute transfers.
         (availableOrders, executions) = _executeAvailableFulfillments(
@@ -908,14 +911,17 @@ contract ReferenceOrderCombiner is
             );
 
         // Validate orders, apply amounts, & determine if they utilize conduits.
-        (bytes32[] memory orderHashes, bool containsNonOpen) = _validateOrdersAndPrepareToFulfill(
-            advancedOrders,
-            ordersToExecute,
-            criteriaResolvers,
-            true, // Signifies that invalid orders should revert.
-            advancedOrders.length,
-            recipient
-        );
+        (
+            bytes32[] memory orderHashes,
+            bool containsNonOpen
+        ) = _validateOrdersAndPrepareToFulfill(
+                advancedOrders,
+                ordersToExecute,
+                criteriaResolvers,
+                true, // Signifies that invalid orders should revert.
+                advancedOrders.length,
+                recipient
+            );
 
         // Emit OrdersMatched event.
         emit OrdersMatched(orderHashes);

diff --git a/reference/lib/ReferenceOrderFulfiller.sol b/reference/lib/ReferenceOrderFulfiller.sol
@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import { ItemType, OrderType } from "seaport-types/src/lib/ConsiderationEnums.sol";
+import {
+    ItemType,
+    OrderType
+} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
 import {
     AdvancedOrder,

diff --git a/reference/lib/ReferenceOrderValidator.sol b/reference/lib/ReferenceOrderValidator.sol
@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import { OrderType, ItemType } from "seaport-types/src/lib/ConsiderationEnums.sol";
+import {
+    OrderType,
+    ItemType
+} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
 import {
     AdvancedOrder,

diff --git a/reference/lib/ReferenceZoneInteraction.sol b/reference/lib/ReferenceZoneInteraction.sol
@@ -7,7 +7,10 @@ import {
     ContractOffererInterface
 } from "seaport-types/src/interfaces/ContractOffererInterface.sol";
 
-import { ItemType, OrderType } from "seaport-types/src/lib/ConsiderationEnums.sol";
+import {
+    ItemType,
+    OrderType
+} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
 import {
     AdditionalRecipient,

diff --git a/test/foundry/FulfillAdvancedOrder.t.sol b/test/foundry/FulfillAdvancedOrder.t.sol
@@ -2,7 +2,10 @@
 
 pragma solidity ^0.8.17;
 
-import { OrderType, ItemType } from "seaport-types/src/lib/ConsiderationEnums.sol";
+import {
+    OrderType,
+    ItemType
+} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
 import {
     ConsiderationInterface

diff --git a/test/foundry/FulfillAvailableAdvancedOrder.t.sol b/test/foundry/FulfillAvailableAdvancedOrder.t.sol
@@ -2,7 +2,10 @@
 
 pragma solidity ^0.8.17;
 
-import { OrderType, ItemType } from "seaport-types/src/lib/ConsiderationEnums.sol";
+import {
+    OrderType,
+    ItemType
+} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
 import {
     ConsiderationInterface

diff --git a/test/foundry/FullfillAvailableOrder.t.sol b/test/foundry/FullfillAvailableOrder.t.sol
@@ -2,7 +2,10 @@
 
 pragma solidity ^0.8.17;
 
-import { OrderType, ItemType } from "seaport-types/src/lib/ConsiderationEnums.sol";
+import {
+    OrderType,
+    ItemType
+} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
 import {
     ConsiderationInterface

diff --git a/test/foundry/MatchAdvancedOrder.t.sol b/test/foundry/MatchAdvancedOrder.t.sol
@@ -2,7 +2,10 @@
 
 pragma solidity ^0.8.17;
 
-import { OrderType, ItemType } from "seaport-types/src/lib/ConsiderationEnums.sol";
+import {
+    OrderType,
+    ItemType
+} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
 import {
     ConsiderationInterface

diff --git a/test/foundry/MatchOrders.t.sol b/test/foundry/MatchOrders.t.sol
@@ -2,7 +2,10 @@
 
 pragma solidity ^0.8.17;
 
-import { OrderType, ItemType } from "seaport-types/src/lib/ConsiderationEnums.sol";
+import {
+    OrderType,
+    ItemType
+} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
 import {
     Order,

diff --git a/test/foundry/TransferHelperMultipleRecipientsTest.sol b/test/foundry/TransferHelperMultipleRecipientsTest.sol
@@ -7,7 +7,9 @@ import {
     ConduitInterface
 } from "seaport-types/src/interfaces/ConduitInterface.sol";
 
-import { ConduitItemType } from "seaport-types/src/conduit/lib/ConduitEnums.sol";
+import {
+    ConduitItemType
+} from "seaport-types/src/conduit/lib/ConduitEnums.sol";
 
 import { TransferHelper } from "../../contracts/helpers/TransferHelper.sol";
 
@@ -46,7 +48,9 @@ import {
     TransferHelperErrors
 } from "seaport-types/src/interfaces/TransferHelperErrors.sol";
 
-import { IERC721Receiver } from "seaport-types/src/interfaces/IERC721Receiver.sol";
+import {
+    IERC721Receiver
+} from "seaport-types/src/interfaces/IERC721Receiver.sol";
 
 import {
     ERC721ReceiverMock