Skip to content

core/services/ocr2: pass limits factory to dontime plugin #23712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jmank88 wants to merge 9 commits into
base: develop
Choose a base branch
from
+47 −29
Draft

core/services/ocr2: pass limits factory to dontime plugin #23712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
08344f3
core/services/ocr2: pass limits factory to dontime plugin
jmank88 Sep 10, 2026
487ebe8
Merge remote-tracking branch 'origin/develop' into CRE-5838-dontime-s…
jmank88 Oct 6, 2026
113e199
bump common
jmank88 Oct 7, 2026
cfcebb9
Merge remote-tracking branch 'origin/develop' into CRE-5838-dontime-s…
jmank88 Oct 7, 2026
dcfab8b
Merge remote-tracking branch 'origin/develop' into CRE-5838-dontime-s…
jmank88 Oct 7, 2026
55dd65e
bump common
jmank88 Oct 8, 2026
768fb00
bump common; add subtest for feature flag
jmank88 Oct 8, 2026
2a63278
bump common
jmank88 Oct 8, 2026
6e0e8bc
bump common
jmank88 Oct 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/scripts/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,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.20261007174852-7fabc093ff84
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261008145803-2a3e61bf549e
github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20260903141829-ef07b52a737d
github.com/smartcontractkit/chainlink-deployments-framework v0.123.3
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261005112317-b723176adfe8
Expand Down
4 changes: 2 additions & 2 deletions core/scripts/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions core/services/ocr2/delegate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ func (d *Delegate) ServicesForSpec(ctx context.Context, jb job.Job) ([]job.Servi
// The job-spec path carries no registry capability ID, so fall back to
// the pinned constant; the registry-driven path (NewServices) passes the
// actual ID from the registry.
return d.newDonTimePlugin(ctx, lggr, jb, bootstrapPeers, kb, ocrDB, lc, dontimeCapabilityID)
return d.newDonTimePlugin(ctx, lggr, jb, bootstrapPeers, kb, ocrDB, lc, dontimeCapabilityID, d.limitsFactory)

case types.RingPlugin:
return d.newServicesRing(ctx, lggr, jb, bootstrapPeers, kb, ocrDB, lc)
Expand Down Expand Up @@ -700,7 +700,7 @@ func (d *Delegate) NewServices(

switch pluginType {
case types.DonTimePlugin:
return d.newDonTimePlugin(ctx, lggr, jb, bootstrapPeers, kb, ocrDB, lc, capabilityID)
return d.newDonTimePlugin(ctx, lggr, jb, bootstrapPeers, kb, ocrDB, lc, capabilityID, d.limitsFactory)
default:
return nil, errors.Errorf("plugin type %s not supported for registry-driven launch", pluginType)
}
Expand Down Expand Up @@ -1180,6 +1180,7 @@ func (d *Delegate) newDonTimePlugin(
ocrDB *db,
lc ocrtypes.LocalConfig,
capabilityID string,
limitsFactory limits.Factory,
) (srvs []job.ServiceCtx, err error) {
spec := jb.OCR2OracleSpec

Expand Down Expand Up @@ -1274,17 +1275,17 @@ func (d *Delegate) newDonTimePlugin(
if err != nil {
return nil, err
}
err = baseFactory.InitLimits(limitsFactory)
if err != nil {
return nil, err
}
oracleArgs.ReportingPluginFactory = ocr3beholderwrapper.NewReportingPluginFactory(
baseFactory,
lggr,
"dontime",
)

oracle, err := libocr2.NewOracle(oracleArgs)
if err != nil {
return nil, err
}

if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion deployment/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,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-20260916222901-720a003dab50
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20261001213322-a2d686f610ca
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261007174852-7fabc093ff84
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261008145803-2a3e61bf549e
github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20260903141829-ef07b52a737d
github.com/smartcontractkit/chainlink-data-streams v1.1.2-0.20261002081259-6c2163b21db9
github.com/smartcontractkit/chainlink-deployments-framework v0.123.3
Expand Down
4 changes: 2 additions & 2 deletions deployment/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.0
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261007174852-7fabc093ff84
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261008145803-2a3e61bf549e
github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20260903141829-ef07b52a737d
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261005132539-b7d63d5fd549
github.com/smartcontractkit/chainlink-data-streams v1.1.2-0.20261002081259-6c2163b21db9
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260916222901-720a003dab50
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260916222901-720a003dab50
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261007174852-7fabc093ff84
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261008145803-2a3e61bf549e
github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20260903141829-ef07b52a737d
github.com/smartcontractkit/chainlink-deployments-framework v0.123.3
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261005112317-b723176adfe8
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration-tests/load/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20261001213322-a2d686f610ca
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260916222901-720a003dab50
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260916222901-720a003dab50
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261007174852-7fabc093ff84
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261008145803-2a3e61bf549e
github.com/smartcontractkit/chainlink-deployments-framework v0.123.3
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20261005112317-b723176adfe8
github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.8
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/load/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion system-tests/lib/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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-20260916222901-720a003dab50
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261007174852-7fabc093ff84
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261008145803-2a3e61bf549e
github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20260903141829-ef07b52a737d
github.com/smartcontractkit/chainlink-confidential-compute v1.3.0
github.com/smartcontractkit/chainlink-deployments-framework v0.123.3
Expand Down
4 changes: 2 additions & 2 deletions system-tests/lib/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion system-tests/tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,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-20260916222901-720a003dab50
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261007174852-7fabc093ff84
github.com/smartcontractkit/chainlink-common v0.11.2-0.20261008145803-2a3e61bf549e
github.com/smartcontractkit/chainlink-common/keystore v1.3.1-0.20260903141829-ef07b52a737d
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20261005132539-b7d63d5fd549
github.com/smartcontractkit/chainlink-confidential-compute v1.3.0
Expand Down
4 changes: 2 additions & 2 deletions system-tests/tests/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 19 additions & 2 deletions system-tests/tests/smoke/cre/cre_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ import (
"fmt"
"os"
"testing"
"time"

"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-common/pkg/config"
"github.com/smartcontractkit/chainlink-common/pkg/settings"
"github.com/smartcontractkit/chainlink-deployments-framework/operations"
suite_config "github.com/smartcontractkit/chainlink/system-tests/tests/smoke/cre/config"
evm_config "github.com/smartcontractkit/chainlink/system-tests/tests/smoke/cre/evm/evmread/config"
Expand Down Expand Up @@ -179,8 +182,22 @@ func runSuiteScenario(t *testing.T, topology string, scenario suite_config.Suite
if parallelEnabled {
t.Parallel()
}
testEnv := t_helpers.SetupTestEnvironmentWithPerTestKeys(t, t_helpers.GetDefaultTestConfig(t))
ExecuteDonTimeTest(t, testEnv)
for _, tc := range []struct {
name string
sequenced bool
}{
{"sequenced", true},
{"unsequenced", false},
} {
t.Run(tc.name, func(t *testing.T) {
testEnv := t_helpers.SetupTestEnvironmentWithPerTestKeys(t, t_helpers.GetDefaultTestConfig(t))
if tc.sequenced {
t_helpers.ApplyCRESettings(t, testEnv, t_helpers.Global(fmt.Sprintf(`DonTimeSequencedTimestampsActivePeriod = '%s'`,
settings.Range[config.Timestamp]{Lower: config.NewTimestamp(time.Now()), Upper: config.NewTimestamp(time.Now().Add(1 * time.Hour))}.String())))
}
ExecuteDonTimeTest(t, testEnv)
})
}
})
case suite_config.SuiteScenarioConsensus:
t.Run("Consensus - "+topology, func(t *testing.T) {
Expand Down
Loading