fix compiler version, snapshot, and wrappers broke in merge conflict …

…resolution

contracts/gas-snapshots/ccip.gas-snapshot

@@ -28,7 +28,8 @@ CCIPHome_setCandidate:test_setCandidate() (gas: 1365392)
 CCIPHome_supportsInterface:test_supportsInterface() (gas: 9885)
 DefensiveExampleTest:test_HappyPath() (gas: 200517)
 DefensiveExampleTest:test_Recovery() (gas: 424996)
-E2E:test_E2E_3MessagesMMultiOffRampSuccess_gas() (gas: 1489913)
+E2E:test_E2E_3MessagesMMultiOffRampSuccess_gas() (gas: 1490237)
+ERC165CheckerReverting_supportsInterfaceReverting:test__supportsInterfaceReverting() (gas: 10445)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_fallbackToWethTransfer() (gas: 96964)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_happyPath() (gas: 49797)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_wrongToken() (gas: 17460)
@@ -195,11 +196,11 @@ NonceManager_applyPreviousRampsUpdates:test_MultipleRampsUpdates() (gas: 123595)
 NonceManager_applyPreviousRampsUpdates:test_PreviousRampAlreadySet_overrideAllowed() (gas: 45935)
 NonceManager_applyPreviousRampsUpdates:test_SingleRampUpdate() (gas: 66937)
 NonceManager_applyPreviousRampsUpdates:test_ZeroInput() (gas: 12145)
-NonceManager_getInboundNonce:test_getInboundNonce_NoPrevOffRampForChain() (gas: 178870)
-NonceManager_getInboundNonce:test_getInboundNonce_Upgraded() (gas: 146059)
-NonceManager_getInboundNonce:test_getInboundNonce_UpgradedNonceNewSenderStartsAtZero() (gas: 182340)
-NonceManager_getInboundNonce:test_getInboundNonce_UpgradedNonceStartsAtV1Nonce() (gas: 245017)
-NonceManager_getInboundNonce:test_getInboundNonce_UpgradedOffRampNonceSkipsIfMsgInFlight() (gas: 213699)
+NonceManager_getInboundNonce:test_getInboundNonce_NoPrevOffRampForChain() (gas: 178906)
+NonceManager_getInboundNonce:test_getInboundNonce_Upgraded() (gas: 146095)
+NonceManager_getInboundNonce:test_getInboundNonce_UpgradedNonceNewSenderStartsAtZero() (gas: 182376)
+NonceManager_getInboundNonce:test_getInboundNonce_UpgradedNonceStartsAtV1Nonce() (gas: 245089)
+NonceManager_getInboundNonce:test_getInboundNonce_UpgradedOffRampNonceSkipsIfMsgInFlight() (gas: 213735)
 NonceManager_getInboundNonce:test_getInboundNonce_UpgradedSenderNoncesReadsPreviousRamp() (gas: 60418)
 NonceManager_getIncrementedOutboundNonce:test_getIncrementedOutboundNonce() (gas: 37974)
 NonceManager_getIncrementedOutboundNonce:test_incrementInboundNonce() (gas: 38746)
@@ -215,12 +216,12 @@ OffRamp_applySourceChainConfigUpdates:test_ApplyZeroUpdates() (gas: 16671)
 OffRamp_applySourceChainConfigUpdates:test_ReplaceExistingChain() (gas: 180998)
 OffRamp_applySourceChainConfigUpdates:test_ReplaceExistingChainOnRamp() (gas: 168513)
 OffRamp_applySourceChainConfigUpdates:test_allowNonOnRampUpdateAfterLaneIsUsed() (gas: 284861)
-OffRamp_batchExecute:test_MultipleReportsDifferentChains() (gas: 325920)
-OffRamp_batchExecute:test_MultipleReportsDifferentChainsSkipCursedChain() (gas: 170816)
-OffRamp_batchExecute:test_MultipleReportsSameChain() (gas: 269219)
-OffRamp_batchExecute:test_MultipleReportsSkipDuplicate() (gas: 161775)
-OffRamp_batchExecute:test_SingleReport() (gas: 149581)
-OffRamp_batchExecute:test_Unhealthy() (gas: 533110)
+OffRamp_batchExecute:test_MultipleReportsDifferentChains() (gas: 326028)
+OffRamp_batchExecute:test_MultipleReportsDifferentChainsSkipCursedChain() (gas: 170852)
+OffRamp_batchExecute:test_MultipleReportsSameChain() (gas: 269327)
+OffRamp_batchExecute:test_MultipleReportsSkipDuplicate() (gas: 161811)
+OffRamp_batchExecute:test_SingleReport() (gas: 149617)
+OffRamp_batchExecute:test_Unhealthy() (gas: 533326)
 OffRamp_commit:test_OnlyGasPriceUpdates() (gas: 112973)
 OffRamp_commit:test_OnlyTokenPriceUpdates() (gas: 112927)
 OffRamp_commit:test_PriceSequenceNumberCleared() (gas: 355397)
