chore(lint): cleanup config and affiliate flows

contracts/.eslintrc.yml

@@ -8,13 +8,3 @@ parserOptions:
   project: "./contracts/tsconfig.json"
 plugins:
   - "@typescript-eslint"
-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: "_"

contracts/.gitignore

@@ -35,6 +35,7 @@ yarn-error.log*
 .DS_Store
 /.idea
 test*.svg
+lcov.info
 
 # broadcasts
 !/broadcast

contracts/.lintstagedrc

@@ -1,5 +1,4 @@
 {
-  "*.{js,json,md,sol,ts,yml}": [
-    "prettier --config ./.prettierrc.yml --write"
-  ]
+  "*.{js,json,md,ts,yml}": ["prettier --config ./.prettierrc.yml --write"],
+  "*.{sol}": ["forge fmt"]
 }

contracts/.prettierignore

@@ -22,8 +22,10 @@
 # files
 *.env
 *.log
+*.sol
 .pnp.*
 coverage.json
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.DS_Store

contracts/.prettierrc.yml

@@ -6,26 +6,3 @@ singleQuote: false
 tabWidth: 2
 trailingComma: "all"
 useTabs: false
-
-plugins:
-  - prettier-plugin-solidity
-
-overrides:
-  - files: "**/*.t.sol"
-    rules:
-      max-state-count": "off"
-      state-visibility": "off"
-      max-line-length": "off"
-    options:
-      tabWidth: 4
-  - files: "*.sol"
-    rules:
-      compiler-version: "0.8.16"
-    options:
-      tabWidth: 4
-  - files: "*.ts"
-    options:
-      importOrder: ["<THIRD_PARTY_MODULES>", "^[./]"]
-      importOrderParserPlugins: ["importAssertions", "typescript"]
-      importOrderSeparation: true
-      importOrderSortSpecifiers: true

contracts/.solhint.json

