merge develop

.changeset/forty-foxes-watch.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Updated Solana TXM's in-memory storage to track statuses across the Solana transaction lifecycle. Added a method to translate Solana transaction statuses into states expected by the ChainWriter interface. Made the duration transactions are retained in storage after finality or error configurable using `TxRetentionTimeout`. #added

.changeset/many-carrots-share.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Update ccip contract reader cfg for ccip message sent to use output codec wrapper modifier

.changeset/nine-stingrays-march.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Add don_id to Mercury Enhanced EA telemetry #added

.github/e2e-tests.yml

@@ -948,6 +948,20 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.4.0
+
+  - id: smoke/ccip_messaging_test.go:*
+    path: integration-tests/smoke/ccip_messaging_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Merge Queue E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/ && go test smoke/ccip_messaging_test.go -timeout 12m -test.parallel=1 -count=1 -json
+    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
+    test_env_vars:
+      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
+      E2E_JD_VERSION: 0.4.0
 
   # END: CCIPv1.6 tests
 
@@ -1178,4 +1192,4 @@ runner-test-matrix:
       TEST_LOG_LEVEL: debug
       E2E_TEST_GRAFANA_DASHBOARD_URL: /d/6vjVx-1V8/ccip-long-running-tests
 
-  # END: CCIP tests
+  # END: CCIP tests

.github/workflows/solidity-foundry.yml

@@ -256,7 +256,7 @@ jobs:
           || needs.changes.outputs.non_src_changes == 'true')
           && matrix.product.setup.run-gas-snapshot }}
         run: |
-          forge snapshot --nmt "test_?Fuzz_\w{1,}?" --check gas-snapshots/${{ matrix.product.name }}.gas-snapshot
+          forge snapshot --nmt "test?(Fuzz|Fork|.*_RevertWhen)_.*" --check gas-snapshots/${{ matrix.product.name }}.gas-snapshot
         id: snapshot
         working-directory: contracts
         env:

contracts/.changeset/dull-otters-behave.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+#internal rework the regex for snapshot inclusion

contracts/GNUmakefile

@@ -16,11 +16,11 @@ ALL_FOUNDRY_PRODUCTS = ccip functions keystone l2ep liquiditymanager llo-feeds o
 # a static fuzz seed by default, flaky gas results per platform are still observed.
 .PHONY: snapshot
 snapshot: ## Make a snapshot for a specific product.
-	export FOUNDRY_PROFILE=$(FOUNDRY_PROFILE) && forge snapshot --nmt "test_?Fuzz_\w{1,}?" --snap gas-snapshots/$(FOUNDRY_PROFILE).gas-snapshot
+	export FOUNDRY_PROFILE=$(FOUNDRY_PROFILE) && forge snapshot --nmt "test?(Fuzz|Fork|.*_RevertWhen)_.*" --snap gas-snapshots/$(FOUNDRY_PROFILE).gas-snapshot
 
 .PHONY: snapshot-diff
 snapshot-diff: ## Make a snapshot for a specific product.
-	export FOUNDRY_PROFILE=$(FOUNDRY_PROFILE) && forge snapshot --nmt "test_?Fuzz_\w{1,}?" --diff gas-snapshots/$(FOUNDRY_PROFILE).gas-snapshot
+	export FOUNDRY_PROFILE=$(FOUNDRY_PROFILE) && forge snapshot --nmt "test?(Fuzz|Fork|.*_RevertWhen)_.*" --diff gas-snapshots/$(FOUNDRY_PROFILE).gas-snapshot
 
 
 .PHONY: snapshot-all

contracts/gas-snapshots/keystone.gas-snapshot

@@ -1,38 +1,11 @@
 CapabilitiesRegistry_AddCapabilitiesTest:test_AddCapability_NoConfigurationContract() (gas: 154800)
 CapabilitiesRegistry_AddCapabilitiesTest:test_AddCapability_WithConfiguration() (gas: 180392)
-CapabilitiesRegistry_AddCapabilitiesTest:test_RevertWhen_CalledByNonAdmin() (gas: 24678)
-CapabilitiesRegistry_AddCapabilitiesTest:test_RevertWhen_CapabilityExists() (gas: 145611)
-CapabilitiesRegistry_AddCapabilitiesTest:test_RevertWhen_ConfigurationContractDoesNotMatchInterface() (gas: 94542)
-CapabilitiesRegistry_AddCapabilitiesTest:test_RevertWhen_ConfigurationContractNotDeployed() (gas: 96348)
 CapabilitiesRegistry_AddDONTest:test_AddDON() (gas: 373985)