@@ -229,51 +230,51 @@ OffRamp_commit:test_ReportOnlyRootSuccess_gas() (gas: 141051)
 OffRamp_commit:test_RootWithRMNDisabled() (gas: 153873)
 OffRamp_commit:test_StaleReportWithRoot() (gas: 232101)
 OffRamp_commit:test_ValidPriceUpdateThenStaleReportWithRoot() (gas: 206722)
-OffRamp_constructor:test_Constructor() (gas: 6268112)
-OffRamp_execute:test_LargeBatch() (gas: 3372780)
-OffRamp_execute:test_MultipleReports() (gas: 291350)
-OffRamp_execute:test_MultipleReportsWithPartialValidationFailures() (gas: 364740)
-OffRamp_execute:test_SingleReport() (gas: 168814)
-OffRamp_executeSingleMessage:test_executeSingleMessage_NoTokens() (gas: 51574)
+OffRamp_constructor:test_Constructor() (gas: 6269512)
+OffRamp_execute:test_LargeBatch() (gas: 3373860)
+OffRamp_execute:test_MultipleReports() (gas: 291458)
+OffRamp_execute:test_MultipleReportsWithPartialValidationFailures() (gas: 364776)
+OffRamp_execute:test_SingleReport() (gas: 168850)
+OffRamp_executeSingleMessage:test_executeSingleMessage_NoTokens() (gas: 51610)
 OffRamp_executeSingleMessage:test_executeSingleMessage_NonContract() (gas: 20514)
-OffRamp_executeSingleMessage:test_executeSingleMessage_NonContractWithTokens() (gas: 230346)
-OffRamp_executeSingleMessage:test_executeSingleMessage_WithMessageInterceptor() (gas: 87429)
-OffRamp_executeSingleMessage:test_executeSingleMessage_WithTokens() (gas: 259827)
-OffRamp_executeSingleReport:test_InvalidSourcePoolAddress() (gas: 455214)
-OffRamp_executeSingleReport:test_ReceiverError() (gas: 180761)
-OffRamp_executeSingleReport:test_SingleMessageNoTokens() (gas: 205198)
-OffRamp_executeSingleReport:test_SingleMessageNoTokensOtherChain() (gas: 241285)
-OffRamp_executeSingleReport:test_SingleMessageNoTokensUnordered() (gas: 185191)
-OffRamp_executeSingleReport:test_SingleMessageToNonCCIPReceiver() (gas: 243935)
-OffRamp_executeSingleReport:test_SingleMessagesNoTokensSuccess_gas() (gas: 134620)
+OffRamp_executeSingleMessage:test_executeSingleMessage_NonContractWithTokens() (gas: 230418)
+OffRamp_executeSingleMessage:test_executeSingleMessage_WithMessageInterceptor() (gas: 87465)
+OffRamp_executeSingleMessage:test_executeSingleMessage_WithTokens() (gas: 259935)
+OffRamp_executeSingleReport:test_InvalidSourcePoolAddress() (gas: 455358)
+OffRamp_executeSingleReport:test_ReceiverError() (gas: 180797)
+OffRamp_executeSingleReport:test_SingleMessageNoTokens() (gas: 205270)
+OffRamp_executeSingleReport:test_SingleMessageNoTokensOtherChain() (gas: 241357)
+OffRamp_executeSingleReport:test_SingleMessageNoTokensUnordered() (gas: 185263)
+OffRamp_executeSingleReport:test_SingleMessageToNonCCIPReceiver() (gas: 243920)
+OffRamp_executeSingleReport:test_SingleMessagesNoTokensSuccess_gas() (gas: 134656)
 OffRamp_executeSingleReport:test_SkippedIncorrectNonce() (gas: 58298)
