chore: solhint imports order

AztecProtocol · Nov 4, 2024 · 10d080b · 10d080b
1 parent ace8335
commit 10d080b
Show file tree

Hide file tree

Showing 22 changed files with 55 additions and 70 deletions.
diff --git a/l1-contracts/.solhint.json b/l1-contracts/.solhint.json
@@ -34,6 +34,8 @@
     "strict-override": "error",
     "ordering": "error",
     "comprehensive-interface": "error",
-    "no-unused-import": "error"
+    "no-unused-import": "error",
+    "imports-order": "error",
+    "check-send-result": "error"
   }
 }
diff --git a/l1-contracts/package.json b/l1-contracts/package.json
@@ -9,6 +9,7 @@
   "scripts": {
     "format": "forge fmt",
     "lint": "solhint --config ./.solhint.json \"src/**/*.sol\"",
+    "lint:fix": "solhint --config ./.solhint.json --fix --noPrompt \"src/**/*.sol\"; forge fmt",
     "slither": "forge clean && forge build --build-info --skip '*/test/**' --force && slither . --checklist --ignore-compile --show-ignored-findings --config-file ./slither.config.json | tee slither_output.md",
     "slither-has-diff": "./slither_has_diff.sh"
   }

diff --git a/l1-contracts/src/core/FeeJuicePortal.sol b/l1-contracts/src/core/FeeJuicePortal.sol
@@ -2,16 +2,15 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {IERC20} from "@oz/token/ERC20/IERC20.sol";
 import {IFeeJuicePortal} from "@aztec/core/interfaces/IFeeJuicePortal.sol";
-import {IInbox} from "@aztec/core/interfaces/messagebridge/IInbox.sol";
-import {IRegistry} from "@aztec/governance/interfaces/IRegistry.sol";
 import {IRollup} from "@aztec/core/interfaces/IRollup.sol";
-
+import {IInbox} from "@aztec/core/interfaces/messagebridge/IInbox.sol";
 import {Constants} from "@aztec/core/libraries/ConstantsGen.sol";
+import {Hash} from "@aztec/core/libraries/crypto/Hash.sol";
 import {DataStructures} from "@aztec/core/libraries/DataStructures.sol";
 import {Errors} from "@aztec/core/libraries/Errors.sol";
