[Automation] Fixes to chaincli for Automation v2.1

core/scripts/chaincli/handler/keeper_deployer.go

@@ -14,6 +14,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	ocr2config "github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
+	ocr3confighelper "github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3confighelper"
 	ocr2types "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 	"github.com/umbracle/ethgo/abi"
 
@@ -297,19 +298,20 @@ func (d *v21KeeperDeployer) SetKeepers(opts *bind.TransactOpts, cls []cmd.HTTPCl
 		panic(err)
 	}
 
-	signerOnchainPublicKeys, transmitterAccounts, f, _, offchainConfigVersion, offchainConfig, err := ocr2config.ContractSetConfigArgsForTests(
+	signerOnchainPublicKeys, transmitterAccounts, f, _, offchainConfigVersion, offchainConfig, err := ocr3confighelper.ContractSetConfigArgsForTests(
 		5*time.Second,         // deltaProgress time.Duration,
 		10*time.Second,        // deltaResend time.Duration,
+		400*time.Millisecond,  // deltaInitial time.Duration,
 		2500*time.Millisecond, // deltaRound time.Duration,
 		40*time.Millisecond,   // deltaGrace time.Duration,
+		300*time.Millisecond,  // deltaCertifiedCommitRequest time.Duration,
 		30*time.Second,        // deltaStage time.Duration,
 		50,                    // rMax uint8,
 		S,                     // s []int,
 		oracleIdentities,      // oracles []OracleIdentityExtra,
 		offC,                  // reportingPluginConfig []byte,
 		20*time.Millisecond,   // maxDurationQuery time.Duration,
 		1600*time.Millisecond, // maxDurationObservation time.Duration,
-		800*time.Millisecond,  // maxDurationReport time.Duration,
 		20*time.Millisecond,   // maxDurationShouldAcceptFinalizedReport time.Duration,
 		20*time.Millisecond,   // maxDurationShouldTransmitAcceptedReport time.Duration,
 		1,                     // f int,

core/scripts/chaincli/handler/keeper_launch.go

@@ -347,6 +347,7 @@ name = "ocr2-automation"
 forwardingAllowed = false
 schemaVersion = 1
 contractID = "%s"
+contractConfigTrackerPollInterval = "15s"
 ocrKeyBundleID = "%s"
 transmitterID = "%s"
 p2pv2Bootstrappers = [
@@ -358,6 +359,8 @@ chainID = %d
 
 [pluginConfig]
 maxServiceWorkers = 100
+cacheEvictionInterval = "1s"
+contractVersion = "%s"
 mercuryCredentialName = "%s"`
 
 // createOCR2KeeperJob creates an ocr2keeper job in the chainlink node by the given address
@@ -367,13 +370,20 @@ func (k *Keeper) createOCR2KeeperJob(client cmd.HTTPClient, contractAddr, nodeAd
 		return fmt.Errorf("failed to get node OCR2 key bundle ID: %s", err)
 	}
 
+	// Correctly assign contract version in OCR job spec.
+	var contractVersion string = "v2.0"
+	if k.cfg.RegistryVersion == keeper.RegistryVersion_2_1 {
+		contractVersion = "v2.1"
+	}
+
 	request, err := json.Marshal(web.CreateJobRequest{
 		TOML: fmt.Sprintf(ocr2keeperJobTemplate,
 			contractAddr,            // contractID
 			ocr2KeyConfig.ID,        // ocrKeyBundleID
 			nodeAddr,                // transmitterID - node wallet address
 			k.cfg.BootstrapNodeAddr, // bootstrap node key and address
 			k.cfg.ChainID,           // chainID
+			contractVersion,         // contractVersion
 			k.cfg.MercuryCredName,   // mercury credential name
 		),
 	})