Merge branch 'develop' into improve-return-value-get-allowlist

# Conflicts:
#	contracts/gas-snapshots/ccip.gas-snapshot
#	contracts/src/v0.8/ccip/offRamp/OffRamp.sol

.changeset/angry-fishes-ring.md

@@ -0,0 +1,8 @@
+---
+"chainlink": minor
+---
+
+#internal add getNextDonId() and getNodes(bytes32[] calldata p2pIds) in CapabilitiesRegistry and define interface for node info
+
+
+PR issue: CCIP-3569

.changeset/curly-baboons-enjoy.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Added the compute unit limit estimation feature for the Solana TXM #added

.changeset/pretty-worms-smell.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Added a custom client error message for Mantle to capture NonceTooLow error. #added

.changeset/silver-pens-float.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal: Adding test for rmn home reader

.changeset/two-snails-mix.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Rename SequenceAt to NonceAt #internal

.github/workflows/ci-core.yml

@@ -14,7 +14,8 @@ on:
   merge_group:
   pull_request:
   schedule:
-    - cron: "0 0 * * *"
+    # Every 6 hours
+    - cron: "0 0,6,12,18 * * *"
   workflow_dispatch:
     inputs:
       distinct_run_name:
@@ -136,9 +137,9 @@ jobs:
         if: ${{ needs.filter.outputs.changes == 'true' && inputs.evm-ref != ''}}
         shell: bash
         run: go get github.com/smartcontractkit/chainlink-integrations/evm/relayer@${{ inputs.evm-ref }}
-      - name: Setup Solana
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        uses: ./.github/actions/setup-solana
+#      - name: Setup Solana
+#        if: ${{ needs.filter.outputs.changes == 'true' }}
+#        uses: ./.github/actions/setup-solana
       - name: Setup wasmd
         if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-wasmd
@@ -244,6 +245,81 @@ jobs:
             echo "path_output=${resultsFile}" >> $GITHUB_OUTPUT
           fi
 
+  detect-flakey-tests:
+    needs: [filter, core]
+    name: Flakey Test Detection
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
+    env:
+      CL_DATABASE_URL: postgresql://postgres:postgres@localhost:5432/chainlink_test?sslmode=disable
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v4.2.1
+      - name: Setup node
+        uses: actions/setup-node@v4.0.4
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-nodejs
+        with:
+          prod: "true"
+      - name: Setup Go
+        uses: ./.github/actions/setup-go
+      - name: Setup Postgres
+        uses: ./.github/actions/setup-postgres
+      - name: Touching core/web/assets/index.html
+        run: mkdir -p core/web/assets && touch core/web/assets/index.html
+      - name: Download Go vendor packages
+        run: go mod download
+      - name: Replace chainlink-evm deps
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.evm-ref != ''}}
+        shell: bash
+        run: go get github.com/smartcontractkit/chainlink-integrations/evm/relayer@${{ inputs.evm-ref }}
+      - name: Build binary
+        run: go build -o chainlink.test .
+      - name: Setup DB
+        run: ./chainlink.test local db preparetest
+      - name: Load test outputs
+        uses: actions/download-artifact@v4.1.8
+        with:
+          name: go_core_tests_logs
+          path: ./artifacts
+      - name: Delete go_core_tests_logs/coverage.txt
+        shell: bash
+        run: |
+          # Need to delete coverage.txt so the disk doesn't fill up
+          rm -f ./artifacts/go_core_tests_logs/coverage.txt
+      - name: Build flakey test runner
+        run: go build ./tools/flakeytests/cmd/runner
+      - name: Re-run tests
+        env:
+          GRAFANA_INTERNAL_BASIC_AUTH: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          GITHUB_EVENT_PATH: ${{ github.event_path }}
+          GITHUB_EVENT_NAME: ${{ github.event_name }}
+          GITHUB_REPO: ${{ github.repository }}
+          GITHUB_RUN_ID: ${{ github.run_id }}
+        run: |
+          ./runner \
+            -grafana_auth=$GRAFANA_INTERNAL_BASIC_AUTH \
+            -grafana_host=$GRAFANA_INTERNAL_HOST \
+            -gh_sha=$GITHUB_SHA \
+            -gh_event_path=$GITHUB_EVENT_PATH \
+            -gh_event_name=$GITHUB_EVENT_NAME \
+            -gh_run_id=$GITHUB_RUN_ID \
+            -gh_repo=$GITHUB_REPO \
+            -command=./tools/bin/go_core_tests \
+            `ls -R ./artifacts/output.txt`
+      - name: Store logs artifacts
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4.4.3
+        with:
+          name: flakey_test_runner_logs
+          path: |
+            ./output.txt
+          retention-days: 7
+
   scan:
     name: SonarQube Scan
     needs: [core]

.golangci.yml

@@ -2,23 +2,29 @@ run:
   timeout: 15m0s
 linters:
   enable:
+    - containedctx
+    - depguard
+    - errname
+    - errorlint
     - exhaustive
     - exportloopref
-    - revive
+    - fatcontext
+    - ginkgolinter
     - goimports
     - gosec
+    - loggercheck
+    - mirror
     - misspell
+    - noctx
+    - perfsprint
+    - prealloc
+    - revive
     - rowserrcheck
-    - errorlint
-    - unconvert
+    - spancheck
     - sqlclosecheck
-    - noctx
-    - depguard
+    - testifylint
+    - unconvert
     - whitespace
-    - containedctx
-    - fatcontext
-    - mirror
-    - loggercheck
 linters-settings:
   exhaustive:
     default-signifies-exhaustive: true

contracts/.changeset/hungry-badgers-jump.md

@@ -0,0 +1,9 @@
+---
+'@chainlink/contracts': minor
+---
+
+#internal add getNextDonId() and getNodes(bytes32[] calldata p2pIds) in CapabilitiesRegistry and define interface for node info
+
+
+
+PR issue: CCIP-3569

contracts/.changeset/wild-tigers-know.md

@@ -0,0 +1,8 @@
+---
+'@chainlink/contracts': patch
+---
+
+change else if to else..if..
+
+
+PR issue: CCIP-3726

contracts/gas-snapshots/ccip.gas-snapshot

