[pull] develop from smartcontractkit:develop

.changeset/dark-jays-hit.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Support for SVR multiplexing #added

.changeset/fancy-apples-dance.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Emit beholder message for Atlas userOp #added

.changeset/fluffy-beans-camp.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Send dualBroadcastParams in TxMessage #added

.changeset/soft-sheep-fish.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Fix overactive logging of submitted transactions #fixed

.github/CODEOWNERS

@@ -48,7 +48,6 @@
 /core/scripts/vrf*/ @smartcontractkit/dev-services
 
 # Keeper/Automation-related services
-/core/services/keeper/ @smartcontractkit/dev-services
 /core/services/ocr2/plugins/ocr2keeper/ @smartcontractkit/dev-services
 
 # Chainlink Functions

.github/integration-in-memory-tests.yml

@@ -54,22 +54,6 @@ runner-test-matrix:
         -- -v -run "Test_CCIPMessaging_EVM2EVM" -timeout 18m -count=1 -parallel=4 ./smoke/ccip
     test_go_project_path: integration-tests
 
-  - id: smoke/ccip/ccip_messaging_test.go:Test_CCIPMessaging_EVM2Solana
-    path: integration-tests/smoke/ccip/ccip_messaging_test.go
-    test_env_type: in-memory
-    runs_on: ubuntu-latest
-    runs_on_self_hosted: runs-on/cpu=8/ram=32/family=m6i+m5.*/spot=false/image=ubuntu24-full-x64/extras=s3-cache+tmpfs
-    triggers:
-      - PR Integration CCIP Tests
-      - Nightly Integration CCIP Tests
-    test_cmd: |
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -v -run "Test_CCIPMessaging_EVM2Solana" -timeout 18m -count=1 -parallel=4 ./smoke/ccip
-    test_go_project_path: integration-tests
-
   - id: smoke/ccip/ccip_messaging_test.go:Test_CCIPMessaging_EVM2Solana_LOOPP
     path: integration-tests/smoke/ccip/ccip_messaging_test.go
     test_env_type: in-memory
@@ -86,24 +70,6 @@ runner-test-matrix:
         -- -v -run "Test_CCIPMessaging_EVM2Solana" -timeout 18m -count=1 -parallel=4 ./smoke/ccip
     test_go_project_path: integration-tests
     install_plugins_public: true
-    test_env_vars:
-      CL_SOLANA_CMD: chainlink-solana
-
-  - id: smoke/ccip/ccip_messaging_test.go:Test_CCIPMessaging_Solana2EVM
-    path: integration-tests/smoke/ccip/ccip_messaging_test.go
-    test_env_type: in-memory
-    runs_on: ubuntu-latest
-    runs_on_self_hosted: runs-on/cpu=8/ram=32/family=m6i+m5.*/spot=false/image=ubuntu24-full-x64/extras=s3-cache+tmpfs
-    triggers:
-      - PR Integration CCIP Tests
-      - Nightly Integration CCIP Tests
-    test_cmd: |
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -v -run "Test_CCIPMessaging_Solana2EVM" -timeout 18m -count=1 -parallel=4 ./smoke/ccip
-    test_go_project_path: integration-tests
 
   - id: smoke/ccip/ccip_messaging_test.go:Test_CCIPMessaging_Solana2EVM_LOOPP
     path: integration-tests/smoke/ccip/ccip_messaging_test.go
@@ -121,8 +87,6 @@ runner-test-matrix:
         -- -v -run "Test_CCIPMessaging_Solana2EVM" -timeout 18m -count=1 -parallel=4 ./smoke/ccip
     test_go_project_path: integration-tests
     install_plugins_public: true
-    test_env_vars:
-      CL_SOLANA_CMD: chainlink-solana
 
   - id: smoke/ccip/ccip_messaging_test.go:Test_CCIPMessaging_Revert_EVM2Solana_LOOPP
     path: integration-tests/smoke/ccip/ccip_messaging_test.go
@@ -140,8 +104,6 @@ runner-test-matrix:
         -- -v -run "Test_CCIPMessaging_Revert_EVM2Solana" -timeout 18m -count=1 -parallel=4 ./smoke/ccip
     test_go_project_path: integration-tests
     install_plugins_public: true
