diff --git a/src/marketplaces/seaport-1.4/SeaportOnePointFourConfig.sol b/src/marketplaces/seaport-1.5/SeaportOnePointFiveConfig.sol similarity index 99% rename from src/marketplaces/seaport-1.4/SeaportOnePointFourConfig.sol rename to src/marketplaces/seaport-1.5/SeaportOnePointFiveConfig.sol index 586c895..4a3ff91 100644 --- a/src/marketplaces/seaport-1.4/SeaportOnePointFourConfig.sol +++ b/src/marketplaces/seaport-1.5/SeaportOnePointFiveConfig.sol @@ -8,12 +8,12 @@ import "./lib/ConsiderationTypeHashes.sol"; import { ConsiderationInterface as ISeaport } from "./interfaces/ConsiderationInterface.sol"; import "forge-std/console2.sol"; -contract SeaportOnePointFourConfig is +contract SeaportOnePointFiveConfig is BaseMarketConfig, ConsiderationTypeHashes { function name() external pure override returns (string memory) { - return "Seaport 1.4"; + return "Seaport 1.5"; } function market() public pure override returns (address) { @@ -21,7 +21,7 @@ contract SeaportOnePointFourConfig is } ISeaport internal constant seaport = - ISeaport(0x00000000000001ad428e4906aE43D8F9852d0dD6); + ISeaport(0x00000000000000ADc04C56Bf30aC9d3c0aAF14dC); function buildBasicOrder( BasicOrderRouteType routeType, diff --git a/src/marketplaces/seaport-1.4/interfaces/ConsiderationInterface.sol b/src/marketplaces/seaport-1.5/interfaces/ConsiderationInterface.sol similarity index 100% rename from src/marketplaces/seaport-1.4/interfaces/ConsiderationInterface.sol rename to src/marketplaces/seaport-1.5/interfaces/ConsiderationInterface.sol diff --git a/src/marketplaces/seaport-1.4/lib/ConsiderationEnums.sol b/src/marketplaces/seaport-1.5/lib/ConsiderationEnums.sol similarity index 100% rename from src/marketplaces/seaport-1.4/lib/ConsiderationEnums.sol rename to src/marketplaces/seaport-1.5/lib/ConsiderationEnums.sol diff --git a/src/marketplaces/seaport-1.4/lib/ConsiderationStructs.sol b/src/marketplaces/seaport-1.5/lib/ConsiderationStructs.sol similarity index 100% rename from src/marketplaces/seaport-1.4/lib/ConsiderationStructs.sol rename to src/marketplaces/seaport-1.5/lib/ConsiderationStructs.sol diff --git a/src/marketplaces/seaport-1.4/lib/ConsiderationTypeHashes.sol b/src/marketplaces/seaport-1.5/lib/ConsiderationTypeHashes.sol similarity index 98% rename from src/marketplaces/seaport-1.4/lib/ConsiderationTypeHashes.sol rename to src/marketplaces/seaport-1.5/lib/ConsiderationTypeHashes.sol index fb605e4..e9b7b95 100644 --- a/src/marketplaces/seaport-1.4/lib/ConsiderationTypeHashes.sol +++ b/src/marketplaces/seaport-1.5/lib/ConsiderationTypeHashes.sol @@ -22,14 +22,14 @@ contract ConsiderationTypeHashes { bytes32 internal immutable _ORDER_TYPEHASH; bytes32 internal immutable _DOMAIN_SEPARATOR; address internal constant seaportAddress = - address(0x00000000000001ad428e4906aE43D8F9852d0dD6); + address(0x00000000000000ADc04C56Bf30aC9d3c0aAF14dC); constructor() { // Derive hash of the name of the contract. _NAME_HASH = keccak256(bytes("Seaport")); // Derive hash of the version string of the contract. - _VERSION_HASH = keccak256(bytes("1.4")); + _VERSION_HASH = keccak256(bytes("1.5")); bytes memory offerItemTypeString = abi.encodePacked( "OfferItem(", diff --git a/test/GenericMarketplaceTest.t.sol b/test/GenericMarketplaceTest.t.sol index ca20eb6..4d07e36 100644 --- a/test/GenericMarketplaceTest.t.sol +++ b/test/GenericMarketplaceTest.t.sol @@ -6,8 +6,8 @@ import { BlurConfig } from "../src/marketplaces/blur/BlurConfig.sol"; import { BlurV2Config } from "../src/marketplaces/blur-2.0/BlurV2Config.sol"; import { FoundationConfig } from "../src/marketplaces/foundation/FoundationConfig.sol"; import { LooksRareConfig } from "../src/marketplaces/looksRare/LooksRareConfig.sol"; +import { SeaportOnePointFiveConfig } from "../src/marketplaces/seaport-1.5/SeaportOnePointFiveConfig.sol"; import { LooksRareV2Config } from "../src/marketplaces/looksRare-v2/LooksRareV2Config.sol"; -import { SeaportOnePointFourConfig } from "../src/marketplaces/seaport-1.4/SeaportOnePointFourConfig.sol"; import { SeaportOnePointOneConfig } from "../src/marketplaces/seaport-1.1/SeaportOnePointOneConfig.sol"; import { SudoswapConfig } from "../src/marketplaces/sudoswap/SudoswapConfig.sol"; import { WyvernConfig } from "../src/marketplaces/wyvern/WyvernConfig.sol"; @@ -28,7 +28,7 @@ contract GenericMarketplaceTest is BaseOrderTest { BaseMarketConfig looksRareConfig; BaseMarketConfig looksRareV2Config; BaseMarketConfig seaportOnePointOneConfig; - BaseMarketConfig seaportOnePointFourConfig; + BaseMarketConfig seaportOnePointFiveConfig; BaseMarketConfig sudoswapConfig; BaseMarketConfig wyvernConfig; BaseMarketConfig x2y2Config; @@ -43,8 +43,8 @@ contract GenericMarketplaceTest is BaseOrderTest { seaportOnePointOneConfig = BaseMarketConfig( new SeaportOnePointOneConfig() ); - seaportOnePointFourConfig = BaseMarketConfig( - new SeaportOnePointFourConfig() + seaportOnePointFiveConfig = BaseMarketConfig( + new SeaportOnePointFiveConfig() ); sudoswapConfig = BaseMarketConfig(new SudoswapConfig()); wyvernConfig = BaseMarketConfig(new WyvernConfig()); @@ -72,8 +72,8 @@ contract GenericMarketplaceTest is BaseOrderTest { benchmarkMarket(looksRareV2Config); } - function testSeaportOnePointFour() external { - benchmarkMarket(seaportOnePointFourConfig); + function testSeaportOnePointFive() external { + benchmarkMarket(seaportOnePointFiveConfig); } function testSeaportOnePointOne() external {