Merge pull request #61 from ProjectOpenSea/dan/2023/07/switch-to-seap…

…ort-1.5 switch from one four to one five
ProjectOpenSea · Jul 18, 2023 · 2e213f8 · 2e213f8
2 parents a70bb95 + 55b6dac
commit 2e213f8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/...seaport-1.4/SeaportOnePointFourConfig.sol → ...seaport-1.5/SeaportOnePointFiveConfig.sol b/...seaport-1.4/SeaportOnePointFourConfig.sol → ...seaport-1.5/SeaportOnePointFiveConfig.sol
@@ -8,20 +8,20 @@ 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) {
         return address(seaport);
     }
 
     ISeaport internal constant seaport =
-        ISeaport(0x00000000000001ad428e4906aE43D8F9852d0dD6);
+        ISeaport(0x00000000000000ADc04C56Bf30aC9d3c0aAF14dC);
 
     function buildBasicOrder(
         BasicOrderRouteType routeType,

diff --git a/...1.4/interfaces/ConsiderationInterface.sol → ...1.5/interfaces/ConsiderationInterface.sol b/...1.4/interfaces/ConsiderationInterface.sol → ...1.5/interfaces/ConsiderationInterface.sol
diff --git a/...es/seaport-1.4/lib/ConsiderationEnums.sol → ...es/seaport-1.5/lib/ConsiderationEnums.sol b/...es/seaport-1.4/lib/ConsiderationEnums.sol → ...es/seaport-1.5/lib/ConsiderationEnums.sol
diff --git a/.../seaport-1.4/lib/ConsiderationStructs.sol → .../seaport-1.5/lib/ConsiderationStructs.sol b/.../seaport-1.4/lib/ConsiderationStructs.sol → .../seaport-1.5/lib/ConsiderationStructs.sol
diff --git a/...aport-1.4/lib/ConsiderationTypeHashes.sol → ...aport-1.5/lib/ConsiderationTypeHashes.sol b/...aport-1.4/lib/ConsiderationTypeHashes.sol → ...aport-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
@@ -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 {