remove unneeded async fns, remove esModuleInterop, upgrade output to …

…es6, bump package.json version to v2 (#246) * remove unneeded async fns, remove esModuleInterop, bump package.json version to v2 (for interface changes due to async removal for certain fns and es6 bump) * fix
ProjectOpenSea · May 25, 2023 · 8207431 · 8207431
1 parent da2852f
commit 8207431
Show file tree

Hide file tree

Showing 19 changed files with 156 additions and 173 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -2,4 +2,5 @@ node_modules
 artifacts
 cache
 coverage
-lib
+lib
+typechain-types
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -15,13 +15,15 @@ module.exports = {
   parser: "@typescript-eslint/parser",
   parserOptions: {
     ecmaVersion: 12,
+    project: ["tsconfig.json"],
   },
   rules: {
     "no-unused-expressions": "off",
     "@typescript-eslint/no-unused-vars": [
       "error",
       { argsIgnorePattern: "^_", varsIgnorePattern: "^_" },
     ],
+    "@typescript-eslint/require-await": "error",
     "object-shorthand": ["error", "always"],
   },
 };
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -30,15 +30,6 @@ const config: HardhatUserConfig = {
           },
         },
       },
-      {
-        version: "0.4.23",
-        settings: {
-          optimizer: {
-            enabled: true,
-            runs: 200,
-          },
-        },
-      },
     ],
   },
   networks: {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensea/seaport-js",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "[Seaport](https://github.com/ProjectOpenSea/seaport) is a new marketplace protocol for safely and efficiently buying and selling NFTs. This is a JavaScript library intended to make interfacing with the contract reasonable and easy.",
   "license": "MIT",
   "author": "OpenSea Developers",

diff --git a/src/__tests__/ascending-descending-amounts.spec.ts b/src/__tests__/ascending-descending-amounts.spec.ts
@@ -4,7 +4,6 @@ import { expect } from "chai";
 import { BigNumber } from "ethers";
 import { parseEther } from "ethers/lib/utils";
 import { ethers } from "hardhat";
-import sinon from "sinon";
 import { ItemType, MAX_INT, OrderType } from "../constants";
 import { CreateOrderInput, CurrencyItem } from "../types";
 import * as fulfill from "../utils/fulfill";
@@ -16,6 +15,8 @@ import {
 } from "./utils/balance";
 import { describeWithFixture } from "./utils/setup";
 
+const sinon = require("sinon");
+
 const SECONDS_IN_WEEK = 604800;
 
 describeWithFixture("As a user I want to create a dutch auction", (fixture) => {
@@ -24,7 +25,7 @@ describeWithFixture("As a user I want to create a dutch auction", (fixture) => {
   let fulfiller: SignerWithAddress;
   let multicallProvider: providers.MulticallProvider;
 
-  let fulfillStandardOrderSpy: sinon.SinonSpy;
+  let fulfillStandardOrderSpy: sinon.SinonSpy; // eslint-disable-line no-undef
   let standardCreateOrderInput: CreateOrderInput;
   let startTime: string;
   let endTime: string;
@@ -45,7 +46,7 @@ describeWithFixture("As a user I want to create a dutch auction", (fixture) => {
     fulfillStandardOrderSpy.restore();
   });
 
-  describe("A single ERC721 is to be transferred", async () => {
+  describe("A single ERC721 is to be transferred", () => {
     describe("Ascending dutch auction", () => {
       beforeEach(async () => {
         const { testErc721 } = fixture;
@@ -474,7 +475,7 @@ describeWithFixture("As a user I want to create a dutch auction", (fixture) => {
     });
   });
 
-  describe("Multiple ERC1155s are to be transferred", async () => {
+  describe("Multiple ERC1155s are to be transferred", () => {
     describe("Ascending dutch auction", () => {
       beforeEach(async () => {
         const { testErc1155 } = fixture;

diff --git a/src/__tests__/basic-fulfill.spec.ts b/src/__tests__/basic-fulfill.spec.ts
@@ -4,7 +4,6 @@ import { expect } from "chai";
 import { BigNumber } from "ethers";
 import { parseEther } from "ethers/lib/utils";
 import { ethers } from "hardhat";
-import sinon from "sinon";
 import { ItemType, MAX_INT } from "../constants";
 import { CreateOrderInput, CurrencyItem } from "../types";
 import * as fulfill from "../utils/fulfill";
@@ -14,6 +13,8 @@ import {
 } from "./utils/balance";
 import { describeWithFixture } from "./utils/setup";
 
+const sinon = require("sinon");
+
 describeWithFixture(
   "As a user I want to buy now or accept an offer",
   (fixture) => {
@@ -22,7 +23,7 @@ describeWithFixture(
     let fulfiller: SignerWithAddress;
     let standardCreateOrderInput: CreateOrderInput;
     let multicallProvider: providers.MulticallProvider;
-    let fulfillBasicOrderSpy: sinon.SinonSpy;
+    let fulfillBasicOrderSpy: sinon.SinonSpy; // eslint-disable-line no-undef
     const nftId = "1";
     const erc1155Amount = "3";
     const OPENSEA_DOMAIN = "opensea.io";
@@ -39,8 +40,8 @@ describeWithFixture(
       fulfillBasicOrderSpy.restore();
     });
 
-    describe("A single ERC721 is to be transferred", async () => {
-      describe("[Buy now] I want to buy a single ERC721", async () => {
+    describe("A single ERC721 is to be transferred", () => {
+      describe("[Buy now] I want to buy a single ERC721", () => {
         beforeEach(async () => {
           const { testErc721 } = fixture;
 
@@ -157,7 +158,7 @@ describeWithFixture(
         });
 
         describe("with ERC20", () => {
-          beforeEach(async () => {
+          beforeEach(() => {
             const { testErc20 } = fixture;
 
             // Use ERC20 instead of eth
@@ -317,7 +318,7 @@ describeWithFixture(
         });
       });
 
-      describe("[Accept offer] I want to accept an offer for my single ERC721", async () => {
+      describe("[Accept offer] I want to accept an offer for my single ERC721", () => {
         beforeEach(async () => {
           const { testErc721, testErc20 } = fixture;
 
@@ -410,8 +411,8 @@ describeWithFixture(
       });
     });
 
-    describe("A single ERC1155 is to be transferred", async () => {
-      describe("[Buy now] I want to buy a single ERC1155", async () => {
+    describe("A single ERC1155 is to be transferred", () => {
+      describe("[Buy now] I want to buy a single ERC1155", () => {
         beforeEach(async () => {
           const { testErc1155 } = fixture;
 
@@ -538,7 +539,7 @@ describeWithFixture(
         });
 
         describe("with ERC20", () => {
-          beforeEach(async () => {
+          beforeEach(() => {
             const { testErc20 } = fixture;
 
             // Use ERC20 instead of eth
@@ -696,7 +697,7 @@ describeWithFixture(
         });
       });
 
-      describe("[Accept offer] I want to accept an offer for my single ERC1155", async () => {
+      describe("[Accept offer] I want to accept an offer for my single ERC1155", () => {
         beforeEach(async () => {
           const { testErc1155, seaportContract, testErc20 } = fixture;
 

diff --git a/src/__tests__/bundle.spec.ts b/src/__tests__/bundle.spec.ts
@@ -4,7 +4,6 @@ import { expect } from "chai";
 import { BigNumber } from "ethers";
 import { parseEther } from "ethers/lib/utils";
 import { ethers } from "hardhat";
-import sinon from "sinon";
 import { ItemType, MAX_INT } from "../constants";
 import { TestERC1155, TestERC721 } from "../typechain-types";
 import { CreateOrderInput, CurrencyItem } from "../types";
@@ -16,6 +15,8 @@ import {
 import { getTagFromDomain } from "../utils/usecase";
 import { describeWithFixture } from "./utils/setup";
 
+const sinon = require("sinon");
+
 describeWithFixture(
   "As a user I want to buy now or accept an offer for a bundle of items",
   (fixture) => {
@@ -24,7 +25,7 @@ describeWithFixture(
     let fulfiller: SignerWithAddress;
     let multicallProvider: providers.MulticallProvider;
 
-    let fulfillStandardOrderSpy: sinon.SinonSpy;
+    let fulfillStandardOrderSpy: sinon.SinonSpy; // eslint-disable-line no-undef
     let secondTestErc721: TestERC721;
     let secondTestErc1155: TestERC1155;
     let standardCreateOrderInput: CreateOrderInput;
@@ -54,8 +55,8 @@ describeWithFixture(
       fulfillStandardOrderSpy.restore();
     });
 
-    describe("A bundle of ERC721s is to be transferred", async () => {
-      describe("[Buy now] I want to buy a bundle of ERC721s", async () => {
+    describe("A bundle of ERC721s is to be transferred", () => {
+      describe("[Buy now] I want to buy a bundle of ERC721s", () => {
         beforeEach(async () => {
           const { testErc721 } = fixture;
 
@@ -247,7 +248,7 @@ describeWithFixture(
         });
       });
 
-      describe("[Accept offer] I want to accept an offer for my bundle of ERC721s", async () => {
+      describe("[Accept offer] I want to accept an offer for my bundle of ERC721s", () => {
         beforeEach(async () => {
           const { testErc20, testErc721 } = fixture;
 
@@ -411,8 +412,8 @@ describeWithFixture(
       });
     });
 
-    describe("A bundle of ERC721s and ERC1155s is to be transferred", async () => {
-      describe("[Buy now] I want to buy a bundle of ERC721s and ERC1155s", async () => {
+    describe("A bundle of ERC721s and ERC1155s is to be transferred", () => {
+      describe("[Buy now] I want to buy a bundle of ERC721s and ERC1155s", () => {
         beforeEach(async () => {
           const { testErc721, testErc1155 } = fixture;
 
@@ -612,7 +613,7 @@ describeWithFixture(
         });
       });
 
-      describe("[Accept offer] I want to accept an offer for my bundle of ERC721s and ERC1155s", async () => {
+      describe("[Accept offer] I want to accept an offer for my bundle of ERC721s and ERC1155s", () => {
         beforeEach(async () => {
           const { testErc20, testErc721, testErc1155 } = fixture;
 
@@ -803,8 +804,8 @@ describeWithFixture(
       });
     });
 
-    describe("A bundle of ERC1155s is to be transferred", async () => {
-      describe("[Buy now] I want to buy a bundle of ERC1155s", async () => {
+    describe("A bundle of ERC1155s is to be transferred", () => {
+      describe("[Buy now] I want to buy a bundle of ERC1155s", () => {
         beforeEach(async () => {
           const { testErc1155 } = fixture;
 
@@ -998,7 +999,7 @@ describeWithFixture(
         });
       });
 
-      describe("[Accept offer] I want to accept an offer for my bundle of ERC1155s", async () => {
+      describe("[Accept offer] I want to accept an offer for my bundle of ERC1155s", () => {
         beforeEach(async () => {
           const { testErc20, testErc1155 } = fixture;
 

diff --git a/src/__tests__/criteria-based.spec.ts b/src/__tests__/criteria-based.spec.ts
@@ -4,7 +4,6 @@ import { expect } from "chai";
 import { BigNumber } from "ethers";
 import { parseEther } from "ethers/lib/utils";
 import { ethers } from "hardhat";
-import sinon from "sinon";
 import { ItemType, MAX_INT } from "../constants";
 import { CreateOrderInput, CurrencyItem, OrderWithCounter } from "../types";
 import * as fulfill from "../utils/fulfill";
@@ -15,6 +14,8 @@ import {
 } from "./utils/balance";
 import { describeWithFixture } from "./utils/setup";
 
+const sinon = require("sinon");
+
 describeWithFixture(
   "As a user I want to buy now or accept an offer for orders with criteria based items",
   (fixture) => {
@@ -23,8 +24,8 @@ describeWithFixture(
     let fulfiller: SignerWithAddress;
     let multicallProvider: providers.MulticallProvider;
 
-    let fulfillStandardOrderSpy: sinon.SinonSpy;
-    let fulfillAvailableOrdersSpy: sinon.SinonSpy;
+    let fulfillStandardOrderSpy: sinon.SinonSpy; // eslint-disable-line no-undef
+    let fulfillAvailableOrdersSpy: sinon.SinonSpy; // eslint-disable-line no-undef
     let standardCreateOrderInput: CreateOrderInput;
 
     const nftId = "1";
@@ -45,7 +46,7 @@ describeWithFixture(
       fulfillAvailableOrdersSpy.restore();
     });
 
-    describe("A criteria based ERC721 is to be transferred", async () => {
+    describe("A criteria based ERC721 is to be transferred", () => {
       describe("Collection based trades", () => {
         describe("[Buy now] I want to buy a collection based listing", () => {
           beforeEach(async () => {
@@ -922,7 +923,7 @@ describeWithFixture(
       });
     });
 
-    describe("A criteria based ERC1155 is to be transferred", async () => {
+    describe("A criteria based ERC1155 is to be transferred", () => {
       describe("Collection based trades", () => {
         describe("[Buy now] I want to buy a collection based listing", () => {
           beforeEach(async () => {
@@ -1618,7 +1619,7 @@ describeWithFixture(
       });
     });
 
-    describe("A criteria based ERC721 to criteria based ERC1155 swap", async () => {
+    describe("A criteria based ERC721 to criteria based ERC1155 swap", () => {
       describe("Collection based swaps", () => {
         beforeEach(async () => {
           const { testErc721, testErc1155 } = fixture;