Bump to 2.3.0 - Drops! (#225)

* Bump to 2.3.0 - Drops! * Delete foundry.toml * Remove subgraph build * Remove subgraph config
f8n · Sep 16, 2022 · 1087a8b · 1087a8b
1 parent 9dcdd63
commit 1087a8b
Show file tree

Hide file tree

Showing 159 changed files with 9,298 additions and 14,488 deletions.
diff --git a/.circleci/commit.sh b/.circleci/commit.sh
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,15 +17,6 @@ jobs:
       - persist_to_workspace:
           root: ~/repo
           paths: .
-  test:
-    docker:
-      - image: circleci/node:16
-    working_directory: ~/repo
-    steps:
-      - attach_workspace:
-          at: ~/repo
-
-      - run: yarn test
   lint:
     docker:
       - image: circleci/node:16
@@ -35,23 +26,6 @@ jobs:
           at: ~/repo
 
       - run: yarn lint
-
-      # Auto-commit any lint or doc changes
-      - run: mkdir -p ~/.ssh
-      - run: ssh-keyscan -H github.com >> ~/.ssh/known_hosts
-      - run: bash .circleci/commit.sh
-  subgraph:
-    docker:
-      - image: circleci/node:16
-    working_directory: ~/repo
-    steps:
-      - attach_workspace:
-          at: ~/repo
-
-      - run: cd subgraph && yarn
-
-      # Test config for mainnet
-      - run: cd subgraph && yarn prepare:mainnet && yarn build
   publish:
     docker:
       - image: circleci/node:16
@@ -77,15 +51,9 @@ workflows:
               ignore:
                 - gh-pages
                 - artifacts
-      - test:
-          requires:
-            - build
       - lint:
           requires:
             - build
-      - subgraph:
-          requires:
-            - build
       - publish:
           requires:
             - build

diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,20 @@
-subgraph/config/
+# folders
+artifacts/
+build/
+cache/
+coverage/
+dist/
+docs/
+lib/
+node_modules/
+src/typechain/
+subgraph/config/
+subgraph/build/
+subgraph/generated/
+subgraph/graph-node/
+versions/
+deployments/
+
+# files
+.solcover.js
+coverage.json
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -1,32 +1,26 @@
 extends:
-  - eslint:recommended
   - plugin:@typescript-eslint/eslint-recommended
-  - plugin:@typescript-eslint/recommended
-  - prettier
 parser: "@typescript-eslint/parser"
 parserOptions:
   project: tsconfig.json
 plugins:
   - "@typescript-eslint"
   - "no-only-tests"
+  - "simple-import-sort"
+  - "unused-imports"
 root: true
 rules:
-  "@typescript-eslint/no-floating-promises":
-    - error
-    - ignoreIIFE: true
-      ignoreVoid: true
-  "@typescript-eslint/no-inferrable-types": "off"
-  "@typescript-eslint/no-unused-vars":
-    - error
-    - argsIgnorePattern: _
-      varsIgnorePattern: _
-  "sort-imports":
-    - error
-    - ignoreCase: true
-      ignoreDeclarationSort: true
-  "no-only-tests/no-only-tests": "error"
+  "@typescript-eslint/no-floating-promises": "error"
+  "@typescript-eslint/no-unused-vars": "off" # Replaced by the unused-imports plugin
+  "unused-imports/no-unused-imports": "warn"
+  "unused-imports/no-unused-vars": "warn"
+  "no-only-tests/no-only-tests": "warn"
+  "simple-import-sort/imports": "warn"
+  "simple-import-sort/exports": "warn"
 overrides:
   - files: subgraph/**/*.ts
     rules:
       prefer-const: 0
       "@typescript-eslint/ban-types": 0
+      "unused-imports/no-unused-vars": 0
+
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.sol linguist-language=Solidity
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@ node_modules
 coverage
 coverage.json
 typechain-types
+typechain
+contracts-exposed
 
 #Hardhat files
 cache

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
diff --git a/.mocharc.json b/.mocharc.json
@@ -0,0 +1,6 @@
+{
+  "extension": ["ts"],
+  "recursive": "test",
+  "require": "ts-node/register/files",
+  "timeout": 60000
+}
diff --git a/.npmpackagejsonlintrc.json b/.npmpackagejsonlintrc.json
@@ -0,0 +1,15 @@
+{
+  "extends": "npm-package-json-lint-config-default",
+  "rules": {
+    "require-name": "error",
+    "require-version": "off",
+    "prefer-absolute-version-dependencies": "error",
+    "prefer-alphabetical-peerDependencies": "error",
+    "prefer-alphabetical-optionalDependencies": "error",
+    "prefer-alphabetical-bundledDependencies": "error",
+    "prefer-alphabetical-devDependencies": "error",
+    "prefer-alphabetical-dependencies": "error",
+    "version-format": "warning",
+    "name-format": "error"
+  }
+}
diff --git a/.prettierignore b/.prettierignore
@@ -7,9 +7,14 @@ dist/
 docs/
 lib/
 node_modules/
-typechain-types/
+src/typechain/
+subgraph/build/
+subgraph/generated/
+subgraph/graph-node/
+versions/
 .vscode/
 deployments/
+contracts-exposed/
 
 # files
 coverage.json
diff --git a/.solcover.js b/.solcover.js
@@ -0,0 +1,28 @@
+const shell = require("shelljs");
+
+// The environment variables are loaded in hardhat.config.ts
+const mnemonic = process.env.MNEMONIC;
+if (!mnemonic) {
+  throw new Error("Please set your MNEMONIC in a .env file");
+}
+
+module.exports = {
+  istanbulReporter: ["html"],
+  onCompileComplete: async function (_config) {
+    await run("typechain");
+  },
+  onIstanbulComplete: async function (_config) {
+    // We need to do this because solcover generates bespoke artifacts.
+    shell.rm("-rf", "./artifacts");
+    shell.rm("-rf", "./src/typechain");
+  },
+  providerOptions: {
+    mnemonic,
+  },
+  skipFiles: ["mocks", "test", "FNDMiddleware", "archive"],
+  istanbulReporter: ["lcov", "html", "text-summary"],
+  mocha: {
+    fgrep: "[skip-on-coverage]",
+    invert: true,
+  },
+};
diff --git a/.solhint.json b/.solhint.json
@@ -3,7 +3,7 @@
   "plugins": ["prettier"],
   "rules": {
     "code-complexity": ["error", 7],
-    "compiler-version": ["error", "^0.8.0"],
+    "compiler-version": ["error", "^0.8.12"],
     "const-name-snakecase": "off",
     "constructor-syntax": "error",
     "func-visibility": ["error", { "ignoreConstructors": true }],
@@ -16,6 +16,7 @@
       }
     ],
     "reason-string": ["warn", { "maxLength": 64 }],