-    test_env_vars:
-      CL_SOLANA_CMD: chainlink-solana
 
   - id: smoke/ccip/ccip_messaging_test.go:Test_CCIPMessaging_MultiExecReports_EVM2Solana
     path: integration-tests/smoke/ccip/ccip_messaging_test.go
@@ -399,6 +361,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run ".*" -timeout 16m -count=1 -parallel=2 smoke/ccip/ccip_token_transfer_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_token_transfer_test.go:*_LOOPP
     path: integration-tests/smoke/ccip/ccip_token_transfer_test.go
@@ -416,8 +379,6 @@ runner-test-matrix:
         -- -v -run ".*" -timeout 16m -count=1 -parallel=2 smoke/ccip/ccip_token_transfer_test.go
     test_go_project_path: integration-tests
     install_plugins_public: true
-    test_env_vars:
-      CL_SOLANA_CMD: chainlink-solana
 
   - id: smoke/ccip/ccip_cs_update_rmn_config_test.go:*
     path: integration-tests/smoke/ccip/ccip_cs_update_rmn_config_test.go
@@ -449,6 +410,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNCurse$" -timeout 20m -count=1 -parallel=4 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNCurseUncurseAptos
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -482,6 +444,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNCurseMCMS$" -timeout 20m -count=1 -parallel=4 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNCurseBypass
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -498,6 +461,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNCurseBypass$" -timeout 20m -count=1 -parallel=4 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNCurseIdempotent
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -513,6 +477,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNCurseIdempotent$" -timeout 20m -count=1 -parallel=4 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNUncurseIdempotent
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -528,6 +493,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNUncurseIdempotent$" -timeout 20m -count=1 -parallel=4 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNUncurse
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -544,6 +510,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNUncurse$" -timeout 20m -count=1 -parallel=4 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNUncurseMCMS
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -560,6 +527,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNUncurseMCMS$" -timeout 20m -count=1 -parallel=4 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNUncurseBypass
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -576,6 +544,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNUncurseBypass$" -timeout 20m -count=1 -parallel=4 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNCurseConfigValidate
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -592,6 +561,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNCurseConfigValidate$" -timeout 20m -count=1 -parallel=2 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNCurseNoConnectedLanes
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -607,6 +577,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNCurseNoConnectedLanes$" -timeout 20m -count=1 -parallel=1 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNCurseOneConnectedLanes
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -622,6 +593,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNCurseOneConnectedLanes$" -timeout 20m -count=1 -parallel=1 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNCurseOneConnectedLanesSolana
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -637,6 +609,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNCurseOneConnectedLanesSolana$" -timeout 20m -count=1 -parallel=1 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNCurseOneConnectedLanesGlobalOnly
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -652,6 +625,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNCurseOneConnectedLanesGlobalOnly$" -timeout 20m -count=1 -parallel=1 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNCurseOneConnectedLanesLaneOnlyOnSource
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -667,6 +641,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNCurseOneConnectedLanesLaneOnlyOnSource$" -timeout 20m -count=1 -parallel=1 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNUncurseForceOption
     path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
@@ -683,6 +658,7 @@ runner-test-matrix:
         --format=github-actions \
         -- -v -run "^TestRMNUncurseForceOption$" -timeout 20m -count=1 -parallel=4 smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
     test_go_project_path: integration-tests
+    install_plugins_public: true
 
   - id: smoke/ccip/ccip_disable_lane_test.go:*
     path: integration-tests/smoke/ccip/ccip_disable_lane_test.go

.github/workflows/legacy-system-tests.yml

@@ -37,7 +37,7 @@
       ecr:
         type: string
         required: true
         default: "sdlc"
         description: "Whether to use the SDLC (sdlc) or public ECR registry (public) for the Chainlink image."
       chainlink_version:
         required: false
@@ -86,7 +86,7 @@
           echo "resolved_image=${resolved_image}" >> "${GITHUB_OUTPUT}"
       - name: Print Summary
         working-directory: .
         run: |
           echo "**Image:** \`${{ steps.resolve-chainlink-image.outputs.resolved_image }}\`" >> $GITHUB_STEP_SUMMARY
 
   test-nightly:
@@ -177,30 +177,6 @@
             runner: "ubuntu24.04-16cores-64GB"
             tests_dir: "automation"
             logs_archive_name: "automation-smoke-2_3"
