Sends extra config + chainlink-common bump

core/scripts/go.mod

@@ -12,8 +12,8 @@ replace github.com/smartcontractkit/chainlink/deployment => ../../deployment
 // Using a separate `require` here to avoid surrounding line changes
 // creating potential merge conflicts.
 require (
-	github.com/smartcontractkit/chainlink/deployment v0.0.0-20250128231431-9279badae2f0
-	github.com/smartcontractkit/chainlink/v2 v2.19.0-ccip1.5.16-alpha.0.0.20250129223716-34cbaaab2d04
+	github.com/smartcontractkit/chainlink/deployment v0.0.0-20250221182743-098d1b0a763a
+	github.com/smartcontractkit/chainlink/v2 v2.0.0-20250221182743-098d1b0a763a
 )
 
 require (
@@ -34,7 +34,7 @@ require (
 	github.com/prometheus/client_golang v1.20.5
 	github.com/shopspring/decimal v1.4.0
 	github.com/smartcontractkit/chainlink-automation v0.8.1
-	github.com/smartcontractkit/chainlink-common v0.4.2-0.20250214231858-f365e2bdecea
+	github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0
 	github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250128203428-08031923fbe5
 	github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250213145514-41d874782c02
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.22

core/scripts/go.sum

@@ -1090,8 +1090,8 @@ github.com/smartcontractkit/chainlink-ccip v0.0.0-20250224132459-c57ae4a97dcb h1
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20250224132459-c57ae4a97dcb/go.mod h1:Hht/OJq/PxC+gnBCIPyzHt4Otsw6mYwUVsmtOqIvlxo=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250214202341-4190f2db1c01 h1:R3OD6Phi0ULIQ2uvHiKVWYdgpi/O1Mt46CUK1UApcXU=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250214202341-4190f2db1c01/go.mod h1:Bmwq4lNb5tE47sydN0TKetcLEGbgl+VxHEWp4S0LI60=
-github.com/smartcontractkit/chainlink-common v0.4.2-0.20250214231858-f365e2bdecea h1:/1f/pWf7vSV9acTR9UPn2exPAwQG/LHGa4l9OywhS00=
-github.com/smartcontractkit/chainlink-common v0.4.2-0.20250214231858-f365e2bdecea/go.mod h1:Z2e1ynSJ4pg83b4Qldbmryc5lmnrI3ojOdg1FUloa68=
+github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0 h1:BTN2nQgFKBxgas6oqY3ym82O+wT++WlpP1+a6KzIfY0=
+github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0/go.mod h1:YQuXIqQpmpAqstWV0LHaDTJ5nsSWuip5ivEM+Fisb+4=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250128203428-08031923fbe5 h1:CvDfgWoLoYPapOumE/UZCplfCu5oNmy9BuH+6V6+fJ8=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250128203428-08031923fbe5/go.mod h1:pDZagSGjs9U+l4YIFhveDznMHqxuuz+5vRxvVgpbdr8=
 github.com/smartcontractkit/chainlink-feeds v0.1.1 h1:JzvUOM/OgGQA1sOqTXXl52R6AnNt+Wg64sVG+XSA49c=

core/scripts/keystone/ocr_config.json

@@ -3,7 +3,7 @@
     "MaxQueryLengthBytes": 1000000,
     "MaxObservationLengthBytes": 1000000,
     "MaxReportLengthBytes": 1000000,
-    "MaxRequestBatchSize": 1000,
+    "MaxBatchSize": 20,
     "UniqueReports": true,
 
     "DeltaProgressMillis": 5000,
@@ -19,8 +19,8 @@
     "MaxDurationQueryMillis": 1000,
     "MaxDurationObservationMillis": 1000,
     "MaxDurationReportMillis": 1000,
-    "MaxDurationAcceptMillis": 1000,
-    "MaxDurationTransmitMillis": 1000,
+    "MaxDurationShouldAcceptMillis": 1000,
+    "MaxDurationShouldTransmitMillis": 1000,
 
     "MaxFaultyOracles": 1
   }

core/scripts/keystone/src/generate_local_ocr3_config.go

@@ -76,7 +76,7 @@ func (g *generateLocalOCR3Config) Run(args []string) {
 		"MaxQueryLengthBytes": 1000000,
 		"MaxObservationLengthBytes": 1000000,
 		"MaxReportLengthBytes": 1000000,
-		"MaxRequestBatchSize": 1000,
+		"MaxBatchSize": 20,
 		"UniqueReports": true,
 		"DeltaProgressMillis": 5000,
 		"DeltaResendMillis": 5000,
@@ -90,8 +90,8 @@ func (g *generateLocalOCR3Config) Run(args []string) {
 		"MaxDurationQueryMillis": 1000,
 		"MaxDurationObservationMillis": 1000,
 		"MaxDurationReportMillis": 1000,
-		"MaxDurationAcceptMillis": 1000,
-		"MaxDurationTransmitMillis": 1000,
+		"MaxDurationShouldAcceptMillis": 1000,
+		"MaxDurationShouldTransmitMillis": 1000,
 		"MaxFaultyOracles": 1}`)
 	var cfg changeset.OracleConfig
 	err = json.Unmarshal(config, &cfg)

core/scripts/keystone/src/testdata/SampleConfig.json

@@ -3,8 +3,9 @@
     "MaxQueryLengthBytes": 1000000,
     "MaxObservationLengthBytes": 1000000,
     "MaxReportLengthBytes": 1000000,
-    "MaxRequestBatchSize": 1000,
+    "MaxBatchSize": 20,
     "UniqueReports": true,
+    "RequestTimeout": "30s",
     "DeltaProgressMillis": 5000,
     "DeltaResendMillis": 5000,
     "DeltaInitialMillis": 5000,
@@ -19,8 +20,9 @@
     "MaxDurationQueryMillis": 1000,
     "MaxDurationObservationMillis": 1000,
     "MaxDurationReportMillis": 1000,
-    "MaxDurationAcceptMillis": 1000,
-    "MaxDurationTransmitMillis": 1000,
+    "MaxDurationShouldAcceptMillis": 1000,
+    "MaxDurationShouldTransmitMillis": 1000,
+
     "MaxFaultyOracles": 1
   }
 }

deployment/environment/nodeclient/chainlink_models_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/codec"
+
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
 )

deployment/go.mod

@@ -7,7 +7,7 @@ replace github.com/smartcontractkit/chainlink/v2 => ../
 
 // Using a separate inline `require` here to avoid surrounding line changes
 // creating potential merge conflicts.
-require github.com/smartcontractkit/chainlink/v2 v2.0.0-20250128231431-9279badae2f0
+require github.com/smartcontractkit/chainlink/v2 v2.0.0-20250221182743-098d1b0a763a
 
 require (
 	github.com/Khan/genqlient v0.7.0
@@ -32,7 +32,7 @@ require (
 	github.com/smartcontractkit/chain-selectors v1.0.40
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20250224132459-c57ae4a97dcb
 	github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250214202341-4190f2db1c01
-	github.com/smartcontractkit/chainlink-common v0.4.2-0.20250214231858-f365e2bdecea
+	github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0
 	github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb
 	github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250213145514-41d874782c02
 	github.com/smartcontractkit/chainlink-protos/job-distributor v0.9.0

deployment/go.sum

@@ -1138,8 +1138,8 @@ github.com/smartcontractkit/chainlink-ccip v0.0.0-20250224132459-c57ae4a97dcb h1
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20250224132459-c57ae4a97dcb/go.mod h1:Hht/OJq/PxC+gnBCIPyzHt4Otsw6mYwUVsmtOqIvlxo=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250214202341-4190f2db1c01 h1:R3OD6Phi0ULIQ2uvHiKVWYdgpi/O1Mt46CUK1UApcXU=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250214202341-4190f2db1c01/go.mod h1:Bmwq4lNb5tE47sydN0TKetcLEGbgl+VxHEWp4S0LI60=
-github.com/smartcontractkit/chainlink-common v0.4.2-0.20250214231858-f365e2bdecea h1:/1f/pWf7vSV9acTR9UPn2exPAwQG/LHGa4l9OywhS00=
-github.com/smartcontractkit/chainlink-common v0.4.2-0.20250214231858-f365e2bdecea/go.mod h1:Z2e1ynSJ4pg83b4Qldbmryc5lmnrI3ojOdg1FUloa68=
+github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0 h1:BTN2nQgFKBxgas6oqY3ym82O+wT++WlpP1+a6KzIfY0=
+github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0/go.mod h1:YQuXIqQpmpAqstWV0LHaDTJ5nsSWuip5ivEM+Fisb+4=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250128203428-08031923fbe5 h1:CvDfgWoLoYPapOumE/UZCplfCu5oNmy9BuH+6V6+fJ8=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250128203428-08031923fbe5/go.mod h1:pDZagSGjs9U+l4YIFhveDznMHqxuuz+5vRxvVgpbdr8=
 github.com/smartcontractkit/chainlink-feeds v0.1.1 h1:JzvUOM/OgGQA1sOqTXXl52R6AnNt+Wg64sVG+XSA49c=

deployment/keystone/changeset/accept_ownership.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
-	kslib "github.com/smartcontractkit/chainlink/deployment/keystone/changeset/internal"
-
 	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/deployment/common/changeset"
 )
@@ -25,7 +23,7 @@ func AcceptAllOwnershipsProposal(e deployment.Environment, req *AcceptAllOwnersh
 	chain := e.Chains[chainSelector]
 	addrBook := e.ExistingAddresses
 
-	r, err := kslib.GetContractSets(e.Logger, &kslib.GetContractSetsRequest{
+	r, err := GetContractSets(e.Logger, &GetContractSetsRequest{
 		Chains: map[uint64]deployment.Chain{
 			req.ChainSelector: chain,
 		},

deployment/keystone/changeset/append_node_capabilities.go

@@ -70,7 +70,7 @@ func (req *AppendNodeCapabilitiesRequest) convert(e deployment.Environment) (*in
 		return nil, nil, fmt.Errorf("failed to validate UpdateNodeCapabilitiesRequest: %w", err)
 	}
 	registryChain := e.Chains[req.RegistryChainSel] // exists because of the validation above
-	resp, err := internal.GetContractSets(e.Logger, &internal.GetContractSetsRequest{
+	resp, err := GetContractSets(e.Logger, &GetContractSetsRequest{
 		Chains:      map[uint64]deployment.Chain{req.RegistryChainSel: registryChain},
 		AddressBook: e.ExistingAddresses,
 	})

deployment/keystone/changeset/compatiblity.go

@@ -19,21 +19,6 @@ type TopLevelConfigSource = internal.TopLevelConfigSource
 // GenerateOCR3Config generates an OCR3 config
 var GenerateOCR3Config = internal.GenerateOCR3Config
 
-// FeedConsumer is a feed consumer contract type
-var FeedConsumer = internal.FeedConsumer
-
-// KeystoneForwarder is a keystone forwarder contract type
-var KeystoneForwarder = internal.KeystoneForwarder
-
-// GetContractSetsRequest is a request to get contract sets
-type GetContractSetsRequest = internal.GetContractSetsRequest
-
-// GetContractSetsResponse is a response to get contract sets
-type GetContractSetsResponse = internal.GetContractSetsResponse
-
-// GetContractSets gets contract sets
-var GetContractSets = internal.GetContractSets
-
 // RegisterNOPSRequest is a request to register NOPS
 type RegisterNOPSRequest = internal.RegisterNOPSRequest
 
@@ -87,5 +72,3 @@ type DONCapabilityWithConfig = internal.DONCapabilityWithConfig
 
 type DeployRequest = internal.DeployRequest
 type DeployResponse = internal.DeployResponse
-
-type ContractSet = internal.ContractSet

deployment/keystone/changeset/deploy_forwarder.go

@@ -87,7 +87,7 @@ func ConfigureForwardContracts(env deployment.Environment, req ConfigureForwardC
 		return deployment.ChangesetOutput{}, fmt.Errorf("failed to configure forward contracts: %w", err)
 	}
 
-	cresp, err := internal.GetContractSets(env.Logger, &internal.GetContractSetsRequest{
+	cresp, err := GetContractSets(env.Logger, &GetContractSetsRequest{
 		Chains:      env.Chains,
 		AddressBook: env.ExistingAddresses,
 	})

deployment/keystone/changeset/deploy_ocr3.go

@@ -84,7 +84,7 @@ func ConfigureOCR3Contract(env deployment.Environment, cfg ConfigureOCR3Config)
 		if resp.Ops == nil {
 			return out, errors.New("expected MCMS operation to be non-nil")
 		}
-		r, err := kslib.GetContractSets(env.Logger, &kslib.GetContractSetsRequest{
+		r, err := GetContractSets(env.Logger, &GetContractSetsRequest{
 			Chains:      env.Chains,
 			AddressBook: env.ExistingAddresses,
 		})

deployment/keystone/changeset/internal/deploy.go

@@ -317,7 +317,7 @@ func ConfigureOCR3Contract(env *deployment.Environment, chainSel uint64, dons []
 			return fmt.Errorf("failed to get contract set for chain %d", chainSel)
 		}
 
-		contract, err := contracts.GetOCR3Contract(nil)
+		contract, err := contracts.getOCR3Contract(nil)
 		if err != nil {
 			env.Logger.Errorf("failed to get OCR3 contract: %s", err)
 			return fmt.Errorf("failed to get OCR3 contract: %w", err)
@@ -375,7 +375,7 @@ func ConfigureOCR3ContractFromJD(env *deployment.Environment, cfg ConfigureOCR3C
 		return nil, fmt.Errorf("failed to get contract set for chain %d", cfg.ChainSel)
 	}
 
-	contract, err := contracts.GetOCR3Contract(cfg.Address)
+	contract, err := contracts.getOCR3Contract(cfg.Address)
 	if err != nil {
 		env.Logger.Errorf("%sfailed to get OCR3 contract at %s : %s", prefix, cfg.Address, err)
 		return nil, fmt.Errorf("failed to get OCR3 contract: %w", err)

deployment/keystone/changeset/internal/ocr3config.go

@@ -13,11 +13,15 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
-	mcmstypes "github.com/smartcontractkit/mcms/types"
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/types/known/durationpb"
 
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3confighelper"
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
+	mcmstypes "github.com/smartcontractkit/mcms/types"
+
+	capocr3types "github.com/smartcontractkit/chainlink-common/pkg/capabilities/consensus/ocr3/types"
 
 	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
@@ -35,8 +39,12 @@ type OracleConfig struct {
 	MaxQueryLengthBytes       uint32
 	MaxObservationLengthBytes uint32
 	MaxReportLengthBytes      uint32
-	MaxRequestBatchSize       uint32
+	MaxOutcomeLengthBytes     uint32
+	MaxReportCount            uint32
+	MaxBatchSize              uint32
+	OutcomePruningThreshold   uint64
 	UniqueReports             bool
+	RequestTimeout            time.Duration
 
 	DeltaProgressMillis               uint32
 	DeltaResendMillis                 uint32
@@ -48,14 +56,50 @@ type OracleConfig struct {
 	MaxRoundsPerEpoch                 uint64
 	TransmissionSchedule              []int
 
-	MaxDurationQueryMillis       uint32
-	MaxDurationObservationMillis uint32
-	MaxDurationAcceptMillis      uint32
-	MaxDurationTransmitMillis    uint32
+	MaxDurationQueryMillis          uint32
+	MaxDurationObservationMillis    uint32
+	MaxDurationShouldAcceptMillis   uint32
+	MaxDurationShouldTransmitMillis uint32
 
 	MaxFaultyOracles int
 }
 
+func (oc *OracleConfig) UnmarshalJSON(data []byte) error {
+	type aliasT OracleConfig
+	temp := &struct {
+		RequestTimeout string `json:"RequestTimeout"`
+		*aliasT
+	}{
+		aliasT: (*aliasT)(oc),
+	}
+	if err := json.Unmarshal(data, temp); err != nil {
+		return fmt.Errorf("failed to unmarshal OracleConfig: %w", err)
+	}
+
+	if temp.RequestTimeout == "" {
+		oc.RequestTimeout = 0
+	} else {
+		requestTimeout, err := time.ParseDuration(temp.RequestTimeout)
+		if err != nil {
+			return fmt.Errorf("failed to parse RequestTimeout: %w", err)
+		}
+		oc.RequestTimeout = requestTimeout
+	}
+
+	return nil
+}
+
+func (oc OracleConfig) MarshalJSON() ([]byte, error) {
+	type aliasT OracleConfig
+	return json.Marshal(&struct {
+		RequestTimeout string `json:"RequestTimeout"`
+		*aliasT
+	}{
+		RequestTimeout: oc.RequestTimeout.String(),
+		aliasT:         (*aliasT)(&oc),
+	})
+}
+
 type NodeKeys struct {
 	EthAddress            string `json:"EthAddress"`
 	AptosAccount          string `json:"AptosAccount"`
@@ -202,7 +246,7 @@ func GenerateOCR3Config(cfg OracleConfig, nca []NodeKeys, secrets deployment.OCR
 			return OCR2OracleConfig{}, fmt.Errorf("wrong num elements copied from ocr2 offchain public key. expected %d but got %d", ed25519.PublicKeySize, nCopied)
 		}
 
-		offchainPubKeysBytes = append(offchainPubKeysBytes, types.OffchainPublicKey(pkBytesFixed))
+		offchainPubKeysBytes = append(offchainPubKeysBytes, pkBytesFixed)
 	}
 
 	configPubKeysBytes := []types.ConfigEncryptionPublicKey{}
@@ -218,7 +262,7 @@ func GenerateOCR3Config(cfg OracleConfig, nca []NodeKeys, secrets deployment.OCR
 			return OCR2OracleConfig{}, fmt.Errorf("wrong num elements copied from ocr2 config public key. expected %d but got %d", ed25519.PublicKeySize, n)
 		}
 
-		configPubKeysBytes = append(configPubKeysBytes, types.ConfigEncryptionPublicKey(pkBytesFixed))
+		configPubKeysBytes = append(configPubKeysBytes, pkBytesFixed)
 	}
 
 	identities := []confighelper.OracleIdentityExtra{}
@@ -234,6 +278,26 @@ func GenerateOCR3Config(cfg OracleConfig, nca []NodeKeys, secrets deployment.OCR
 		})
 	}
 
+	// let's keep reqTimeout as nil if it's 0, so we can use the default value within `chainlink-common`.
+	// See: https://github.com/smartcontractkit/chainlink-common/blob/main/pkg/capabilities/consensus/ocr3/factory.go#L73
+	var reqTimeout *durationpb.Duration
+	if cfg.RequestTimeout > 0 {
+		reqTimeout = durationpb.New(cfg.RequestTimeout)
+	}
+	cfgBytes, err := proto.Marshal(&capocr3types.ReportingPluginConfig{
+		MaxQueryLengthBytes:       cfg.MaxQueryLengthBytes,
+		MaxObservationLengthBytes: cfg.MaxObservationLengthBytes,
+		MaxReportLengthBytes:      cfg.MaxReportLengthBytes,
+		MaxOutcomeLengthBytes:     cfg.MaxOutcomeLengthBytes,
+		MaxReportCount:            cfg.MaxReportCount,
+		MaxBatchSize:              cfg.MaxBatchSize,
+		OutcomePruningThreshold:   cfg.OutcomePruningThreshold,
+		RequestTimeout:            reqTimeout,
+	})
+	if err != nil {
+		return OCR2OracleConfig{}, fmt.Errorf("failed to marshal ReportingPluginConfig: %w", err)
+	}
+
 	signers, transmitters, f, onchainConfig, offchainConfigVersion, offchainConfig, err := ocr3confighelper.ContractSetConfigArgsDeterministic(
 		secrets.EphemeralSk,
 		secrets.SharedSecret,
@@ -247,12 +311,12 @@ func GenerateOCR3Config(cfg OracleConfig, nca []NodeKeys, secrets deployment.OCR
 		cfg.MaxRoundsPerEpoch,
 		cfg.TransmissionSchedule,
 		identities,
-		nil, // reportingPluginConfig
-		nil, // maxDurationInitialization
+		cfgBytes, // reportingPluginConfig
+		nil,      // maxDurationInitialization
 		time.Duration(cfg.MaxDurationQueryMillis)*time.Millisecond,
 		time.Duration(cfg.MaxDurationObservationMillis)*time.Millisecond,
-		time.Duration(cfg.MaxDurationAcceptMillis)*time.Millisecond,
-		time.Duration(cfg.MaxDurationTransmitMillis)*time.Millisecond,
+		time.Duration(cfg.MaxDurationShouldAcceptMillis)*time.Millisecond,
+		time.Duration(cfg.MaxDurationShouldTransmitMillis)*time.Millisecond,
 		cfg.MaxFaultyOracles,
 		nil, // empty onChain config
 	)