-OffRamp_executeSingleReport:test_SkippedIncorrectNonceStillExecutes() (gas: 392286)
-OffRamp_executeSingleReport:test_TwoMessagesWithTokensAndGE() (gas: 562211)
-OffRamp_executeSingleReport:test_TwoMessagesWithTokensSuccess_gas() (gas: 510592)
-OffRamp_executeSingleReport:test_Unhealthy() (gas: 528733)
-OffRamp_executeSingleReport:test_WithCurseOnAnotherSourceChain() (gas: 439083)
-OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessage() (gas: 158002)
-OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessageUnordered() (gas: 128386)
+OffRamp_executeSingleReport:test_SkippedIncorrectNonceStillExecutes() (gas: 392394)
+OffRamp_executeSingleReport:test_TwoMessagesWithTokensAndGE() (gas: 562427)
+OffRamp_executeSingleReport:test_TwoMessagesWithTokensSuccess_gas() (gas: 510808)
+OffRamp_executeSingleReport:test_Unhealthy() (gas: 528949)
+OffRamp_executeSingleReport:test_WithCurseOnAnotherSourceChain() (gas: 439299)
+OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessage() (gas: 158038)
+OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessageUnordered() (gas: 128422)
 OffRamp_getExecutionState:test_FillExecutionState() (gas: 3955662)
 OffRamp_getExecutionState:test_GetDifferentChainExecutionState() (gas: 121311)
 OffRamp_getExecutionState:test_GetExecutionState() (gas: 90102)
-OffRamp_manuallyExecute:test_manuallyExecute() (gas: 212296)
-OffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched() (gas: 165706)
-OffRamp_manuallyExecute:test_manuallyExecute_LowGasLimit() (gas: 479073)
-OffRamp_manuallyExecute:test_manuallyExecute_ReentrancyFails() (gas: 2229590)
-OffRamp_manuallyExecute:test_manuallyExecute_WithGasOverride() (gas: 212846)
-OffRamp_manuallyExecute:test_manuallyExecute_WithMultiReportGasOverride() (gas: 731858)
-OffRamp_manuallyExecute:test_manuallyExecute_WithPartialMessages() (gas: 336871)
-OffRamp_releaseOrMintSingleToken:test__releaseOrMintSingleToken() (gas: 94593)
-OffRamp_releaseOrMintTokens:test_releaseOrMintTokens() (gas: 161085)
-OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_WithGasOverride() (gas: 162951)
-OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_destDenominatedDecimals() (gas: 174204)
+OffRamp_manuallyExecute:test_manuallyExecute() (gas: 212368)
+OffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched() (gas: 165742)
+OffRamp_manuallyExecute:test_manuallyExecute_LowGasLimit() (gas: 479145)
+OffRamp_manuallyExecute:test_manuallyExecute_ReentrancyFails() (gas: 2229662)
+OffRamp_manuallyExecute:test_manuallyExecute_WithGasOverride() (gas: 212918)
+OffRamp_manuallyExecute:test_manuallyExecute_WithMultiReportGasOverride() (gas: 732218)
+OffRamp_manuallyExecute:test_manuallyExecute_WithPartialMessages() (gas: 337015)
+OffRamp_releaseOrMintSingleToken:test__releaseOrMintSingleToken() (gas: 94629)
+OffRamp_releaseOrMintTokens:test_releaseOrMintTokens() (gas: 161157)
+OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_WithGasOverride() (gas: 163023)
+OffRamp_releaseOrMintTokens:test_releaseOrMintTokens_destDenominatedDecimals() (gas: 174276)
 OffRamp_setDynamicConfig:test_SetDynamicConfig() (gas: 25442)
 OffRamp_setDynamicConfig:test_SetDynamicConfigWithInterceptor() (gas: 47493)
-OffRamp_trialExecute:test_trialExecute() (gas: 263527)
-OffRamp_trialExecute:test_trialExecute_RateLimitError() (gas: 120685)
-OffRamp_trialExecute:test_trialExecute_TokenHandlingErrorIsCaught() (gas: 131995)
-OffRamp_trialExecute:test_trialExecute_TokenPoolIsNotAContract() (gas: 281272)
+OffRamp_trialExecute:test_trialExecute() (gas: 263635)
+OffRamp_trialExecute:test_trialExecute_RateLimitError() (gas: 120721)
+OffRamp_trialExecute:test_trialExecute_TokenHandlingErrorIsCaught() (gas: 132031)
+OffRamp_trialExecute:test_trialExecute_TokenPoolIsNotAContract() (gas: 281380)
 OnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy() (gas: 244294)
 OnRamp_applyAllowlistUpdates:test_applyAllowlistUpdates() (gas: 325979)
 OnRamp_applyAllowlistUpdates:test_applyAllowlistUpdates_InvalidAllowListRequestDisabledAllowListWithAdds() (gas: 17190)

contracts/src/v0.8/ccip/test/libraries/ERC165CheckerReverting.supportsInterfaceReverting.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.24;
+pragma solidity ^0.8.24;
 
 import {IAny2EVMMessageReceiver} from "../../interfaces/IAny2EVMMessageReceiver.sol";