-          - display_name: "Keepers Smoke Tests 1"
-            testcmd: "go test -v -timeout 1h -run TestKeeperBasic\\|TestKeeperSimulation\\|TestKeeperCheckPerformGasLimit\\|TestKeeperRegisterUpkeep\\|TestKeeperAddFunds\\|TestKeeperRemove\\|TestKeeperPauseRegistry\\|TestKeeperMigrateRegistry\\|TestKeeperJobReplacement"
-            envcmd: "cl u env.toml,products/keepers/basic.toml"
-            runner: "ubuntu24.04-16cores-64GB"
-            tests_dir: "keepers"
-            logs_archive_name: "keepers-smoke-1"
-          - display_name: "Keepers Smoke Tests 2"
-            testcmd: "go test -v -timeout 1h -run TestKeeperNodeDown"
-            envcmd: "cl u env.toml,products/keepers/low_bcptr.toml"
-            runner: "ubuntu24.04-16cores-64GB"
-            tests_dir: "keepers"
-            logs_archive_name: "keepers-smoke-2"
-          - display_name: "Keepers Smoke Tests 3"
-            testcmd: "go test -v -timeout 1h -run TestKeeperPauseUnPauseUpkeep\\|TestKeeperUpdateCheckData"
-            envcmd: "cl u env.toml,products/keepers/low_bcptr.toml"
-            runner: "ubuntu24.04-16cores-64GB"
-            tests_dir: "keepers"
-            logs_archive_name: "keepers-smoke-3"
-          - display_name: "Keepers Smoke Tests 4"
-            testcmd: "go test -v -timeout 1h -run TestKeeperBlockCountPerTurn"
-            envcmd: "cl u env.toml,env-geth.toml,products/keepers/high_bcptr.toml"
-            runner: "ubuntu24.04-16cores-64GB"
-            tests_dir: "keepers"
-            logs_archive_name: "keepers-smoke-4"
           - display_name: "Test VRFv2Plus Smoke"
             testcmd: "go test -v -timeout 30m -run TestVRFv2PlusSmoke"
             envcmd: "cl u env-vrf2plus.toml,products/vrfv2plus/basic.toml"
@@ -347,7 +323,7 @@
           echo "resolved_image=${resolved_image}" >> "${GITHUB_OUTPUT}"
 
       - name: Set environment variables
         run: |
           echo "CHAINLINK_IMAGE=${{ steps.resolve-chainlink-image.outputs.resolved_image }}" >> $GITHUB_ENV
       - name: Setup environment
         env:

core/capabilities/ccip/ccipsolana/pluginconfig.go

@@ -6,8 +6,6 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/ccip/consts"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
-	"github.com/smartcontractkit/chainlink/v2/core/config/env"
-
 	ccipcommon "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ocrimpls"
 )
@@ -26,7 +24,7 @@ func InitializePluginConfig(lggr logger.Logger, extraDataCodec ccipocr3.ExtraDat
 		ChainRW:                    ChainRWProvider{},
 		ExtraDataCodec:             ExtraDataDecoder{},
 		PriceOnlyCommitFn:          consts.MethodCommitPriceOnly,
-		CCIPProviderSupported:      env.SolanaPlugin.Cmd.Get() != "",
+		CCIPProviderSupported:      true,
 	}
 }
 

core/cmd/blocks_commands_integration_test.go

@@ -0,0 +1,37 @@
+//go:build integration
+
+package cmd_test
+
+import (
+	"flag"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"github.com/urfave/cli"
+
+	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
+)
+
+func Test_ReplayFromBlock_Solana(t *testing.T) {
+	t.Parallel()
+
+	chain := chainlink.RawConfig{
+		"ChainID": "devnet",
+		"Enabled": true,
+		"Nodes": []map[string]any{{
+			"Name": "primary",
+			"URL":  "http://solana.example",
+		}},
+	}
+	app := solanaStartNewApplication(t, chain)
+	client, _ := app.NewShellAndRenderer()
+
+	set := flag.NewFlagSet("test", 0)
+	flagSetApplyFromAction(client.ReplayFromBlock, set, "")
+
+	require.NoError(t, set.Set("block-number", "1"))
+	require.NoError(t, set.Set("chain-id", "devnet"))
+	require.NoError(t, set.Set("family", "solana"))
+	c := cli.NewContext(nil, set, nil)
+	require.NoError(t, client.ReplayFromBlock(c))
+}