Merge pull request #1 from ProjectOpenSea/no-remapping

remove src remappings
ProjectOpenSea · May 11, 2023 · bd1c246 · bd1c246
2 parents ef79c4b + c0deac1
commit bd1c246
Show file tree

Hide file tree

Showing 26 changed files with 99 additions and 99 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -2,6 +2,6 @@
 src = "src"
 out = "out"
 libs = ["lib"]
-remappings = ['seaport-types/=lib/seaport-types/src/']
+remappings = ['seaport-types/=lib/seaport-types/']
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
diff --git a/src/conduit/Conduit.sol b/src/conduit/Conduit.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import {ConduitInterface} from "seaport-types/interfaces/ConduitInterface.sol";
+import {ConduitInterface} from "seaport-types/src/interfaces/ConduitInterface.sol";
 
-import {ConduitItemType} from "seaport-types/conduit/lib/ConduitEnums.sol";
+import {ConduitItemType} from "seaport-types/src/conduit/lib/ConduitEnums.sol";
 
 import {TokenTransferrer} from "../lib/TokenTransferrer.sol";
 
-import {ConduitBatch1155Transfer, ConduitTransfer} from "seaport-types/conduit/lib/ConduitStructs.sol";
+import {ConduitBatch1155Transfer, ConduitTransfer} from "seaport-types/src/conduit/lib/ConduitStructs.sol";
 
 import {
     ChannelClosed_channel_ptr,
@@ -17,7 +17,7 @@ import {
     ChannelKey_channel_ptr,
     ChannelKey_length,
     ChannelKey_slot_ptr
-} from "seaport-types/conduit/lib/ConduitConstants.sol";
+} from "seaport-types/src/conduit/lib/ConduitConstants.sol";
 
 /**
  * @title Conduit

diff --git a/src/conduit/ConduitController.sol b/src/conduit/ConduitController.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import {ConduitControllerInterface} from "seaport-types/interfaces/ConduitControllerInterface.sol";
+import {ConduitControllerInterface} from "seaport-types/src/interfaces/ConduitControllerInterface.sol";
 
-import {ConduitInterface} from "seaport-types/interfaces/ConduitInterface.sol";
+import {ConduitInterface} from "seaport-types/src/interfaces/ConduitInterface.sol";
 
 import {Conduit} from "./Conduit.sol";
 

diff --git a/src/helpers/SeaportRouter.sol b/src/helpers/SeaportRouter.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import {SeaportRouterInterface} from "seaport-types/interfaces/SeaportRouterInterface.sol";
+import {SeaportRouterInterface} from "seaport-types/src/interfaces/SeaportRouterInterface.sol";
 
-import {SeaportInterface} from "seaport-types/interfaces/SeaportInterface.sol";
+import {SeaportInterface} from "seaport-types/src/interfaces/SeaportInterface.sol";
 
 import {ReentrancyGuard} from "../lib/ReentrancyGuard.sol";
 
@@ -12,7 +12,7 @@ import {
     CriteriaResolver,
     Execution,
     FulfillmentComponent
-} from "seaport-types/lib/ConsiderationStructs.sol";
+} from "seaport-types/src/lib/ConsiderationStructs.sol";
 
 /**
  * @title  SeaportRouter

diff --git a/src/helpers/TransferHelper.sol b/src/helpers/TransferHelper.sol
@@ -1,21 +1,21 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import {IERC721Receiver} from "seaport-types/interfaces/IERC721Receiver.sol";
+import {IERC721Receiver} from "seaport-types/src/interfaces/IERC721Receiver.sol";
 
-import {TransferHelperItem, TransferHelperItemsWithRecipient} from "seaport-types/helpers/TransferHelperStructs.sol";
+import {TransferHelperItem, TransferHelperItemsWithRecipient} from "seaport-types/src/helpers/TransferHelperStructs.sol";
 
-import {ConduitItemType} from "seaport-types/conduit/lib/ConduitEnums.sol";
+import {ConduitItemType} from "seaport-types/src/conduit/lib/ConduitEnums.sol";
 
-import {ConduitInterface} from "seaport-types/interfaces/ConduitInterface.sol";
+import {ConduitInterface} from "seaport-types/src/interfaces/ConduitInterface.sol";
 
-import {ConduitControllerInterface} from "seaport-types/interfaces/ConduitControllerInterface.sol";
+import {ConduitControllerInterface} from "seaport-types/src/interfaces/ConduitControllerInterface.sol";
 
-import {ConduitTransfer} from "seaport-types/conduit/lib/ConduitStructs.sol";
+import {ConduitTransfer} from "seaport-types/src/conduit/lib/ConduitStructs.sol";
 
-import {TransferHelperInterface} from "seaport-types/interfaces/TransferHelperInterface.sol";
+import {TransferHelperInterface} from "seaport-types/src/interfaces/TransferHelperInterface.sol";
 
-import {TransferHelperErrors} from "seaport-types/interfaces/TransferHelperErrors.sol";
+import {TransferHelperErrors} from "seaport-types/src/interfaces/TransferHelperErrors.sol";
 
 /**
  * @title TransferHelper

diff --git a/src/lib/AmountDeriver.sol b/src/lib/AmountDeriver.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {AmountDerivationErrors} from "seaport-types/interfaces/AmountDerivationErrors.sol";
+import {AmountDerivationErrors} from "seaport-types/src/interfaces/AmountDerivationErrors.sol";
 
 import {
     Error_selector_offset,
     InexactFraction_error_length,
     InexactFraction_error_selector
-} from "seaport-types/lib/ConsiderationErrorConstants.sol";
+} from "seaport-types/src/lib/ConsiderationErrorConstants.sol";
 
 /**
  * @title AmountDeriver

diff --git a/src/lib/Assertions.sol b/src/lib/Assertions.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {OrderParameters} from "seaport-types/lib/ConsiderationStructs.sol";
+import {OrderParameters} from "seaport-types/src/lib/ConsiderationStructs.sol";
 
 import {GettersAndDerivers} from "./GettersAndDerivers.sol";
 
-import {TokenTransferrerErrors} from "seaport-types/interfaces/TokenTransferrerErrors.sol";
+import {TokenTransferrerErrors} from "seaport-types/src/interfaces/TokenTransferrerErrors.sol";
 
 import {CounterManager} from "./CounterManager.sol";
 
@@ -25,18 +25,18 @@ import {
     BasicOrder_signature_cdPtr,
     BasicOrder_signature_ptr,
     BasicOrder_zone_cdPtr
-} from "seaport-types/lib/ConsiderationConstants.sol";
+} from "seaport-types/src/lib/ConsiderationConstants.sol";
 
 import {
     Error_selector_offset,
     MissingItemAmount_error_length,
     MissingItemAmount_error_selector
-} from "seaport-types/lib/ConsiderationErrorConstants.sol";
+} from "seaport-types/src/lib/ConsiderationErrorConstants.sol";
 
 import {
     _revertInvalidBasicOrderParameterEncoding,
     _revertMissingOriginalConsiderationItems
-} from "seaport-types/lib/ConsiderationErrors.sol";
+} from "seaport-types/src/lib/ConsiderationErrors.sol";
 
 /**
  * @title Assertions

diff --git a/src/lib/BasicOrderFulfiller.sol b/src/lib/BasicOrderFulfiller.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {BasicOrderRouteType, ItemType, OrderType} from "seaport-types/lib/ConsiderationEnums.sol";
+import {BasicOrderRouteType, ItemType, OrderType} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
-import {BasicOrderParameters} from "seaport-types/lib/ConsiderationStructs.sol";
+import {BasicOrderParameters} from "seaport-types/src/lib/ConsiderationStructs.sol";
 
 import {OrderValidator} from "./OrderValidator.sol";
 
@@ -12,7 +12,7 @@ import {
     _revertInvalidMsgValue,
     _revertInvalidERC721TransferAmount,
     _revertUnusedItemParameters
-} from "seaport-types/lib/ConsiderationErrors.sol";
+} from "seaport-types/src/lib/ConsiderationErrors.sol";
 
 import {
     AccumulatorDisarmed,
@@ -93,7 +93,7 @@ import {
     ThreeWords,
     TwoWords,
     ZeroSlot
-} from "seaport-types/lib/ConsiderationConstants.sol";
+} from "seaport-types/src/lib/ConsiderationConstants.sol";
 
 import {
     Error_selector_offset,
@@ -107,7 +107,7 @@ import {
     MissingOriginalConsiderationItems_error_selector,
     UnusedItemParameters_error_length,
     UnusedItemParameters_error_selector
-} from "seaport-types/lib/ConsiderationErrorConstants.sol";
+} from "seaport-types/src/lib/ConsiderationErrorConstants.sol";
 
 /**
  * @title BasicOrderFulfiller

diff --git a/src/lib/Consideration.sol b/src/lib/Consideration.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {ConsiderationInterface} from "seaport-types/interfaces/ConsiderationInterface.sol";
+import {ConsiderationInterface} from "seaport-types/src/interfaces/ConsiderationInterface.sol";
 
 import {
     AdvancedOrder,
@@ -12,11 +12,11 @@ import {
     FulfillmentComponent,
     Order,
     OrderComponents
-} from "seaport-types/lib/ConsiderationStructs.sol";
+} from "seaport-types/src/lib/ConsiderationStructs.sol";
 
 import {OrderCombiner} from "./OrderCombiner.sol";
 
-import {CalldataStart, CalldataPointer} from "seaport-types/helpers/PointerLibraries.sol";
+import {CalldataStart, CalldataPointer} from "seaport-types/src/helpers/PointerLibraries.sol";
 
 import {
     Offset_fulfillAdvancedOrder_criteriaResolvers,
@@ -29,7 +29,7 @@ import {
     Offset_matchAdvancedOrders_fulfillments,
     Offset_matchOrders_fulfillments,
     OrderParameters_counter_offset
-} from "seaport-types/lib/ConsiderationConstants.sol";
+} from "seaport-types/src/lib/ConsiderationConstants.sol";
 
 /**
  * @title Consideration

diff --git a/src/lib/ConsiderationBase.sol b/src/lib/ConsiderationBase.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {ConduitControllerInterface} from "seaport-types/interfaces/ConduitControllerInterface.sol";
+import {ConduitControllerInterface} from "seaport-types/src/interfaces/ConduitControllerInterface.sol";
 
-import {ConsiderationEventsAndErrors} from "seaport-types/interfaces/ConsiderationEventsAndErrors.sol";
+import {ConsiderationEventsAndErrors} from "seaport-types/src/interfaces/ConsiderationEventsAndErrors.sol";
 
 import {
     BulkOrder_Typehash_Height_One,
@@ -42,7 +42,7 @@ import {
     Slot0x80,
     ThreeWords,
     ZeroSlot
-} from "seaport-types/lib/ConsiderationConstants.sol";
+} from "seaport-types/src/lib/ConsiderationConstants.sol";
 
 import {ConsiderationDecoder} from "./ConsiderationDecoder.sol";
 

diff --git a/src/lib/ConsiderationDecoder.sol b/src/lib/ConsiderationDecoder.sol
@@ -11,7 +11,7 @@ import {
     Order,
     OrderParameters,
     ReceivedItem
-} from "seaport-types/lib/ConsiderationStructs.sol";
+} from "seaport-types/src/lib/ConsiderationStructs.sol";
 
 import {
     AdvancedOrder_denominator_offset,
@@ -54,9 +54,9 @@ import {
     SpentItem_size,
     ThirtyOneBytes,
     TwoWords
-} from "seaport-types/lib/ConsiderationConstants.sol";
+} from "seaport-types/src/lib/ConsiderationConstants.sol";
 
-import {CalldataPointer, malloc, MemoryPointer, OffsetOrLengthMask} from "seaport-types/helpers/PointerLibraries.sol";
+import {CalldataPointer, malloc, MemoryPointer, OffsetOrLengthMask} from "seaport-types/src/helpers/PointerLibraries.sol";
 
 contract ConsiderationDecoder {
     /**

diff --git a/src/lib/ConsiderationEncoder.sol b/src/lib/ConsiderationEncoder.sol
@@ -55,11 +55,11 @@ import {
     ZoneParameters_selectorAndPointer_length,
     ZoneParameters_startTime_offset,
     ZoneParameters_zoneHash_offset
-} from "seaport-types/lib/ConsiderationConstants.sol";
+} from "seaport-types/src/lib/ConsiderationConstants.sol";
 
-import {BasicOrderParameters, OrderParameters} from "seaport-types/lib/ConsiderationStructs.sol";
+import {BasicOrderParameters, OrderParameters} from "seaport-types/src/lib/ConsiderationStructs.sol";
 
-import {CalldataPointer, getFreeMemoryPointer, MemoryPointer} from "seaport-types/helpers/PointerLibraries.sol";
+import {CalldataPointer, getFreeMemoryPointer, MemoryPointer} from "seaport-types/src/helpers/PointerLibraries.sol";
 
 contract ConsiderationEncoder {
     /**

diff --git a/src/lib/CounterManager.sol b/src/lib/CounterManager.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {ConsiderationEventsAndErrors} from "seaport-types/interfaces/ConsiderationEventsAndErrors.sol";
+import {ConsiderationEventsAndErrors} from "seaport-types/src/interfaces/ConsiderationEventsAndErrors.sol";
 
 import {ReentrancyGuard} from "./ReentrancyGuard.sol";
 
-import {Counter_blockhash_shift, OneWord, TwoWords} from "seaport-types/lib/ConsiderationConstants.sol";
+import {Counter_blockhash_shift, OneWord, TwoWords} from "seaport-types/src/lib/ConsiderationConstants.sol";
 
 /**
  * @title CounterManager

diff --git a/src/lib/CriteriaResolution.sol b/src/lib/CriteriaResolution.sol
@@ -1,39 +1,39 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {ItemType, Side} from "seaport-types/lib/ConsiderationEnums.sol";
+import {ItemType, Side} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
 import {
     AdvancedOrder,
     CriteriaResolver,
     MemoryPointer,
     OfferItem,
     OrderParameters
-} from "seaport-types/lib/ConsiderationStructs.sol";
+} from "seaport-types/src/lib/ConsiderationStructs.sol";
 
 import {
     _revertCriteriaNotEnabledForItem,
     _revertInvalidProof,
     _revertOrderCriteriaResolverOutOfRange,
     _revertUnresolvedConsiderationCriteria,
     _revertUnresolvedOfferCriteria
-} from "seaport-types/lib/ConsiderationErrors.sol";
+} from "seaport-types/src/lib/ConsiderationErrors.sol";
 
-import {CriteriaResolutionErrors} from "seaport-types/interfaces/CriteriaResolutionErrors.sol";
+import {CriteriaResolutionErrors} from "seaport-types/src/interfaces/CriteriaResolutionErrors.sol";
 
 import {
     OneWord,
     OneWordShift,
     OrderParameters_consideration_head_offset,
     Selector_length,
     TwoWords
-} from "seaport-types/lib/ConsiderationConstants.sol";
+} from "seaport-types/src/lib/ConsiderationConstants.sol";
 
 import {
     ConsiderationCriteriaResolverOutOfRange_err_selector,
     Error_selector_offset,
     OfferCriteriaResolverOutOfRange_error_selector
-} from "seaport-types/lib/ConsiderationErrorConstants.sol";
+} from "seaport-types/src/lib/ConsiderationErrorConstants.sol";
 
 /**
  * @title CriteriaResolution

diff --git a/src/lib/Executor.sol b/src/lib/Executor.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {ConduitInterface} from "seaport-types/interfaces/ConduitInterface.sol";
+import {ConduitInterface} from "seaport-types/src/interfaces/ConduitInterface.sol";
 
-import {ConduitItemType} from "seaport-types/conduit/lib/ConduitEnums.sol";
+import {ConduitItemType} from "seaport-types/src/conduit/lib/ConduitEnums.sol";
 
-import {ItemType} from "seaport-types/lib/ConsiderationEnums.sol";
+import {ItemType} from "seaport-types/src/lib/ConsiderationEnums.sol";
 
-import {ReceivedItem} from "seaport-types/lib/ConsiderationStructs.sol";
+import {ReceivedItem} from "seaport-types/src/lib/ConsiderationStructs.sol";
 
 import {Verifiers} from "./Verifiers.sol";
 
@@ -31,22 +31,22 @@ import {
     FreeMemoryPointerSlot,
     OneWord,
     TwoWords
-} from "seaport-types/lib/ConsiderationConstants.sol";
+} from "seaport-types/src/lib/ConsiderationConstants.sol";
 
 import {
     Error_selector_offset,
     NativeTokenTransferGenericFailure_error_account_ptr,
     NativeTokenTransferGenericFailure_error_amount_ptr,
     NativeTokenTransferGenericFailure_error_length,
     NativeTokenTransferGenericFailure_error_selector
-} from "seaport-types/lib/ConsiderationErrorConstants.sol";
+} from "seaport-types/src/lib/ConsiderationErrorConstants.sol";
 
 import {
     _revertInvalidCallToConduit,
     _revertInvalidConduit,
     _revertInvalidERC721TransferAmount,
     _revertUnusedItemParameters
-} from "seaport-types/lib/ConsiderationErrors.sol";
+} from "seaport-types/src/lib/ConsiderationErrors.sol";
 
 /**
  * @title Executor