Merge branch 'develop' into jtw/increase-instant-finality-depth

.changeset/cyan-items-lie.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#breaking_change Remove the `xdai` `ChainType` config option. Moving forward, only `gnosis` can be used.

.changeset/fast-kings-compete.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal keystone: handle local target transmission logic in capability wrapper

.changeset/lazy-ravens-hide.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+bump chainlink-starknet so it builds reports with median gas price #updated

.changeset/neat-zebras-fix.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#updated Remove deprecated app.shortcut links

.changeset/olive-knives-happen.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Generic Plugin `onchainSigningStrategy` support

common/config/chaintype.go

@@ -47,7 +47,7 @@ func ChainTypeFromSlug(slug string) ChainType {
 		return ChainArbitrum
 	case "celo":
 		return ChainCelo
-	case "gnosis", "xdai":
+	case "gnosis":
 		return ChainGnosis
 	case "kroma":
 		return ChainKroma

contracts/test/v0.8/automation/CronUpkeep.test.ts

@@ -117,7 +117,7 @@ describe('CronUpkeep', () => {
   it('has a limited public ABI [ @skip-coverage ]', () => {
     // Casting cron is necessary due to a tricky versioning mismatch issue, likely between ethers
     // and typechain. Remove once the version issue is resolved.
-    // https://app.shortcut.com/chainlinklabs/story/21905/remove-contract-cast-in-cronupkeep-test-ts
+    // https://smartcontract-it.atlassian.net/browse/ARCHIVE-22094
     h.publicAbi(cron as unknown as Contract, [
       's_maxJobs',
       'performUpkeep',

core/capabilities/registry.go

@@ -6,15 +6,20 @@ import (
 	"sync"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
+	"github.com/smartcontractkit/chainlink/v2/core/capabilities/transmission"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
 )
 
 // Registry is a struct for the registry of capabilities.
 // Registry is safe for concurrent use.
 type Registry struct {
-	m    map[string]capabilities.BaseCapability
-	mu   sync.RWMutex
-	lggr logger.Logger
+	lggr   logger.Logger
+	peerID p2ptypes.PeerID
+	don    capabilities.DON
+
+	m  map[string]capabilities.BaseCapability
+	mu sync.RWMutex
 }
 
 // Get gets a capability from the registry.
@@ -134,6 +139,17 @@ func (r *Registry) Add(ctx context.Context, c capabilities.BaseCapability) error
 		if !ok {
 			return fmt.Errorf("target capability does not satisfy TargetCapability interface")
 		}
+
+		capInfo, err := c.Info(ctx)
+		if err != nil {
+			return fmt.Errorf("failed to get info of target capability: %w", err)
+		}
+
+		// If the DON is nil this is a local capability and requires wrapping in a local target transmission capability
+		if capInfo.DON == nil {
+			c = transmission.NewLocalTargetCapability(r.lggr, r.peerID, r.don, c.(capabilities.TargetCapability))
+		}
+
 	default:
 		return fmt.Errorf("unknown capability type: %s", info.CapabilityType)
 	}
@@ -150,9 +166,11 @@ func (r *Registry) Add(ctx context.Context, c capabilities.BaseCapability) error
 }
 
 // NewRegistry returns a new Registry.
-func NewRegistry(lggr logger.Logger) *Registry {
+func NewRegistry(lggr logger.Logger, peerID p2ptypes.PeerID, don capabilities.DON) *Registry {
 	return &Registry{
-		m:    map[string]capabilities.BaseCapability{},
-		lggr: lggr.Named("CapabilityRegistry"),
+		m:      map[string]capabilities.BaseCapability{},
+		lggr:   lggr.Named("CapabilityRegistry"),
+		peerID: peerID,
+		don:    don,
 	}
 }

core/capabilities/registry_test.go

@@ -10,9 +10,12 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
 	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/triggers"
+	"github.com/smartcontractkit/chainlink-common/pkg/values"
 	coreCapabilities "github.com/smartcontractkit/chainlink/v2/core/capabilities"
+	"github.com/smartcontractkit/chainlink/v2/core/capabilities/transmission"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
 )
 
 type mockCapability struct {
@@ -34,7 +37,7 @@ func (m *mockCapability) UnregisterFromWorkflow(ctx context.Context, request cap
 func TestRegistry(t *testing.T) {
 	ctx := testutils.Context(t)
 
-	r := coreCapabilities.NewRegistry(logger.TestLogger(t))
+	r := coreCapabilities.NewRegistry(logger.TestLogger(t), p2ptypes.PeerID{}, capabilities.DON{})
 
 	id := "capability-1"
 	ci, err := capabilities.NewCapabilityInfo(
@@ -62,7 +65,7 @@ func TestRegistry(t *testing.T) {
 
 func TestRegistry_NoDuplicateIDs(t *testing.T) {
 	ctx := testutils.Context(t)
-	r := coreCapabilities.NewRegistry(logger.TestLogger(t))
+	r := coreCapabilities.NewRegistry(logger.TestLogger(t), p2ptypes.PeerID{}, capabilities.DON{})
 
 	id := "capability-1"
 	ci, err := capabilities.NewCapabilityInfo(
@@ -173,7 +176,7 @@ func TestRegistry_ChecksExecutionAPIByType(t *testing.T) {
 	}
 
 	ctx := testutils.Context(t)
-	reg := coreCapabilities.NewRegistry(logger.TestLogger(t))
+	reg := coreCapabilities.NewRegistry(logger.TestLogger(t), p2ptypes.PeerID{}, capabilities.DON{})
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
 			id, err := tc.newCapability(ctx, reg)
@@ -184,3 +187,47 @@ func TestRegistry_ChecksExecutionAPIByType(t *testing.T) {
 		})
 	}
 }
+
+func TestRegistry_ReturnsLocalTargetCapabilityForLocalTargets(t *testing.T) {
+	ctx := testutils.Context(t)
+	r := coreCapabilities.NewRegistry(logger.TestLogger(t), p2ptypes.PeerID{}, capabilities.DON{})
+
+	id := "capability-1"
+	ci, err := capabilities.NewRemoteCapabilityInfo(
+		id,
+		capabilities.CapabilityTypeTarget,
+		"capability-1-description",
+		"v1.0.0",
+		nil,
+	)
+	require.NoError(t, err)
+
+	c := &mockCapability{CapabilityInfo: ci}
+	err = r.Add(ctx, c)
+	require.NoError(t, err)
+
+	targetCapability, err := r.GetTarget(ctx, id)
+	require.NoError(t, err)
+
+	duffTransmissionSchedule, err := values.NewMap(map[string]any{
+		"schedule":   transmission.Schedule_AllAtOnce,
+		"deltaStage": "10banana",
+	})
+	require.NoError(t, err)
+
+	_, err = targetCapability.Execute(ctx, capabilities.CapabilityRequest{
+		Config: duffTransmissionSchedule,
+	})
+	assert.NotNil(t, err)
+
+	validTransmissionSchedule, err := values.NewMap(map[string]any{
+		"schedule":   transmission.Schedule_OneAtATime,
+		"deltaStage": "10ms",
+	})
+	require.NoError(t, err)
+
+	_, err = targetCapability.Execute(ctx, capabilities.CapabilityRequest{
+		Config: validTransmissionSchedule,
+	})
+	assert.NoError(t, err)
+}