Merge branch 'develop' of github.com:smartcontractkit/chainlink into …

…fix-reorgtest-flake

.changeset/late-windows-clean.md

@@ -0,0 +1,11 @@
+---
+"chainlink": minor
+---
+
+#internal Updated the TXM confirmation logic to use the mined transaction count to identify re-org'd or confirmed transactions.
+
+- Confirmer uses the mined transaction count to determine if transactions have been re-org'd or confirmed.
+- Confirmer no longer sets transaction states to `confirmed_missing_receipt`. This state is maintained in queries for backwards compatibility.
+- Finalizer now responsible for fetching and storing receipts for confirmed transactions.
+- Finalizer now responsible for resuming pending task runs.
+- Finalizer now responsible for marking old transactions without receipts broadcasted before the finalized head as fatal.

.changeset/mean-dots-move.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Add config var Mercury.Transmitter.TransmitConcurrency #added

.changeset/purple-seas-help.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#removed unused key files and move public_key test file.

.changeset/seven-schools-invent.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Integration tests for USDC token transfer #internal

.changeset/shiny-owls-destroy.md

@@ -0,0 +1,6 @@
+---
+"chainlink": patch
+---
+
+Logging improvements for LLO
+#internal

.changeset/sixty-queens-wait.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#updated chain config: allow chain id and account address to be manually provided when no selections are available

.changeset/tame-tomatoes-refuse.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#added feat: support creating solana chain config in job distributor page

.changeset/three-mayflies-learn.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#updated Update few incorrect occurences of the password for [email protected].

.changeset/weak-weeks-grin.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Bump Solana to include MultiNode integration. #added

.github/actions/goreleaser-build-sign-publish/action.yml

@@ -26,19 +26,32 @@ inputs:
     description: "The goreleaser configuration yaml"
     default: ".goreleaser.yaml"
     required: false
+  # other inputs
+  enable-debug:
+    description: |
+      Enable debug information for the run (true/false). This includes
+      buildkit debug information, and goreleaser debug, etc.
+    required: false
+    default: "${{ runner.debug == '1' }}"
+
 runs:
   using: composite
   steps:
     - # We need QEMU to test the cross architecture builds after they're built. 
       name: Set up QEMU 
       uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
+
     - name: Setup docker buildx
       uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.0
+      with:
+        buildkitd-flags: ${{ inputs.enable-debug == 'true' && '--debug' || '' }}
+
     - name: Set up Go
       uses: ./.github/actions/setup-go
       with:
         go-version-file: 'go.mod'
         only-modules: 'true'
+
     - name: Setup goreleaser
       uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
       with:
@@ -65,6 +78,7 @@ runs:
         IMAGE_TAG: ${{ inputs.docker-image-tag }}
         GORELEASER_KEY: ${{ inputs.goreleaser-key }}
         GITHUB_TOKEN: ${{ github.token }}
+        DEBUG: ${{ inputs.enable-debug }}
       run: |
         # https://github.com/orgs/community/discussions/24950
         ${GITHUB_ACTION_PATH}/release.js

.github/actions/goreleaser-build-sign-publish/release.js

