diff --git a/foundry.toml b/foundry.toml index 290e9e6c..ddaf590a 100644 --- 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 index 99a72c03..a36ead8a 100644 --- 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 index ac806190..1782fc57 100644 --- 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 index 8cebc925..258b7616 100644 --- 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 index 4f8a3dec..ba9adada 100644 --- 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 index 3cca6417..11c65da2 100644 --- 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 index 5057fbe0..decf44f5 100644 --- 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 index 58bad68b..54783d04 100644 --- 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 index 73f71aff..96e1d461 100644 --- 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 index 40f9d449..53b7279a 100644 --- 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 index 764b98ff..b41726a6 100644 --- 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 index 28f576fd..3fbf5c76 100644 --- 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 index 1161439b..7c88752a 100644 --- 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 index 586e02ba..18030691 100644 --- a/src/lib/CriteriaResolution.sol +++ b/src/lib/CriteriaResolution.sol @@ -1,7 +1,7 @@ // 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, @@ -9,7 +9,7 @@ import { MemoryPointer, OfferItem, OrderParameters -} from "seaport-types/lib/ConsiderationStructs.sol"; +} from "seaport-types/src/lib/ConsiderationStructs.sol"; import { _revertCriteriaNotEnabledForItem, @@ -17,9 +17,9 @@ import { _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, @@ -27,13 +27,13 @@ import { 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 index dbbec922..9bb6834f 100644 --- 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,7 +31,7 @@ import { FreeMemoryPointerSlot, OneWord, TwoWords -} from "seaport-types/lib/ConsiderationConstants.sol"; +} from "seaport-types/src/lib/ConsiderationConstants.sol"; import { Error_selector_offset, @@ -39,14 +39,14 @@ import { 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 diff --git a/src/lib/FulfillmentApplier.sol b/src/lib/FulfillmentApplier.sol index 5f4da54f..022bd9fd 100644 --- a/src/lib/FulfillmentApplier.sol +++ b/src/lib/FulfillmentApplier.sol @@ -1,19 +1,19 @@ // 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, Execution, FulfillmentComponent, ReceivedItem -} from "seaport-types/lib/ConsiderationStructs.sol"; +} from "seaport-types/src/lib/ConsiderationStructs.sol"; import { _revertMismatchedFulfillmentOfferAndConsiderationComponents, _revertMissingFulfillmentComponentOnAggregation, _revertOfferAndConsiderationRequiredOnFulfillment -} from "seaport-types/lib/ConsiderationErrors.sol"; +} from "seaport-types/src/lib/ConsiderationErrors.sol"; -import {FulfillmentApplicationErrors} from "seaport-types/interfaces/FulfillmentApplicationErrors.sol"; +import {FulfillmentApplicationErrors} from "seaport-types/src/interfaces/FulfillmentApplicationErrors.sol"; import { AdvancedOrder_numerator_offset, @@ -31,7 +31,7 @@ import { ReceivedItem_CommonParams_size, ReceivedItem_recipient_offset, ReceivedItem_size -} from "seaport-types/lib/ConsiderationConstants.sol"; +} from "seaport-types/src/lib/ConsiderationConstants.sol"; import { Error_selector_offset, @@ -43,7 +43,7 @@ import { Panic_error_code_ptr, Panic_error_length, Panic_error_selector -} from "seaport-types/lib/ConsiderationErrorConstants.sol"; +} from "seaport-types/src/lib/ConsiderationErrorConstants.sol"; /** * @title FulfillmentApplier diff --git a/src/lib/GettersAndDerivers.sol b/src/lib/GettersAndDerivers.sol index 0b37dc09..e724ad2f 100644 --- a/src/lib/GettersAndDerivers.sol +++ b/src/lib/GettersAndDerivers.sol @@ -1,7 +1,7 @@ // 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 {ConsiderationBase} from "./ConsiderationBase.sol"; @@ -31,7 +31,7 @@ import { OrderParameters_counter_offset, OrderParameters_offer_head_offset, TwoWords -} from "seaport-types/lib/ConsiderationConstants.sol"; +} from "seaport-types/src/lib/ConsiderationConstants.sol"; /** * @title GettersAndDerivers diff --git a/src/lib/LowLevelHelpers.sol b/src/lib/LowLevelHelpers.sol index 1fa3f16a..ffc9dec9 100644 --- a/src/lib/LowLevelHelpers.sol +++ b/src/lib/LowLevelHelpers.sol @@ -9,7 +9,7 @@ import { OneWord, OneWordShift, ThirtyOneBytes -} from "seaport-types/lib/ConsiderationConstants.sol"; +} from "seaport-types/src/lib/ConsiderationConstants.sol"; /** * @title LowLevelHelpers diff --git a/src/lib/OrderCombiner.sol b/src/lib/OrderCombiner.sol index d10683c8..d6c6a14d 100644 --- a/src/lib/OrderCombiner.sol +++ b/src/lib/OrderCombiner.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.17; -import {Side, ItemType, OrderType} from "seaport-types/lib/ConsiderationEnums.sol"; +import {Side, ItemType, OrderType} from "seaport-types/src/lib/ConsiderationEnums.sol"; import { AdvancedOrder, @@ -13,7 +13,7 @@ import { OfferItem, OrderParameters, ReceivedItem -} from "seaport-types/lib/ConsiderationStructs.sol"; +} from "seaport-types/src/lib/ConsiderationStructs.sol"; import {OrderFulfiller} from "./OrderFulfiller.sol"; @@ -24,7 +24,7 @@ import { _revertInsufficientNativeTokensSupplied, _revertInvalidNativeOfferItem, _revertNoSpecifiedOrdersAvailable -} from "seaport-types/lib/ConsiderationErrors.sol"; +} from "seaport-types/src/lib/ConsiderationErrors.sol"; import { AccumulatorDisarmed, @@ -38,7 +38,7 @@ import { ReceivedItem_amount_offset, ReceivedItem_recipient_offset, TwoWords -} from "seaport-types/lib/ConsiderationConstants.sol"; +} from "seaport-types/src/lib/ConsiderationConstants.sol"; /** * @title OrderCombiner diff --git a/src/lib/OrderFulfiller.sol b/src/lib/OrderFulfiller.sol index 24f0e118..e0d47b09 100644 --- a/src/lib/OrderFulfiller.sol +++ b/src/lib/OrderFulfiller.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.17; -import {ItemType, OrderType} from "seaport-types/lib/ConsiderationEnums.sol"; +import {ItemType, OrderType} from "seaport-types/src/lib/ConsiderationEnums.sol"; import { AdvancedOrder, @@ -11,7 +11,7 @@ import { OrderParameters, ReceivedItem, SpentItem -} from "seaport-types/lib/ConsiderationStructs.sol"; +} from "seaport-types/src/lib/ConsiderationStructs.sol"; import {BasicOrderFulfiller} from "./BasicOrderFulfiller.sol"; @@ -22,14 +22,14 @@ import {AmountDeriver} from "./AmountDeriver.sol"; import { _revertInsufficientNativeTokensSupplied, _revertInvalidNativeOfferItem -} from "seaport-types/lib/ConsiderationErrors.sol"; +} from "seaport-types/src/lib/ConsiderationErrors.sol"; import { AccumulatorDisarmed, ConsiderationItem_recipient_offset, ReceivedItem_amount_offset, ReceivedItem_recipient_offset -} from "seaport-types/lib/ConsiderationConstants.sol"; +} from "seaport-types/src/lib/ConsiderationConstants.sol"; /** * @title OrderFulfiller diff --git a/src/lib/OrderValidator.sol b/src/lib/OrderValidator.sol index 6ea19e28..530d3227 100644 --- a/src/lib/OrderValidator.sol +++ b/src/lib/OrderValidator.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.17; -import {OrderType} from "seaport-types/lib/ConsiderationEnums.sol"; +import {OrderType} from "seaport-types/src/lib/ConsiderationEnums.sol"; import { AdvancedOrder, @@ -11,7 +11,7 @@ import { OrderComponents, OrderParameters, OrderStatus -} from "seaport-types/lib/ConsiderationStructs.sol"; +} from "seaport-types/src/lib/ConsiderationStructs.sol"; import { _revertBadFraction, @@ -19,13 +19,13 @@ import { _revertConsiderationLengthNotEqualToTotalOriginal, _revertInvalidContractOrder, _revertPartialFillsNotEnabledForOrder -} from "seaport-types/lib/ConsiderationErrors.sol"; +} from "seaport-types/src/lib/ConsiderationErrors.sol"; import {Executor} from "./Executor.sol"; import {ZoneInteraction} from "./ZoneInteraction.sol"; -import {MemoryPointer} from "seaport-types/helpers/PointerLibraries.sol"; +import {MemoryPointer} from "seaport-types/src/helpers/PointerLibraries.sol"; import { AdvancedOrder_denominator_offset, @@ -41,7 +41,7 @@ import { OrderStatus_filledDenominator_offset, OrderStatus_filledNumerator_offset, OrderStatus_ValidatedAndNotCancelled -} from "seaport-types/lib/ConsiderationConstants.sol"; +} from "seaport-types/src/lib/ConsiderationConstants.sol"; import { Error_selector_offset, @@ -49,7 +49,7 @@ import { Panic_error_code_ptr, Panic_error_length, Panic_error_selector -} from "seaport-types/lib/ConsiderationErrorConstants.sol"; +} from "seaport-types/src/lib/ConsiderationErrorConstants.sol"; /** * @title OrderValidator diff --git a/src/lib/ReentrancyGuard.sol b/src/lib/ReentrancyGuard.sol index 7f441ed4..7a303dfb 100644 --- a/src/lib/ReentrancyGuard.sol +++ b/src/lib/ReentrancyGuard.sol @@ -1,15 +1,15 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.17; -import {ReentrancyErrors} from "seaport-types/interfaces/ReentrancyErrors.sol"; +import {ReentrancyErrors} from "seaport-types/src/interfaces/ReentrancyErrors.sol"; import {LowLevelHelpers} from "./LowLevelHelpers.sol"; -import {_revertInvalidMsgValue, _revertNoReentrantCalls} from "seaport-types/lib/ConsiderationErrors.sol"; +import {_revertInvalidMsgValue, _revertNoReentrantCalls} from "seaport-types/src/lib/ConsiderationErrors.sol"; import { _ENTERED_AND_ACCEPTING_NATIVE_TOKENS, _ENTERED, _NOT_ENTERED -} from "seaport-types/lib/ConsiderationConstants.sol"; +} from "seaport-types/src/lib/ConsiderationConstants.sol"; /** * @title ReentrancyGuard diff --git a/src/lib/SignatureVerification.sol b/src/lib/SignatureVerification.sol index da0759c7..7561a4c2 100644 --- a/src/lib/SignatureVerification.sol +++ b/src/lib/SignatureVerification.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.17; -import {SignatureVerificationErrors} from "seaport-types/interfaces/SignatureVerificationErrors.sol"; +import {SignatureVerificationErrors} from "seaport-types/src/interfaces/SignatureVerificationErrors.sol"; import {LowLevelHelpers} from "./LowLevelHelpers.sol"; @@ -21,7 +21,7 @@ import { MaxUint8, OneWord, Signature_lower_v -} from "seaport-types/lib/ConsiderationConstants.sol"; +} from "seaport-types/src/lib/ConsiderationConstants.sol"; import { BadContractSignature_error_length, @@ -34,7 +34,7 @@ import { InvalidSignature_error_selector, InvalidSigner_error_length, InvalidSigner_error_selector -} from "seaport-types/lib/ConsiderationErrorConstants.sol"; +} from "seaport-types/src/lib/ConsiderationErrorConstants.sol"; /** * @title SignatureVerification diff --git a/src/lib/TokenTransferrer.sol b/src/lib/TokenTransferrer.sol index 484a642f..a796a602 100644 --- a/src/lib/TokenTransferrer.sol +++ b/src/lib/TokenTransferrer.sol @@ -77,11 +77,11 @@ import { TwoWords, TwoWordsShift, ZeroSlot -} from "seaport-types/lib/TokenTransferrerConstants.sol"; +} from "seaport-types/src/lib/TokenTransferrerConstants.sol"; -import {TokenTransferrerErrors} from "seaport-types/interfaces/TokenTransferrerErrors.sol"; +import {TokenTransferrerErrors} from "seaport-types/src/interfaces/TokenTransferrerErrors.sol"; -import {ConduitBatch1155Transfer} from "seaport-types/conduit/lib/ConduitStructs.sol"; +import {ConduitBatch1155Transfer} from "seaport-types/src/conduit/lib/ConduitStructs.sol"; /** * @title TokenTransferrer diff --git a/src/lib/Verifiers.sol b/src/lib/Verifiers.sol index 3e716ae3..d879f33e 100644 --- a/src/lib/Verifiers.sol +++ b/src/lib/Verifiers.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.17; -import {OrderStatus} from "seaport-types/lib/ConsiderationStructs.sol"; +import {OrderStatus} from "seaport-types/src/lib/ConsiderationStructs.sol"; import {Assertions} from "./Assertions.sol"; @@ -12,7 +12,7 @@ import { _revertOrderAlreadyFilled, _revertOrderIsCancelled, _revertOrderPartiallyFilled -} from "seaport-types/lib/ConsiderationErrors.sol"; +} from "seaport-types/src/lib/ConsiderationErrors.sol"; import { BulkOrderProof_keyShift, @@ -26,7 +26,7 @@ import { OneWordShift, ThirtyOneBytes, TwoWords -} from "seaport-types/lib/ConsiderationConstants.sol"; +} from "seaport-types/src/lib/ConsiderationConstants.sol"; /** * @title Verifiers diff --git a/src/lib/ZoneInteraction.sol b/src/lib/ZoneInteraction.sol index abbd08ac..b85183c0 100644 --- a/src/lib/ZoneInteraction.sol +++ b/src/lib/ZoneInteraction.sol @@ -1,24 +1,24 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.17; -import {OrderType} from "seaport-types/lib/ConsiderationEnums.sol"; +import {OrderType} from "seaport-types/src/lib/ConsiderationEnums.sol"; -import {AdvancedOrder, BasicOrderParameters, OrderParameters} from "seaport-types/lib/ConsiderationStructs.sol"; +import {AdvancedOrder, BasicOrderParameters, OrderParameters} from "seaport-types/src/lib/ConsiderationStructs.sol"; -import {ZoneInteractionErrors} from "seaport-types/interfaces/ZoneInteractionErrors.sol"; +import {ZoneInteractionErrors} from "seaport-types/src/interfaces/ZoneInteractionErrors.sol"; import {LowLevelHelpers} from "./LowLevelHelpers.sol"; import {ConsiderationEncoder} from "./ConsiderationEncoder.sol"; -import {MemoryPointer} from "seaport-types/helpers/PointerLibraries.sol"; +import {MemoryPointer} from "seaport-types/src/helpers/PointerLibraries.sol"; import { ContractOrder_orderHash_offerer_shift, MaskOverFirstFourBytes, OneWord, OrderParameters_zone_offset -} from "seaport-types/lib/ConsiderationConstants.sol"; +} from "seaport-types/src/lib/ConsiderationConstants.sol"; import { Error_selector_offset, @@ -26,7 +26,7 @@ import { InvalidRestrictedOrder_error_length, InvalidRestrictedOrder_error_orderHash_ptr, InvalidRestrictedOrder_error_selector -} from "seaport-types/lib/ConsiderationErrorConstants.sol"; +} from "seaport-types/src/lib/ConsiderationErrorConstants.sol"; /** * @title ZoneInteraction