@@ -1,13 +1,14 @@
 {
-  "plugins": ["prettier"],
   "extends": "solhint:recommended",
   "rules": {
+    "avoid-low-level-calls": "off",
     "code-complexity": ["error", 12],
     "compiler-version": ["error", ">=0.8.16"],
     "func-visibility": ["error", { "ignoreConstructors": true }],
-    "max-line-length": ["warn", 200],
     "no-console": "off",
+    "no-empty-blocks": "off",
     "not-rely-on-time": "off",
+    "private-vars-leading-underscore": "warn",
     "reason-string": ["warn", { "maxLength": 64 }],
     "one-contract-per-file": "off"
   }

contracts/.vscode/settings.json

@@ -1,10 +1,8 @@
 {
   "editor.formatOnSave": true,
-  "solidity.formatter": "prettier",
   "solidity.packageDefaultDependenciesContractsDirectory": "src",
   "solidity.packageDefaultDependenciesDirectory": "lib",
   "solidity.remappings": ["./remappings.txt"],
-  "solidity.defaultCompiler": "remoteFile",
   "files.exclude": {
     "**/.git": true,
     "**/.svn": true,

contracts/foundry.toml

@@ -1,7 +1,7 @@
 # Full reference https://github.com/foundry-rs/foundry/tree/master/config
 
 [profile.default]
-auto_detect_solc = true 
+auto_detect_solc = true
 allow_paths = ["../node_modules", "lib"]
 bytecode_hash = "none"
 force = false
@@ -23,4 +23,8 @@ verbosity = 1
 [rpc_endpoints]
 mainnet = "${MAINNET_RPC_URL}"
 goerli = "${GOERLI_RPC_URL}"
-optimism = "${OPTIMISM_RPC_URL}"
+optimism = "${OPTIMISM_RPC_URL}"
+
+[fmt]
+number_underscore = "thousands"
+wrap_comments = true

contracts/package.json

@@ -84,7 +84,6 @@
     "shx": "^0.3.4",
     "solhint": "^3.6.2",
     "solhint-plugin-prettier": "^0.0.5",
-    "solidity-coverage": "^0.8.2",
     "solmate": "^6.2.0",
     "ts-node": "^10.9.1",
     "typechain": "^8.3.1",
@@ -104,14 +103,14 @@
     "build": "hardhat compile && pnpm tsc -p tsconfig.build.json && rollup -c && pnpm copy:contracts",
     "build:forge": "forge build",
     "clean": "rimraf cache out dist src/typechain src/abi",
-    "copy:contracts": "copyfiles -u 1 ./src/**/*.sol  ./src/*.sol ./contracts",
+    "copy:contracts": "copyfiles -u 1 ./src/**/*.sol ./src/*.sol ./contracts",
     "docs": "hardhat dodoc",
     "lint": "pnpm lint:sol && pnpm prettier:check",
-    "lint:sol": "solhint -w 60 \"./{src,test/protocol,test/marketplace}/**/*.sol\"",
+    "lint:sol": "forge fmt --check && solhint \"./{src,test/protocol,test/marketplace}/**/*.sol\"",
     "prebuild": "pnpm clean",
     "prepublish": "pnpm build",
-    "prettier": "prettier --config \"./.prettierrc.yml\" --write \"**/*.{json,md,sol,yml}\"",
-    "prettier:check": "prettier --config \"./.prettierrc.yml\" --check \"**/*.{json,md,sol,yml}\"",
+    "prettier": "prettier --config \"./.prettierrc.yml\" --write \"**/*.{json,md,ts,yml}\"",
+    "prettier:check": "prettier --config \"./.prettierrc.yml\" --check \"**/*.{json,md,ts,yml}\"",
     "slither": "slither ./src",
     "test": "pnpm test:hardhat && pnpm test:forge",
     "test:forge": "forge test",

contracts/src/marketplace/BatchOrderTypehashRegistry.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.17;
 
 // Shared errors
-import { MerkleProofTooLarge } from "./errors/SharedErrors.sol";
+import {MerkleProofTooLarge} from "./errors/SharedErrors.sol";
 
 /**
  * @title BatchOrderTypehashRegistry
@@ -22,9 +22,17 @@ contract BatchOrderTypehashRegistry {
 
     /**
      * @dev It looks like this for each height
-     *      height == 1: BatchOrder(Maker[2] tree)Maker(uint8 quoteType,uint256 globalNonce,uint256 subsetNonce,uint256 orderNonce,uint256 strategyId,uint8 collectionType,address collection,address currency,address signer,uint256 startTime,uint256 endTime,uint256 price,uint256[] itemIds,uint256[] amounts,bytes additionalParameters)
-     *      height == 2: BatchOrder(Maker[2][2] tree)Maker(uint8 quoteType,uint256 globalNonce,uint256 subsetNonce,uint256 orderNonce,uint256 strategyId,uint8 collectionType,address collection,address currency,address signer,uint256 startTime,uint256 endTime,uint256 price,uint256[] itemIds,uint256[] amounts,bytes additionalParameters)
-     *      height == n: BatchOrder(Maker[2]...[2] tree)Maker(uint8 quoteType,uint256 globalNonce,uint256 subsetNonce,uint256 orderNonce,uint256 strategyId,uint8 collectionType,address collection,address currency,address signer,uint256 startTime,uint256 endTime,uint256 price,uint256[] itemIds,uint256[] amounts,bytes additionalParameters)
+     *      height == 1: BatchOrder(Maker[2] tree)Maker(uint8 quoteType,uint256 globalNonce,uint256 subsetNonce,uint256
+     * orderNonce,uint256 strategyId,uint8 collectionType,address collection,address currency,address signer,uint256
+     * startTime,uint256 endTime,uint256 price,uint256[] itemIds,uint256[] amounts,bytes additionalParameters)
+     *      height == 2: BatchOrder(Maker[2][2] tree)Maker(uint8 quoteType,uint256 globalNonce,uint256
+     * subsetNonce,uint256 orderNonce,uint256 strategyId,uint8 collectionType,address collection,address
+     * currency,address signer,uint256 startTime,uint256 endTime,uint256 price,uint256[] itemIds,uint256[] amounts,bytes
+     * additionalParameters)
+     *      height == n: BatchOrder(Maker[2]...[2] tree)Maker(uint8 quoteType,uint256 globalNonce,uint256
+     * subsetNonce,uint256 orderNonce,uint256 strategyId,uint8 collectionType,address collection,address
+     * currency,address signer,uint256 startTime,uint256 endTime,uint256 price,uint256[] itemIds,uint256[] amounts,bytes
+     * additionalParameters)
      */
     function _getBatchOrderTypehash(uint256 height) internal pure returns (bytes32 typehash) {
         if (height == 1) {

contracts/src/marketplace/CreatorFeeManagerWithRebates.sol

@@ -2,14 +2,14 @@
 pragma solidity 0.8.17;
 
 // LooksRare unopinionated libraries
-import { IERC2981 } from "@looksrare/contracts-libs/contracts/interfaces/generic/IERC2981.sol";
+import {IERC2981} from "@looksrare/contracts-libs/contracts/interfaces/generic/IERC2981.sol";
 
 // Interfaces
-import { ICreatorFeeManager } from "./interfaces/ICreatorFeeManager.sol";
-import { IRoyaltyFeeRegistry } from "./interfaces/IRoyaltyFeeRegistry.sol";
+import {ICreatorFeeManager} from "./interfaces/ICreatorFeeManager.sol";
+import {IRoyaltyFeeRegistry} from "./interfaces/IRoyaltyFeeRegistry.sol";
 
 // Constants
-import { ONE_HUNDRED_PERCENT_IN_BP } from "./constants/NumericConstants.sol";
+import {ONE_HUNDRED_PERCENT_IN_BP} from "./constants/NumericConstants.sol";
 
 /**
  * @title CreatorFeeManagerWithRebates
@@ -38,22 +38,21 @@ contract CreatorFeeManagerWithRebates is ICreatorFeeManager {
     /**
      * @inheritdoc ICreatorFeeManager
      */
-    function viewCreatorFeeInfo(
-        address collection,
-        uint256 price,
-        uint256[] memory itemIds
-    ) external view returns (address creator, uint256 creatorFeeAmount) {
+    function viewCreatorFeeInfo(address collection, uint256 price, uint256[] memory itemIds)
+        external
+        view
+        returns (address creator, uint256 creatorFeeAmount)
+    {
         // Check if there is a royalty info in the system
-        (creator, ) = royaltyFeeRegistry.royaltyInfo(collection, price);
+        (creator,) = royaltyFeeRegistry.royaltyInfo(collection, price);
 
         if (creator == address(0)) {
             if (IERC2981(collection).supportsInterface(IERC2981.royaltyInfo.selector)) {
                 uint256 length = itemIds.length;
 
-                for (uint256 i; i < length; ) {
+                for (uint256 i; i < length;) {
                     try IERC2981(collection).royaltyInfo(itemIds[i], price) returns (
-                        address newCreator,
-                        uint256 /* newCreatorFeeAmount */
+                        address newCreator, uint256 /* newCreatorFeeAmount */
                     ) {
                         if (i == 0) {
                             creator = newCreator;

contracts/src/marketplace/CreatorFeeManagerWithRoyalties.sol

@@ -2,11 +2,11 @@
 pragma solidity 0.8.17;
 
 // LooksRare unopinionated libraries
-import { IERC2981 } from "@looksrare/contracts-libs/contracts/interfaces/generic/IERC2981.sol";
+import {IERC2981} from "@looksrare/contracts-libs/contracts/interfaces/generic/IERC2981.sol";
 
 // Interfaces
-import { ICreatorFeeManager } from "./interfaces/ICreatorFeeManager.sol";
-import { IRoyaltyFeeRegistry } from "./interfaces/IRoyaltyFeeRegistry.sol";
+import {ICreatorFeeManager} from "./interfaces/ICreatorFeeManager.sol";
+import {IRoyaltyFeeRegistry} from "./interfaces/IRoyaltyFeeRegistry.sol";
 
 /**
  * @title CreatorFeeManagerWithRoyalties
@@ -44,22 +44,21 @@ contract CreatorFeeManagerWithRoyalties is ICreatorFeeManager {
      *      (1) high royalties
      *      (2) potential unexpected royalty changes that can occur after the creation of the order.
      */
-    function viewCreatorFeeInfo(
-        address collection,
-        uint256 price,
-        uint256[] memory itemIds
-    ) external view returns (address creator, uint256 creatorFeeAmount) {
+    function viewCreatorFeeInfo(address collection, uint256 price, uint256[] memory itemIds)
+        external
+        view
+        returns (address creator, uint256 creatorFeeAmount)
+    {
         // Check if there is a royalty info in the system
         (creator, creatorFeeAmount) = royaltyFeeRegistry.royaltyInfo(collection, price);
 
         if (creator == address(0)) {
             if (IERC2981(collection).supportsInterface(IERC2981.royaltyInfo.selector)) {
                 uint256 length = itemIds.length;
 
-                for (uint256 i; i < length; ) {
+                for (uint256 i; i < length;) {
                     try IERC2981(collection).royaltyInfo(itemIds[i], price) returns (
-                        address newCreator,
-                        uint256 newCreatorFeeAmount
+                        address newCreator, uint256 newCreatorFeeAmount
                     ) {
                         if (i == 0) {
                             creator = newCreator;

contracts/src/marketplace/CurrencyManager.sol

@@ -2,10 +2,10 @@
 pragma solidity 0.8.17;
 
 // LooksRare unopinionated libraries
-import { OwnableTwoSteps } from "@looksrare/contracts-libs/contracts/OwnableTwoSteps.sol";
+import {OwnableTwoSteps} from "@looksrare/contracts-libs/contracts/OwnableTwoSteps.sol";
 
 // Interfaces
-import { ICurrencyManager } from "./interfaces/ICurrencyManager.sol";
+import {ICurrencyManager} from "./interfaces/ICurrencyManager.sol";
 
 /**
  * @title CurrencyManager

contracts/src/marketplace/ExecutionManager.sol

@@ -2,25 +2,31 @@
 pragma solidity 0.8.17;
 
 // Libraries
-import { OrderStructs } from "./libraries/OrderStructs.sol";
+import {OrderStructs} from "./libraries/OrderStructs.sol";
 
 // Interfaces
-import { IExecutionManager } from "./interfaces/IExecutionManager.sol";
-import { ICreatorFeeManager } from "./interfaces/ICreatorFeeManager.sol";
+import {IExecutionManager} from "./interfaces/IExecutionManager.sol";
+import {ICreatorFeeManager} from "./interfaces/ICreatorFeeManager.sol";
 
 // Direct dependencies
-import { InheritedStrategy } from "./InheritedStrategy.sol";
-import { NonceManager } from "./NonceManager.sol";
-import { StrategyManager } from "./StrategyManager.sol";
+import {InheritedStrategy} from "./InheritedStrategy.sol";
+import {NonceManager} from "./NonceManager.sol";
+import {StrategyManager} from "./StrategyManager.sol";
 
 // Assembly
-import { NoSelectorForStrategy_error_selector, NoSelectorForStrategy_error_length, OutsideOfTimeRange_error_selector, OutsideOfTimeRange_error_length, Error_selector_offset } from "./constants/AssemblyConstants.sol";
+import {
+    NoSelectorForStrategy_error_selector,
+    NoSelectorForStrategy_error_length,
+    OutsideOfTimeRange_error_selector,
+    OutsideOfTimeRange_error_length,
+    Error_selector_offset
+} from "./constants/AssemblyConstants.sol";
 
 // Constants
-import { ONE_HUNDRED_PERCENT_IN_BP } from "./constants/NumericConstants.sol";
+import {ONE_HUNDRED_PERCENT_IN_BP} from "./constants/NumericConstants.sol";
 
 // Enums
-import { QuoteType } from "./enums/QuoteType.sol";
+import {QuoteType} from "./enums/QuoteType.sol";
 
 /**
  * @title ExecutionManager
@@ -39,7 +45,7 @@ contract ExecutionManager is InheritedStrategy, NonceManager, StrategyManager, I
      * @notice Maximum creator fee (in basis point).
      */
     // TODO do we need a max? Is 1% max fair?
-    uint16 public maxCreatorFeeBp = 1_000;
+    uint16 public maxCreatorFeeBp = 1000;
 
     /**
      * @notice Creator fee manager.
@@ -72,7 +78,7 @@ contract ExecutionManager is InheritedStrategy, NonceManager, StrategyManager, I
      *      Only callable by owner.
      */
     function updateMaxCreatorFeeBp(uint16 newMaxCreatorFeeBp) external onlyOwner {
-        if (newMaxCreatorFeeBp > 2_500) {
+        if (newMaxCreatorFeeBp > 2500) {
             revert CreatorFeeBpTooHigh();
         }
 
@@ -172,11 +178,8 @@ contract ExecutionManager is InheritedStrategy, NonceManager, StrategyManager, I
         }
 
         // Creator fee and adjustment of protocol fee
-        (recipients[1], feeAmounts[1]) = _getCreatorRecipientAndCalculateFeeAmount(
-            makerOrder.collection,
-            price,
-            itemIds
-        );
+        (recipients[1], feeAmounts[1]) =
+            _getCreatorRecipientAndCalculateFeeAmount(makerOrder.collection, price, itemIds);
         if (makerOrder.quoteType == QuoteType.Bid) {
             _setTheRestOfFeeAmountsAndRecipients(
                 makerOrder.strategyId,
@@ -187,11 +190,7 @@ contract ExecutionManager is InheritedStrategy, NonceManager, StrategyManager, I
             );
         } else {
             _setTheRestOfFeeAmountsAndRecipients(
-                makerOrder.strategyId,
-                price,
-                makerOrder.signer,
-                feeAmounts,
-                recipients
+                makerOrder.strategyId, price, makerOrder.signer, feeAmounts, recipients
             );
         }
     }
@@ -240,11 +239,11 @@ contract ExecutionManager is InheritedStrategy, NonceManager, StrategyManager, I
      * @return creator Creator recipient
      * @return creatorFeeAmount Creator fee amount
      */
-    function _getCreatorRecipientAndCalculateFeeAmount(
-        address collection,
-        uint256 price,
-        uint256[] memory itemIds
-    ) private view returns (address creator, uint256 creatorFeeAmount) {
+    function _getCreatorRecipientAndCalculateFeeAmount(address collection, uint256 price, uint256[] memory itemIds)
+        private
+        view
+        returns (address creator, uint256 creatorFeeAmount)
+    {
         if (address(creatorFeeManager) != address(0)) {
             (creator, creatorFeeAmount) = creatorFeeManager.viewCreatorFeeInfo(collection, price, itemIds);