fix(evm): fixes solhint errors

gnosis · Oct 16, 2023 · 9401d11 · 9401d11
1 parent a5d4a4a
commit 9401d11
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/packages/evm/.solhint.json b/packages/evm/.solhint.json
@@ -2,10 +2,9 @@
   "extends": "solhint:recommended",
   "plugins": ["prettier"],
   "rules": {
-    "code-complexity": ["error", 8],
+    "code-complexity": ["error", 9],
     "compiler-version": ["error", ">=0.8.4"],
     "func-visibility": ["error", { "ignoreConstructors": true }],
-    "max-line-length": ["error", 120],
     "not-rely-on-time": "off",
     "avoid-low-level-calls": "off",
     "prettier/prettier": [

diff --git a/packages/evm/contracts/adapters/axiom/AxiomV02.sol b/packages/evm/contracts/adapters/axiom/AxiomV02.sol
@@ -36,11 +36,11 @@ function calcMerkleRoot(bytes32[HISTORICAL_NUM_ROOTS] calldata leaves) pure retu
 contract AxiomV02 is IAxiomV0, Ownable {
     string public constant VERSION = "0.2";
 
-    /// @notice The address of the snark verifier contract.
+    /// @notice The address of the snark verifier contract. */
     address public verifierAddress;
-    /// @dev The address of AxiomV0 version "0.1". We will read from the storage of the old contract for old block hashes.
+    /** @dev The address of AxiomV0 version "0.1". We will read from the storage of the old contract for old block hashes. */
     address public oldAxiomAddress;
-    /// @notice The block the contract was created at.
+    /// @notice The block the contract was created at
     uint256 public creationBlockNumber;
 
     // historicalRoots[startBlockNumber] is 0 unless (startBlockNumber % NUM_LEAVES == 0)
@@ -56,7 +56,7 @@ contract AxiomV02 is IAxiomV0, Ownable {
 
     event UpdateSnarkVerifierAddress(address newAddress);
 
-    /// @dev We do not re-import all historical blockhashes in this v0.2 contract, so we use the old v0.1 contract for older block numbers
+    /** @dev We do not re-import all historical blockhashes in this v0.2 contract, so we use the old v0.1 contract for older block numbers */
     function historicalRoots(uint32 startBlockNumber) public view returns (bytes32) {
         if (startBlockNumber < creationBlockNumber) {
             return IAxiomV0(oldAxiomAddress).historicalRoots(startBlockNumber);
@@ -98,7 +98,8 @@ contract AxiomV02 is IAxiomV0, Ownable {
         return emptyHashes[depth];
     }
 
-    // The ZKP has block headers for [startBlockNumber, endBlockNumber] blocks. We extract some common information from the calldata.
+    // The ZKP has block headers for [startBlockNumber, endBlockNumber] blocks.
+    // We extract some common information from the calldata.
     function getBoundaryBlockData(
         bytes calldata proofData
     )

diff --git a/packages/evm/contracts/adapters/axiom/Ownable.sol b/packages/evm/contracts/adapters/axiom/Ownable.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.7.0) (access/Ownable.sol)
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.4;
 
-import "./utils/Context.sol";
+import { Context } from "./utils/Context.sol";
 
 /**
  * @dev Contract module which provides a basic access control mechanism, where

diff --git a/packages/evm/contracts/adapters/axiom/utils/Context.sol b/packages/evm/contracts/adapters/axiom/utils/Context.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (utils/Context.sol)
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.4;
 
 /**
  * @dev Provides information about the current execution context, including the