Bump Foundry & Forge-std (#12640)

* bump foundry from December to March release

* bump forge-std from v1.7.1 to v1.8.1

* rm unused imports and set visibility explicitly

.github/workflows/solidity-foundry.yml

@@ -57,7 +57,7 @@ jobs:
         uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
         with:
           # Has to match the `make foundry` version.
-          version: nightly-5b7e4cb3c882b28f3c32ba580de27ce7381f415a
+          version: nightly-de33b6af53005037b463318d2628b5cfcaf39916
 
       - name: Run Forge build
         if: needs.changes.outputs.changes == 'true'

contracts/.changeset/modern-horses-destroy.md

@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts": patch
+---
+
+fix solhint issues in automation folder

contracts/GNUmakefile

@@ -43,7 +43,7 @@ mockery: $(mockery) ## Install mockery.
 
 .PHONY: foundry
 foundry: ## Install foundry.
-	foundryup --version nightly-5b7e4cb3c882b28f3c32ba580de27ce7381f415a
+	foundryup --version nightly-de33b6af53005037b463318d2628b5cfcaf39916
 
 .PHONY: foundry-refresh
 foundry-refresh: foundry

contracts/gas-snapshots/keystone.gas-snapshot

@@ -1,2 +1,2 @@
-KeystoneForwarderTest:test_abi_partial_decoding_works() (gas: 2068)
-KeystoneForwarderTest:test_it_works() (gas: 993848)
+KeystoneForwarderTest:test_abi_partial_decoding_works() (gas: 5123)
+KeystoneForwarderTest:test_it_works() (gas: 996215)

contracts/gas-snapshots/shared.gas-snapshot

@@ -1,48 +1,48 @@
-BurnMintERC677_approve:testApproveSuccess() (gas: 55248)
+BurnMintERC677_approve:testApproveSuccess() (gas: 55512)
 BurnMintERC677_approve:testInvalidAddressReverts() (gas: 10663)
-BurnMintERC677_burn:testBasicBurnSuccess() (gas: 164342)
+BurnMintERC677_burn:testBasicBurnSuccess() (gas: 173939)
 BurnMintERC677_burn:testBurnFromZeroAddressReverts() (gas: 47201)
 BurnMintERC677_burn:testExceedsBalanceReverts() (gas: 21841)
 BurnMintERC677_burn:testSenderNotBurnerReverts() (gas: 13359)
-BurnMintERC677_burnFrom:testBurnFromSuccess() (gas: 57658)
+BurnMintERC677_burnFrom:testBurnFromSuccess() (gas: 57923)
 BurnMintERC677_burnFrom:testExceedsBalanceReverts() (gas: 35864)
 BurnMintERC677_burnFrom:testInsufficientAllowanceReverts() (gas: 21849)
 BurnMintERC677_burnFrom:testSenderNotBurnerReverts() (gas: 13359)
-BurnMintERC677_burnFromAlias:testBurnFromSuccess() (gas: 57684)
+BurnMintERC677_burnFromAlias:testBurnFromSuccess() (gas: 57949)
 BurnMintERC677_burnFromAlias:testExceedsBalanceReverts() (gas: 35880)
 BurnMintERC677_burnFromAlias:testInsufficientAllowanceReverts() (gas: 21869)
 BurnMintERC677_burnFromAlias:testSenderNotBurnerReverts() (gas: 13379)
-BurnMintERC677_constructor:testConstructorSuccess() (gas: 1669109)
-BurnMintERC677_decreaseApproval:testDecreaseApprovalSuccess() (gas: 28537)
-BurnMintERC677_grantMintAndBurnRoles:testGrantMintAndBurnRolesSuccess() (gas: 120071)
-BurnMintERC677_grantRole:testGrantBurnAccessSuccess() (gas: 52724)
-BurnMintERC677_grantRole:testGrantManySuccess() (gas: 935521)
-BurnMintERC677_grantRole:testGrantMintAccessSuccess() (gas: 93605)
-BurnMintERC677_increaseApproval:testIncreaseApprovalSuccess() (gas: 40911)
-BurnMintERC677_mint:testBasicMintSuccess() (gas: 149365)
+BurnMintERC677_constructor:testConstructorSuccess() (gas: 1672809)
+BurnMintERC677_decreaseApproval:testDecreaseApprovalSuccess() (gas: 31069)
+BurnMintERC677_grantMintAndBurnRoles:testGrantMintAndBurnRolesSuccess() (gas: 121324)
+BurnMintERC677_grantRole:testGrantBurnAccessSuccess() (gas: 53460)
+BurnMintERC677_grantRole:testGrantManySuccess() (gas: 937759)
+BurnMintERC677_grantRole:testGrantMintAccessSuccess() (gas: 94340)
+BurnMintERC677_increaseApproval:testIncreaseApprovalSuccess() (gas: 44076)
+BurnMintERC677_mint:testBasicMintSuccess() (gas: 149699)
 BurnMintERC677_mint:testMaxSupplyExceededReverts() (gas: 50385)
 BurnMintERC677_mint:testSenderNotMinterReverts() (gas: 11195)
-BurnMintERC677_supportsInterface:testConstructorSuccess() (gas: 8685)
+BurnMintERC677_supportsInterface:testConstructorSuccess() (gas: 12476)
 BurnMintERC677_transfer:testInvalidAddressReverts() (gas: 10639)
-BurnMintERC677_transfer:testTransferSuccess() (gas: 39462)
-CallWithExactGas__callWithExactGas:test_CallWithExactGasReceiverErrorSuccess() (gas: 66918)
-CallWithExactGas__callWithExactGas:test_CallWithExactGasSafeReturnDataExactGas() (gas: 22615)
+BurnMintERC677_transfer:testTransferSuccess() (gas: 42299)
+CallWithExactGas__callWithExactGas:test_CallWithExactGasReceiverErrorSuccess() (gas: 67209)
+CallWithExactGas__callWithExactGas:test_CallWithExactGasSafeReturnDataExactGas() (gas: 18324)
 CallWithExactGas__callWithExactGas:test_NoContractReverts() (gas: 11559)
-CallWithExactGas__callWithExactGas:test_NoGasForCallExactCheckReverts() (gas: 12908)
-CallWithExactGas__callWithExactGas:test_NotEnoughGasForCallReverts() (gas: 13361)
-CallWithExactGas__callWithExactGas:test_callWithExactGasSuccess(bytes,bytes4) (runs: 256, μ: 15477, ~: 15418)
-CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractExactGasSuccess() (gas: 19147)
-CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractReceiverErrorSuccess() (gas: 67096)
-CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractSuccess(bytes,bytes4) (runs: 256, μ: 15675, ~: 15616)
-CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NoContractSuccess() (gas: 9816)
-CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NoGasForCallExactCheckReturnFalseSuccess() (gas: 9578)
-CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NotEnoughGasForCallReturnsFalseSuccess() (gas: 9890)
-CallWithExactGas__callWithExactGasSafeReturnData:test_CallWithExactGasSafeReturnDataExactGas() (gas: 19017)
-CallWithExactGas__callWithExactGasSafeReturnData:test_NoContractReverts() (gas: 13949)
-CallWithExactGas__callWithExactGasSafeReturnData:test_NoGasForCallExactCheckReverts() (gas: 13239)
-CallWithExactGas__callWithExactGasSafeReturnData:test_NotEnoughGasForCallReverts() (gas: 13670)
-OpStackBurnMintERC677_constructor:testConstructorSuccess() (gas: 1739317)
-OpStackBurnMintERC677_interfaceCompatibility:testBurnCompatibility() (gas: 263373)
+CallWithExactGas__callWithExactGas:test_NoGasForCallExactCheckReverts() (gas: 15788)
+CallWithExactGas__callWithExactGas:test_NotEnoughGasForCallReverts() (gas: 16241)
+CallWithExactGas__callWithExactGas:test_callWithExactGasSuccess(bytes,bytes4) (runs: 256, μ: 15812, ~: 15752)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractExactGasSuccess() (gas: 20116)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractReceiverErrorSuccess() (gas: 67721)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractSuccess(bytes,bytes4) (runs: 256, μ: 16322, ~: 16262)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NoContractSuccess() (gas: 12962)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NoGasForCallExactCheckReturnFalseSuccess() (gas: 13005)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NotEnoughGasForCallReturnsFalseSuccess() (gas: 13317)
+CallWithExactGas__callWithExactGasSafeReturnData:test_CallWithExactGasSafeReturnDataExactGas() (gas: 20331)
+CallWithExactGas__callWithExactGasSafeReturnData:test_NoContractReverts() (gas: 13917)
+CallWithExactGas__callWithExactGasSafeReturnData:test_NoGasForCallExactCheckReverts() (gas: 16116)
+CallWithExactGas__callWithExactGasSafeReturnData:test_NotEnoughGasForCallReverts() (gas: 16547)
+OpStackBurnMintERC677_constructor:testConstructorSuccess() (gas: 1743649)
+OpStackBurnMintERC677_interfaceCompatibility:testBurnCompatibility() (gas: 298649)
 OpStackBurnMintERC677_interfaceCompatibility:testMintCompatibility() (gas: 137957)
-OpStackBurnMintERC677_interfaceCompatibility:testStaticFunctionsCompatibility() (gas: 10622)
-OpStackBurnMintERC677_supportsInterface:testConstructorSuccess() (gas: 8961)
+OpStackBurnMintERC677_interfaceCompatibility:testStaticFunctionsCompatibility() (gas: 13781)
+OpStackBurnMintERC677_supportsInterface:testConstructorSuccess() (gas: 12752)

contracts/gas-snapshots/transmission.gas-snapshot

@@ -1,4 +1,4 @@
-EIP_712_1014_4337:testEIP712EIP4337AndCreateSmartContractAccount() (gas: 910039)
-EIP_712_1014_4337:testEIP712EIP4337AndCreateSmartContractAccountWithPaymaster() (gas: 2286631)
-EIP_712_1014_4337:testEIP712EIP4337AndCreateSmartContractAccountWithPaymasterForVRFRequest() (gas: 2876825)
-EIP_712_1014_4337:testEIP712EIP4337WithExistingSmartContractAccount() (gas: 878457)
+EIP_712_1014_4337:testEIP712EIP4337AndCreateSmartContractAccount() (gas: 910982)
+EIP_712_1014_4337:testEIP712EIP4337AndCreateSmartContractAccountWithPaymaster() (gas: 2287249)
+EIP_712_1014_4337:testEIP712EIP4337AndCreateSmartContractAccountWithPaymasterForVRFRequest() (gas: 2877786)
+EIP_712_1014_4337:testEIP712EIP4337WithExistingSmartContractAccount() (gas: 879722)

contracts/src/v0.8/automation/dev/v2_3/AutomationRegistrar2_3.sol

@@ -107,7 +107,7 @@ contract AutomationRegistrar2_3 is TypeAndVersionInterface, ConfirmedOwner, IERC
 
   LinkTokenInterface public immutable i_LINK;
   IWrappedNative public immutable i_WRAPPED_NATIVE_TOKEN;
-  IAutomationRegistryMaster2_3 s_registry;
+  IAutomationRegistryMaster2_3 private s_registry;
 
   // Only applicable if trigger config is set to ENABLED_SENDER_ALLOWLIST
   mapping(address => bool) private s_autoApproveAllowedSenders;

contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryBase2_3.sol

@@ -10,7 +10,6 @@ import {ConfirmedOwner} from "../../../shared/access/ConfirmedOwner.sol";
 import {AggregatorV3Interface} from "../../../shared/interfaces/AggregatorV3Interface.sol";
 import {LinkTokenInterface} from "../../../shared/interfaces/LinkTokenInterface.sol";
 import {KeeperCompatibleInterface} from "../../interfaces/KeeperCompatibleInterface.sol";
-import {UpkeepFormat} from "../../interfaces/UpkeepTranscoderInterface.sol";
 import {IChainModule} from "../../interfaces/IChainModule.sol";
 import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 import {SafeCast} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/math/SafeCast.sol";

contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicB2_3.sol

@@ -7,7 +7,6 @@ import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/ut
 import {AutomationRegistryLogicC2_3} from "./AutomationRegistryLogicC2_3.sol";
 import {Chainable} from "../../Chainable.sol";
 import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
-import {SafeCast} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/math/SafeCast.sol";
 import {SafeERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
 
 contract AutomationRegistryLogicB2_3 is AutomationRegistryBase2_3, Chainable {

contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicC2_3.sol

@@ -4,7 +4,6 @@ pragma solidity 0.8.19;
 import {AutomationRegistryBase2_3} from "./AutomationRegistryBase2_3.sol";
 import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
 import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
-import {UpkeepFormat} from "../../interfaces/UpkeepTranscoderInterface.sol";
 import {IAutomationForwarder} from "../../interfaces/IAutomationForwarder.sol";
 import {IChainModule} from "../../interfaces/IChainModule.sol";
 import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";