From c70c9b0e036537b1d9a0cd59b22e7304de90b066 Mon Sep 17 00:00:00 2001 From: Dylan Tinianov Date: Wed, 18 Nov 2026 10:02:16 -0500 Subject: [PATCH 01/11] Bump chainlink-common to 9efbd16f9249 Co-Authored-By: Claude Code --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 59abe76df89..b258daadf2c 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccv v0.16.0 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 github.com/smartcontractkit/chainlink-data-streams v1.1.3 diff --git a/go.sum b/go.sum index b13d0f7a42e..ab6acefdf72 100644 --- a/go.sum +++ b/go.sum @@ -1104,6 +1104,8 @@ github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 h1:GdBrQxbG6woXNOOGzu8HhQb/2QAdukxBte+aVpFvN+o= github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 h1:SrJoshGScUvnH8A3PdUweTVfuh+fEpRnPVaiX2NLbm0= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= From 707531bbe09dde22f5d2ea215455a2e641904533 Mon Sep 17 00:00:00 2001 From: Dylan Tinianov Date: Wed, 18 Nov 2026 10:02:19 -0500 Subject: [PATCH 02/11] workflow engine: meter TEE-routed executions as confidential compute Executions of triggers whose subscription requires a TEE now emit cre:workflow:confidential-compute instead of cre:workflow:compute, so billing can distinguish enclave compute downstream. The value is unchanged: the enclave-measured duration already returned in the execution result. The record's resource pool follows the resource type. Co-Authored-By: Claude Code --- core/services/workflows/v2/base_engine.go | 41 +++++++++++++++---- .../workflows/v2/compute_usage_test.go | 2 + 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/core/services/workflows/v2/base_engine.go b/core/services/workflows/v2/base_engine.go index 96a876e158d..7346f39f299 100644 --- a/core/services/workflows/v2/base_engine.go +++ b/core/services/workflows/v2/base_engine.go @@ -116,7 +116,12 @@ type baseEngine struct { usageMeter *resourcemanager.ResourceManager usageIdentity resourcemanager.ResourceIdentity - orgID string + // confidentialIdentity is the identity for meter records of executions + // routed to a TEE enclave; it carries the confidential resource type. + confidentialIdentity resourcemanager.ResourceIdentity + // teeTriggers marks trigger indexes whose subscription requires a TEE. + teeTriggers map[uint64]bool + orgID string // orgIDMissingReason records why orgID is empty ("resolver_nil", // "resolver_error", or "empty_response"). It is set once in startWith() and // read by startExecution() to label the org_id_missing counter. It is only @@ -200,6 +205,10 @@ func newBaseEngine(cfg *EngineConfig, engineMode string) (*baseEngine, logger.Su engine.usageIdentity = resourcemanager.WithWorkflowUsagePool( resourcemanager.NewBaseIdentity(cfg.MeteringIdentity, resourcemanager.EmittingServiceWorkflowEngine, ""), resourcemanager.ResourceTypeWorkflowCompute) + engine.confidentialIdentity = resourcemanager.WithWorkflowUsagePool( + resourcemanager.NewBaseIdentity(cfg.MeteringIdentity, resourcemanager.EmittingServiceWorkflowEngine, ""), + resourcemanager.ResourceTypeWorkflowConfidentialCompute) + engine.teeTriggers = map[uint64]bool{} engine.loggerLabels.Store(&labelsMap) engine.localNode.Store(&localNode) @@ -313,6 +322,7 @@ func (e *baseEngine) Subscribe(ctx context.Context) ([]*sdkpb.TriggerSubscriptio if err := e.cfg.Hooks.OnSubscriptionsReady(e.cfg.CachedTriggerSubscriptions, e.Tenant(), true); err != nil { return nil, fmt.Errorf("OnSubscriptionsReady hook failed: %w", err) } + e.markTeeTriggers(e.cfg.CachedTriggerSubscriptions) return e.cfg.CachedTriggerSubscriptions, nil } @@ -388,9 +398,20 @@ func (e *baseEngine) Subscribe(ctx context.Context) ([]*sdkpb.TriggerSubscriptio return nil, fmt.Errorf("OnSubscriptionsReady hook failed: %w", err) } + e.markTeeTriggers(subs.Subscriptions) return subs.Subscriptions, nil } +// markTeeTriggers records which trigger subscriptions require a TEE; their +// executions meter as confidential compute. +func (e *baseEngine) markTeeTriggers(subs []*sdkpb.TriggerSubscription) { + for i, sub := range subs { + if sub.GetRequirements().GetTee() != nil { + e.teeTriggers[uint64(i)] = true + } + } +} + // Tenant is the engine's tenant identity. Valid once resolveOrgID has run during // init. Every field it reads is written before OnInitialized fires. func (e *baseEngine) Tenant() contexts.CRE { @@ -811,7 +832,7 @@ func (e *baseEngine) startExecution(ctx context.Context, event triggers.Coordina computeDuration = time.Duration(result.GetComputeDurationMs()) * time.Millisecond } - e.emitComputeUsage(ctx, executionLogger, executionID, computeDuration) + e.emitComputeUsage(ctx, executionLogger, tid, executionID, computeDuration) if isMetering { computeUnit := billing.ResourceType_name[int32(billing.ResourceType_RESOURCE_TYPE_COMPUTE)] @@ -1161,11 +1182,12 @@ func resolveOrgID(ctx context.Context, resolver orgresolver.OrgResolver, workflo return resolvedOrg{ID: orgID} } -// emitComputeUsage emits the cre:workflow:compute usage MeterRecord for one -// execution and logs the emission. The log line is a contract consumed by the +// emitComputeUsage emits the compute usage MeterRecord for one execution and +// logs the emission. Executions of TEE-required triggers meter under the +// confidential resource type. The log line is a contract consumed by the // billing reconciler (fields: executionID, eventID, resourceType, value, orgID) // and must stay stable. Fail-open: never returns an error to the execution. -func (e *baseEngine) emitComputeUsage(ctx context.Context, lggr logger.Logger, executionID string, computeDuration time.Duration) { +func (e *baseEngine) emitComputeUsage(ctx context.Context, lggr logger.Logger, triggerIndex uint64, executionID string, computeDuration time.Duration) { if !e.cfg.MeterRecordsEnabled { return } @@ -1174,7 +1196,12 @@ func (e *baseEngine) emitComputeUsage(ctx context.Context, lggr logger.Logger, e lggr.Errorw("Compute usage meter record not emitted", "err", err) return } + resourceType := resourcemanager.ResourceTypeWorkflowCompute identity := e.usageIdentity + if e.teeTriggers[triggerIndex] { + resourceType = resourcemanager.ResourceTypeWorkflowConfidentialCompute + identity = e.confidentialIdentity + } if node := e.localNode.Load(); node != nil { identity = identity.WithDonID(strconv.FormatUint(uint64(node.WorkflowDON.ID), 10)) } @@ -1182,13 +1209,13 @@ func (e *baseEngine) emitComputeUsage(ctx context.Context, lggr logger.Logger, e // The capability event id for compute is the execution id itself: one // compute record per execution, identical on every node of the DON. e.usageMeter.EmitUsage(ctx, identity, executionID, valueMs, resourcemanager.UtilizationFields{ - ResourceType: resourcemanager.ResourceTypeWorkflowCompute, + ResourceType: resourceType, ResourceID: resourceID, OrgID: e.orgID, }) lggr.Infow("Emitted capability usage meter record", "eventID", executionID, - "resourceType", resourcemanager.ResourceTypeWorkflowCompute, + "resourceType", resourceType, "value", valueMs, "orgID", e.orgID, ) diff --git a/core/services/workflows/v2/compute_usage_test.go b/core/services/workflows/v2/compute_usage_test.go index ea27fd0d621..cb3077a08cf 100644 --- a/core/services/workflows/v2/compute_usage_test.go +++ b/core/services/workflows/v2/compute_usage_test.go @@ -292,6 +292,8 @@ func TestEngine_ComputeUsageMeterRecord_ConfidentialRun(t *testing.T) { records := emitter.all() require.Len(t, records, 1) u := records[0].GetUtilizations()[0] + require.Equal(t, resourcemanager.ResourceTypeWorkflowConfidentialCompute, u.GetResourceType()) + require.Equal(t, resourcemanager.ResourceTypeWorkflowConfidentialCompute, records[0].GetIdentity().GetResourcePoolId()) require.Equal(t, cfg.WorkflowID+":"+executionID, u.GetResourceId()) require.Equal(t, "1234", u.GetValue(), "enclave-measured duration, not the round trip") } From 46807aacb6d8ebf8951976b5601b377a46a1ba2f Mon Sep 17 00:00:00 2001 From: Dylan Tinianov Date: Wed, 18 Nov 2026 10:11:13 -0500 Subject: [PATCH 03/11] Tidy modules after the chainlink-common bump Co-Authored-By: Claude Code --- deployment/go.mod | 2 +- deployment/go.sum | 4 ++-- go.sum | 2 -- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/deployment/go.mod b/deployment/go.mod index 42911a365c4..53de6e62771 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -41,7 +41,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/deployment v0.0.0-20260916222901-720a003dab50 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-data-streams v1.1.3 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 diff --git a/deployment/go.sum b/deployment/go.sum index d48e4ad81e6..ba3a03835a3 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1411,8 +1411,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 h1:GdBrQxbG6woXNOOGzu8HhQb/2QAdukxBte+aVpFvN+o= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 h1:SrJoshGScUvnH8A3PdUweTVfuh+fEpRnPVaiX2NLbm0= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/go.sum b/go.sum index ab6acefdf72..aeb65170265 100644 --- a/go.sum +++ b/go.sum @@ -1102,8 +1102,6 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62/go.mod h1:c++Ed0jeYn4w8WIfiAboRwN6ClRRVGglL0qwB/QjJvM= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 h1:GdBrQxbG6woXNOOGzu8HhQb/2QAdukxBte+aVpFvN+o= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 h1:SrJoshGScUvnH8A3PdUweTVfuh+fEpRnPVaiX2NLbm0= github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index f928ccf9ee4..34f7311f1f0 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -30,7 +30,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 07e09b74dc3..9fb9778cf5d 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1396,8 +1396,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 h1:GdBrQxbG6woXNOOGzu8HhQb/2QAdukxBte+aVpFvN+o= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 h1:SrJoshGScUvnH8A3PdUweTVfuh+fEpRnPVaiX2NLbm0= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= From fe509675a8a16136e05e3b41b312671986bba1a2 Mon Sep 17 00:00:00 2001 From: Dylan Tinianov Date: Wed, 18 Nov 2026 12:47:00 -0500 Subject: [PATCH 04/11] Bump chainlink-common to the merged c8ae73ae8de7 The resource-type constant is on common's main now; every module is tidied against it (make gomodtidy). Co-Authored-By: Claude Code --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- deployment/go.mod | 2 +- deployment/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- system-tests/lib/go.mod | 2 +- system-tests/lib/go.sum | 4 ++-- system-tests/tests/go.mod | 2 +- system-tests/tests/go.sum | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 5ed80ec78db..96ee603ef3d 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -29,7 +29,7 @@ require ( github.com/shopspring/decimal v1.4.0 github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 8a70d389521..93f53658d36 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1686,8 +1686,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 h1:GdBrQxbG6woXNOOGzu8HhQb/2QAdukxBte+aVpFvN+o= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/deployment/go.mod b/deployment/go.mod index 53de6e62771..939aec3bd85 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -41,7 +41,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/deployment v0.0.0-20260916222901-720a003dab50 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-data-streams v1.1.3 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 diff --git a/deployment/go.sum b/deployment/go.sum index ba3a03835a3..f8e11548ccd 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1411,8 +1411,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 h1:SrJoshGScUvnH8A3PdUweTVfuh+fEpRnPVaiX2NLbm0= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/go.mod b/go.mod index b258daadf2c..ba90dd3c4ea 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccv v0.16.0 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 github.com/smartcontractkit/chainlink-data-streams v1.1.3 diff --git a/go.sum b/go.sum index aeb65170265..b2548925de1 100644 --- a/go.sum +++ b/go.sum @@ -1102,8 +1102,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62/go.mod h1:c++Ed0jeYn4w8WIfiAboRwN6ClRRVGglL0qwB/QjJvM= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 h1:SrJoshGScUvnH8A3PdUweTVfuh+fEpRnPVaiX2NLbm0= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 34f7311f1f0..35199e7e7c2 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -30,7 +30,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 9fb9778cf5d..ed969f11364 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1396,8 +1396,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249 h1:SrJoshGScUvnH8A3PdUweTVfuh+fEpRnPVaiX2NLbm0= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118144040-9efbd16f9249/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 9cae0b71bc3..a55674f270a 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -20,7 +20,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.9 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 980739ed47c..2444d3c7f21 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1636,8 +1636,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 h1:GdBrQxbG6woXNOOGzu8HhQb/2QAdukxBte+aVpFvN+o= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 6d873fb9646..99a3d4bdb38 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -32,7 +32,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260923062809-ca886ade4d26 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-confidential-compute v1.3.0 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index 33b81788b76..0005b9b1cdf 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1657,8 +1657,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 h1:GdBrQxbG6woXNOOGzu8HhQb/2QAdukxBte+aVpFvN+o= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index 048ac9693af..5b497fe4469 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -73,7 +73,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260923062809-ca886ade4d26 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 github.com/smartcontractkit/chainlink-confidential-compute v1.3.0 diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index 7a733893e52..674f450e6fd 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1836,8 +1836,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710 h1:GdBrQxbG6woXNOOGzu8HhQb/2QAdukxBte+aVpFvN+o= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261117180805-a2fb88ff3710/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= From 5675fc275f1bf148b1a184055cfd723fc61230fd Mon Sep 17 00:00:00 2001 From: Dylan Tinianov Date: Wed, 18 Nov 2026 13:18:48 -0500 Subject: [PATCH 05/11] Meter executions under the routed runner's usage identity The engine stops reading trigger TEE requirements and keeping a route map: the requirement-selecting module reports which runner a trigger routed to, and the record carries that runner's declared usage identity. The wiring declares the confidential runner's identity (cre:workflow:confidential-compute) where the confidential module is constructed; the engine code names no runner. Carries the chainlink-common bump for the UsageIdentity/UsageRouter addition. Co-Authored-By: Claude Code --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 +- core/services/workflows/syncer/v2/handler.go | 7 +++ core/services/workflows/v2/base_engine.go | 47 +++++++------------ .../workflows/v2/compute_usage_test.go | 5 ++ deployment/go.mod | 2 +- deployment/go.sum | 4 +- go.mod | 2 +- go.sum | 4 +- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 +- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 +- system-tests/lib/go.mod | 2 +- system-tests/lib/go.sum | 4 +- system-tests/tests/go.mod | 2 +- system-tests/tests/go.sum | 4 +- 17 files changed, 49 insertions(+), 52 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 96ee603ef3d..315e2f5b57c 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -29,7 +29,7 @@ require ( github.com/shopspring/decimal v1.4.0 github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 93f53658d36..c801afd8a55 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1686,8 +1686,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/core/services/workflows/syncer/v2/handler.go b/core/services/workflows/syncer/v2/handler.go index bbd5ec39d58..2d264749843 100644 --- a/core/services/workflows/syncer/v2/handler.go +++ b/core/services/workflows/syncer/v2/handler.go @@ -1034,11 +1034,18 @@ func (h *eventHandler) buildEngineConfig(ctx context.Context, workflowID, owner return nil, fmt.Errorf("failed to create confidential module: %w", err) } engineModule := h.createEngineModule(ctx, workflowID, binary, moduleConfig, module) + // Executions the confidential runner takes meter under the confidential + // compute resource type, via the identity the runner declares. + confidentialIdentity := resourcemanager.WithWorkflowUsagePool( + resourcemanager.NewBaseIdentity(h.meteringIdentity, resourcemanager.EmittingServiceWorkflowEngine, ""), + resourcemanager.ResourceTypeWorkflowConfidentialCompute, + ) selectingModule := generichost.NewRequirementSelectingModule( generichost.ModuleAndHandler{Module: engineModule}, []generichost.ModuleAndHandler{{ Module: confidential, RequirementsHandler: generichost.RequirementsHandler{Tee: confidential.Tee}, + UsageIdentity: &confidentialIdentity, }}, ) cfg := h.newV2EngineConfig(ctx, selectingModule, workflowID, owner, tag, sdkName, name, config) diff --git a/core/services/workflows/v2/base_engine.go b/core/services/workflows/v2/base_engine.go index 7346f39f299..4195ad26a79 100644 --- a/core/services/workflows/v2/base_engine.go +++ b/core/services/workflows/v2/base_engine.go @@ -116,12 +116,7 @@ type baseEngine struct { usageMeter *resourcemanager.ResourceManager usageIdentity resourcemanager.ResourceIdentity - // confidentialIdentity is the identity for meter records of executions - // routed to a TEE enclave; it carries the confidential resource type. - confidentialIdentity resourcemanager.ResourceIdentity - // teeTriggers marks trigger indexes whose subscription requires a TEE. - teeTriggers map[uint64]bool - orgID string + orgID string // orgIDMissingReason records why orgID is empty ("resolver_nil", // "resolver_error", or "empty_response"). It is set once in startWith() and // read by startExecution() to label the org_id_missing counter. It is only @@ -205,10 +200,6 @@ func newBaseEngine(cfg *EngineConfig, engineMode string) (*baseEngine, logger.Su engine.usageIdentity = resourcemanager.WithWorkflowUsagePool( resourcemanager.NewBaseIdentity(cfg.MeteringIdentity, resourcemanager.EmittingServiceWorkflowEngine, ""), resourcemanager.ResourceTypeWorkflowCompute) - engine.confidentialIdentity = resourcemanager.WithWorkflowUsagePool( - resourcemanager.NewBaseIdentity(cfg.MeteringIdentity, resourcemanager.EmittingServiceWorkflowEngine, ""), - resourcemanager.ResourceTypeWorkflowConfidentialCompute) - engine.teeTriggers = map[uint64]bool{} engine.loggerLabels.Store(&labelsMap) engine.localNode.Store(&localNode) @@ -322,7 +313,6 @@ func (e *baseEngine) Subscribe(ctx context.Context) ([]*sdkpb.TriggerSubscriptio if err := e.cfg.Hooks.OnSubscriptionsReady(e.cfg.CachedTriggerSubscriptions, e.Tenant(), true); err != nil { return nil, fmt.Errorf("OnSubscriptionsReady hook failed: %w", err) } - e.markTeeTriggers(e.cfg.CachedTriggerSubscriptions) return e.cfg.CachedTriggerSubscriptions, nil } @@ -398,20 +388,9 @@ func (e *baseEngine) Subscribe(ctx context.Context) ([]*sdkpb.TriggerSubscriptio return nil, fmt.Errorf("OnSubscriptionsReady hook failed: %w", err) } - e.markTeeTriggers(subs.Subscriptions) return subs.Subscriptions, nil } -// markTeeTriggers records which trigger subscriptions require a TEE; their -// executions meter as confidential compute. -func (e *baseEngine) markTeeTriggers(subs []*sdkpb.TriggerSubscription) { - for i, sub := range subs { - if sub.GetRequirements().GetTee() != nil { - e.teeTriggers[uint64(i)] = true - } - } -} - // Tenant is the engine's tenant identity. Valid once resolveOrgID has run during // init. Every field it reads is written before OnInitialized fires. func (e *baseEngine) Tenant() contexts.CRE { @@ -1183,10 +1162,10 @@ func resolveOrgID(ctx context.Context, resolver orgresolver.OrgResolver, workflo } // emitComputeUsage emits the compute usage MeterRecord for one execution and -// logs the emission. Executions of TEE-required triggers meter under the -// confidential resource type. The log line is a contract consumed by the -// billing reconciler (fields: executionID, eventID, resourceType, value, orgID) -// and must stay stable. Fail-open: never returns an error to the execution. +// logs the emission. The record carries the routed runner's usage identity +// when it declares one. The log line is a contract consumed by the billing +// reconciler (fields: executionID, eventID, resourceType, value, orgID) and +// must stay stable. Fail-open: never returns an error to the execution. func (e *baseEngine) emitComputeUsage(ctx context.Context, lggr logger.Logger, triggerIndex uint64, executionID string, computeDuration time.Duration) { if !e.cfg.MeterRecordsEnabled { return @@ -1196,18 +1175,24 @@ func (e *baseEngine) emitComputeUsage(ctx context.Context, lggr logger.Logger, t lggr.Errorw("Compute usage meter record not emitted", "err", err) return } - resourceType := resourcemanager.ResourceTypeWorkflowCompute identity := e.usageIdentity - if e.teeTriggers[triggerIndex] { - resourceType = resourcemanager.ResourceTypeWorkflowConfidentialCompute - identity = e.confidentialIdentity + if router, ok := e.cfg.Module.(workflowhost.UsageRouter); ok { + if runner, found := router.UsageRunnerForTrigger(triggerIndex); found && runner.UsageIdentity != nil { + identity = *runner.UsageIdentity + } } if node := e.localNode.Load(); node != nil { identity = identity.WithDonID(strconv.FormatUint(uint64(node.WorkflowDON.ID), 10)) } valueMs := computeDuration.Milliseconds() // The capability event id for compute is the execution id itself: one - // compute record per execution, identical on every node of the DON. + // compute record per execution, identical on every node of the DON. The + // resource type rides the identity's pool id, which WithWorkflowUsagePool + // sets to the resource type. + resourceType := identity.ResourcePoolID + if resourceType == "" { + resourceType = resourcemanager.ResourceTypeWorkflowCompute + } e.usageMeter.EmitUsage(ctx, identity, executionID, valueMs, resourcemanager.UtilizationFields{ ResourceType: resourceType, ResourceID: resourceID, diff --git a/core/services/workflows/v2/compute_usage_test.go b/core/services/workflows/v2/compute_usage_test.go index cb3077a08cf..37bc3e4f449 100644 --- a/core/services/workflows/v2/compute_usage_test.go +++ b/core/services/workflows/v2/compute_usage_test.go @@ -255,9 +255,14 @@ func TestEngine_ComputeUsageMeterRecord_ConfidentialRun(t *testing.T) { }} // Subscribe runs locally; the trigger is routed to the enclave. local.EXPECT().Execute(matches.AnyContext, mock.Anything, mock.Anything).Return(teeSubs, nil).Once() + confidentialIdentity := resourcemanager.WithWorkflowUsagePool( + resourcemanager.NewBaseIdentity(cfg.MeteringIdentity, resourcemanager.EmittingServiceWorkflowEngine, ""), + resourcemanager.ResourceTypeWorkflowConfidentialCompute, + ) cfg.Module = host.NewRequirementSelectingModule(host.ModuleAndHandler{Module: local}, []host.ModuleAndHandler{{ Module: conf, RequirementsHandler: host.RequirementsHandler{Tee: conf.Tee}, + UsageIdentity: &confidentialIdentity, }}) cfg.CapRegistry = capreg cfg.BillingClient = setupMockBillingClient(t) diff --git a/deployment/go.mod b/deployment/go.mod index 939aec3bd85..d1a2b9d613f 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -41,7 +41,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/deployment v0.0.0-20260916222901-720a003dab50 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-data-streams v1.1.3 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 diff --git a/deployment/go.sum b/deployment/go.sum index f8e11548ccd..9799e59024f 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1411,8 +1411,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/go.mod b/go.mod index ba90dd3c4ea..34b4f8a3c51 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccv v0.16.0 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 github.com/smartcontractkit/chainlink-data-streams v1.1.3 diff --git a/go.sum b/go.sum index b2548925de1..d742b863c1b 100644 --- a/go.sum +++ b/go.sum @@ -1102,8 +1102,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62/go.mod h1:c++Ed0jeYn4w8WIfiAboRwN6ClRRVGglL0qwB/QjJvM= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 35199e7e7c2..fd4e2b44ff1 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -30,7 +30,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index ed969f11364..12f789696cd 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1396,8 +1396,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index a55674f270a..9428c3a4182 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -20,7 +20,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.9 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 2444d3c7f21..577b9c5fa1c 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1636,8 +1636,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 99a3d4bdb38..8e55fc92b01 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -32,7 +32,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260923062809-ca886ade4d26 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-confidential-compute v1.3.0 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index 0005b9b1cdf..e64cd731747 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1657,8 +1657,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index 5b497fe4469..4d42cbbef0d 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -73,7 +73,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260923062809-ca886ade4d26 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 github.com/smartcontractkit/chainlink-confidential-compute v1.3.0 diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index 674f450e6fd..ad357504b92 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1836,8 +1836,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7 h1:nOZfXpfrotpfXsVc8ZL7T5GD4xzU9nD/+0Orf12Wdgs= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118165320-c8ae73ae8de7/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= From 2cf7d7cbfca03e596db4a4a034f42fb580e5265f Mon Sep 17 00:00:00 2001 From: Dylan Tinianov Date: Wed, 18 Nov 2026 13:51:03 -0500 Subject: [PATCH 06/11] Log an error when an execution's trigger has no routed runner Co-Authored-By: Claude Code --- core/services/workflows/v2/base_engine.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/services/workflows/v2/base_engine.go b/core/services/workflows/v2/base_engine.go index 4195ad26a79..a10fe2090a5 100644 --- a/core/services/workflows/v2/base_engine.go +++ b/core/services/workflows/v2/base_engine.go @@ -1175,9 +1175,15 @@ func (e *baseEngine) emitComputeUsage(ctx context.Context, lggr logger.Logger, t lggr.Errorw("Compute usage meter record not emitted", "err", err) return } + // The routed runner's declared identity, else the default compute identity. identity := e.usageIdentity if router, ok := e.cfg.Module.(workflowhost.UsageRouter); ok { - if runner, found := router.UsageRunnerForTrigger(triggerIndex); found && runner.UsageIdentity != nil { + runner, found := router.UsageRunnerForTrigger(triggerIndex) + if !found { + // Trigger events only flow after Subscribe, so this should be + // unreachable; a miss would mislabel the record as ordinary compute. + lggr.Errorw("Execution's trigger has no routed runner; metering as ordinary compute", "triggerIndex", triggerIndex) + } else if runner.UsageIdentity != nil { identity = *runner.UsageIdentity } } From d7cda0556ac6b17659a636829194d3151e30c059 Mon Sep 17 00:00:00 2001 From: Dylan Tinianov Date: Wed, 18 Nov 2026 14:02:27 -0500 Subject: [PATCH 07/11] Bump chainlink-common for the UsageRouter identity return The engine's call site follows the renamed interface: UsageIdentityForTrigger returns the declared identity directly. Co-Authored-By: Claude Code --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- core/services/workflows/v2/base_engine.go | 6 +++--- deployment/go.mod | 2 +- deployment/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- system-tests/lib/go.mod | 2 +- system-tests/lib/go.sum | 4 ++-- system-tests/tests/go.mod | 2 +- system-tests/tests/go.sum | 4 ++-- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 315e2f5b57c..1dcdd2e3b7d 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -29,7 +29,7 @@ require ( github.com/shopspring/decimal v1.4.0 github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index c801afd8a55..c588bfb5d1c 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1686,8 +1686,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/core/services/workflows/v2/base_engine.go b/core/services/workflows/v2/base_engine.go index a10fe2090a5..e1cbbd88480 100644 --- a/core/services/workflows/v2/base_engine.go +++ b/core/services/workflows/v2/base_engine.go @@ -1178,13 +1178,13 @@ func (e *baseEngine) emitComputeUsage(ctx context.Context, lggr logger.Logger, t // The routed runner's declared identity, else the default compute identity. identity := e.usageIdentity if router, ok := e.cfg.Module.(workflowhost.UsageRouter); ok { - runner, found := router.UsageRunnerForTrigger(triggerIndex) + usageIdentity, found := router.UsageIdentityForTrigger(triggerIndex) if !found { // Trigger events only flow after Subscribe, so this should be // unreachable; a miss would mislabel the record as ordinary compute. lggr.Errorw("Execution's trigger has no routed runner; metering as ordinary compute", "triggerIndex", triggerIndex) - } else if runner.UsageIdentity != nil { - identity = *runner.UsageIdentity + } else if usageIdentity != nil { + identity = *usageIdentity } } if node := e.localNode.Load(); node != nil { diff --git a/deployment/go.mod b/deployment/go.mod index d1a2b9d613f..7afc793f69b 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -41,7 +41,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/deployment v0.0.0-20260916222901-720a003dab50 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-data-streams v1.1.3 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 diff --git a/deployment/go.sum b/deployment/go.sum index 9799e59024f..8b29fdabde0 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1411,8 +1411,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/go.mod b/go.mod index 34b4f8a3c51..7aa08cc1290 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccv v0.16.0 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 github.com/smartcontractkit/chainlink-data-streams v1.1.3 diff --git a/go.sum b/go.sum index d742b863c1b..de8d58bd469 100644 --- a/go.sum +++ b/go.sum @@ -1102,8 +1102,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62/go.mod h1:c++Ed0jeYn4w8WIfiAboRwN6ClRRVGglL0qwB/QjJvM= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index fd4e2b44ff1..bf24e102a56 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -30,7 +30,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 12f789696cd..fd7a644f966 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1396,8 +1396,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 9428c3a4182..f8652c8d2dc 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -20,7 +20,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.9 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 577b9c5fa1c..cfdea073b20 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1636,8 +1636,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 8e55fc92b01..6e8fababe75 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -32,7 +32,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260923062809-ca886ade4d26 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-confidential-compute v1.3.0 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index e64cd731747..841aeda5647 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1657,8 +1657,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index 4d42cbbef0d..2880f8c4bad 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -73,7 +73,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260923062809-ca886ade4d26 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 github.com/smartcontractkit/chainlink-confidential-compute v1.3.0 diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index ad357504b92..ace09cd279f 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1836,8 +1836,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915 h1:A1X49wL0enxe7aQEzFoegPlg4O1vVBVroSqBj9Oa1OQ= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118181232-fa09eb198915/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= From 30ce64152f757cde5f4718f4658babc961e4062a Mon Sep 17 00:00:00 2001 From: Dylan Tinianov Date: Wed, 18 Nov 2026 15:08:49 -0500 Subject: [PATCH 08/11] Meter executions under the routed module's compute resource type The confidential module declares its compute resource type next to where it reports the enclave's duration; the engine asks the routed module for it and stamps the pool on its base identity at emit. The engine's wiring layer is untouched. Co-Authored-By: Claude Code --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 +-- core/services/workflows/syncer/v2/handler.go | 7 ---- core/services/workflows/v2/base_engine.go | 36 ++++++++----------- .../workflows/v2/compute_usage_test.go | 5 --- .../workflows/v2/confidential_module.go | 6 ++++ deployment/go.mod | 2 +- deployment/go.sum | 4 +-- go.mod | 2 +- go.sum | 4 +-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 +-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 +-- system-tests/lib/go.mod | 2 +- system-tests/lib/go.sum | 4 +-- system-tests/tests/go.mod | 2 +- system-tests/tests/go.sum | 4 +-- 18 files changed, 42 insertions(+), 54 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 1dcdd2e3b7d..547e0534aa6 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -29,7 +29,7 @@ require ( github.com/shopspring/decimal v1.4.0 github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index c588bfb5d1c..0d9ed3bf2ea 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1686,8 +1686,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/core/services/workflows/syncer/v2/handler.go b/core/services/workflows/syncer/v2/handler.go index 2d264749843..bbd5ec39d58 100644 --- a/core/services/workflows/syncer/v2/handler.go +++ b/core/services/workflows/syncer/v2/handler.go @@ -1034,18 +1034,11 @@ func (h *eventHandler) buildEngineConfig(ctx context.Context, workflowID, owner return nil, fmt.Errorf("failed to create confidential module: %w", err) } engineModule := h.createEngineModule(ctx, workflowID, binary, moduleConfig, module) - // Executions the confidential runner takes meter under the confidential - // compute resource type, via the identity the runner declares. - confidentialIdentity := resourcemanager.WithWorkflowUsagePool( - resourcemanager.NewBaseIdentity(h.meteringIdentity, resourcemanager.EmittingServiceWorkflowEngine, ""), - resourcemanager.ResourceTypeWorkflowConfidentialCompute, - ) selectingModule := generichost.NewRequirementSelectingModule( generichost.ModuleAndHandler{Module: engineModule}, []generichost.ModuleAndHandler{{ Module: confidential, RequirementsHandler: generichost.RequirementsHandler{Tee: confidential.Tee}, - UsageIdentity: &confidentialIdentity, }}, ) cfg := h.newV2EngineConfig(ctx, selectingModule, workflowID, owner, tag, sdkName, name, config) diff --git a/core/services/workflows/v2/base_engine.go b/core/services/workflows/v2/base_engine.go index e1cbbd88480..553e5da71a9 100644 --- a/core/services/workflows/v2/base_engine.go +++ b/core/services/workflows/v2/base_engine.go @@ -114,9 +114,9 @@ type baseEngine struct { // tracer is the OTel tracer for this engine. It's a noop tracer when DebugMode is false. tracer trace.Tracer - usageMeter *resourcemanager.ResourceManager - usageIdentity resourcemanager.ResourceIdentity - orgID string + usageMeter *resourcemanager.ResourceManager + baseUsageIdentity resourcemanager.ResourceIdentity + orgID string // orgIDMissingReason records why orgID is empty ("resolver_nil", // "resolver_error", or "empty_response"). It is set once in startWith() and // read by startExecution() to label the org_id_missing counter. It is only @@ -197,9 +197,7 @@ func newBaseEngine(cfg *EngineConfig, engineMode string) (*baseEngine, logger.Su engine.metrics = metricsLabeler // Disabled metering is a no-op inside the resource manager. engine.usageMeter = resourcemanager.NewResourceManager(cfg.Lggr, resourcemanager.ResourceManagerConfig{MeterRecordsEnabled: cfg.MeterRecordsEnabled, Emitter: cfg.UsageEmitter, Settings: cfg.LocalLimiters.Settings}) - engine.usageIdentity = resourcemanager.WithWorkflowUsagePool( - resourcemanager.NewBaseIdentity(cfg.MeteringIdentity, resourcemanager.EmittingServiceWorkflowEngine, ""), - resourcemanager.ResourceTypeWorkflowCompute) + engine.baseUsageIdentity = resourcemanager.NewBaseIdentity(cfg.MeteringIdentity, resourcemanager.EmittingServiceWorkflowEngine, "") engine.loggerLabels.Store(&labelsMap) engine.localNode.Store(&localNode) @@ -1175,30 +1173,26 @@ func (e *baseEngine) emitComputeUsage(ctx context.Context, lggr logger.Logger, t lggr.Errorw("Compute usage meter record not emitted", "err", err) return } - // The routed runner's declared identity, else the default compute identity. - identity := e.usageIdentity - if router, ok := e.cfg.Module.(workflowhost.UsageRouter); ok { - usageIdentity, found := router.UsageIdentityForTrigger(triggerIndex) - if !found { + // The routed module's compute resource type, when it declares one. + resourceType := resourcemanager.ResourceTypeWorkflowCompute + if router, ok := e.cfg.Module.(workflowhost.TriggerRouter); ok { + if m, found := router.RoutedModule(triggerIndex); found { + if t, ok := m.(interface{ ComputeResourceType() string }); ok { + resourceType = t.ComputeResourceType() + } + } else { // Trigger events only flow after Subscribe, so this should be // unreachable; a miss would mislabel the record as ordinary compute. - lggr.Errorw("Execution's trigger has no routed runner; metering as ordinary compute", "triggerIndex", triggerIndex) - } else if usageIdentity != nil { - identity = *usageIdentity + lggr.Errorw("Execution's trigger has no routed module; metering as ordinary compute", "triggerIndex", triggerIndex) } } + identity := resourcemanager.WithWorkflowUsagePool(e.baseUsageIdentity, resourceType) if node := e.localNode.Load(); node != nil { identity = identity.WithDonID(strconv.FormatUint(uint64(node.WorkflowDON.ID), 10)) } valueMs := computeDuration.Milliseconds() // The capability event id for compute is the execution id itself: one - // compute record per execution, identical on every node of the DON. The - // resource type rides the identity's pool id, which WithWorkflowUsagePool - // sets to the resource type. - resourceType := identity.ResourcePoolID - if resourceType == "" { - resourceType = resourcemanager.ResourceTypeWorkflowCompute - } + // compute record per execution, identical on every node of the DON. e.usageMeter.EmitUsage(ctx, identity, executionID, valueMs, resourcemanager.UtilizationFields{ ResourceType: resourceType, ResourceID: resourceID, diff --git a/core/services/workflows/v2/compute_usage_test.go b/core/services/workflows/v2/compute_usage_test.go index 37bc3e4f449..cb3077a08cf 100644 --- a/core/services/workflows/v2/compute_usage_test.go +++ b/core/services/workflows/v2/compute_usage_test.go @@ -255,14 +255,9 @@ func TestEngine_ComputeUsageMeterRecord_ConfidentialRun(t *testing.T) { }} // Subscribe runs locally; the trigger is routed to the enclave. local.EXPECT().Execute(matches.AnyContext, mock.Anything, mock.Anything).Return(teeSubs, nil).Once() - confidentialIdentity := resourcemanager.WithWorkflowUsagePool( - resourcemanager.NewBaseIdentity(cfg.MeteringIdentity, resourcemanager.EmittingServiceWorkflowEngine, ""), - resourcemanager.ResourceTypeWorkflowConfidentialCompute, - ) cfg.Module = host.NewRequirementSelectingModule(host.ModuleAndHandler{Module: local}, []host.ModuleAndHandler{{ Module: conf, RequirementsHandler: host.RequirementsHandler{Tee: conf.Tee}, - UsageIdentity: &confidentialIdentity, }}) cfg.CapRegistry = capreg cfg.BillingClient = setupMockBillingClient(t) diff --git a/core/services/workflows/v2/confidential_module.go b/core/services/workflows/v2/confidential_module.go index f671bfa4b81..753cb7b8c63 100644 --- a/core/services/workflows/v2/confidential_module.go +++ b/core/services/workflows/v2/confidential_module.go @@ -18,6 +18,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" confworkflowtypes "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/actions/confidentialworkflow" "github.com/smartcontractkit/chainlink-common/pkg/logger" + "github.com/smartcontractkit/chainlink-common/pkg/resourcemanager" "github.com/smartcontractkit/chainlink-common/pkg/settings" "github.com/smartcontractkit/chainlink-common/pkg/settings/cresettings" "github.com/smartcontractkit/chainlink-common/pkg/settings/limits" @@ -57,6 +58,11 @@ func ParseWorkflowAttributes(data []byte) (WorkflowAttributes, error) { // ConfidentialModule implements host.ModuleV2 for confidential workflows. // Instead of running WASM locally, it delegates execution to the // confidential-workflows capability via the CapabilitiesRegistry. +// ComputeResourceType is the resource type the module's executions bill under. +func (m *ConfidentialModule) ComputeResourceType() string { + return resourcemanager.ResourceTypeWorkflowConfidentialCompute +} + type ConfidentialModule struct { capRegistry registry.CapabilitiesRegistry binaryURL string diff --git a/deployment/go.mod b/deployment/go.mod index 7afc793f69b..f41a9513662 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -41,7 +41,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/deployment v0.0.0-20260916222901-720a003dab50 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-data-streams v1.1.3 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 diff --git a/deployment/go.sum b/deployment/go.sum index 8b29fdabde0..51f0375e5b8 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1411,8 +1411,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/go.mod b/go.mod index 7aa08cc1290..1fb20bd8fd2 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccv v0.16.0 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 github.com/smartcontractkit/chainlink-data-streams v1.1.3 diff --git a/go.sum b/go.sum index de8d58bd469..d43cf9646b9 100644 --- a/go.sum +++ b/go.sum @@ -1102,8 +1102,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62/go.mod h1:c++Ed0jeYn4w8WIfiAboRwN6ClRRVGglL0qwB/QjJvM= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index bf24e102a56..52e0a85e2fd 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -30,7 +30,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index fd7a644f966..7de3bf85d24 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1396,8 +1396,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index f8652c8d2dc..3d0df3c7f04 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -20,7 +20,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.9 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index cfdea073b20..2bcdd39a174 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1636,8 +1636,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 6e8fababe75..906e63976f1 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -32,7 +32,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260923062809-ca886ade4d26 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-confidential-compute v1.3.0 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index 841aeda5647..946caf908a7 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1657,8 +1657,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index 2880f8c4bad..53ebc58a47d 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -73,7 +73,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260923062809-ca886ade4d26 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 github.com/smartcontractkit/chainlink-confidential-compute v1.3.0 diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index ace09cd279f..7afa5dae466 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1836,8 +1836,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e h1:H05gs9jz7SF5F+AeR/9Qgr3juBRcnw1DdL+z//Zfckc= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118185923-6e1b863bfd9e/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= From 145ac0d82464323a48e285b2201723cab202ea00 Mon Sep 17 00:00:00 2001 From: Dylan Tinianov Date: Wed, 18 Nov 2026 15:16:27 -0500 Subject: [PATCH 09/11] Name the compute resource typer interface Co-Authored-By: Claude Code --- core/services/workflows/v2/base_engine.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/services/workflows/v2/base_engine.go b/core/services/workflows/v2/base_engine.go index 553e5da71a9..ae5fd9f2d3a 100644 --- a/core/services/workflows/v2/base_engine.go +++ b/core/services/workflows/v2/base_engine.go @@ -1159,6 +1159,12 @@ func resolveOrgID(ctx context.Context, resolver orgresolver.OrgResolver, workflo return resolvedOrg{ID: orgID} } +// computeResourceTyper is implemented by modules whose executions bill under +// a non-default compute resource type. +type computeResourceTyper interface { + ComputeResourceType() string +} + // emitComputeUsage emits the compute usage MeterRecord for one execution and // logs the emission. The record carries the routed runner's usage identity // when it declares one. The log line is a contract consumed by the billing @@ -1177,7 +1183,7 @@ func (e *baseEngine) emitComputeUsage(ctx context.Context, lggr logger.Logger, t resourceType := resourcemanager.ResourceTypeWorkflowCompute if router, ok := e.cfg.Module.(workflowhost.TriggerRouter); ok { if m, found := router.RoutedModule(triggerIndex); found { - if t, ok := m.(interface{ ComputeResourceType() string }); ok { + if t, ok := m.(computeResourceTyper); ok { resourceType = t.ComputeResourceType() } } else { From 731b3fe0766d729cedb98d01c17531d10a3e2744 Mon Sep 17 00:00:00 2001 From: Dylan Tinianov Date: Wed, 18 Nov 2026 15:31:18 -0500 Subject: [PATCH 10/11] Place the compute resource typer with the module's other guards Co-Authored-By: Claude Code --- core/services/workflows/v2/confidential_module.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/services/workflows/v2/confidential_module.go b/core/services/workflows/v2/confidential_module.go index 753cb7b8c63..dac91b2c440 100644 --- a/core/services/workflows/v2/confidential_module.go +++ b/core/services/workflows/v2/confidential_module.go @@ -58,11 +58,6 @@ func ParseWorkflowAttributes(data []byte) (WorkflowAttributes, error) { // ConfidentialModule implements host.ModuleV2 for confidential workflows. // Instead of running WASM locally, it delegates execution to the // confidential-workflows capability via the CapabilitiesRegistry. -// ComputeResourceType is the resource type the module's executions bill under. -func (m *ConfidentialModule) ComputeResourceType() string { - return resourcemanager.ResourceTypeWorkflowConfidentialCompute -} - type ConfidentialModule struct { capRegistry registry.CapabilitiesRegistry binaryURL string @@ -100,6 +95,12 @@ func errorTypeFor(err error) string { var _ host.RequirementEnforcingModule = (*ConfidentialModule)(nil) var _ host.RestrictionAwareModule = (*ConfidentialModule)(nil) +var _ computeResourceTyper = (*ConfidentialModule)(nil) + +// ComputeResourceType is the resource type the module's executions bill under. +func (m *ConfidentialModule) ComputeResourceType() string { + return resourcemanager.ResourceTypeWorkflowConfidentialCompute +} func NewConfidentialModule(capRegistry registry.CapabilitiesRegistry, executionHandlers *confidentialrelay.ExecutionHandlers, binaryURL string, binaryHash []byte, workflowID, workflowOwner, workflowName, workflowTag string, resolveOrgID func(ctx context.Context, owner string) (string, error), enabledGate limits.GateLimiter, creSettingsGetter settings.Getter, lggr logger.Logger) (*ConfidentialModule, error) { if enabledGate == nil { From 49db561fb3c961cd07313c4e1cb7fbbdf9157738 Mon Sep 17 00:00:00 2001 From: Dylan Tinianov Date: Thu, 19 Nov 2026 10:18:03 -0500 Subject: [PATCH 11/11] Bump chainlink-common to c2cd552dc1f2 Co-Authored-By: Claude Code --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- deployment/go.mod | 2 +- deployment/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- system-tests/lib/go.mod | 2 +- system-tests/lib/go.sum | 4 ++-- system-tests/tests/go.mod | 2 +- system-tests/tests/go.sum | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 547e0534aa6..9b08c6f6a36 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -29,7 +29,7 @@ require ( github.com/shopspring/decimal v1.4.0 github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 0d9ed3bf2ea..495cc990c0f 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1686,8 +1686,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 h1:YULotjDiDiBd6FIvScVJP5RVWCv/aE9lJ8kcjcNcL28= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/deployment/go.mod b/deployment/go.mod index f41a9513662..fb7dc344e96 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -41,7 +41,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana/deployment v0.0.0-20260916222901-720a003dab50 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-data-streams v1.1.3 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 diff --git a/deployment/go.sum b/deployment/go.sum index 51f0375e5b8..21fe05d66de 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1411,8 +1411,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 h1:YULotjDiDiBd6FIvScVJP5RVWCv/aE9lJ8kcjcNcL28= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/go.mod b/go.mod index 1fb20bd8fd2..be01d184fab 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62 github.com/smartcontractkit/chainlink-ccv v0.16.0 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 github.com/smartcontractkit/chainlink-data-streams v1.1.3 diff --git a/go.sum b/go.sum index d43cf9646b9..498c72e4929 100644 --- a/go.sum +++ b/go.sum @@ -1102,8 +1102,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260908155618-50f521d70e62/go.mod h1:c++Ed0jeYn4w8WIfiAboRwN6ClRRVGglL0qwB/QjJvM= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 h1:YULotjDiDiBd6FIvScVJP5RVWCv/aE9lJ8kcjcNcL28= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 52e0a85e2fd..09f64578318 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -30,7 +30,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 7de3bf85d24..f3e3ff39fc0 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1396,8 +1396,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 h1:YULotjDiDiBd6FIvScVJP5RVWCv/aE9lJ8kcjcNcL28= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 3d0df3c7f04..8f55ede1059 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -20,7 +20,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261112211734-e640e1c12078 github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.9 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 2bcdd39a174..c2dc50a6aa6 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1636,8 +1636,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 h1:YULotjDiDiBd6FIvScVJP5RVWCv/aE9lJ8kcjcNcL28= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 906e63976f1..415277e4094 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -32,7 +32,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260923062809-ca886ade4d26 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-confidential-compute v1.3.0 github.com/smartcontractkit/chainlink-deployments-framework v0.126.0 diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index 946caf908a7..ab549f47567 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1657,8 +1657,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 h1:YULotjDiDiBd6FIvScVJP5RVWCv/aE9lJ8kcjcNcL28= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index 53ebc58a47d..b92ca6b81ee 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -73,7 +73,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.112 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260923062809-ca886ade4d26 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260922043016-517a12a4220e - github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa + github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 github.com/smartcontractkit/chainlink-confidential-compute v1.3.0 diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index 7afa5dae466..501ba5f6936 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1836,8 +1836,8 @@ github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d6 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca/go.mod h1:Dm/Abz0vr7F2v9TygUX947q8HIwJEJikDfSdanX1Cic= github.com/smartcontractkit/chainlink-ccv v0.16.0 h1:WhDQEEI2Kb5A4C0PNAa+nyGLDvG0H+uT6h4y1NwmkYg= github.com/smartcontractkit/chainlink-ccv v0.16.0/go.mod h1:oaSLVHiJVbJ9aCcUQnoRuVONACWzA/DWVqvUnLAe9bE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa h1:ddZOebe8FiCoRwPRgtGUzdAgsM+T9qe5HQY0CAb1rEw= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118200421-63ce0afa33aa/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2 h1:YULotjDiDiBd6FIvScVJP5RVWCv/aE9lJ8kcjcNcL28= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20261118204812-c2cd552dc1f2/go.mod h1:DgO1pEniaA/K6rG8cVjiox44HrCzfeVXV+f1nx0KteE= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb h1:9rVrSeVOAwZsVe2pOpeVRp9XjhtMyjndgeROFglvOhg= github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20261111193935-c83f8e2996fb/go.mod h1:WcOKzF6HkTDrkQ96aBHhcJ2IIYE7iK7M2tdt58ea2qc= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261106154152-9426766b30a9 h1:rs2zmGoDw4AHaJ2Y76J46slPPE3iL801sWPgOTCyDZc=