From f44f0f4d417471a5f354666c94877d3f01ea4a0e Mon Sep 17 00:00:00 2001
From: kaleofduty <59616916+kaleofduty@users.noreply.github.com>
Date: Mon, 25 Sep 2023 21:18:58 +0200
Subject: [PATCH] Remove logs that reveal report/observation payload & cosmetic
 OCR3 changes

---
 .../internal/managed/managed_mercury_oracle.go              | 6 +++---
 .../internal/ocr2/protocol/report_generation_follower.go    | 3 +--
 .../internal/ocr2/protocol/report_generation_leader.go      | 3 +--
 offchainreporting2plus/internal/ocr3/protocol/common.go     | 3 ++-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/offchainreporting2plus/internal/managed/managed_mercury_oracle.go b/offchainreporting2plus/internal/managed/managed_mercury_oracle.go
index 389c2ba5..94a09e86 100644
--- a/offchainreporting2plus/internal/managed/managed_mercury_oracle.go
+++ b/offchainreporting2plus/internal/managed/managed_mercury_oracle.go
@@ -125,13 +125,13 @@ func RunManagedMercuryOracle(
 
 			reportingPluginLimits := mercuryshim.ReportingPluginLimits(mercuryPluginInfo.Limits)
 
-			lims, err := limits.OCR3Limits(sharedConfig.PublicConfig, reportingPluginLimits, onchainKeyring.MaxSignatureLength())
+			lims, err := limits.OCR3Limits(sharedConfig.PublicConfig, reportingPluginLimits, ocr3OnchainKeyring.MaxSignatureLength())
 			if err != nil {
 				logger.Error("ManagedMercuryOracle: error during limits", commontypes.LogFields{
 					"error":                 err,
 					"publicConfig":          sharedConfig.PublicConfig,
 					"reportingPluginLimits": reportingPluginLimits,
-					"maxSigLen":             onchainKeyring.MaxSignatureLength(),
+					"maxSigLen":             ocr3OnchainKeyring.MaxSignatureLength(),
 				})
 				return
 			}
@@ -157,7 +157,7 @@ func RunManagedMercuryOracle(
 				chTelemetrySend,
 				sharedConfig.ConfigDigest,
 				binNetEndpoint,
-				onchainKeyring.MaxSignatureLength(),
+				ocr3OnchainKeyring.MaxSignatureLength(),
 				childLogger,
 				reportingPluginLimits,
 				sharedConfig.N(),
diff --git a/offchainreporting2plus/internal/ocr2/protocol/report_generation_follower.go b/offchainreporting2plus/internal/ocr2/protocol/report_generation_follower.go
index 126d4a0e..375d4e20 100644
--- a/offchainreporting2plus/internal/ocr2/protocol/report_generation_follower.go
+++ b/offchainreporting2plus/internal/ocr2/protocol/report_generation_follower.go
@@ -170,8 +170,7 @@ func (repgen *reportGenerationState) messageObserveReq(msg MessageObserveReq, se
 	}
 
 	repgen.logger.Debug("sent observation to leader", commontypes.LogFields{
-		"round":       repgen.followerState.r,
-		"observation": o,
+		"round": repgen.followerState.r,
 	})
 	repgen.netSender.SendTo(MessageObserve{
 		repgen.e,
diff --git a/offchainreporting2plus/internal/ocr2/protocol/report_generation_leader.go b/offchainreporting2plus/internal/ocr2/protocol/report_generation_leader.go
index 662e3d4e..bc80fab9 100644
--- a/offchainreporting2plus/internal/ocr2/protocol/report_generation_leader.go
+++ b/offchainreporting2plus/internal/ocr2/protocol/report_generation_leader.go
@@ -312,8 +312,7 @@ func (repgen *reportGenerationState) messageReport(msg MessageReport, sender com
 				})
 			} else if !report.Skip && !msg.AttestedReport.Skip { // oracles may commonly disagree on whether to skip, no need to warn about that
 				repgen.logger.Warn("received disparate reports messages", commontypes.LogFields{
-					"round":          repgen.leaderState.r,
-					"previousReport": report,
+					"round": repgen.leaderState.r,
 				})
 			}
 		}
diff --git a/offchainreporting2plus/internal/ocr3/protocol/common.go b/offchainreporting2plus/internal/ocr3/protocol/common.go
index 3149e266..a5024980 100644
--- a/offchainreporting2plus/internal/ocr3/protocol/common.go
+++ b/offchainreporting2plus/internal/ocr3/protocol/common.go
@@ -26,7 +26,8 @@ func callPlugin[T any](
 		maxDuration+ReportingPluginTimeoutWarningGracePeriod,
 		func() {
 			logger.MakeChild(logFields).Error(fmt.Sprintf("call to ReportingPlugin.%s is taking too long", name), commontypes.LogFields{
-				"maxDuration": maxDuration,
+				"maxDuration": maxDuration.String(),
+				"gracePeriod": ReportingPluginTimeoutWarningGracePeriod.String(),
 			})
 		},
 	)