Fix monitoring endpoint delegation

smartcontractkit · Nov 9, 2023 · 5a4e7ec · 5a4e7ec
1 parent 544a68d
commit 5a4e7ec
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go
@@ -1359,10 +1359,15 @@ func (d *Delegate) newServicesCCIPCommit(lggr logger.SugaredLogger, jb job.Job,
 		ContractConfigTracker:        ccipProvider.ContractConfigTracker(),
 		Database:                     ocrDB,
 		LocalConfig:                  lc,
-		MonitoringEndpoint:           d.monitoringEndpointGen.GenMonitoringEndpoint(spec.ContractID, synchronization.OCR2CCIP),
-		OffchainConfigDigester:       ccipProvider.OffchainConfigDigester(),
-		OffchainKeyring:              kb,
-		OnchainKeyring:               kb,
+		MonitoringEndpoint: d.monitoringEndpointGen.GenMonitoringEndpoint(
+			spec.ContractID,
+			synchronization.OCR2CCIP,
+			rid.Network,
+			rid.ChainID,
+		),
+		OffchainConfigDigester: ccipProvider.OffchainConfigDigester(),
+		OffchainKeyring:        kb,
+		OnchainKeyring:         kb,
 	}
 	logError := func(msg string) {
 		lggr.ErrorIf(d.jobORM.RecordError(jb.ID, msg), "unable to record error")
@@ -1407,10 +1412,15 @@ func (d *Delegate) newServicesCCIPExecution(lggr logger.SugaredLogger, jb job.Jo
 		ContractConfigTracker:        ccipProvider.ContractConfigTracker(),
 		Database:                     ocrDB,
 		LocalConfig:                  lc,
-		MonitoringEndpoint:           d.monitoringEndpointGen.GenMonitoringEndpoint(spec.ContractID, synchronization.OCR2CCIP),
-		OffchainConfigDigester:       ccipProvider.OffchainConfigDigester(),
-		OffchainKeyring:              kb,
-		OnchainKeyring:               kb,
+		MonitoringEndpoint: d.monitoringEndpointGen.GenMonitoringEndpoint(
+			spec.ContractID,
+			synchronization.OCR2CCIP,
+			rid.Network,
+			rid.ChainID,
+		),
+		OffchainConfigDigester: ccipProvider.OffchainConfigDigester(),
+		OffchainKeyring:        kb,
+		OnchainKeyring:         kb,
 	}
 	logError := func(msg string) {
 		lggr.ErrorIf(d.jobORM.RecordError(jb.ID, msg), "unable to record error")