Base 1 commit

.tool-versions

@@ -1,2 +1,2 @@
 golang 1.20
-mockery 2.12.1
+mockery 2.43.2

Automation_Grants.md

@@ -2,4 +2,4 @@ Automation-License-grants
 
 Additional Use Grant(s):
 
-You may make use of Plugin Automation (which is available subject to the license here the “Licensed Work”) solely for purposes listed below:
+You may make use of plugin Automation (which is available subject to the license here the “Licensed Work”) solely for purposes listed below:

LICENSE

@@ -1,6 +1,4 @@
 
-Copyright (c) 2023 SmartContract Plugin Limited SEZC
-
 Portions of this software are licensed as follows:
 
 *All content residing under (1) https://github.com/goplugin/pluginv3.0/tree/develop/contracts/src/v0.8/automation/2_1; (2) https://github.com/goplugin/plugin-automation/tree/main/pkg/v3  are licensed under “Business Source License 1.1” with a Change Date of September 12, 2027 and Change License to “MIT License”

docs/PROTOCOL_v21.md

@@ -37,7 +37,7 @@ This document aims to give a high level overview of the protocol for Automation
 
 ## Abstract
 
-Plugin Automation is a decentralized execution engine for automating smart contracts,
+plugin Automation is a decentralized execution engine for automating smart contracts,
 with a generic and extensible triggering mechanism.
 
 The protocol is implemented using the OCR3 interface, which is a decentralized consensus framework for off-chain computation.

go.mod

@@ -14,9 +14,10 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.17.0
 	github.com/shopspring/decimal v1.4.0
-	github.com/goplugin/plugin-common v0.0.1
-	github.com/goplugin/plugin-libocr v0.1.1//changes for plugin update
+	//github.com/goplugin/plugin-common v0.0.1
 	//github.com/goplugin/plugin-libocr v0.0.0-20241007185508-adbe57025f12
+	github.com/goplugin/plugin-common v0.0.1
+	github.com/goplugin/plugin-libocr v0.1.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/crypto v0.27.0
@@ -73,3 +74,5 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
+
+retract [v1.0.0-0, v1.0.5] // reverting to v0

pkg/v2/coordinator/coordinator.go

@@ -32,6 +32,7 @@ import (
 
 	"github.com/goplugin/plugin-automation/pkg/util"
 	ocr2keepers "github.com/goplugin/plugin-automation/pkg/v2"
+	"github.com/goplugin/plugin-common/pkg/services"
 )
 
 var (
@@ -74,7 +75,7 @@ type reportCoordinator struct {
 
 	// run state data
 	running atomic.Bool
-	chStop  chan struct{}
+	chStop  services.StopChan
 }
 
 // NewReportCoordinator provides a new report coordinator. The coordinator
@@ -228,7 +229,7 @@ func (rc *reportCoordinator) checkLogs(ctx context.Context) error {
 		}
 	}
 
-	staleReportLogs, err = rc.logs.StaleReportLogs(context.Background())
+	staleReportLogs, err = rc.logs.StaleReportLogs(ctx)
 	// It can happen that in between the time the report is generated and it gets
 	// confirmed on chain something changes and it becomes stale. Current scenarios are:
 	//    - Another report for the upkeep is transmitted making this report stale
@@ -386,13 +387,20 @@ func (rc *reportCoordinator) Close() error {
 func (rc *reportCoordinator) run() {
 	cadence := time.Second
 	timer := time.NewTimer(cadence)
+	defer timer.Stop()
+
+	ctx, cancel := rc.chStop.NewCtx()
+	defer cancel()
 
 	for {
 		select {
 		case <-timer.C:
 			startTime := time.Now()
 
-			if err := rc.checkLogs(context.Background()); err != nil {
+			if err := rc.checkLogs(ctx); err != nil {
+				if ctx.Err() != nil {
+					return
+				}
 				rc.logger.Printf("failed to check perform and stale report logs: %s", err)
 			}
 
@@ -407,8 +415,7 @@ func (rc *reportCoordinator) run() {
 				// wait the difference between the cadence and the time taken
 				timer.Reset(cadence - diff)
 			}
-		case <-rc.chStop:
-			timer.Stop()
+		case <-ctx.Done():
 			return
 		}
 	}

pkg/v3/LICENSE

@@ -7,10 +7,8 @@ License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
 
 Parameters
 
-Licensor:             	SmartContract Plugin Limited SEZC
 
 Licensed Work:     	Automation v2.1
-The Licensed Work is (c) 2023 SmartContract Plugin Limited SEZC
 
 Additional Use Grant:	Any uses listed and defined at https://github.com/goplugin/plugin-automation/tree/main/pkg/v3/Automation_v2.1_Grants.md