Revert "chore(contracts): Replace solhint linting with prettier"

This reverts commit 1bb656c6e8ca6777bd245b49c1677b0db1503d4f.

integration-tests/contracts/Proxy.sol

@@ -19,6 +19,7 @@ abstract contract Proxy {
      * This function does not return to its internall call site, it will return directly to the external caller.
      */
     function _delegate(address implementation) internal virtual {
+        // solhint-disable-next-line no-inline-assembly
         assembly {
             // Copy msg.data. We take full control of memory in this inline assembly
             // block because it will not return to Solidity code. We overwrite the

packages/contracts/contracts/L1/rollup/CanonicalTransactionChain.sol

@@ -429,6 +429,7 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
         uint40 lastTimestamp;
         uint40 lastBlockNumber;
 
+        // solhint-disable max-line-length
         assembly {
             extraData := shr(40, extraData)
             totalElements := and(
@@ -448,6 +449,7 @@ contract CanonicalTransactionChain is ICanonicalTransactionChain, Lib_AddressRes
                 and(extraData, 0x000000000000000000000000FFFFFFFFFF000000000000000000000000000000)
             )
         }
+        // solhint-enable max-line-length
 
         return (totalElements, nextQueueIndex, lastTimestamp, lastBlockNumber);
     }

packages/contracts/contracts/L1/rollup/StateCommitmentChain.sol

@@ -179,6 +179,7 @@ contract StateCommitmentChain is IStateCommitmentChain, Lib_AddressResolver {
     function _getBatchExtraData() internal view returns (uint40, uint40) {
         bytes27 extraData = batches().getGlobalMetadata();
 
+        // solhint-disable max-line-length
         uint40 totalElements;
         uint40 lastSequencerTimestamp;
         assembly {
@@ -192,6 +193,7 @@ contract StateCommitmentChain is IStateCommitmentChain, Lib_AddressResolver {
                 and(extraData, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000)
             )
         }
+        // solhint-enable max-line-length
 
         return (totalElements, lastSequencerTimestamp);
     }

packages/contracts/contracts/L2/predeploys/OVM_SequencerFeeVault.sol

@@ -53,6 +53,7 @@ contract OVM_SequencerFeeVault {
     function withdraw() public {
         require(
             address(this).balance >= MIN_WITHDRAWAL_AMOUNT,
+            // solhint-disable-next-line max-line-length
             "OVM_SequencerFeeVault: withdrawal amount must be greater than minimum withdrawal amount"
         );
 

packages/contracts/contracts/libraries/constants/Lib_PredeployAddresses.sol

@@ -5,6 +5,7 @@ pragma solidity ^0.8.9;
  * @title Lib_PredeployAddresses
  */
 library Lib_PredeployAddresses {
+    // solhint-disable max-line-length
     address internal constant L2_TO_L1_MESSAGE_PASSER = 0x4200000000000000000000000000000000000000;
     address internal constant L1_MESSAGE_SENDER = 0x4200000000000000000000000000000000000001;
     address internal constant DEPLOYER_WHITELIST = 0x4200000000000000000000000000000000000002;

packages/contracts/contracts/libraries/trie/Lib_MerkleTrie.sol

@@ -303,6 +303,7 @@ library Lib_MerkleTrie {
         TrieNode[] memory newNodes = new TrieNode[](3);
         uint256 totalNewNodes = 0;
 
+        // solhint-disable-next-line max-line-length
         // Reference: https://github.com/ethereumjs/merkle-patricia-tree/blob/c0a10395aab37d42c175a47114ebfcbd7efcf059/src/baseTrie.ts#L294-L313
         bool matchLeaf = false;
         if (lastNodeType == NodeType.LeafNode) {

packages/contracts/package.json

@@ -29,8 +29,8 @@
     "pretest:slither": "rm -f @openzeppelin && rm -f @ens && rm -f hardhat && ln -s ../../node_modules/@openzeppelin @openzeppelin && ln -s ../../node_modules/@ens @ens && ln -s ../../node_modules/hardhat hardhat",
     "posttest:slither": "rm -f @openzeppelin && rm -f @ens && rm -f hardhat",
     "lint:typescript:check": "eslint .",
-    "lint:contracts:check": "yarn prettier --check 'contracts/**/*.sol'",
-    "lint:check": "yarn lint:typescript:check",
+    "lint:contracts:check": "yarn solhint -f table 'contracts/**/*.sol'",
+    "lint:check": "yarn lint:contracts:check && yarn lint:typescript:check",
     "lint": "yarn lint:check",
     "lint:typescript:fix": "eslint --fix .",
     "lint:contracts:fix": "yarn prettier --write 'contracts/**/*.sol'",
@@ -95,6 +95,7 @@
     "prettier": "^2.3.1",
     "random-bytes-seed": "^1.0.3",
     "rlp": "^2.2.6",
+    "solhint": "^3.3.6",
     "solidity-coverage": "^0.7.16",
     "ts-generator": "0.0.8",
     "ts-node": "^10.0.0",