-CapabilitiesRegistry_AddDONTest:test_RevertWhen_CalledByNonAdmin() (gas: 19333)
-CapabilitiesRegistry_AddDONTest:test_RevertWhen_CapabilityDoesNotExist() (gas: 169812)
-CapabilitiesRegistry_AddDONTest:test_RevertWhen_DeprecatedCapabilityAdded() (gas: 239851)
-CapabilitiesRegistry_AddDONTest:test_RevertWhen_DuplicateCapabilityAdded() (gas: 250973)
-CapabilitiesRegistry_AddDONTest:test_RevertWhen_DuplicateNodeAdded() (gas: 116928)
-CapabilitiesRegistry_AddDONTest:test_RevertWhen_FaultToleranceIsZero() (gas: 43396)
-CapabilitiesRegistry_AddDONTest:test_RevertWhen_NodeAlreadyBelongsToWorkflowDON() (gas: 344127)
-CapabilitiesRegistry_AddDONTest:test_RevertWhen_NodeDoesNotSupportCapability() (gas: 180188)
-CapabilitiesRegistry_AddDONTest_WhenMaliciousCapabilityConfigurationConfigured:test_RevertWhen_MaliciousCapabilitiesConfigContractTriesToRemoveCapabilitiesFromDONNodes() (gas: 340769)
 CapabilitiesRegistry_AddNodeOperatorsTest:test_AddNodeOperators() (gas: 184201)
-CapabilitiesRegistry_AddNodeOperatorsTest:test_RevertWhen_CalledByNonAdmin() (gas: 17624)
-CapabilitiesRegistry_AddNodeOperatorsTest:test_RevertWhen_NodeOperatorAdminAddressZero() (gas: 18542)
 CapabilitiesRegistry_AddNodesTest:test_AddsNodeParams() (gas: 380796)
 CapabilitiesRegistry_AddNodesTest:test_OwnerCanAddNodes() (gas: 380784)
-CapabilitiesRegistry_AddNodesTest:test_RevertWhen_AddingDuplicateP2PId() (gas: 323602)
-CapabilitiesRegistry_AddNodesTest:test_RevertWhen_AddingNodeWithInvalidCapability() (gas: 55328)
-CapabilitiesRegistry_AddNodesTest:test_RevertWhen_AddingNodeWithInvalidNodeOperator() (gas: 25090)
-CapabilitiesRegistry_AddNodesTest:test_RevertWhen_AddingNodeWithoutCapabilities() (gas: 27844)
-CapabilitiesRegistry_AddNodesTest:test_RevertWhen_CalledByNonNodeOperatorAdminAndNonOwner() (gas: 25258)
-CapabilitiesRegistry_AddNodesTest:test_RevertWhen_EncryptionPublicKeyEmpty() (gas: 29852)
-CapabilitiesRegistry_AddNodesTest:test_RevertWhen_P2PIDEmpty() (gas: 27558)
-CapabilitiesRegistry_AddNodesTest:test_RevertWhen_SignerAddressEmpty() (gas: 27241)
-CapabilitiesRegistry_AddNodesTest:test_RevertWhen_SignerAddressNotUnique() (gas: 332070)
 CapabilitiesRegistry_DeprecateCapabilitiesTest:test_DeprecatesCapability() (gas: 89796)
 CapabilitiesRegistry_DeprecateCapabilitiesTest:test_EmitsEvent() (gas: 89924)
-CapabilitiesRegistry_DeprecateCapabilitiesTest:test_RevertWhen_CalledByNonAdmin() (gas: 22911)
-CapabilitiesRegistry_DeprecateCapabilitiesTest:test_RevertWhen_CapabilityDoesNotExist() (gas: 16188)
-CapabilitiesRegistry_DeprecateCapabilitiesTest:test_RevertWhen_CapabilityIsDeprecated() (gas: 91210)
 CapabilitiesRegistry_GetCapabilitiesTest:test_ReturnsCapabilities() (gas: 135531)
 CapabilitiesRegistry_GetDONsTest:test_CorrectlyFetchesDONs() (gas: 65490)
 CapabilitiesRegistry_GetDONsTest:test_DoesNotIncludeRemovedDONs() (gas: 65060)
