Merge remote-tracking branch 'origin/develop' into fix-healthchecker-stale-cache

# Conflicts:
#	integration-tests/load/go.mod

Author: Fletch153

core/scripts/cre/environment/completions.go

@@ -244,7 +244,6 @@ func buildCommandTree() *CompletionNode {
 			{Text: "--extra-allowed-gateway-ports", Description: "Extra allowed ports for outgoing connections from the Gateway Connector (e.g. 8080,8081)"},
 			{Text: "--with-example", Description: "Deploys and registers example workflow (default: false)"},
 			{Text: "--example-workflow-timeout", Description: "Time to wait until example workflow succeeds (e.g. 10s, 1m, 1h) (default: 5m)"},
-			{Text: "--with-plugins-docker-image", Description: "Docker image to use (must have all capabilities included)"},
 			{Text: "--with-beholder", Description: "Deploys Beholder (Chip Ingress + Red Panda) (default: false)"},
 			{Text: "--with-dashboards", Description: "Deploys Observability Stack and Grafana Dashboards (default: false)"},
 			{Text: "--with-billing", Description: "Deploys Billing Platform Service (default: false)"},

core/scripts/cre/environment/environment/setup.go

@@ -645,7 +645,6 @@ func RunSetup(ctx context.Context, config SetupConfig, noPrompt, purge, withBill
 	logger.Info().Msg("1. Navigate to the CRE environment directory: cd core/scripts/cre/environment")
 	logger.Info().Msg("2. Start the environment: go run . env start")
 	logger.Info().Msg("   Optional: Add --with-example to start with an example workflow")
-	logger.Info().Msg("   Optional: Add --with-plugins-docker-image to use a pre-built image with capabilities")
 	logger.Info().Msg("   Optional: Add --with-beholder to start the Beholder")
 	logger.Info().Msg("\nFor more information, see the documentation in core/scripts/cre/environment/README.md")
 

core/scripts/go.mod

@@ -49,7 +49,7 @@ require (
 	github.com/smartcontractkit/chainlink-common v0.11.2-0.20260413215716-a931c3f2f162
 	github.com/smartcontractkit/chainlink-common/keystore v1.0.2
 	github.com/smartcontractkit/chainlink-data-streams v0.1.13
-	github.com/smartcontractkit/chainlink-deployments-framework v0.94.1
+	github.com/smartcontractkit/chainlink-deployments-framework v0.95.0
 	github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260416173445-80f6efde0a03
 	github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd
 	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260409211238-5b99921cbc7c

core/scripts/go.sum

@@ -3,6 +3,7 @@ package v2_test
 import (
 	"encoding/hex"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"math"
 	"math/big"
@@ -2131,6 +2132,7 @@ func TestStartingCountsV1(t *testing.T) {
 	ec.On("ConfiguredChainID").Return(testutils.SimulatedChainID)
 	ec.On("BalanceAt", mock.Anything, mock.Anything, mock.Anything).Maybe().Return(big.NewInt(0), nil)
 	ec.On("LatestBlockHeight", mock.Anything).Return(big.NewInt(2), nil).Maybe()
+	ec.On("SubscribeToHeads", mock.Anything).Maybe().Return(nil, nil, errors.ErrUnsupported)
 	txm := makeTestTxm(t, txStore, ks.Eth(), ec)
 	legacyChains := evmtest.NewLegacyChains(t, evmtest.TestChainOpts{
 		KeyStore:       ks.Eth(),

core/services/vrf/v2/integration_v2_test.go

@@ -17,15 +17,16 @@ var _ cldf.ChangeSetV2[ProposeAptosCapJobSpecInput] = ProposeAptosCapJobSpec{}
 const aptosNetwork = "aptos"
 
 type AptosOverrideDefaultCfg struct {
-	CREForwarderAddress           string        `json:"creForwarderAddress,omitempty" yaml:"creForwarderAddress,omitempty"`
-	Network                       string        `json:"network,omitempty" yaml:"network,omitempty"`
-	ChainID                       string        `json:"chainId,omitempty" yaml:"chainId,omitempty"`
-	ObservationPollerWorkersCount uint          `json:"observationPollerWorkersCount,omitempty" yaml:"observationPollerWorkersCount,omitempty"`
-	ObservationPollPeriod         time.Duration `json:"observationPollPeriod,omitempty" yaml:"observationPollPeriod,omitempty"`
-	ChainHeightPollPeriod         time.Duration `json:"chainHeightPollPeriod,omitempty" yaml:"chainHeightPollPeriod,omitempty"`
-	UnknownRequestsTTL            time.Duration `json:"unknownRequestsTTL,omitempty" yaml:"unknownRequestsTTL,omitempty"`
-	DeltaStage                    time.Duration `json:"deltaStage" yaml:"deltaStage,omitempty"`
-	TxSearchStartingBuffer        time.Duration `json:"txSearchStartingBuffer" yaml:"txSearchStartingBuffer,omitempty"`
+	CREForwarderAddress           string            `json:"creForwarderAddress,omitempty" yaml:"creForwarderAddress,omitempty"`
+	Network                       string            `json:"network,omitempty" yaml:"network,omitempty"`
+	ChainID                       string            `json:"chainId,omitempty" yaml:"chainId,omitempty"`
+	ObservationPollerWorkersCount uint              `json:"observationPollerWorkersCount,omitempty" yaml:"observationPollerWorkersCount,omitempty"`
+	ObservationPollPeriod         time.Duration     `json:"observationPollPeriod,omitempty" yaml:"observationPollPeriod,omitempty"`
+	ChainHeightPollPeriod         time.Duration     `json:"chainHeightPollPeriod,omitempty" yaml:"chainHeightPollPeriod,omitempty"`
+	UnknownRequestsTTL            time.Duration     `json:"unknownRequestsTTL,omitempty" yaml:"unknownRequestsTTL,omitempty"`
+	DeltaStage                    time.Duration     `json:"deltaStage" yaml:"deltaStage,omitempty"`
+	TxSearchStartingBuffer        time.Duration     `json:"txSearchStartingBuffer" yaml:"txSearchStartingBuffer,omitempty"`
+	P2PToTransmitterMap           map[string]string `json:"p2pToTransmitterMap,omitempty" yaml:"p2pToTransmitterMap,omitempty"`
 }
 
 type AptosCapabilityInput struct {
@@ -47,6 +48,7 @@ type ProposeAptosCapJobSpecInput struct {
 	DeltaStage             time.Duration          `json:"deltaStage" yaml:"deltaStage,omitempty"`
 	TxSearchStartingBuffer time.Duration          `json:"txSearchStartingBuffer" yaml:"txSearchStartingBuffer,omitempty"`
 	CREForwarderAddress    string                 `json:"creForwarderAddress" yaml:"creForwarderAddress,omitempty"`
+	P2PToTransmitterMap    map[string]string      `json:"p2pToTransmitterMap,omitempty" yaml:"p2pToTransmitterMap,omitempty"`
 	AptosCapabilityInputs  []AptosCapabilityInput `json:"aptosCapabilityInputs" yaml:"aptosCapabilityInputs"`
 }
 
@@ -153,6 +155,7 @@ func (u ProposeAptosCapJobSpec) Apply(e cldf.Environment, input ProposeAptosCapJ
 		cfg.ChainID = chainIDStr
 		cfg.Network = aptosNetwork
 		cfg.CREForwarderAddress = input.CREForwarderAddress // PLEX-2797
+		cfg.P2PToTransmitterMap = input.P2PToTransmitterMap
 		cfg.DeltaStage = input.DeltaStage
 		cfg.TxSearchStartingBuffer = input.TxSearchStartingBuffer
 		enc, err := json.Marshal(cfg)

deployment/cre/jobs/propose_aptos_cap.go

@@ -281,6 +281,23 @@ func TestProposeAptosCapJobSpec_Apply_success(t *testing.T) {
 	assert.Len(t, out.Reports, 1)
 }
 
+func TestProposeAptosCapJobSpec_Apply_withP2PToTransmitterMap(t *testing.T) {
+	setup := setupAptosCapTest(t)
+	env := setup.env
+
+	input := setup.baseInput
+	input.P2PToTransmitterMap = map[string]string{
+		"aabbccdd": "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
+		"11223344": "0xabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcd",
+	}
+
+	require.NoError(t, jobs.ProposeAptosCapJobSpec{}.VerifyPreconditions(*env, input))
+
+	out, err := jobs.ProposeAptosCapJobSpec{}.Apply(*env, input)
+	require.NoError(t, err)
+	assert.Len(t, out.Reports, 1)
+}
+
 func TestProposeAptosCapJobSpec_Apply_duplicateNodeIDs(t *testing.T) {
 	setup := setupAptosCapTest(t)
 	env := setup.env

deployment/cre/jobs/propose_aptos_cap_test.go

@@ -45,7 +45,7 @@ require (
 	github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260415165642-49f23e4d76cc
 	github.com/smartcontractkit/chainlink-common v0.11.2-0.20260413215716-a931c3f2f162
 	github.com/smartcontractkit/chainlink-common/keystore v1.0.2
-	github.com/smartcontractkit/chainlink-deployments-framework v0.94.1
+	github.com/smartcontractkit/chainlink-deployments-framework v0.95.0
 	github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260416173445-80f6efde0a03
 	github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501
 	github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd

deployment/go.mod

@@ -119,7 +119,7 @@ require (
 	github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20251120172354-e8ec0386b06c
 	github.com/smartcontractkit/wsrpc v0.8.5-0.20250502134807-c57d3d995945
 	github.com/spf13/cast v1.10.0
-	github.com/spf13/cobra v1.10.1
+	github.com/spf13/cobra v1.10.2
 	github.com/stretchr/testify v1.11.1
 	github.com/theodesp/go-heaps v0.0.0-20190520121037-88e35354fe0a
 	github.com/tidwall/gjson v1.18.0
@@ -259,7 +259,7 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.30.1 // indirect
 	github.com/go-webauthn/x v0.1.5 // indirect
-	github.com/goccy/go-yaml v1.12.0 // indirect
+	github.com/goccy/go-yaml v1.19.2 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gofrs/flock v0.12.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect