Merge pull request #113 from smartcontractkit/copy-478f9240ece50a87dba40b2985d1e27a22daf896

Improvements:

Author: kaleofduty

offchainreporting/internal/protocol/observation/observation.go

@@ -58,7 +58,6 @@ func (o Observation) GoEthereumValue() *big.Int { return o.v }
 
 func (o Observation) Deviates(old Observation, thresholdPPB uint64) bool {
 	if old.v.Cmp(i(0)) == 0 {
-		//nolint:gosimple
 		if o.v.Cmp(i(0)) == 0 {
 			return false // Both values are zero; no deviation
 		}

offchainreporting/internal/serialization/serialization.go

@@ -389,7 +389,7 @@ func finalToProtoMessage(v protocol.MessageFinal) *protobuf.MessageFinal {
 			Signatures:             make([][]byte, len(v.Report.Signatures)),
 		},
 	}
-	for i, sig := range v.Report.Signatures { //nolint:gosimple
+	for i, sig := range v.Report.Signatures { //nolint:staticcheck
 		pm.Report.Signatures[i] = sig
 	}
 	return pm

offchainreporting2/reportingplugin/median/median.go

@@ -337,7 +337,7 @@ func (fac NumericalMedianFactory) NewReportingPlugin(ctx context.Context, config
 
 func DefaultDeviationFunc(_ context.Context, thresholdPPB uint64, old *big.Int, new *big.Int) (bool, error) {
 	if old.Cmp(i(0)) == 0 {
-		if new.Cmp(i(0)) == 0 { //nolint:gosimple
+		if new.Cmp(i(0)) == 0 {
 			return false, nil // Both values are zero; no deviation
 		}
 		return true, nil // Any deviation from 0 is significant

offchainreporting2plus/internal/config/ocr2config/public_config.go

@@ -12,8 +12,10 @@ import (
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 )
 
-// PublicConfig is the configuration disseminated through the smart contract
-// It's public, because anybody can read it from the blockchain
+// PublicConfig is the configuration disseminated through the smart contract.
+// It's public, because anybody can read it from the blockchain.
+// The various parameters (e.g. Delta*, MaxDuration*) have some dependencies
+// on each other, so be sure to consider the holistic impact of changes to them.
 type PublicConfig struct {
 	// If an epoch (driven by a leader) fails to achieve progress (generate a
 	// report) after DeltaProgress, we enter a new epoch. This parameter must be

offchainreporting2plus/internal/config/ocr3config/public_config.go

@@ -13,8 +13,10 @@ import (
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 )
 
-// PublicConfig is the configuration disseminated through the smart contract
-// It's public, because anybody can read it from the blockchain
+// PublicConfig is the configuration disseminated through the smart contract.
+// It's public, because anybody can read it from the blockchain.
+// The various parameters (e.g. Delta*, MaxDuration*) have some dependencies
+// on each other, so be sure to consider the holistic impact of changes to them.
 type PublicConfig struct {
 	// If an epoch (driven by a leader) fails to achieve progress (generate a
 	// report) after DeltaProgress, we enter a new epoch. This parameter must be

offchainreporting2plus/internal/managed/limits/ocr3_limits.go

@@ -61,9 +61,9 @@ func ocr3limits(cfg ocr3config.PublicConfig, pluginLimits ocr3types.ReportingPlu
 	maxLenMsgNewEpoch := overhead
 	maxLenMsgEpochStartRequest := add(maxLenCertifiedPrepareOrCommit, overhead)
 	maxLenMsgEpochStart := add(maxLenCertifiedPrepareOrCommit, mul(2*(ed25519.SignatureSize+sigOverhead), cfg.ByzQuorumSize()), overhead)
-	maxLenMsgRoundStart := add(pluginLimits.MaxQueryLength, overhead)
+	maxLenMsgRoundStart := add(pluginLimits.MaxQueryLength, ed25519.SignatureSize+sigOverhead, overhead)
 	maxLenMsgObservation := add(pluginLimits.MaxObservationLength, overhead)
-	maxLenMsgProposal := add(mul(add(pluginLimits.MaxObservationLength, ed25519.SignatureSize+sigOverhead), cfg.N()), overhead)
+	maxLenMsgProposal := add(mul(add(pluginLimits.MaxObservationLength, ed25519.SignatureSize+sigOverhead), cfg.N()), ed25519.SignatureSize+sigOverhead, overhead)
 	maxLenMsgPrepare := overhead
 	maxLenMsgCommit := overhead
 	maxLenMsgReportSignatures := add(mul(add(maxSigLen, sigOverhead), pluginLimits.MaxReportCount), overhead)

offchainreporting2plus/internal/managed/managed_mercury_oracle.go

@@ -229,7 +229,7 @@ func RunManagedMercuryOracle(
 				offchainKeyring,
 				ocr3OnchainKeyring,
 				shim.LimitCheckOCR3ReportingPlugin[mercuryshim.MercuryReportInfo]{reportingPlugin, reportingPluginLimits},
-				shim.NewOCR3TelemetrySender(chTelemetrySend, childLogger),
+				shim.NewOCR3TelemetrySender(chTelemetrySend, childLogger, localConfig.EnableTransmissionTelemetry),
 			)
 
 			return nil, false

offchainreporting2plus/internal/managed/managed_ocr2_oracle.go

@@ -237,7 +237,7 @@ func RunManagedOCR2Oracle(
 				onchainKeyring,
 				shim.LimitCheckReportingPlugin{reportingPlugin, reportingPluginInfo.Limits},
 				reportQuorum,
-				shim.NewOCR2TelemetrySender(chTelemetrySend, childLogger),
+				shim.NewOCR2TelemetrySender(chTelemetrySend, childLogger, localConfig.EnableTransmissionTelemetry),
 			)
 
 			return nil, false

offchainreporting2plus/internal/managed/managed_ocr3_oracle.go

@@ -208,7 +208,7 @@ func RunManagedOCR3Oracle[RI any](
 				offchainKeyring,
 				onchainKeyring,
 				shim.LimitCheckOCR3ReportingPlugin[RI]{reportingPlugin, reportingPluginInfo.Limits},
-				shim.NewOCR3TelemetrySender(chTelemetrySend, childLogger),
+				shim.NewOCR3TelemetrySender(chTelemetrySend, childLogger, localConfig.EnableTransmissionTelemetry),
 			)
 
 			return nil, false

offchainreporting2plus/internal/ocr2/protocol/oracle.go

@@ -202,6 +202,7 @@ func (o *oracleState) run() {
 			o.localConfig,
 			o.logger,
 			o.reportingPlugin,
+			o.telemetrySender,
 			o.contractTransmitter,
 		)
 	})