-import {Hash} from "@aztec/core/libraries/crypto/Hash.sol";
+import {IRegistry} from "@aztec/governance/interfaces/IRegistry.sol";
+import {IERC20} from "@oz/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@oz/token/ERC20/utils/SafeERC20.sol";
 
 contract FeeJuicePortal is IFeeJuicePortal {

diff --git a/l1-contracts/src/core/Leonidas.sol b/l1-contracts/src/core/Leonidas.sol
@@ -3,19 +3,16 @@
 pragma solidity >=0.8.27;
 
 import {ILeonidas} from "@aztec/core/interfaces/ILeonidas.sol";
-
 import {Constants} from "@aztec/core/libraries/ConstantsGen.sol";
-import {DataStructures} from "@aztec/core/libraries/DataStructures.sol";
-import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {SampleLib} from "@aztec/core/libraries/crypto/SampleLib.sol";
 import {SignatureLib} from "@aztec/core/libraries/crypto/SignatureLib.sol";
+import {DataStructures} from "@aztec/core/libraries/DataStructures.sol";
+import {Errors} from "@aztec/core/libraries/Errors.sol";
+import {Timestamp, Slot, Epoch, SlotLib, EpochLib} from "@aztec/core/libraries/TimeMath.sol";
+import {Ownable} from "@oz/access/Ownable.sol";
 import {MessageHashUtils} from "@oz/utils/cryptography/MessageHashUtils.sol";
 import {EnumerableSet} from "@oz/utils/structs/EnumerableSet.sol";
 
-import {Ownable} from "@oz/access/Ownable.sol";
-
-import {Timestamp, Slot, Epoch, SlotLib, EpochLib} from "@aztec/core/libraries/TimeMath.sol";
-
 /**
  * @title   Leonidas
  * @author  Anaxandridas II

diff --git a/l1-contracts/src/core/ProofCommitmentEscrow.sol b/l1-contracts/src/core/ProofCommitmentEscrow.sol
@@ -2,13 +2,12 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {SafeERC20} from "@oz/token/ERC20/utils/SafeERC20.sol";
-import {IERC20} from "@oz/token/ERC20/IERC20.sol";
-
 import {IProofCommitmentEscrow} from "@aztec/core/interfaces/IProofCommitmentEscrow.sol";
-import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {Constants} from "@aztec/core/libraries/ConstantsGen.sol";
+import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {Timestamp} from "@aztec/core/libraries/TimeMath.sol";
+import {IERC20} from "@oz/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@oz/token/ERC20/utils/SafeERC20.sol";
 
 contract ProofCommitmentEscrow is IProofCommitmentEscrow {
   using SafeERC20 for IERC20;

diff --git a/l1-contracts/src/core/Rollup.sol b/l1-contracts/src/core/Rollup.sol
@@ -2,36 +2,32 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {EIP712} from "@oz/utils/cryptography/EIP712.sol";
-
-import {IProofCommitmentEscrow} from "@aztec/core/interfaces/IProofCommitmentEscrow.sol";
-import {IInbox} from "@aztec/core/interfaces/messagebridge/IInbox.sol";
-import {IOutbox} from "@aztec/core/interfaces/messagebridge/IOutbox.sol";
 import {IFeeJuicePortal} from "@aztec/core/interfaces/IFeeJuicePortal.sol";
+import {IProofCommitmentEscrow} from "@aztec/core/interfaces/IProofCommitmentEscrow.sol";
 import {IRollup, ITestRollup} from "@aztec/core/interfaces/IRollup.sol";
 import {IVerifier} from "@aztec/core/interfaces/IVerifier.sol";
-import {ISysstia} from "@aztec/governance/interfaces/ISysstia.sol";
-import {IERC20} from "@oz/token/ERC20/IERC20.sol";
-
+import {IInbox} from "@aztec/core/interfaces/messagebridge/IInbox.sol";
+import {IOutbox} from "@aztec/core/interfaces/messagebridge/IOutbox.sol";
+import {Leonidas} from "@aztec/core/Leonidas.sol";
 import {Constants} from "@aztec/core/libraries/ConstantsGen.sol";
+import {MerkleLib} from "@aztec/core/libraries/crypto/MerkleLib.sol";
+import {SignatureLib} from "@aztec/core/libraries/crypto/SignatureLib.sol";
 import {DataStructures} from "@aztec/core/libraries/DataStructures.sol";
 import {EpochProofQuoteLib} from "@aztec/core/libraries/EpochProofQuoteLib.sol";
 import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {HeaderLib} from "@aztec/core/libraries/HeaderLib.sol";
+import {Timestamp, Slot, Epoch, SlotLib, EpochLib} from "@aztec/core/libraries/TimeMath.sol";
 import {TxsDecoder} from "@aztec/core/libraries/TxsDecoder.sol";
-import {MerkleLib} from "@aztec/core/libraries/crypto/MerkleLib.sol";
-import {SignatureLib} from "@aztec/core/libraries/crypto/SignatureLib.sol";
-import {SafeCast} from "@oz/utils/math/SafeCast.sol";
-import {Math} from "@oz/utils/math/Math.sol";
-import {SafeERC20} from "@oz/token/ERC20/utils/SafeERC20.sol";
-
 import {Inbox} from "@aztec/core/messagebridge/Inbox.sol";
-import {Leonidas} from "@aztec/core/Leonidas.sol";
-import {MockVerifier} from "@aztec/mock/MockVerifier.sol";
-import {ProofCommitmentEscrow} from "@aztec/core/ProofCommitmentEscrow.sol";
 import {Outbox} from "@aztec/core/messagebridge/Outbox.sol";
-
-import {Timestamp, Slot, Epoch, SlotLib, EpochLib} from "@aztec/core/libraries/TimeMath.sol";
+import {ProofCommitmentEscrow} from "@aztec/core/ProofCommitmentEscrow.sol";
+import {ISysstia} from "@aztec/governance/interfaces/ISysstia.sol";
+import {MockVerifier} from "@aztec/mock/MockVerifier.sol";
+import {IERC20} from "@oz/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@oz/token/ERC20/utils/SafeERC20.sol";
+import {EIP712} from "@oz/utils/cryptography/EIP712.sol";
+import {Math} from "@oz/utils/math/Math.sol";
+import {SafeCast} from "@oz/utils/math/SafeCast.sol";
 
 /**
  * @title Rollup

diff --git a/l1-contracts/src/core/interfaces/IFeeJuicePortal.sol b/l1-contracts/src/core/interfaces/IFeeJuicePortal.sol
@@ -2,8 +2,8 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {IERC20} from "@oz/token/ERC20/IERC20.sol";
 import {IRegistry} from "@aztec/governance/interfaces/IRegistry.sol";
+import {IERC20} from "@oz/token/ERC20/IERC20.sol";
 
 interface IFeeJuicePortal {
   event DepositToAztecPublic(

diff --git a/l1-contracts/src/core/libraries/EpochProofQuoteLib.sol b/l1-contracts/src/core/libraries/EpochProofQuoteLib.sol
@@ -2,8 +2,8 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {Slot, Epoch} from "@aztec/core/libraries/TimeMath.sol";
 import {SignatureLib} from "@aztec/core/libraries/crypto/SignatureLib.sol";
+import {Slot, Epoch} from "@aztec/core/libraries/TimeMath.sol";
 
 library EpochProofQuoteLib {
   /**

diff --git a/l1-contracts/src/core/libraries/TxsDecoder.sol b/l1-contracts/src/core/libraries/TxsDecoder.sol
@@ -3,8 +3,8 @@
 pragma solidity >=0.8.27;
 
 import {Constants} from "@aztec/core/libraries/ConstantsGen.sol";
-import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {Hash} from "@aztec/core/libraries/crypto/Hash.sol";
+import {Errors} from "@aztec/core/libraries/Errors.sol";
 
 /**
  * @title Txs Decoder Library

diff --git a/l1-contracts/src/core/libraries/crypto/MerkleLib.sol b/l1-contracts/src/core/libraries/crypto/MerkleLib.sol
@@ -2,8 +2,8 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {Hash} from "@aztec/core/libraries/crypto/Hash.sol";
+import {Errors} from "@aztec/core/libraries/Errors.sol";
 
 /**
  * @title Merkle Library

diff --git a/l1-contracts/src/core/messagebridge/Inbox.sol b/l1-contracts/src/core/messagebridge/Inbox.sol
@@ -3,12 +3,11 @@
 pragma solidity >=0.8.27;
 
 import {IInbox} from "@aztec/core/interfaces/messagebridge/IInbox.sol";
-
 import {Constants} from "@aztec/core/libraries/ConstantsGen.sol";
+import {FrontierLib} from "@aztec/core/libraries/crypto/FrontierLib.sol";
+import {Hash} from "@aztec/core/libraries/crypto/Hash.sol";
 import {DataStructures} from "@aztec/core/libraries/DataStructures.sol";
 import {Errors} from "@aztec/core/libraries/Errors.sol";
-import {Hash} from "@aztec/core/libraries/crypto/Hash.sol";
-import {FrontierLib} from "@aztec/core/libraries/crypto/FrontierLib.sol";
 
 /**
  * @title Inbox

diff --git a/l1-contracts/src/core/messagebridge/Outbox.sol b/l1-contracts/src/core/messagebridge/Outbox.sol
@@ -3,12 +3,10 @@
 pragma solidity >=0.8.27;
 
 import {IOutbox} from "@aztec/core//interfaces/messagebridge/IOutbox.sol";
-
+import {Hash} from "@aztec/core/libraries/crypto/Hash.sol";
+import {MerkleLib} from "@aztec/core/libraries/crypto/MerkleLib.sol";
 import {DataStructures} from "@aztec/core/libraries/DataStructures.sol";
 import {Errors} from "@aztec/core/libraries/Errors.sol";
-import {MerkleLib} from "@aztec/core/libraries/crypto/MerkleLib.sol";
-import {Hash} from "@aztec/core/libraries/crypto/Hash.sol";
-
 import {Rollup} from "@aztec/core/Rollup.sol";
 
 /**

diff --git a/l1-contracts/src/governance/Apella.sol b/l1-contracts/src/governance/Apella.sol
@@ -1,17 +1,14 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.27;
 
-import {IPayload} from "@aztec/governance/interfaces/IPayload.sol";
+import {Timestamp} from "@aztec/core/libraries/TimeMath.sol";
 import {IApella} from "@aztec/governance/interfaces/IApella.sol";
-
-import {DataStructures} from "@aztec/governance/libraries/DataStructures.sol";
+import {IPayload} from "@aztec/governance/interfaces/IPayload.sol";
 import {ConfigurationLib} from "@aztec/governance/libraries/ConfigurationLib.sol";
+import {DataStructures} from "@aztec/governance/libraries/DataStructures.sol";
 import {Errors} from "@aztec/governance/libraries/Errors.sol";
 import {ProposalLib, VoteTabulationReturn} from "@aztec/governance/libraries/ProposalLib.sol";
 import {UserLib} from "@aztec/governance/libraries/UserLib.sol";
-
-import {Timestamp} from "@aztec/core/libraries/TimeMath.sol";
-
 import {IERC20} from "@oz/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@oz/token/ERC20/utils/SafeERC20.sol";
 

diff --git a/l1-contracts/src/governance/Gerousia.sol b/l1-contracts/src/governance/Gerousia.sol
@@ -1,15 +1,14 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.27;
 
-import {IRegistry} from "@aztec/governance/interfaces/IRegistry.sol";
+import {ILeonidas} from "@aztec/core/interfaces/ILeonidas.sol";
+import {Slot, SlotLib} from "@aztec/core/libraries/TimeMath.sol";
 import {IApella} from "@aztec/governance/interfaces/IApella.sol";
 import {IGerousia} from "@aztec/governance/interfaces/IGerousia.sol";
 import {IPayload} from "@aztec/governance/interfaces/IPayload.sol";
+import {IRegistry} from "@aztec/governance/interfaces/IRegistry.sol";
 import {Errors} from "@aztec/governance/libraries/Errors.sol";
 
-import {Slot, SlotLib} from "@aztec/core/libraries/TimeMath.sol";
-import {ILeonidas} from "@aztec/core/interfaces/ILeonidas.sol";
-
 /**
  * @notice  A Gerousia implementation following the empire model
  *          Beware that while governance generally do not care about the implementation

diff --git a/l1-contracts/src/governance/Nomismatokopio.sol b/l1-contracts/src/governance/Nomismatokopio.sol
@@ -2,10 +2,10 @@
 // Copyright 2023 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {Ownable} from "@oz/access/Ownable.sol";
-import {Errors} from "@aztec/governance/libraries/Errors.sol";
 import {IMintableERC20} from "@aztec/governance/interfaces/IMintableERC20.sol";
 import {INomismatokopio} from "@aztec/governance/interfaces/INomismatokopio.sol";
+import {Errors} from "@aztec/governance/libraries/Errors.sol";
+import {Ownable} from "@oz/access/Ownable.sol";
 
 contract Nomismatokopio is INomismatokopio, Ownable {
   IMintableERC20 public immutable ASSET;

diff --git a/l1-contracts/src/governance/Sysstia.sol b/l1-contracts/src/governance/Sysstia.sol
@@ -2,14 +2,12 @@
 // Copyright 2023 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {IERC20} from "@oz/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@oz/token/ERC20/utils/SafeERC20.sol";
-
 import {IRegistry} from "@aztec/governance/interfaces/IRegistry.sol";
 import {ISysstia} from "@aztec/governance/interfaces/ISysstia.sol";
-
 import {Errors} from "@aztec/governance/libraries/Errors.sol";
 import {Ownable} from "@oz/access/Ownable.sol";
+import {IERC20} from "@oz/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@oz/token/ERC20/utils/SafeERC20.sol";
 
 contract Sysstia is ISysstia, Ownable {
   using SafeERC20 for IERC20;

diff --git a/l1-contracts/src/governance/interfaces/IApella.sol b/l1-contracts/src/governance/interfaces/IApella.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.27;
 
+import {Timestamp} from "@aztec/core/libraries/TimeMath.sol";
 import {IPayload} from "@aztec/governance/interfaces/IPayload.sol";
 import {DataStructures} from "@aztec/governance/libraries/DataStructures.sol";
-import {Timestamp} from "@aztec/core/libraries/TimeMath.sol";
 
 interface IApella {
   event Proposed(uint256 indexed proposalId, address indexed proposal);

diff --git a/l1-contracts/src/governance/libraries/ConfigurationLib.sol b/l1-contracts/src/governance/libraries/ConfigurationLib.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.27;
 
-import {DataStructures} from "@aztec/governance/libraries/DataStructures.sol";
 import {Timestamp} from "@aztec/core/libraries/TimeMath.sol";
+import {DataStructures} from "@aztec/governance/libraries/DataStructures.sol";
 import {Errors} from "@aztec/governance/libraries/Errors.sol";
 
 library ConfigurationLib {

diff --git a/l1-contracts/src/governance/libraries/Errors.sol b/l1-contracts/src/governance/libraries/Errors.sol
@@ -2,8 +2,8 @@
 // Copyright 2023 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {IPayload} from "@aztec/governance/interfaces/IPayload.sol";
 import {Slot, Timestamp} from "@aztec/core/libraries/TimeMath.sol";
+import {IPayload} from "@aztec/governance/interfaces/IPayload.sol";
 
 /**
  * @title Errors Library

diff --git a/l1-contracts/src/governance/libraries/ProposalLib.sol b/l1-contracts/src/governance/libraries/ProposalLib.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.27;
 
-import {DataStructures} from "@aztec/governance/libraries/DataStructures.sol";
 import {Timestamp} from "@aztec/core/libraries/TimeMath.sol";
+import {DataStructures} from "@aztec/governance/libraries/DataStructures.sol";
 import {Math} from "@oz/utils/math/Math.sol";
 
 enum VoteTabulationReturn {

diff --git a/l1-contracts/src/governance/libraries/UserLib.sol b/l1-contracts/src/governance/libraries/UserLib.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.27;
 
-import {DataStructures} from "@aztec/governance/libraries/DataStructures.sol";
 import {Timestamp} from "@aztec/core/libraries/TimeMath.sol";
+import {DataStructures} from "@aztec/governance/libraries/DataStructures.sol";
 import {Errors} from "@aztec/governance/libraries/Errors.sol";
 
 library UserLib {

diff --git a/l1-contracts/src/mock/MockFeeJuicePortal.sol b/l1-contracts/src/mock/MockFeeJuicePortal.sol
@@ -2,10 +2,10 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {IERC20} from "@oz/token/ERC20/IERC20.sol";
 import {IFeeJuicePortal} from "@aztec/core/interfaces/IFeeJuicePortal.sol";
-import {TestERC20} from "@aztec/mock/TestERC20.sol";
 import {IRegistry} from "@aztec/governance/interfaces/IRegistry.sol";
+import {TestERC20} from "@aztec/mock/TestERC20.sol";
+import {IERC20} from "@oz/token/ERC20/IERC20.sol";
 
 contract MockFeeJuicePortal is IFeeJuicePortal {
   IERC20 public immutable UNDERLYING;