@@ -20,52 +20,51 @@ BurnWithFromMintTokenPool_lockOrBurn:test_PoolBurnRevertNotHealthy_Revert() (gas
 BurnWithFromMintTokenPool_lockOrBurn:test_PoolBurn_Success() (gas: 244092)
 BurnWithFromMintTokenPool_lockOrBurn:test_Setup_Success() (gas: 24189)
 CCIPClientExample_sanity:test_ImmutableExamples_Success() (gas: 2108354)
-CCIPHome__validateConfig:test__validateConfigLessTransmittersThanSigners_Success() (gas: 335794)
-CCIPHome__validateConfig:test__validateConfigSmallerFChain_Success() (gas: 468721)
-CCIPHome__validateConfig:test__validateConfig_ABIEncodedAddress_OfframpAddressCannotBeZero_Reverts() (gas: 290481)
-CCIPHome__validateConfig:test__validateConfig_ABIEncodedAddress_RMNHomeAddressCannotBeZero_Reverts() (gas: 290754)
-CCIPHome__validateConfig:test__validateConfig_ChainSelectorNotFound_Reverts() (gas: 293491)
-CCIPHome__validateConfig:test__validateConfig_ChainSelectorNotSet_Reverts() (gas: 290092)
-CCIPHome__validateConfig:test__validateConfig_FChainTooHigh_Reverts() (gas: 338872)
-CCIPHome__validateConfig:test__validateConfig_FMustBePositive_Reverts() (gas: 291865)
-CCIPHome__validateConfig:test__validateConfig_FTooHigh_Reverts() (gas: 291412)
-CCIPHome__validateConfig:test__validateConfig_NodeNotInRegistry_Reverts() (gas: 345901)
-CCIPHome__validateConfig:test__validateConfig_NotEnoughTransmittersEmptyAddresses_Reverts() (gas: 309921)
-CCIPHome__validateConfig:test__validateConfig_NotEnoughTransmitters_Reverts() (gas: 1219220)
-CCIPHome__validateConfig:test__validateConfig_OfframpAddressCannotBeZero_Reverts() (gas: 290208)
-CCIPHome__validateConfig:test__validateConfig_RMNHomeAddressCannotBeZero_Reverts() (gas: 290402)
-CCIPHome__validateConfig:test__validateConfig_Success() (gas: 301560)
-CCIPHome__validateConfig:test__validateConfig_TooManySigners_Reverts() (gas: 774058)
-CCIPHome__validateConfig:test__validateConfig_ZeroP2PId_Reverts() (gas: 294730)
-CCIPHome__validateConfig:test__validateConfig_ZeroSignerKey_Reverts() (gas: 294777)
-CCIPHome_applyChainConfigUpdates:test__applyChainConfigUpdates_FChainNotPositive_Reverts() (gas: 185425)
-CCIPHome_applyChainConfigUpdates:test_applyChainConfigUpdates_addChainConfigs_Success() (gas: 347454)
-CCIPHome_applyChainConfigUpdates:test_applyChainConfigUpdates_nodeNotInRegistry_Reverts() (gas: 20780)
-CCIPHome_applyChainConfigUpdates:test_applyChainConfigUpdates_removeChainConfigs_Success() (gas: 271006)
+CCIPHome__validateConfig:test__validateConfigLessTransmittersThanSigners_Success() (gas: 332601)
+CCIPHome__validateConfig:test__validateConfigSmallerFChain_Success() (gas: 458549)
+CCIPHome__validateConfig:test__validateConfig_ABIEncodedAddress_OfframpAddressCannotBeZero_Reverts() (gas: 289173)
+CCIPHome__validateConfig:test__validateConfig_ABIEncodedAddress_RMNHomeAddressCannotBeZero_Reverts() (gas: 289468)
+CCIPHome__validateConfig:test__validateConfig_ChainSelectorNotFound_Reverts() (gas: 292198)
+CCIPHome__validateConfig:test__validateConfig_ChainSelectorNotSet_Reverts() (gas: 288806)
+CCIPHome__validateConfig:test__validateConfig_FChainTooHigh_Reverts() (gas: 336339)
+CCIPHome__validateConfig:test__validateConfig_FMustBePositive_Reverts() (gas: 290572)
+CCIPHome__validateConfig:test__validateConfig_FTooHigh_Reverts() (gas: 290037)
+CCIPHome__validateConfig:test__validateConfig_NotEnoughTransmittersEmptyAddresses_Reverts() (gas: 308628)
+CCIPHome__validateConfig:test__validateConfig_NotEnoughTransmitters_Reverts() (gas: 1191207)
+CCIPHome__validateConfig:test__validateConfig_OfframpAddressCannotBeZero_Reverts() (gas: 288900)
+CCIPHome__validateConfig:test__validateConfig_RMNHomeAddressCannotBeZero_Reverts() (gas: 289094)
+CCIPHome__validateConfig:test__validateConfig_Success() (gas: 299779)
+CCIPHome__validateConfig:test__validateConfig_TooManySigners_Reverts() (gas: 773087)
+CCIPHome__validateConfig:test__validateConfig_ZeroP2PId_Reverts() (gas: 293437)
+CCIPHome__validateConfig:test__validateConfig_ZeroSignerKey_Reverts() (gas: 293485)
+CCIPHome_applyChainConfigUpdates:test__applyChainConfigUpdates_FChainNotPositive_Reverts() (gas: 187716)
+CCIPHome_applyChainConfigUpdates:test_applyChainConfigUpdates_addChainConfigs_Success() (gas: 349798)
+CCIPHome_applyChainConfigUpdates:test_applyChainConfigUpdates_nodeNotInRegistry_Reverts() (gas: 18043)
+CCIPHome_applyChainConfigUpdates:test_applyChainConfigUpdates_removeChainConfigs_Success() (gas: 272797)
 CCIPHome_applyChainConfigUpdates:test_applyChainConfigUpdates_selectorNotFound_Reverts() (gas: 14930)
-CCIPHome_applyChainConfigUpdates:test_getPaginatedCCIPHomes_Success() (gas: 371164)
-CCIPHome_beforeCapabilityConfigSet:test_beforeCapabilityConfigSet_DONIdMismatch_reverts() (gas: 27137)
+CCIPHome_applyChainConfigUpdates:test_getPaginatedCCIPHomes_Success() (gas: 373719)
+CCIPHome_beforeCapabilityConfigSet:test_beforeCapabilityConfigSet_DONIdMismatch_reverts() (gas: 38052)
 CCIPHome_beforeCapabilityConfigSet:test_beforeCapabilityConfigSet_InnerCallReverts_reverts() (gas: 11783)
 CCIPHome_beforeCapabilityConfigSet:test_beforeCapabilityConfigSet_InvalidSelector_reverts() (gas: 11038)
-CCIPHome_beforeCapabilityConfigSet:test_beforeCapabilityConfigSet_OnlyCapabilitiesRegistryCanCall_reverts() (gas: 26173)
-CCIPHome_beforeCapabilityConfigSet:test_beforeCapabilityConfigSet_success() (gas: 1437037)
-CCIPHome_constructor:test_constructor_CapabilitiesRegistryAddressZero_reverts() (gas: 63878)
-CCIPHome_constructor:test_constructor_success() (gas: 3516226)
+CCIPHome_beforeCapabilityConfigSet:test_beforeCapabilityConfigSet_OnlyCapabilitiesRegistryCanCall_reverts() (gas: 37071)
+CCIPHome_beforeCapabilityConfigSet:test_beforeCapabilityConfigSet_success() (gas: 1455626)
+CCIPHome_constructor:test_constructor_CapabilitiesRegistryAddressZero_reverts() (gas: 63886)
+CCIPHome_constructor:test_constructor_success() (gas: 3526450)
 CCIPHome_constructor:test_getCapabilityConfiguration_success() (gas: 9151)
 CCIPHome_constructor:test_supportsInterface_success() (gas: 9931)
-CCIPHome_getAllConfigs:test_getAllConfigs_success() (gas: 2765592)
-CCIPHome_getConfigDigests:test_getConfigDigests_success() (gas: 2540012)
+CCIPHome_getAllConfigs:test_getAllConfigs_success() (gas: 2772754)
+CCIPHome_getConfigDigests:test_getConfigDigests_success() (gas: 2547429)
 CCIPHome_promoteCandidateAndRevokeActive:test_promoteCandidateAndRevokeActive_CanOnlySelfCall_reverts() (gas: 9110)
 CCIPHome_promoteCandidateAndRevokeActive:test_promoteCandidateAndRevokeActive_ConfigDigestMismatch_reverts() (gas: 23052)
 CCIPHome_promoteCandidateAndRevokeActive:test_promoteCandidateAndRevokeActive_NoOpStateTransitionNotAllowed_reverts() (gas: 8818)
-CCIPHome_promoteCandidateAndRevokeActive:test_promoteCandidateAndRevokeActive_multiplePlugins_success() (gas: 5096688)
+CCIPHome_promoteCandidateAndRevokeActive:test_promoteCandidateAndRevokeActive_multiplePlugins_success() (gas: 5113562)
 CCIPHome_revokeCandidate:test_revokeCandidate_CanOnlySelfCall_reverts() (gas: 9046)
 CCIPHome_revokeCandidate:test_revokeCandidate_ConfigDigestMismatch_reverts() (gas: 19106)
 CCIPHome_revokeCandidate:test_revokeCandidate_RevokingZeroDigestNotAllowed_reverts() (gas: 8773)
 CCIPHome_revokeCandidate:test_revokeCandidate_success() (gas: 30699)
-CCIPHome_setCandidate:test_setCandidate_CanOnlySelfCall_reverts() (gas: 19051)
-CCIPHome_setCandidate:test_setCandidate_ConfigDigestMismatch_reverts() (gas: 1388623)
-CCIPHome_setCandidate:test_setCandidate_success() (gas: 1357884)
+CCIPHome_setCandidate:test_setCandidate_CanOnlySelfCall_reverts() (gas: 29359)
+CCIPHome_setCandidate:test_setCandidate_ConfigDigestMismatch_reverts() (gas: 1395130)
+CCIPHome_setCandidate:test_setCandidate_success() (gas: 1365381)
 DefensiveExampleTest:test_HappyPath_Success() (gas: 200048)
 DefensiveExampleTest:test_Recovery() (gas: 424306)
 E2E:test_E2E_3MessagesMMultiOffRampSuccess_gas() (gas: 1518475)