Merge branch 'main' into aliX/ens-1

Author: Alex Sedighi

.github/workflows/checks.yml

@@ -23,15 +23,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      
-      - name: Install cSpell
-        run: npm install -g cspell
+
+      - name: Install dependencies
+        run: yarn
 
       - name: Spell Check
-        run: cspell --config .cspell.json
+        run: yarn spellcheck
 
       - name: Lint
-        run: forge fmt --check
+        run: yarn lint
 
       - name: Run tests
         run: forge test --zksync

.solhint.json

@@ -8,6 +8,8 @@
                 "ignoreConstructors": true
             }
         ],
-        "constructor-syntax": "error"
+        "constructor-syntax": "error",
+        "immutable-vars-naming": "off",
+        "gas-custom-errors": "error"
     }
 }

package.json

@@ -8,7 +8,8 @@
   "scripts": {
     "compile": "hardhat compile",
     "clean": "hardhat clean",
-    "lint": "solhint 'src/**/*.sol'"
+    "lint": "solhint 'src/**/*.sol'",
+    "spellcheck": "cspell --config .cspell.json"
   },
   "devDependencies": {
     "@matterlabs/hardhat-zksync": "^1.3.0",
@@ -25,6 +26,7 @@
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.12.12",
     "chai": "^4.4.1",
+    "cspell": "^8.16.1",
     "dotenv": "^16.4.5",
     "ethers": "^6.12.1",
     "hardhat": "^2.22.4",

src/Grants.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 pragma solidity ^0.8.23;
 
-import "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /**
  * @title Grants

src/Rewards.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.23;
 
 import {NODL} from "./NODL.sol";
 import {QuotaControl} from "./QuotaControl.sol";
-import {AccessControl} from "openzeppelin-contracts/contracts/access/AccessControl.sol";
 import {EIP712} from "openzeppelin-contracts/contracts/utils/cryptography/EIP712.sol";
 import {SignatureChecker} from "openzeppelin-contracts/contracts/utils/cryptography/SignatureChecker.sol";
 import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";

src/bridge/MigrationNFT.sol

@@ -23,7 +23,6 @@
 pragma solidity 0.8.23;
 
 import {ERC721} from "openzeppelin-contracts/contracts/token/ERC721/ERC721.sol";
-import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";
 import {NODLMigration} from "./NODLMigration.sol";
 
 contract MigrationNFT is ERC721 {

src/contentsign/BaseContentSign.sol

@@ -5,8 +5,6 @@ pragma solidity 0.8.23;
 import {ERC721} from "openzeppelin-contracts/contracts/token/ERC721/ERC721.sol";
 import {ERC721URIStorage} from "openzeppelin-contracts/contracts/token/ERC721/extensions/ERC721URIStorage.sol";
 
-import {WhitelistPaymaster} from "../paymasters/WhitelistPaymaster.sol";
-
 /// @notice a simple NFT contract for contentsign data where each nft is mapped to a one-time
 /// configurable URL. This is used for every variant of ContentSign with associated hooks.
 abstract contract BaseContentSign is ERC721, ERC721URIStorage {

src/nameservice/ClickResolver.sol

@@ -23,9 +23,9 @@ interface IExtendedResolver {
 contract ClickResolver is IExtendedResolver, IERC165, Ownable {
     bytes4 private constant EXTENDED_INTERFACE_ID = 0x9061b923; // ENSIP-10
 
-    bytes4 constant ADDR_SELECTOR = 0x3b3b57de; // addr(bytes32)
-    bytes4 constant ADDR_MULTICHAIN_SELECTOR = 0xf1cb7e06; // addr(bytes32,uint)
-    uint256 constant ZKSYNC_MAINNET_COIN_TYPE = 2147483972; // (0x80000000 | 0x144) >>> 0 as per ENSIP11
+    bytes4 private constant ADDR_SELECTOR = 0x3b3b57de; // addr(bytes32)
+    bytes4 private constant ADDR_MULTICHAIN_SELECTOR = 0xf1cb7e06; // addr(bytes32,uint)
+    uint256 private constant ZKSYNC_MAINNET_COIN_TYPE = 2147483972; // (0x80000000 | 0x144) >>> 0 as per ENSIP11
 
     error OffchainLookup(address sender, string[] urls, bytes callData, bytes4 callbackFunction, bytes extraData);
     error UnsupportedCoinType(uint256 coinType);
@@ -110,12 +110,12 @@ contract ClickResolver is IExtendedResolver, IERC165, Ownable {
     }
 
     /// @notice Resolves a name based on its subdomain part regardless of the given domain and top level
-    /// @param _name The name to resolve which must be a pack of length prefixed names for subdomain, domain and top. 
+    /// @param _name The name to resolve which must be a pack of length prefixed names for subdomain, domain and top.
     /// example: b"\x07example\x05clave\x03eth"
     ///
     /// @param _data The ABI encoded data for the underlying resolution function (Eg, addr(bytes32), text(bytes32,string), etc).
     function resolve(bytes calldata _name, bytes calldata _data) external view returns (bytes memory) {
-        (string memory sub, string memory _domain, string memory _top) = parseDnsDomain(_name);
+        (string memory sub,,) = parseDnsDomain(_name);
 
         if (bytes(sub).length == 0) {
             return abi.encodePacked(domainOwner);
@@ -130,26 +130,14 @@ contract ClickResolver is IExtendedResolver, IERC165, Ownable {
 
         bytes4 functionSelector = bytes4(_data[:4]);
         if (functionSelector == ADDR_SELECTOR) {
-            revert OffchainLookup(
-                address(this),
-                urls,
-                callData,
-                ClickResolver.resolveWithProof.selector,
-                callData
-            );
+            revert OffchainLookup(address(this), urls, callData, ClickResolver.resolveWithProof.selector, callData);
         } else if (functionSelector == ADDR_MULTICHAIN_SELECTOR) {
             (, uint256 coinType) = abi.decode(_data[4:], (bytes32, uint256));
             if (coinType != ZKSYNC_MAINNET_COIN_TYPE) {
                 // TODO: Handle other chains when this is supported
                 revert UnsupportedCoinType(coinType);
             }
-            revert OffchainLookup(
-                address(this),
-                urls,
-                callData,
-                ClickResolver.resolveWithProof.selector,
-                callData
-            );
+            revert OffchainLookup(address(this), urls, callData, ClickResolver.resolveWithProof.selector, callData);
         } else {
             revert UnsupportedSelector(functionSelector);
         }