@@ -46,46 +19,17 @@ CapabilitiesRegistry_GetNodesTest:test_CorrectlyFetchesSpecificNodes() (gas: 321
 CapabilitiesRegistry_GetNodesTest:test_DoesNotIncludeRemovedNodes() (gas: 79284)
 CapabilitiesRegistry_GetNodesTest:test_GetNodesByP2PIdsInvalidNode_Revers() (gas: 26249)
 CapabilitiesRegistry_RemoveDONsTest:test_RemovesDON() (gas: 55026)
-CapabilitiesRegistry_RemoveDONsTest:test_RevertWhen_CalledByNonAdmin() (gas: 15647)
-CapabilitiesRegistry_RemoveDONsTest:test_RevertWhen_DONDoesNotExist() (gas: 16561)
 CapabilitiesRegistry_RemoveNodeOperatorsTest:test_RemovesNodeOperator() (gas: 36157)
-CapabilitiesRegistry_RemoveNodeOperatorsTest:test_RevertWhen_CalledByNonOwner() (gas: 15816)
 CapabilitiesRegistry_RemoveNodesTest:test_CanAddNodeWithSameSignerAddressAfterRemoving() (gas: 117736)
 CapabilitiesRegistry_RemoveNodesTest:test_CanRemoveWhenDONDeleted() (gas: 288163)
 CapabilitiesRegistry_RemoveNodesTest:test_CanRemoveWhenNodeNoLongerPartOfDON() (gas: 561487)
 CapabilitiesRegistry_RemoveNodesTest:test_OwnerCanRemoveNodes() (gas: 77404)
 CapabilitiesRegistry_RemoveNodesTest:test_RemovesNode() (gas: 79239)
-CapabilitiesRegistry_RemoveNodesTest:test_RevertWhen_CalledByNonNodeOperatorAdminAndNonOwner() (gas: 25008)
-CapabilitiesRegistry_RemoveNodesTest:test_RevertWhen_NodeDoesNotExist() (gas: 18373)
-CapabilitiesRegistry_RemoveNodesTest:test_RevertWhen_NodePartOfCapabilitiesDON() (gas: 385467)
-CapabilitiesRegistry_RemoveNodesTest:test_RevertWhen_P2PIDEmpty() (gas: 18363)
 CapabilitiesRegistry_TypeAndVersionTest:test_TypeAndVersion() (gas: 9768)
-CapabilitiesRegistry_UpdateDONTest:test_RevertWhen_CalledByNonAdmin() (gas: 19323)
-CapabilitiesRegistry_UpdateDONTest:test_RevertWhen_CapabilityDoesNotExist() (gas: 152958)
-CapabilitiesRegistry_UpdateDONTest:test_RevertWhen_DONDoesNotExist() (gas: 17749)
-CapabilitiesRegistry_UpdateDONTest:test_RevertWhen_DeprecatedCapabilityAdded() (gas: 222997)
-CapabilitiesRegistry_UpdateDONTest:test_RevertWhen_DuplicateCapabilityAdded() (gas: 236986)
-CapabilitiesRegistry_UpdateDONTest:test_RevertWhen_DuplicateNodeAdded() (gas: 107687)
-CapabilitiesRegistry_UpdateDONTest:test_RevertWhen_NodeDoesNotSupportCapability() (gas: 163401)
 CapabilitiesRegistry_UpdateDONTest:test_UpdatesDON() (gas: 373535)
-CapabilitiesRegistry_UpdateNodeOperatorTest:test_RevertWhen_CalledByNonAdminAndNonOwner() (gas: 20728)
-CapabilitiesRegistry_UpdateNodeOperatorTest:test_RevertWhen_NodeOperatorAdminIsZeroAddress() (gas: 20097)
-CapabilitiesRegistry_UpdateNodeOperatorTest:test_RevertWhen_NodeOperatorDoesNotExist() (gas: 19790)
-CapabilitiesRegistry_UpdateNodeOperatorTest:test_RevertWhen_NodeOperatorIdAndParamLengthsMismatch() (gas: 15452)
 CapabilitiesRegistry_UpdateNodeOperatorTest:test_UpdatesNodeOperator() (gas: 37144)
 CapabilitiesRegistry_UpdateNodesTest:test_CanUpdateParamsIfNodeSignerAddressNoLongerUsed() (gas: 261420)
 CapabilitiesRegistry_UpdateNodesTest:test_OwnerCanUpdateNodes() (gas: 164875)
-CapabilitiesRegistry_UpdateNodesTest:test_RevertWhen_AddingNodeWithInvalidCapability() (gas: 36026)
-CapabilitiesRegistry_UpdateNodesTest:test_RevertWhen_CalledByAnotherNodeOperatorAdmin() (gas: 29326)
-CapabilitiesRegistry_UpdateNodesTest:test_RevertWhen_CalledByNonNodeOperatorAdminAndNonOwner() (gas: 29504)
-CapabilitiesRegistry_UpdateNodesTest:test_RevertWhen_EncryptionPublicKeyEmpty() (gas: 29746)
-CapabilitiesRegistry_UpdateNodesTest:test_RevertWhen_NodeDoesNotExist() (gas: 29326)
-CapabilitiesRegistry_UpdateNodesTest:test_RevertWhen_NodeSignerAlreadyAssignedToAnotherNode() (gas: 31452)
-CapabilitiesRegistry_UpdateNodesTest:test_RevertWhen_P2PIDEmpty() (gas: 29292)
-CapabilitiesRegistry_UpdateNodesTest:test_RevertWhen_RemovingCapabilityRequiredByCapabilityDON() (gas: 471202)
-CapabilitiesRegistry_UpdateNodesTest:test_RevertWhen_RemovingCapabilityRequiredByWorkflowDON() (gas: 341548)
-CapabilitiesRegistry_UpdateNodesTest:test_RevertWhen_SignerAddressEmpty() (gas: 29184)
-CapabilitiesRegistry_UpdateNodesTest:test_RevertWhen_UpdatingNodeWithoutCapabilities() (gas: 27739)
 CapabilitiesRegistry_UpdateNodesTest:test_UpdatesNodeParams() (gas: 164929)
 KeystoneForwarder_ReportTest:test_Report_ConfigVersion() (gas: 2006852)
 KeystoneForwarder_ReportTest:test_Report_FailedDelieryWhenReportReceiverConsumesAllGas() (gas: 1004833)
@@ -94,28 +38,8 @@ KeystoneForwarder_ReportTest:test_Report_FailedDeliveryWhenReceiverNotContract()
 KeystoneForwarder_ReportTest:test_Report_FailedDeliveryWhenReportReceiverConsumesAllGasAndInterfaceCheckUsesMax() (gas: 440303)
 KeystoneForwarder_ReportTest:test_Report_SuccessfulDelivery() (gas: 362838)
 KeystoneForwarder_ReportTest:test_Report_SuccessfulRetryWithMoreGas() (gas: 510677)
-KeystoneForwarder_ReportTest:test_RevertWhen_AnySignatureIsInvalid() (gas: 86326)
-KeystoneForwarder_ReportTest:test_RevertWhen_AnySignerIsInvalid() (gas: 118476)
-KeystoneForwarder_ReportTest:test_RevertWhen_AttemptingTransmissionWithInsufficientGas() (gas: 96629)
-KeystoneForwarder_ReportTest:test_RevertWhen_ReportHasDuplicateSignatures() (gas: 94538)
-KeystoneForwarder_ReportTest:test_RevertWhen_ReportHasIncorrectDON() (gas: 75930)
-KeystoneForwarder_ReportTest:test_RevertWhen_ReportHasInexistentConfigVersion() (gas: 76298)
-KeystoneForwarder_ReportTest:test_RevertWhen_ReportIsMalformed() (gas: 45563)
-KeystoneForwarder_ReportTest:test_RevertWhen_RetryingInvalidContractTransmission() (gas: 144231)
-KeystoneForwarder_ReportTest:test_RevertWhen_RetryingSuccessfulTransmission() (gas: 355976)
-KeystoneForwarder_ReportTest:test_RevertWhen_TooFewSignatures() (gas: 55270)
-KeystoneForwarder_ReportTest:test_RevertWhen_TooManySignatures() (gas: 56050)
-KeystoneForwarder_SetConfigTest:test_RevertWhen_ExcessSigners() (gas: 20184)
-KeystoneForwarder_SetConfigTest:test_RevertWhen_FaultToleranceIsZero() (gas: 88057)
-KeystoneForwarder_SetConfigTest:test_RevertWhen_InsufficientSigners() (gas: 14555)
-KeystoneForwarder_SetConfigTest:test_RevertWhen_NotOwner() (gas: 88766)
-KeystoneForwarder_SetConfigTest:test_RevertWhen_ProvidingDuplicateSigners() (gas: 114578)
-KeystoneForwarder_SetConfigTest:test_RevertWhen_ProvidingZeroAddressSigner() (gas: 114233)
 KeystoneForwarder_SetConfigTest:test_SetConfig_FirstTime() (gas: 1540687)
 KeystoneForwarder_SetConfigTest:test_SetConfig_WhenSignersAreRemoved() (gas: 1535361)
 KeystoneForwarder_TypeAndVersionTest:test_TypeAndVersion() (gas: 9641)
-KeystoneRouter_SetConfigTest:test_AddForwarder_RevertWhen_NotOwner() (gas: 10960)
-KeystoneRouter_SetConfigTest:test_RemoveForwarder_RevertWhen_NotOwner() (gas: 10950)
 KeystoneRouter_SetConfigTest:test_RemoveForwarder_Success() (gas: 17603)
-KeystoneRouter_SetConfigTest:test_Route_RevertWhen_UnauthorizedForwarder() (gas: 18530)
 KeystoneRouter_SetConfigTest:test_Route_Success() (gas: 80948)

contracts/gas-snapshots/operatorforwarder.gas-snapshot

@@ -2,14 +2,10 @@ FactoryTest:test_DeployNewForwarderAndTransferOwnership_Success() (gas: 1059722)
 FactoryTest:test_DeployNewForwarder_Success() (gas: 1048209)
 FactoryTest:test_DeployNewOperatorAndForwarder_Success() (gas: 4069305)
 FactoryTest:test_DeployNewOperator_Success() (gas: 3020509)
-ForwarderTest:test_Forward_Success(uint256) (runs: 257, μ: 226966, ~: 227276)
-ForwarderTest:test_MultiForward_Success(uint256,uint256) (runs: 257, μ: 258642, ~: 259185)
-ForwarderTest:test_OwnerForward_Success() (gas: 30090)
+ForwarderTest:test_OwnerForward_Success() (gas: 30112)
 ForwarderTest:test_SetAuthorizedSenders_Success() (gas: 160524)
-ForwarderTest:test_TransferOwnershipWithMessage_Success() (gas: 35141)
+ForwarderTest:test_TransferOwnershipWithMessage_Success() (gas: 35159)
 OperatorTest:test_CancelOracleRequest_Success() (gas: 274465)
 OperatorTest:test_FulfillOracleRequest_Success() (gas: 330649)
-OperatorTest:test_NotAuthorizedSender_Revert() (gas: 246764)
-OperatorTest:test_OracleRequest_Success() (gas: 250043)
-OperatorTest:test_SendRequestAndCancelRequest_Success(uint96) (runs: 257, μ: 387179, ~: 387183)
-OperatorTest:test_SendRequest_Success(uint96) (runs: 257, μ: 303633, ~: 303636)
+OperatorTest:test_NotAuthorizedSender_Revert() (gas: 246781)
+OperatorTest:test_OracleRequest_Success() (gas: 250043)

contracts/gas-snapshots/shared.gas-snapshot

@@ -39,18 +39,16 @@ CallWithExactGas__callWithExactGas:test_CallWithExactGasSafeReturnDataExactGas()
 CallWithExactGas__callWithExactGas:test_NoContractReverts() (gas: 11559)
 CallWithExactGas__callWithExactGas:test_NoGasForCallExactCheckReverts() (gas: 15788)
 CallWithExactGas__callWithExactGas:test_NotEnoughGasForCallReverts() (gas: 16241)
-CallWithExactGas__callWithExactGas:test_callWithExactGasSuccess(bytes,bytes4) (runs: 257, μ: 15744, ~: 15697)
-CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractExactGasSuccess() (gas: 20116)
-CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractReceiverErrorSuccess() (gas: 66439)
-CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractSuccess(bytes,bytes4) (runs: 257, μ: 16254, ~: 16207)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractExactGasSuccess() (gas: 20073)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractReceiverErrorSuccess() (gas: 66461)
 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: 13939)
 CallWithExactGas__callWithExactGasSafeReturnData:test_NoGasForCallExactCheckReverts() (gas: 16139)
