evm: fix most new lints

Author: evan-gray

evm/foundry.toml

@@ -9,3 +9,10 @@ out = "out"
 libs = ["lib"]
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
+
+[lint]
+exclude_lints = [
+    "asm-keccak256",
+    "mixed-case-function",
+    "unaliased-plain-import"
+]

evm/script/DeployExecutorQuoter.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-import {ExecutorQuoter, executorQuoterVersion} from "../src/ExecutorQuoter.sol";
+import {ExecutorQuoter, EXECUTOR_QUOTER_VERSION_STR} from "../src/ExecutorQuoter.sol";
 import "forge-std/Script.sol";
 
 // DeployExecutorQuoter is a forge script to deploy the ExecutorQuoter contract. Use ./sh/deployExecutorQuoter.sh to invoke this.
@@ -31,7 +31,7 @@ contract DeployExecutorQuoter is Script {
         internal
         returns (address deployedAddress)
     {
-        bytes32 salt = keccak256(abi.encodePacked(executorQuoterVersion));
+        bytes32 salt = keccak256(abi.encodePacked(EXECUTOR_QUOTER_VERSION_STR));
         ExecutorQuoter executorQuoter =
             new ExecutorQuoter{salt: salt}(quoterAddress, updaterAddress, srcTokenDecimals, payeeAddress);
 

evm/script/DeployExecutorQuoterRouter.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-import {ExecutorQuoterRouter, executorQuoterRouterVersion} from "../src/ExecutorQuoterRouter.sol";
+import {ExecutorQuoterRouter, EXECUTOR_QUOTER_ROUTER_VERSION_STR} from "../src/ExecutorQuoterRouter.sol";
 import "forge-std/Script.sol";
 
 // DeployExecutorQuoterRouter is a forge script to deploy the ExecutorQuoterRouter contract. Use ./sh/deployExecutorQuoterRouter.sh to invoke this.
@@ -23,7 +23,7 @@ contract DeployExecutorQuoterRouter is Script {
     }
 
     function _deploy(address executor) internal returns (address deployedAddress) {
-        bytes32 salt = keccak256(abi.encodePacked(executorQuoterRouterVersion));
+        bytes32 salt = keccak256(abi.encodePacked(EXECUTOR_QUOTER_ROUTER_VERSION_STR));
         ExecutorQuoterRouter executorQuoterRouter = new ExecutorQuoterRouter{salt: salt}(executor);
 
         return (address(executorQuoterRouter));

evm/src/ExecutorQuoter.sol

@@ -3,17 +3,17 @@ pragma solidity ^0.8.13;
 
 import "./interfaces/IExecutorQuoter.sol";
 
-string constant executorQuoterVersion = "Executor-Quoter-0.0.1";
+string constant EXECUTOR_QUOTER_VERSION_STR = "Executor-Quoter-0.0.1";
 
 contract ExecutorQuoter is IExecutorQuoter {
-    string public constant EXECUTOR_QUOTER_VERSION = executorQuoterVersion;
+    string public constant EXECUTOR_QUOTER_VERSION = EXECUTOR_QUOTER_VERSION_STR;
     uint8 private constant QUOTE_DECIMALS = 10;
     uint8 private constant DECIMAL_RESOLUTION = 18;
 
-    address public immutable quoterAddress;
-    address public immutable updaterAddress;
-    uint8 public immutable srcTokenDecimals;
-    bytes32 public immutable payeeAddress;
+    address public immutable QUOTER_ADDRESS;
+    address public immutable UPDATER_ADDRESS;
+    uint8 public immutable SRC_TOKEN_DECIMALS;
+    bytes32 public immutable PAYEE_ADDRESS;
 
     /// This is the same as an EQ01 quote body
     /// It fits into a single bytes32 storage slot
@@ -52,17 +52,17 @@ contract ExecutorQuoter is IExecutorQuoter {
     error MoreThanOneDropOff();
 
     modifier onlyUpdater() {
-        if (msg.sender != updaterAddress) {
-            revert InvalidUpdater(msg.sender, updaterAddress);
+        if (msg.sender != UPDATER_ADDRESS) {
+            revert InvalidUpdater(msg.sender, UPDATER_ADDRESS);
         }
         _;
     }
 
     constructor(address _quoterAddress, address _updaterAddress, uint8 _srcTokenDecimals, bytes32 _payeeAddress) {
-        quoterAddress = _quoterAddress;
-        updaterAddress = _updaterAddress;
-        srcTokenDecimals = _srcTokenDecimals;
-        payeeAddress = _payeeAddress;
+        QUOTER_ADDRESS = _quoterAddress;
+        UPDATER_ADDRESS = _updaterAddress;
+        SRC_TOKEN_DECIMALS = _srcTokenDecimals;
+        PAYEE_ADDRESS = _payeeAddress;
     }
 
     function _batchUpdate(Update[] calldata updates, uint256 mappingSlot) private {
@@ -170,7 +170,7 @@ contract ExecutorQuoter is IExecutorQuoter {
         uint256 gasLimit,
         uint256 msgValue
     ) private view returns (uint256) {
-        uint256 srcChainValueForBaseFee = normalize(quote.baseFee, QUOTE_DECIMALS, srcTokenDecimals);
+        uint256 srcChainValueForBaseFee = normalize(quote.baseFee, QUOTE_DECIMALS, SRC_TOKEN_DECIMALS);
 
         uint256 nSrcPrice = normalize(quote.srcPrice, QUOTE_DECIMALS, DECIMAL_RESOLUTION);
         uint256 nDstPrice = normalize(quote.dstPrice, QUOTE_DECIMALS, DECIMAL_RESOLUTION);
@@ -179,11 +179,11 @@ contract ExecutorQuoter is IExecutorQuoter {
         uint256 nGasLimitCost =
             normalize(gasLimit * quote.dstGasPrice, dstChainInfo.gasPriceDecimals, DECIMAL_RESOLUTION);
         uint256 srcChainValueForGasLimit =
-            normalize(mul(nGasLimitCost, scaledConversion, DECIMAL_RESOLUTION), DECIMAL_RESOLUTION, srcTokenDecimals);
+            normalize(mul(nGasLimitCost, scaledConversion, DECIMAL_RESOLUTION), DECIMAL_RESOLUTION, SRC_TOKEN_DECIMALS);
 
         uint256 nMsgValue = normalize(msgValue, dstChainInfo.nativeDecimals, DECIMAL_RESOLUTION);
         uint256 srcChainValueForMsgValue =
-            normalize(mul(nMsgValue, scaledConversion, DECIMAL_RESOLUTION), DECIMAL_RESOLUTION, srcTokenDecimals);
+            normalize(mul(nMsgValue, scaledConversion, DECIMAL_RESOLUTION), DECIMAL_RESOLUTION, SRC_TOKEN_DECIMALS);
         return srcChainValueForBaseFee + srcChainValueForGasLimit + srcChainValueForMsgValue;
     }
 
@@ -203,6 +203,6 @@ contract ExecutorQuoter is IExecutorQuoter {
         // NOTE: this does not include any maxGasLimit or maxMsgValue checks
         uint256 requiredPayment = estimateQuote(quote, dstChainInfo, gasLimit, msgValue);
 
-        return (payeeAddress, requiredPayment);
+        return (PAYEE_ADDRESS, requiredPayment);
     }
 }

evm/src/ExecutorQuoterRouter.sol

@@ -5,16 +5,16 @@ import "./interfaces/IExecutor.sol";
 import "./interfaces/IExecutorQuoter.sol";
 import "./interfaces/IExecutorQuoterRouter.sol";
 
-string constant executorQuoterRouterVersion = "Executor-Quote-Router-0.0.1";
+string constant EXECUTOR_QUOTER_ROUTER_VERSION_STR = "Executor-Quote-Router-0.0.1";
 
 contract ExecutorQuoterRouter is IExecutorQuoterRouter {
-    string public constant EXECUTOR_QUOTER_ROUTER_VERSION = executorQuoterRouterVersion;
+    string public constant EXECUTOR_QUOTER_ROUTER_VERSION = EXECUTOR_QUOTER_ROUTER_VERSION_STR;
     bytes4 private constant QUOTE_PREFIX = "EQ02";
     bytes4 private constant GOVERNANCE_PREFIX = "EG01";
     uint64 private constant EXPIRY_TIME = type(uint64).max;
 
-    IExecutor public immutable executor;
-    uint16 public immutable ourChain;
+    IExecutor public immutable EXECUTOR;
+    uint16 public immutable OUR_CHAIN;
 
     mapping(address => IExecutorQuoter) public quoterContract;
 
@@ -33,8 +33,8 @@ contract ExecutorQuoterRouter is IExecutorQuoterRouter {
     error NotAnEvmAddress(bytes32);
 
     constructor(address _executor) {
-        executor = IExecutor(_executor);
-        ourChain = executor.ourChain();
+        EXECUTOR = IExecutor(_executor);
+        OUR_CHAIN = EXECUTOR.ourChain();
     }
 
     function updateQuoterContract(bytes calldata gov) external {
@@ -57,8 +57,8 @@ contract ExecutorQuoterRouter is IExecutorQuoterRouter {
             s := calldataload(add(gov.offset, 98))
             v := shr(248, calldataload(add(gov.offset, 130)))
         }
-        if (chainId != ourChain) {
-            revert ChainIdMismatch(chainId, ourChain);
+        if (chainId != OUR_CHAIN) {
+            revert ChainIdMismatch(chainId, OUR_CHAIN);
         }
         // Check if the higher 96 bits (left-most 12 bytes) are non-zero
         if (uint256(universalContractAddress) >> 160 != 0) {
@@ -113,11 +113,11 @@ contract ExecutorQuoterRouter is IExecutorQuoterRouter {
                 revert RefundFailed(refundAddr);
             }
         }
-        executor.requestExecution{value: requiredPayment}(
+        EXECUTOR.requestExecution{value: requiredPayment}(
             dstChain,
             dstAddr,
             refundAddr,
-            abi.encodePacked(QUOTE_PREFIX, quoterAddr, payeeAddress, ourChain, dstChain, EXPIRY_TIME),
+            abi.encodePacked(QUOTE_PREFIX, quoterAddr, payeeAddress, OUR_CHAIN, dstChain, EXPIRY_TIME),
             requestBytes,
             relayInstructions
         );

evm/test/Executor.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.13;
 
-import {Test, console} from "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 import {IExecutor} from "../src/interfaces/IExecutor.sol";
 import {Executor} from "../src/Executor.sol";
 

evm/test/ExecutorMessages.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.13;
 
-import {Test, console} from "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 import {ExecutorMessages} from "../src/libraries/ExecutorMessages.sol";
 
 contract ExecutorMessagesTest is Test {

evm/test/ExecutorQuoter.t.sol

@@ -9,20 +9,20 @@ contract ExecutorQuoterTest is Test {
     ExecutorQuoter.Update[] public updates;
     ExecutorQuoter.Update[] public chainInfoUpdates;
 
-    address constant updater = 0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496;
-    bytes32 constant chainInfoUpdatePacked = 0x0000000000000000000000000000000000000000000000000000000000121201;
-    uint16 constant dstChain = 10003;
-    bytes32 constant dstAddr = bytes32(0);
+    address constant UPDATER = 0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496;
+    bytes32 constant CHAIN_INFO_UPDATE_PACKED = 0x0000000000000000000000000000000000000000000000000000000000121201;
+    uint16 constant DST_CHAIN = 10003;
+    bytes32 constant DST_ADDR = bytes32(0);
 
     function packUint64(uint64 a, uint64 b, uint64 c, uint64 d) public pure returns (bytes32) {
         return bytes32((uint256(d) << 192) | (uint256(c) << 128) | (uint256(b) << 64) | uint256(a));
     }
 
     function setUp() public {
-        executorQuoter = new ExecutorQuoter(updater, updater, 18, bytes32(uint256(uint160(updater))));
+        executorQuoter = new ExecutorQuoter(UPDATER, UPDATER, 18, bytes32(uint256(uint160(UPDATER))));
         ExecutorQuoter.Update memory chainInfoUpdate;
         chainInfoUpdate.chainId = 10003;
-        chainInfoUpdate.update = chainInfoUpdatePacked;
+        chainInfoUpdate.update = CHAIN_INFO_UPDATE_PACKED;
         chainInfoUpdates.push(chainInfoUpdate);
         executorQuoter.chainInfoUpdate(chainInfoUpdates);
         ExecutorQuoter.OnChainQuoteBody memory quote1;
@@ -76,7 +76,7 @@ contract ExecutorQuoterTest is Test {
 
     function test_requestQuote() public view {
         executorQuoter.requestQuote(
-            dstChain, dstAddr, updater, abi.encodePacked(""), abi.encodePacked(uint8(1), uint128(250000))
+            DST_CHAIN, DST_ADDR, UPDATER, abi.encodePacked(""), abi.encodePacked(uint8(1), uint128(250000))
         );
     }
 }

evm/test/RelayInstructions.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.13;
 
-import {Test, console} from "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 import {RelayInstructions} from "../src/libraries/RelayInstructions.sol";
 
 contract RelayInstructionsTest is Test {