Update to final Seaport v1.2 address (ProjectOpenSea#165)

* update to final 1.2 address

* add updated package-lock

Author: ryanio

.c8rc

@@ -1,5 +1,5 @@
 {
-    "reporter": ["lcov","text"],
-    "src": ["src"],
-    "exclude": ["hardhat.config.ts", "src/__tests__/*", "src/abi/*"]
-}
+  "reporter": ["lcov", "text"],
+  "src": ["src"],
+  "exclude": ["hardhat.config.ts", "src/__tests__/*", "src/abi/*"]
+}

package-lock.json

@@ -28,10 +28,10 @@
     "eslint:check": "eslint . --max-warnings 0 --ext .js,.jsx,.ts,.tsx",
     "lint": "concurrently \"npm run check-types\" \"npm run eslint:check\" \"npm run prettier:check\" \"npm run prettier:check:package.json\"",
     "prepare": "husky install && npm run build",
-    "test": "hardhat test",
     "prettier:check": "prettier --check .",
     "prettier:check:package.json": "prettier-package-json --list-different",
-    "prettier:fix": "prettier --write ."
+    "prettier:fix": "prettier --write .",
+    "test": "hardhat test"
   },
   "types": "lib/index.d.ts",
   "resolutions": {
@@ -92,7 +92,7 @@
     "prettier-package-json": "^2.6.3",
     "prettier-plugin-solidity": "^1.0.0-beta.13",
     "seaport": "ProjectOpenSea/seaport#76e508657888e3ec84039e1da269c822826991ef",
-    "seaportv12": "ProjectOpenSea/seaport#1.2-alpha-deploy",
+    "seaport_v1_2": "ProjectOpenSea/seaport#1.2",
     "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "solhint": "^3.3.7",

package.json

@@ -5,7 +5,6 @@ import type {
   TestERC20,
   TestERC1155,
   Seaport as SeaportContract,
-  SeaportAlphaVersion as Seaportv12Contract,
   DomainRegistry,
 } from "../../typechain";
 import chai from "chai";
@@ -17,7 +16,7 @@ chai.use(sinonChai);
 
 type Fixture = {
   seaportContract: SeaportContract;
-  seaportv12Contract: Seaportv12Contract;
+  seaportv12Contract: SeaportContract;
   seaport: Seaport;
   seaportv12: Seaport;
   domainRegistry: DomainRegistry;
@@ -34,10 +33,12 @@ export const describeWithFixture = (
     const fixture: Partial<Fixture> = {};
 
     beforeEach(async () => {
-      const SeaportFactory = await ethers.getContractFactory("Seaport");
+      const SeaportFactory = await ethers.getContractFactory(
+        "seaport/contracts/Seaport.sol:Seaport"
+      );
 
       const Seaportv12Factory = await ethers.getContractFactory(
-        "SeaportAlphaVersion"
+        "seaport_v1_2/contracts/Seaport.sol:Seaport"
       );
 
       const ConduitControllerFactory = await ethers.getContractFactory(
@@ -46,13 +47,13 @@ export const describeWithFixture = (
 
       const conduitController = await ConduitControllerFactory.deploy();
 
-      const seaportContract = await SeaportFactory.deploy(
+      const seaportContract = (await SeaportFactory.deploy(
         conduitController.address
-      );
+      )) as SeaportContract;
 
-      const seaportv12Contract = await Seaportv12Factory.deploy(
+      const seaportv12Contract = (await Seaportv12Factory.deploy(
         conduitController.address
-      );
+      )) as SeaportContract;
 
       await seaportContract.deployed();
 

src/__tests__/utils/setup.ts

@@ -1,7 +1,6 @@
 import { BigNumber } from "ethers";
 
 export const SEAPORT_CONTRACT_NAME = "Seaport";
-export const SEAPORT_CONTRACT_NAME_ALPHA = "Seaport-alpha";
 export const SEAPORT_CONTRACT_VERSION = "1.1";
 export const SEAPORT_CONTRACT_VERSION_V1_2 = "1.2";
 export const OPENSEA_CONDUIT_KEY =
@@ -122,7 +121,7 @@ export const CROSS_CHAIN_SEAPORT_ADDRESS =
   "0x00000000006c3852cbef3e08e8df289169ede581";
 
 export const CROSS_CHAIN_SEAPORT_V1_2_ADDRESS =
-  "0x000000000090d2b159528c290616cf919b24e1d9";
+  "0x00000000000006c7676171937C444f6BDe3D6282";
 
 export const DOMAIN_REGISTRY_ADDRESS =
   "0x000000000DaD0DE04D2B2D4a5A74581EBA94124A";

src/constants.ts

@@ -1,4 +1,4 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import "seaportv12/contracts/Seaport.sol";
+import "seaport_v1_2/contracts/Seaport.sol";

src/contracts/Seaportv12.sol src/contracts/Seaport_v1_2.sol

@@ -13,7 +13,6 @@ import { SeaportABI } from "./abi/Seaport";
 import { SeaportABIv12 } from "./abi/Seaport_v1_2";
 import {
   SEAPORT_CONTRACT_NAME,
-  SEAPORT_CONTRACT_NAME_ALPHA,
   SEAPORT_CONTRACT_VERSION,
   SEAPORT_CONTRACT_VERSION_V1_2,
   EIP_712_ORDER_TYPE,
@@ -447,10 +446,7 @@ export class Seaport {
     const { chainId } = await this.provider.getNetwork();
 
     return {
-      name:
-        this.config.seaportVersion === "1.2"
-          ? SEAPORT_CONTRACT_NAME_ALPHA
-          : SEAPORT_CONTRACT_NAME,
+      name: SEAPORT_CONTRACT_NAME,
       version:
         this.config.seaportVersion === "1.2"
           ? SEAPORT_CONTRACT_VERSION_V1_2