-CallWithExactGas__callWithExactGasSafeReturnData:test_NotEnoughGasForCallReverts() (gas: 16569)
-CallWithExactGas__callWithExactGasSafeReturnData:test_callWithExactGasSafeReturnData_ThrowOOGError_Revert() (gas: 36711)
+CallWithExactGas__callWithExactGasSafeReturnData:test_NotEnoughGasForCallReverts() (gas: 16547)
+CallWithExactGas__callWithExactGasSafeReturnData:test_callWithExactGasSafeReturnData_ThrowOOGError_Revert() (gas: 36755)
 EnumerableMapAddresses_at:testAtSuccess() (gas: 95086)
 EnumerableMapAddresses_at:testBytes32AtSuccess() (gas: 94855)
 EnumerableMapAddresses_at:testBytesAtSuccess() (gas: 96542)

contracts/src/v0.8/ccip/test/applications/EtherSenderReceiver/EtherSenderReceiverTest.ccipReceive.t.sol

@@ -12,7 +12,7 @@ contract EtherSenderReceiverTest_ccipReceive is EtherSenderReceiverTestSetup {
   error InvalidTokenAmounts(uint256 gotAmounts);
   error InvalidToken(address gotToken, address expectedToken);
 
-  function test_Fuzz_ccipReceive(
+  function testFuzz_ccipReceive(
     uint256 tokenAmount
   ) public {
     // cap to 10 ether because OWNER only has 10 ether.

contracts/src/v0.8/ccip/test/applications/EtherSenderReceiver/EtherSenderReceiverTest.ccipSend.t.sol

@@ -13,7 +13,7 @@ contract EtherSenderReceiverTest_ccipSend is EtherSenderReceiverTestSetup {
   uint256 internal constant FEE_WEI = 121212;
   uint256 internal constant FEE_JUELS = 232323;
 
-  function test_Fuzz_ccipSend(uint256 feeFromRouter, uint256 feeSupplied) public {
+  function testFuzz_ccipSend(uint256 feeFromRouter, uint256 feeSupplied) public {
     // cap the fuzzer because OWNER only has a million ether.
     vm.assume(feeSupplied < 1_000_000 ether - AMOUNT);
 
@@ -56,7 +56,7 @@ contract EtherSenderReceiverTest_ccipSend is EtherSenderReceiverTestSetup {
     }
   }
 
-  function test_Fuzz_ccipSend_feeToken(uint256 feeFromRouter, uint256 feeSupplied) public {
+  function testFuzz_ccipSend_feeToken(uint256 feeFromRouter, uint256 feeSupplied) public {
     // cap the fuzzer because OWNER only has a million LINK.
     vm.assume(feeSupplied < 1_000_000 ether - AMOUNT);
 

contracts/src/v0.8/ccip/test/applications/EtherSenderReceiver/EtherSenderReceiverTest.validatedMessage.t.sol

@@ -10,7 +10,7 @@ contract EtherSenderReceiverTest_validatedMessage is EtherSenderReceiverTestSetu
   error InvalidWethAddress(address want, address got);
   error GasLimitTooLow(uint256 minLimit, uint256 gotLimit);
 
-  function test_Fuzz_validatedMessage_msgSenderOverwrite(
+  function testFuzz_validatedMessage_msgSenderOverwrite(
     bytes memory data
   ) public view {
     Client.EVMTokenAmount[] memory tokenAmounts = new Client.EVMTokenAmount[](1);
@@ -35,7 +35,7 @@ contract EtherSenderReceiverTest_validatedMessage is EtherSenderReceiverTestSetu
     assertEq(validatedMessage.extraArgs, bytes(""), "extraArgs must be empty");
   }
 
-  function test_Fuzz_validatedMessage_tokenAddressOverwrite(
+  function testFuzz_validatedMessage_tokenAddressOverwrite(
     address token
   ) public view {
     Client.EVMTokenAmount[] memory tokenAmounts = new Client.EVMTokenAmount[](1);

contracts/src/v0.8/ccip/test/applications/PingPong/PingPong.setCounterpart.t.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.24;
 import {PingPongDappSetup} from "./PingPongDappSetup.t.sol";
 
 contract PingPong_setCounterpart is PingPongDappSetup {
-  function test_Fuzz_CounterPartAddress_Success(uint64 chainSelector, address counterpartAddress) public {
+  function testFuzz_CounterPartAddress_Success(uint64 chainSelector, address counterpartAddress) public {
     s_pingPong.setCounterpartChainSelector(chainSelector);
 
     s_pingPong.setCounterpart(chainSelector, counterpartAddress);

contracts/src/v0.8/ccip/test/applications/PingPong/PingPong.setCounterpartAddress.t.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.24;
 import {PingPongDappSetup} from "./PingPongDappSetup.t.sol";
 
 contract PingPong_setCounterpartAddress is PingPongDappSetup {
-  function test_Fuzz_CounterPartAddress_Success(
+  function testFuzz_CounterPartAddress_Success(
     address counterpartAddress
   ) public {
     s_pingPong.setCounterpartAddress(counterpartAddress);