@@ -168,6 +168,7 @@ function extractDockerImages(artifacts) {
 
 function constructGoreleaserCommand(releaseType, version, goreleaserConfig) {
   const flags = [];
+  const debugFlag = (process.env.DEBUG == 'true') ? '--verbose' : '';
 
   checkReleaseType(releaseType);
 
@@ -192,9 +193,9 @@ function constructGoreleaserCommand(releaseType, version, goreleaserConfig) {
 
   const flagsStr = flags.join(" ");
   if (releaseType === "merge") {
-    return `CHAINLINK_VERSION=${version} goreleaser ${subCmd} ${flagsStr}`;
+    return `CHAINLINK_VERSION=${version} goreleaser ${debugFlag} ${subCmd} ${flagsStr}`;
   } else {
-    return `CHAINLINK_VERSION=${version} goreleaser ${subCmd} --config ${goreleaserConfig} ${flagsStr}`;
+    return `CHAINLINK_VERSION=${version} goreleaser ${debugFlag} ${subCmd} --config ${goreleaserConfig} ${flagsStr}`;
   }
 }
 

.github/e2e-tests.yml

@@ -947,7 +947,7 @@ runner-test-matrix:
     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
+      E2E_JD_VERSION: 0.6.0
 
   - id: smoke/ccip_messaging_test.go:*
     path: integration-tests/smoke/ccip_messaging_test.go
@@ -961,7 +961,21 @@ runner-test-matrix:
     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
+      E2E_JD_VERSION: 0.6.0
+
+  - id: smoke/ccip_usdc_test.go:*
+    path: integration-tests/smoke/ccip_usdc_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_usdc_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.6.0
 
   - id: smoke/fee_boosting_test.go:*
     path: integration-tests/smoke/fee_boosting_test.go
@@ -975,7 +989,107 @@ runner-test-matrix:
     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
+      E2E_JD_VERSION: 0.6.0
+
+  - id: smoke/ccip_rmn_test.go:^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$
+    path: integration-tests/smoke/ccip_rmn_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/smoke && go test -test.run ^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$ -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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
+      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+
+  - id: smoke/ccip_rmn_test.go:^TestRMN_MultipleMessagesOnOneLaneNoWaitForExec$
+    path: integration-tests/smoke/ccip_rmn_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/smoke && go test -test.run ^TestRMN_MultipleMessagesOnOneLaneNoWaitForExec$ -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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
+      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+
+# Enable after flaking issue is resolved
+#  - id: smoke/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
+#    path: integration-tests/smoke/ccip_rmn_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/smoke && go test -test.run ^TestRMN_NotEnoughObservers$ -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.6.0
+#      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
+#      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+
+  - id: smoke/ccip_rmn_test.go:^TestRMN_DifferentSigners$
+    path: integration-tests/smoke/ccip_rmn_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/smoke && go test -test.run ^TestRMN_DifferentSigners$ -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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
+      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+
+# Enable after flaking issue is resolved
+#  - id: smoke/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
+#    path: integration-tests/smoke/ccip_rmn_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/smoke && go test -test.run ^TestRMN_NotEnoughSigners$ -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.6.0
+#      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
+#      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+
+
+  - id: smoke/ccip_rmn_test.go:^TestRMN_DifferentRmnNodesForDifferentChains$
+    path: integration-tests/smoke/ccip_rmn_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/smoke/ && go test -test.run ^TestRMN_DifferentRmnNodesForDifferentChains$ -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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
+      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+
 
   # END: CCIPv1.6 tests
 

.github/workflows/automation-benchmark-tests.yml

@@ -24,7 +24,7 @@ on:
 jobs:
   run-e2e-tests-workflow:
     name: Run E2E Tests
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@f1f2dac0a20f0e02408eb7f528c768fe95c39229
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
     with:
       test_path: .github/e2e-tests.yml
       test_ids: '${{ inputs.testType }}/automation_test.go:TestAutomationBenchmark'

.github/workflows/automation-load-tests.yml

@@ -19,7 +19,7 @@ on:
 jobs:
   run-e2e-tests-workflow:
     name: Run E2E Tests
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@f1f2dac0a20f0e02408eb7f528c768fe95c39229
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
     with:
       test_path: .github/e2e-tests.yml
       test_ids: 'load/automationv2_1/automationv2_1_test.go:TestLogTrigger'

.github/workflows/automation-nightly-tests.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   run-e2e-tests-workflow:
     name: Run E2E Tests
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@f1f2dac0a20f0e02408eb7f528c768fe95c39229
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
     with:
       test_path: .github/e2e-tests.yml
       test_trigger: Automation Nightly Tests

.github/workflows/automation-ondemand-tests.yml

@@ -153,7 +153,7 @@ jobs:
   call-run-e2e-tests-workflow:
     name: Run E2E Tests
     needs: set-tests-to-run
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@f1f2dac0a20f0e02408eb7f528c768fe95c39229
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
     with:
       test_path: .github/e2e-tests.yml
       test_list: ${{ needs.set-tests-to-run.outputs.test_list }}

.github/workflows/ccip-chaos-tests.yml

@@ -15,8 +15,7 @@ concurrency:
 jobs:
   run-e2e-tests-workflow:
     name: Run E2E Tests
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@f1f2dac0a20f0e02408eb7f528c768fe95c39229
-    with:
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
       test_path: .github/e2e-tests.yml
       chainlink_version: ${{ github.sha }}
       require_chainlink_image_versions_in_qa_ecr: ${{ github.sha }}

.github/workflows/ccip-load-tests.yml

@@ -31,7 +31,7 @@ concurrency:
 jobs:
   run-e2e-tests-workflow:
     name: Run E2E Tests
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@f1f2dac0a20f0e02408eb7f528c768fe95c39229
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
     with:
       test_path: .github/e2e-tests.yml
       test_trigger: E2E CCIP Load Tests

.github/workflows/ci-core.yml

@@ -526,10 +526,14 @@ jobs:
           make rm-mocked
           make generate
       - name: Ensure clean after generate
-        run: git diff --stat --exit-code
+        run: |
+          git add --all
+          git diff --stat --cached --exit-code
       - run: make gomodtidy
       - name: Ensure clean after tidy
-        run: git diff --minimal --exit-code
+        run: |
+          git add --all
+          git diff --minimal --cached --exit-code
 
   run-frequency:
     name: Scheduled Run Frequency

.github/workflows/delete-caches.yml

@@ -24,10 +24,14 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup gh-actions-cache extension
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: gh extension install actions/gh-actions-cache
 
       - name: Retrieve Trunk SHA
         id: get-sha
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           SHA=$(gh pr view -R $REPO $PR_NUMBER --json mergeCommit --jq .mergeCommit.oid)
           echo "sha=$SHA" >> $GITHUB_OUTPUT