-    "var-name-mixedcase": "off"
+    "var-name-mixedcase": "off",
+    "no-inline-assembly": "off"
   }
 }
diff --git a/.solhintignore b/.solhintignore
@@ -0,0 +1,5 @@
+# folders
+.yarn/
+build/
+dist/
+node_modules/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,33 +1,47 @@
 # Changelog
 
-## 2.2.3.1
+## 2.3.0
 
-- NPM package: add `subgraphEndpoints.js` with the URLs to use when querying subgraph.
+- Add Drops
+- [Remove admin cancel](https://github.com/f8n/fnd-contracts/pull/1973) functions from the market
+- Remove `makeOffer` (was deprecated in favor of `makeOfferV2`).
+- Introduce the `NFTDropMarket`.
+- Add `getSellerOf` to the markets and `getSellerOrOwnerOf` to the middleware.
+- Upgrade to [solc 0.8.16](https://github.com/ethereum/solidity/releases/tag/v0.8.16)
+- SplitsV3: Gas-optimization to reduce costs of creating splits
+
+## 2.2.5
+
+- Upgrade to [solc 0.8.15](https://github.com/ethereum/solidity/releases/tag/v0.8.15)
+
+## 2.2.4
+
+- Middleware [fix div by 0](https://github.com/f8n/fnd-contracts/pull/1888) when 0 royalties are requested
 
 ## 2.2.3
 
-- Remove Private Sales
-- Try/catch `tokenCreator` so that other royalty APIs are checked for contracts with a fallback function.
-- Ignore `owner` when address(0)
+- [Remove Private Sales](https://github.com/f8n/fnd-contracts/pull/1864)
+- [Try/catch `tokenCreator`](https://github.com/f8n/fnd-contracts/pull/1867) so that other royalty APIs are checked for contracts with a fallback function.
+- [Ignore `owner` when address(0)](https://github.com/f8n/fnd-contracts/pull/1868)
 
 ## 2.2.2
 
-- Middleware: Fix `probeNFT` for fallback function in the royalty recipient.
+- Middleware: [Fix `probeNFT`](https://github.com/f8n/fnd-contracts/pull/1865) for fallback function in the royalty recipient.
 - Upgrade to [solc 0.8.14](https://github.com/ethereum/solidity/releases/tag/v0.8.14)
 
 ## 2.2.1
 
 ### Market
 
-- Try try catch so that contracts with a fallback function or unsupported return types do not cause the NFT to get stuck in escrow.
+- [Try try catch](https://github.com/f8n/fnd-contracts/pull/1838) so that contracts with a fallback function or unsupported return types do not cause the NFT to get stuck in escrow.
 
 ## 2.2.0
 
 ### Market
 
-- Bid Referrals: adds `placeBidV2` with referral incentives and `getReserveAuctionBidReferrer`.
-- Offer Referrals: adds `makeOfferV2` with referral incentives and `getOfferReferrer`.
-- Auction gas savings: don't store duration/extension.
+- [Bid Referrals](https://github.com/f8n/fnd-contracts/pull/1782): adds `placeBidV2` with referral incentives.
+- [Offer Referrals](https://github.com/f8n/fnd-contracts/pull/1790): adds `makeOfferV2` with referral incentives.
+- Auction gas savings: don't store duration/extension. https://github.com/f8n/fnd-contracts/pull/1793
 
 ## 2.1.1
 
@@ -43,7 +57,7 @@
 
 ### Market
 
-- Buy referrals: adds `buyV2` with referral incentives.
+- [Buy referrals](https://github.com/f8n/fnd-contracts/pull/1726): adds `buyV2` with referral incentives.
 - Royalties: ignore `royaltyInfo` from the NFT contract when the amount is 0 (does not impact the royalty override)
 - On placeBidOf, leverage FETH from an outstanding offer.
 - Remove withdraw from escrow (leaning on fallback to FETH instead).
@@ -60,7 +74,7 @@
 
 ### Middleware
 
-- `probeNFT`
+- `probeNFT` https://github.com/f8n/fnd-contracts/pull/1645
 
 ## 2.0.1