From 880f9b3fae22985fc66c1b6b90a9925b483ce5f4 Mon Sep 17 00:00:00 2001 From: Bolek <1416262+bolekk@users.noreply.github.com> Date: Fri, 25 Sep 2026 20:53:49 +0000 Subject: [PATCH 1/2] [CRE-6791] Remove legacy keystone workflow job changesets (#23827) [CRE] Remove legacy data-feeds workflow job changesets Deletes ProposeWFJobsToJDChangeset (v1+v2), the offchain legacy workflow-spec generation (workflow.go + workflow.tmpl + workflow_spec.yaml.tmpl), their config types and the now-unused LoadJSON helper. Both changesets generated legacy type=workflow job specs, rejected at every JD entry point. Also removes chainlink's last import of common's legacy pkg/workflows/sdk root. Part of CRE-5836. --- .../changeset/jd_propose_wf_jobs.go | 223 -------------- .../changeset/jd_propose_wf_jobs_v2.go | 282 ------------------ .../data-feeds/changeset/types/types.go | 38 --- deployment/data-feeds/changeset/utils.go | 16 - deployment/data-feeds/offchain/workflow.go | 149 --------- deployment/data-feeds/offchain/workflow.tmpl | 10 - .../offchain/workflow_spec.yaml.tmpl | 61 ---- 7 files changed, 779 deletions(-) delete mode 100644 deployment/data-feeds/changeset/jd_propose_wf_jobs.go delete mode 100644 deployment/data-feeds/changeset/jd_propose_wf_jobs_v2.go delete mode 100644 deployment/data-feeds/offchain/workflow.go delete mode 100644 deployment/data-feeds/offchain/workflow.tmpl delete mode 100644 deployment/data-feeds/offchain/workflow_spec.yaml.tmpl diff --git a/deployment/data-feeds/changeset/jd_propose_wf_jobs.go b/deployment/data-feeds/changeset/jd_propose_wf_jobs.go deleted file mode 100644 index 983522630b4..00000000000 --- a/deployment/data-feeds/changeset/jd_propose_wf_jobs.go +++ /dev/null @@ -1,223 +0,0 @@ -package changeset - -import ( - "context" - "errors" - "fmt" - "os" - "path/filepath" - "strings" - "time" - - cldf_chain_utils "github.com/smartcontractkit/chainlink-deployments-framework/chain/utils" - cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" - - "github.com/smartcontractkit/chainlink/deployment/data-feeds/changeset/types" - "github.com/smartcontractkit/chainlink/deployment/data-feeds/offchain" - "github.com/smartcontractkit/chainlink/deployment/data-feeds/view/v1_0" -) - -const ( - timeout = 240 * time.Second -) - -// ProposeWFJobsToJDChangeset is a changeset that reads a feed state file, creates a workflow job spec from it and proposes it to JD. -var ProposeWFJobsToJDChangeset = cldf.CreateChangeSet(proposeWFJobsToJDLogic, proposeWFJobsToJDPrecondition) - -func proposeWFJobsToJDLogic(env cldf.Environment, c types.ProposeWFJobsConfig) (cldf.ChangesetOutput, error) { - ctx, cancel := context.WithTimeout(env.GetContext(), timeout) - defer cancel() - - chainInfo, _ := cldf_chain_utils.ChainInfo(c.ChainSelector) - - feedStatePath := filepath.Join("feeds", chainInfo.ChainName+".json") - feedState, _ := LoadJSON[*v1_0.FeedState](feedStatePath, c.InputFS) - - // Add extra padded zeros to the feed IDs - extraPaddedZeros := strings.Repeat("0", 32) - for i := range feedState.Feeds { - feedState.Feeds[i].FeedID += extraPaddedZeros - } - - workflowSpecConfig := c.WorkflowSpecConfig - workflowState := feedState.Workflows[workflowSpecConfig.WorkflowName] - - // Addressbook is deprecated, but we still use it for the time being - cacheAddress := GetDataFeedsCacheAddress(env.ExistingAddresses, env.DataStore.Addresses(), c.ChainSelector, &c.CacheLabel) - - // default values - consensusEncoderAbi, _ := getWorkflowConsensusEncoderAbi(workflowSpecConfig.TargetContractEncoderType) - - consensusConfigKeyID := workflowSpecConfig.ConsensusConfigKeyID - if consensusConfigKeyID == "" { - consensusConfigKeyID = "evm" - } - - consensusRef := workflowSpecConfig.ConsensusRef - if consensusRef == "" { - consensusRef = "data-feeds" - } - - var triggersMaxFrequencyMs int - if workflowSpecConfig.TriggersMaxFrequencyMs == nil { - triggersMaxFrequencyMs = 5000 - } else { - triggersMaxFrequencyMs = *workflowSpecConfig.TriggersMaxFrequencyMs - } - - var deltaStageSec int - if workflowSpecConfig.DeltaStageSec == nil { - deltaStageSec = 45 - } else { - deltaStageSec = *workflowSpecConfig.DeltaStageSec - } - - targetSchedule := workflowSpecConfig.TargetsSchedule - if targetSchedule == "" { - targetSchedule = "oneAtATime" - } - - // for legacy tooling - var triggerCapability string - if workflowSpecConfig.ConsensusAggregationMethod == "llo_streams" { - triggerCapability = "streams-trigger:don_asset-1@2.0.0" - } else { - triggerCapability = "streams-trigger@1.1.0" - } - - // create the workflow YAML spec - workflowSpec, err := offchain.CreateWorkflowSpec( - feedState.Feeds, - workflowSpecConfig.WorkflowName, - workflowState.Owner, - triggersMaxFrequencyMs, - consensusRef, - workflowSpecConfig.ConsensusReportID, - workflowSpecConfig.ConsensusAggregationMethod, - triggerCapability, - consensusConfigKeyID, - workflowSpecConfig.ConsensusAllowedPartialStaleness, - consensusEncoderAbi, - deltaStageSec, - workflowSpecConfig.WriteTargetTrigger, - targetSchedule, - workflowSpecConfig.CREStepTimeout, - workflowSpecConfig.TargetProcessor, - cacheAddress, - ) - if err != nil { - return cldf.ChangesetOutput{}, fmt.Errorf("failed to create workflow spec: %w", err) - } - - // create workflow job spec TOML - workflowJobSpec, err := offchain.JobSpecFromWorkflowSpec(workflowSpec, c.WorkflowJobName, workflowState.Owner) - if err != nil { - return cldf.ChangesetOutput{}, fmt.Errorf("failed to create workflow job spec: %w", err) - } - - // propose workflow jobs to JD - out, err := offchain.ProposeJobs(ctx, env, workflowJobSpec, &workflowSpecConfig.WorkflowName, c.NodeFilter) - if err != nil { - env.Logger.Debugf("%s", workflowJobSpec) - return cldf.ChangesetOutput{}, fmt.Errorf("failed to propose workflow job spec: %w", err) - } - - // write the workflow spec to artifacts/migration_name folder. Do not exit on error as the jobs are already proposed - // using the absolute path to the file as the command is run from root in CLD pipeline - wfSpecPath := filepath.Join("domains", "data-feeds", env.Name, "artifacts", c.MigrationName, workflowState.Name+".yaml") - err = os.MkdirAll(filepath.Dir(wfSpecPath), 0755) - if err != nil { - env.Logger.Errorf("failed to create directory for workflow file: %s", err) - env.Logger.Debugf("%s", workflowJobSpec) - return out, nil - } - - err = os.WriteFile(wfSpecPath, []byte(workflowSpec), 0600) - if err != nil { - env.Logger.Errorf("failed to write workflow to file: %s", err) - env.Logger.Debugf("%s", workflowJobSpec) - } - - return out, nil -} - -func proposeWFJobsToJDPrecondition(env cldf.Environment, c types.ProposeWFJobsConfig) error { - if c.MigrationName == "" { - return errors.New("migration name is required") - } - - if c.WorkflowJobName == "" { - return errors.New("workflow job name is required") - } - - if c.WorkflowSpecConfig.WorkflowName == "" { - return errors.New("workflow name is required") - } - - validTargetEncoder := c.WorkflowSpecConfig.TargetContractEncoderType - if validTargetEncoder != "data-feeds_decimal" && validTargetEncoder != "aptos" && validTargetEncoder != "ccip" { - return fmt.Errorf("invalid consensus target encoder: %s", c.WorkflowSpecConfig.ConsensusAggregationMethod) - } - - validMethod := c.WorkflowSpecConfig.ConsensusAggregationMethod - if validMethod != "data_feeds" && validMethod != "llo_streams" { - return fmt.Errorf("invalid consensus aggregation method: %s", c.WorkflowSpecConfig.ConsensusAggregationMethod) - } - - if c.WorkflowSpecConfig.ConsensusReportID == "" { - return errors.New("consensus report id is required") - } - - if c.WorkflowSpecConfig.WriteTargetTrigger == "" { - return errors.New("write target trigger is required") - } - if _, err := getWorkflowConsensusEncoderAbi(c.WorkflowSpecConfig.TargetContractEncoderType); err != nil { - return fmt.Errorf("failed to get consensus encoder abi: %w", err) - } - - chainInfo, err := cldf_chain_utils.ChainInfo(c.ChainSelector) - if err != nil { - return fmt.Errorf("failed to get chain info for chain %d: %w", c.ChainSelector, err) - } - inputFileName := filepath.Join("feeds", chainInfo.ChainName+".json") - - feedState, err := LoadJSON[*v1_0.FeedState](inputFileName, c.InputFS) - if err != nil { - return fmt.Errorf("failed to load feed mapping from %s: %w", inputFileName, err) - } - - err = feedState.Validate() - if err != nil { - return fmt.Errorf("failed to validate feeds: %w", err) - } - - workflowState := feedState.Workflows[c.WorkflowSpecConfig.WorkflowName] - if workflowState.Name == "" || workflowState.Owner == "" || workflowState.Forwarder == "" { - return fmt.Errorf("no workflow found for hash %s in %s", c.WorkflowSpecConfig.WorkflowName, inputFileName) - } - - // Addressbook is deprecated, but we still use it for the time being - cacheAddress := GetDataFeedsCacheAddress(env.ExistingAddresses, env.DataStore.Addresses(), c.ChainSelector, &c.CacheLabel) - if cacheAddress == "" { - return errors.New("failed to get data feeds cache address") - } - - if c.NodeFilter == nil { - return errors.New("missing node filter") - } - - return nil -} - -func getWorkflowConsensusEncoderAbi(targetContractEncoderType string) (string, error) { - switch targetContractEncoderType { - case "data-feeds_decimal": - return "(bytes32 RemappedID, uint32 Timestamp, uint224 Price)[] Reports", nil - case "ccip": - return "(bytes32 FeedID, uint224 Price, uint32 Timestamp)[] Reports", nil - case "aptos": - return "(bytes32 RemappedID, bytes RawReport)[] Reports", nil - default: - return "", fmt.Errorf("unknown consensus encoder type %s", targetContractEncoderType) - } -} diff --git a/deployment/data-feeds/changeset/jd_propose_wf_jobs_v2.go b/deployment/data-feeds/changeset/jd_propose_wf_jobs_v2.go deleted file mode 100644 index 659d3528f81..00000000000 --- a/deployment/data-feeds/changeset/jd_propose_wf_jobs_v2.go +++ /dev/null @@ -1,282 +0,0 @@ -package changeset - -import ( - "context" - "encoding/json" - "errors" - "fmt" - "os" - "path/filepath" - "slices" - "strings" - "time" - - cldf_chain_utils "github.com/smartcontractkit/chainlink-deployments-framework/chain/utils" - "github.com/smartcontractkit/chainlink-deployments-framework/datastore" - cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" - - "github.com/smartcontractkit/chainlink/deployment/data-feeds/changeset/types" - "github.com/smartcontractkit/chainlink/deployment/data-feeds/offchain" - "github.com/smartcontractkit/chainlink/deployment/data-feeds/view/v1_0" -) - -const ( - timeoutV2 = 240 * time.Second -) - -// ProposeWFJobsToJDV2Changeset is a Durable Pipeline compatible changeset that reads a feed state file, -// creates a workflow job spec from it and proposes it to JD. -var ProposeWFJobsToJDV2Changeset = cldf.CreateChangeSet(proposeWFJobsToJDV2Logic, proposeWFJobsToJDV2Precondition) - -func proposeWFJobsToJDV2Logic(env cldf.Environment, c types.ProposeWFJobsV2Config) (cldf.ChangesetOutput, error) { - ctx, cancel := context.WithTimeout(env.GetContext(), timeoutV2) - defer cancel() - - chainInfo, _ := cldf_chain_utils.ChainInfo(c.ChainSelector) - - domain := getDomain(c.Domain) - - feedStatePath := filepath.Join("domains", domain, env.Name, "inputs", "feeds", c.NodeFilter.Zone, chainInfo.ChainName+".json") - feedState, _ := readFeedStateFile(feedStatePath) - - // Only get feeds that are part of the workflow - feeds := *getFeedsByWorkflow(&feedState.Feeds, c.WorkflowSpecConfig.WorkflowName) - - // Add extra padded zeros to the feed IDs - for i := range feeds { - extraPaddedZeros := strings.Repeat("0", 32) - feeds[i].FeedID += extraPaddedZeros - } - - workflowSpecConfig := c.WorkflowSpecConfig - workflowState := feedState.Workflows[workflowSpecConfig.WorkflowName] - - // Addressbook is deprecated, but we still use it for the time being - cacheAddress := GetDataFeedsCacheAddress(env.ExistingAddresses, env.DataStore.Addresses(), c.ChainSelector, &c.CacheLabel) - - // default values - consensusEncoderAbi, _ := _getWorkflowConsensusEncoderAbi(workflowSpecConfig.TargetContractEncoderType) - consensusConfigKeyID := getConsensusConfigKey(workflowSpecConfig.ConsensusConfigKeyID) - consensusRef := getConsensusRef(workflowSpecConfig.ConsensusRef) - triggersMaxFrequencyMs := getMaxFrequencyMs(workflowSpecConfig.TriggersMaxFrequencyMs) - deltaStageSec := getDeltaStage(workflowSpecConfig.DeltaStageSec) - targetSchedule := getTargetSchedule(workflowSpecConfig.TargetsSchedule) - - // create the workflow YAML spec - workflowSpec, err := offchain.CreateWorkflowSpec( - feeds, - workflowSpecConfig.WorkflowName, - workflowState.Owner, - triggersMaxFrequencyMs, - consensusRef, - workflowSpecConfig.ConsensusReportID, - workflowSpecConfig.ConsensusAggregationMethod, - workflowSpecConfig.TriggerCapability, - consensusConfigKeyID, - workflowSpecConfig.ConsensusAllowedPartialStaleness, - consensusEncoderAbi, - deltaStageSec, - workflowSpecConfig.WriteTargetTrigger, - targetSchedule, - workflowSpecConfig.CREStepTimeout, - workflowSpecConfig.TargetProcessor, - cacheAddress, - ) - if err != nil { - return cldf.ChangesetOutput{}, fmt.Errorf("failed to create workflow spec: %w", err) - } - - // log the workflow spec for debugging purposes. - fmt.Println(workflowSpec) - - // create workflow job spec TOML - workflowJobSpec, err := offchain.JobSpecFromWorkflowSpec(workflowSpec, c.WorkflowJobName, workflowState.Owner) - if err != nil { - return cldf.ChangesetOutput{}, fmt.Errorf("failed to create workflow job spec: %w", err) - } - - // propose workflow jobs to JD - out, err := offchain.ProposeJobs(ctx, env, workflowJobSpec, &workflowSpecConfig.WorkflowName, c.NodeFilter) - if err != nil { - env.Logger.Debugf("%s", workflowJobSpec) - return cldf.ChangesetOutput{}, fmt.Errorf("failed to propose workflow job spec: %w", err) - } - - // Save workflow spec in the datastore - ds := datastore.NewMemoryDataStore() - - err = UpdateWorkflowMetadataDS(env, ds, workflowSpecConfig.WorkflowName, workflowSpec) - if err != nil { - env.Logger.Errorf("failed to set workflow spec in datastore: %s", err) - } - - out.DataStore = ds - - return out, nil -} - -func proposeWFJobsToJDV2Precondition(env cldf.Environment, c types.ProposeWFJobsV2Config) error { - if c.WorkflowJobName == "" { - return errors.New("workflow job name is required") - } - - if c.WorkflowSpecConfig.WorkflowName == "" { - return errors.New("workflow name is required") - } - - validTargetEncoder := c.WorkflowSpecConfig.TargetContractEncoderType - if validTargetEncoder != "data-feeds_decimal" && validTargetEncoder != "aptos" && validTargetEncoder != "ccip" { - return fmt.Errorf("invalid consensus target encoder: %s", c.WorkflowSpecConfig.TargetContractEncoderType) - } - - validMethod := c.WorkflowSpecConfig.ConsensusAggregationMethod - if validMethod != "data_feeds" && validMethod != "llo_streams" { - return fmt.Errorf("invalid consensus aggregation method: %s", c.WorkflowSpecConfig.ConsensusAggregationMethod) - } - - if c.WorkflowSpecConfig.TriggerCapability == "" { - return errors.New("trigger capability is required") - } - - if c.WorkflowSpecConfig.ConsensusReportID == "" { - return errors.New("consensus report id is required") - } - - if c.WorkflowSpecConfig.WriteTargetTrigger == "" { - return errors.New("write target trigger is required") - } - if _, err := getWorkflowConsensusEncoderAbi(c.WorkflowSpecConfig.TargetContractEncoderType); err != nil { - return fmt.Errorf("failed to get consensus encoder abi: %w", err) - } - - if c.NodeFilter == nil { - return errors.New("missing node filter") - } - - if c.NodeFilter.DONID == 0 { - return errors.New("missing DON ID in node filter") - } - - if c.NodeFilter.EnvLabel == "" { - return errors.New("missing environment label in node filter") - } - - if c.NodeFilter.Zone != "zone-a" && c.NodeFilter.Zone != "zone-b" { - return errors.New("missing or invalid zone in node filter") - } - - domain := getDomain(c.Domain) - chainInfo, err := cldf_chain_utils.ChainInfo(c.ChainSelector) - if err != nil { - return fmt.Errorf("failed to get chain info for chain %d: %w", c.ChainSelector, err) - } - - feedStatePath := filepath.Join("domains", domain, env.Name, "inputs", "feeds", c.NodeFilter.Zone, chainInfo.ChainName+".json") - - feedState, err := readFeedStateFile(feedStatePath) - if err != nil { - return fmt.Errorf("failed to read feed state file %s: %w", feedStatePath, err) - } - - feeds := *getFeedsByWorkflow(&feedState.Feeds, c.WorkflowSpecConfig.WorkflowName) - feedState.Feeds = feeds - - err = feedState.Validate() - if err != nil { - return fmt.Errorf("failed to validate feeds: %w", err) - } - - workflowState := feedState.Workflows[c.WorkflowSpecConfig.WorkflowName] - if workflowState.Name == "" || workflowState.Owner == "" || workflowState.Forwarder == "" { - return fmt.Errorf("no workflow found for hash %s in %s", c.WorkflowSpecConfig.WorkflowName, feedStatePath) - } - - // Addressbook is deprecated, but we still use it for the time being - cacheAddress := GetDataFeedsCacheAddress(env.ExistingAddresses, env.DataStore.Addresses(), c.ChainSelector, &c.CacheLabel) - if cacheAddress == "" { - return errors.New("failed to get data feeds cache address") - } - - return nil -} - -func _getWorkflowConsensusEncoderAbi(targetContractEncoderType string) (string, error) { - switch targetContractEncoderType { - case "data-feeds_decimal": - return "(bytes32 RemappedID, uint32 Timestamp, uint224 Price)[] Reports", nil - case "ccip": - return "(bytes32 FeedID, uint224 Price, uint32 Timestamp)[] Reports", nil - case "aptos": - return "(bytes32 RemappedID, bytes RawReport)[] Reports", nil - default: - return "", fmt.Errorf("unknown consensus encoder type %s", targetContractEncoderType) - } -} - -func getDomain(domain string) string { - if domain == "" { - return "data-feeds" - } - return domain -} - -func readFeedStateFile(inputFileName string) (*v1_0.FeedState, error) { - content, err := os.ReadFile(inputFileName) - if err != nil { - return nil, fmt.Errorf("failed to load feed mapping from %s: %w", inputFileName, err) - } - - var feedState *v1_0.FeedState - - err = json.Unmarshal(content, &feedState) - if err != nil { - return nil, fmt.Errorf("failed to unmarshal feed state from %s: %w", inputFileName, err) - } - return feedState, nil -} - -func getConsensusConfigKey(consensusConfigKeyID string) string { - if consensusConfigKeyID == "" { - return "evm" - } - return consensusConfigKeyID -} - -func getConsensusRef(consensusRef string) string { - if consensusRef == "" { - return "data-feeds" - } - return consensusRef -} - -func getMaxFrequencyMs(maxFrequencyMs *int) int { - if maxFrequencyMs == nil { - return 5000 - } - return *maxFrequencyMs -} - -func getDeltaStage(deltaStageSec *int) int { - if deltaStageSec == nil { - return 45 - } - return *deltaStageSec -} - -func getTargetSchedule(targetSchedule string) string { - if targetSchedule == "" { - return "oneAtATime" - } - return targetSchedule -} - -func getFeedsByWorkflow(allFeeds *[]v1_0.Feed, workflowHash string) *[]v1_0.Feed { - var result []v1_0.Feed - for _, feed := range *allFeeds { - if slices.Contains(feed.Workflows, workflowHash) { - result = append(result, feed) - } - } - - return &result -} diff --git a/deployment/data-feeds/changeset/types/types.go b/deployment/data-feeds/changeset/types/types.go index ddac851f52e..549d0d310ac 100644 --- a/deployment/data-feeds/changeset/types/types.go +++ b/deployment/data-feeds/changeset/types/types.go @@ -1,7 +1,6 @@ package types import ( - "embed" "time" "github.com/aptos-labs/aptos-go-sdk" @@ -256,43 +255,6 @@ type RegisterNodeConfig struct { DONs []*DONConfigSchema `json:"dons" yaml:"dons"` // list of DONs to register } -type WorkflowSpecConfig struct { - TargetContractEncoderType string `json:"targetContractEncoderType" yaml:"targetContractEncoderType"` // Required. "data-feeds_decimal", "aptos" or "ccip" - ConsensusAggregationMethod string `json:"consensusAggregationMethod" yaml:"consensusAggregationMethod"` // Required. "llo_streams" or "data_feeds" - TriggerCapability string `json:"triggerCapability" yaml:"triggerCapability"` // Required - WorkflowName string `json:"workflowName" yaml:"workflowName"` // Required - ConsensusReportID string `json:"consensusReportID" yaml:"consensusReportID"` // Required - WriteTargetTrigger string `json:"writeTargetTrigger" yaml:"writeTargetTrigger"` // Required - ConsensusRef string `json:"consensusRef" yaml:"consensusRef"` // Default "data-feeds" - ConsensusConfigKeyID string `json:"consensusConfigKeyID" yaml:"consensusConfigKeyID"` // Default "evm" - ConsensusAllowedPartialStaleness string `json:"consensusAllowedPartialStaleness,omitempty" yaml:"consensusAllowedPartialStaleness,omitempty"` - DeltaStageSec *int `json:"deltaStageSec,omitempty" yaml:"deltaStageSec,omitempty"` // Default 45 - TargetsSchedule string `json:"targetsSchedule,omitempty" yaml:"targetsSchedule,omitempty"` // Default "oneAtATime" - TargetProcessor string `json:"targetProcessor,omitempty" yaml:"targetProcessor,omitempty"` - TriggersMaxFrequencyMs *int `json:"triggersMaxFrequencyMs,omitempty" yaml:"triggersMaxFrequencyMs,omitempty"` // Default 5000 - CREStepTimeout int64 `json:"creStepTimeout,omitempty" yaml:"creStepTimeout,omitempty"` -} - -// ProposeWFJobsConfig legacy type for legacy changet -type ProposeWFJobsConfig struct { - ChainSelector uint64 - CacheLabel string // Label for the DataFeedsCache contract in AB - MigrationName string // Name of the migration in CLD - InputFS embed.FS // filesystem to read the feeds json mapping - WorkflowJobName string // Required - WorkflowSpecConfig WorkflowSpecConfig - NodeFilter *offchain.NodesFilter // Required. Node filter to select the nodes to send the jobs to. -} - -type ProposeWFJobsV2Config struct { - ChainSelector uint64 `json:"chainSelector" yaml:"chainSelector"` - CacheLabel string `json:"cacheLabel" yaml:"cacheLabel"` // Label for the DataFeedsCache contract in AB, or qualifier in DataStore - Domain string `json:"domain" yaml:"domain"` // default to data-feeds - WorkflowJobName string `json:"workflowJobName" yaml:"workflowJobName"` // Required - WorkflowSpecConfig WorkflowSpecConfig `json:"workflowSpecConfig" yaml:"workflowSpecConfig"` - NodeFilter *offchain.NodesFilter `json:"nodeFilter" yaml:"nodeFilter"` // Required. Node filter to select the nodes to send the jobs to. -} - type ProposeBtJobsConfig struct { ChainSelector uint64 BootstrapJobName string diff --git a/deployment/data-feeds/changeset/utils.go b/deployment/data-feeds/changeset/utils.go index 85986895cd4..1e616bea1e5 100644 --- a/deployment/data-feeds/changeset/utils.go +++ b/deployment/data-feeds/changeset/utils.go @@ -2,10 +2,8 @@ package changeset import ( "encoding/hex" - "encoding/json" "errors" "fmt" - "io/fs" "math/big" "strings" @@ -104,20 +102,6 @@ func HashedWorkflowName(name string) [10]byte { return result } -func LoadJSON[T any](pth string, fs fs.ReadFileFS) (T, error) { - var dflt T - f, err := fs.ReadFile(pth) - if err != nil { - return dflt, fmt.Errorf("failed to read %s: %w", pth, err) - } - var v T - err = json.Unmarshal(f, &v) - if err != nil { - return dflt, fmt.Errorf("failed to unmarshal JSON: %w", err) - } - return v, nil -} - func GetDecimalsFromFeedID(feedID string) (uint8, error) { err := shared.ValidateFeedID(feedID) if err != nil { diff --git a/deployment/data-feeds/offchain/workflow.go b/deployment/data-feeds/offchain/workflow.go deleted file mode 100644 index 69f650825fb..00000000000 --- a/deployment/data-feeds/offchain/workflow.go +++ /dev/null @@ -1,149 +0,0 @@ -package offchain - -import ( - "bytes" - "crypto/sha256" - "encoding/hex" - "fmt" - "text/template" - - "github.com/google/uuid" - - "github.com/smartcontractkit/chainlink/deployment/data-feeds/view/v1_0" - - "github.com/smartcontractkit/chainlink-common/pkg/workflows/sdk" -) - -const ( - workflowJobPath = "workflow.tmpl" - workflowSpecPath = "workflow_spec.yaml.tmpl" -) - -type WorkflowSpecAlias sdk.WorkflowSpec - -type WorkflowJobCfg struct { - JobName string - SpecFileName string - ExternalJobID string - Workflow string // yaml of the workflow - WorkflowID string - WorkflowOwner string -} - -type WorkflowSpecCfg struct { - Feeds []v1_0.Feed - WorkflowName string - WorkflowOwner string - TriggersMaxFrequencyMs int - ConsensusRef string - ConsensusReportID string - ConsensusConfigKeyID string - ConsensusAggregationMethod string - TriggerCapabilityName string - ConsensusAllowedPartialStaleness string - ConsensusEncoderABI string - DeltaStageSec int - WriteTargetTrigger string - TargetsSchedule string - TargetProcessor string - CREStepTimeout int64 - DataFeedsCacheAddress string -} - -func JobSpecFromWorkflowSpec(workflowSpec string, workflowJobName string, workflowOwner string) (wfSpec string, err error) { - externalID := uuid.New().String() - - wfCfg := WorkflowJobCfg{ - JobName: workflowJobName, - ExternalJobID: externalID, - Workflow: workflowSpec, - WorkflowID: getWorkflowID(workflowSpec), - WorkflowOwner: workflowOwner, - } - - workflowJobSpec, err := wfCfg.createSpec() - if err != nil { - return "", fmt.Errorf("failed to create workflow job spec: %w", err) - } - return workflowJobSpec, nil -} - -func CreateWorkflowSpec( - feeds []v1_0.Feed, - workflowName string, - workflowOwner string, - triggerFrequency int, - consensusRef string, - consensusReportID string, - consensusAggregationMethod string, - triggerCapability string, - consensusConfigKeyID string, - consensusAllowedPartialStaleness string, - consensusEncoderABI string, - deltaStageSec int, - writeTargetTrigger string, - targetsSchedule string, - creStepTimeout int64, - targetProcessor string, - cacheAddress string) (wfSpec string, err error) { - wfCfg := WorkflowSpecCfg{ - Feeds: feeds, - WorkflowName: workflowName, - WorkflowOwner: workflowOwner, - TriggersMaxFrequencyMs: triggerFrequency, - ConsensusRef: consensusRef, - ConsensusReportID: consensusReportID, - ConsensusAggregationMethod: consensusAggregationMethod, - TriggerCapabilityName: triggerCapability, - ConsensusConfigKeyID: consensusConfigKeyID, - ConsensusAllowedPartialStaleness: consensusAllowedPartialStaleness, - ConsensusEncoderABI: consensusEncoderABI, - DeltaStageSec: deltaStageSec, - WriteTargetTrigger: writeTargetTrigger, - TargetsSchedule: targetsSchedule, - TargetProcessor: targetProcessor, - CREStepTimeout: creStepTimeout, - DataFeedsCacheAddress: cacheAddress, - } - - workflowSpec, err := wfCfg.createSpec() - if err != nil { - return "", fmt.Errorf("failed to create workflow job spec: %w", err) - } - return workflowSpec, nil -} - -func (wfCfg *WorkflowJobCfg) createSpec() (string, error) { - t, err := template.New("s").ParseFS(offchainFs, workflowJobPath) - if err != nil { - return "", err - } - - b := &bytes.Buffer{} - err = t.ExecuteTemplate(b, workflowJobPath, wfCfg) - if err != nil { - return "", err - } - return b.String(), nil -} - -func (wfCfg *WorkflowSpecCfg) createSpec() (string, error) { - t, err := template.New("s").ParseFS(offchainFs, workflowSpecPath) - if err != nil { - return "", err - } - - b := &bytes.Buffer{} - err = t.ExecuteTemplate(b, workflowSpecPath, wfCfg) - if err != nil { - return "", err - } - return b.String(), nil -} - -func getWorkflowID(wf string) string { - sha256Hash := sha256.New() - sha256Hash.Write([]byte(wf)) - cid := sha256Hash.Sum(nil) - return hex.EncodeToString(cid) -} diff --git a/deployment/data-feeds/offchain/workflow.tmpl b/deployment/data-feeds/offchain/workflow.tmpl deleted file mode 100644 index 06b7e3320ef..00000000000 --- a/deployment/data-feeds/offchain/workflow.tmpl +++ /dev/null @@ -1,10 +0,0 @@ -type = "workflow" -schemaVersion = 1 -externalJobID = "{{ .ExternalJobID }}" -name = "{{ .JobName }}" -forwardingAllowed = false -workflowID = "{{ .WorkflowID }}" -workflow = """ -{{ .Workflow }} -""" -workflowOwner = "{{ .WorkflowOwner }}" \ No newline at end of file diff --git a/deployment/data-feeds/offchain/workflow_spec.yaml.tmpl b/deployment/data-feeds/offchain/workflow_spec.yaml.tmpl deleted file mode 100644 index 203056d0c59..00000000000 --- a/deployment/data-feeds/offchain/workflow_spec.yaml.tmpl +++ /dev/null @@ -1,61 +0,0 @@ -name: "{{ .WorkflowName }}" -owner: "{{ .WorkflowOwner }}" - -triggers: - - id: "{{ .TriggerCapabilityName }}" - config: - maxFrequencyMs: {{ .TriggersMaxFrequencyMs }} - feedIds: - {{- range .Feeds }} - - "{{ .StreamsID }}" # {{ .Description }} - {{- end }} - -consensus: - - id: "offchain_reporting@1.0.0" - ref: "{{ .ConsensusRef }}" - inputs: - observations: - - $(trigger.outputs) - config: - report_id: "{{ .ConsensusReportID }}" - key_id: "{{ .ConsensusConfigKeyID }}" - aggregation_method: "{{.ConsensusAggregationMethod}}" - aggregation_config: - {{- if .ConsensusAllowedPartialStaleness -}} - {{""}} - allowedPartialStaleness: '{{ .ConsensusAllowedPartialStaleness }}' - {{- end }} - {{- if eq .ConsensusAggregationMethod "llo_streams" }} - streams: - {{- else }} - feeds: - {{- end }} - {{- range $index, $feed := .Feeds }} - "{{ $feed.StreamsID }}": # {{ $feed.Description }} - {{- if $feed.FeedID }} - remappedID: "{{ $feed.FeedID }}" - {{- end }} - deviation: "{{ $feed.Deviation }}" - heartbeat: {{ $feed.Heartbeat }} - {{- end }} - - encoder: "EVM" - encoder_config: - abi: {{ .ConsensusEncoderABI }} - -targets: - - id: "{{ .WriteTargetTrigger }}" - inputs: - signed_report: $({{ .ConsensusRef }}.outputs) - config: - address: "{{ .DataFeedsCacheAddress }}" - deltaStage: "{{ .DeltaStageSec }}s" - schedule: "{{ .TargetsSchedule }}" - {{- if .CREStepTimeout -}} - {{""}} - cre_step_timeout: {{ .CREStepTimeout }} - {{- end }} - {{- if .TargetProcessor -}} - {{""}} - processor: {{ .TargetProcessor }} - {{- end }} From 1f64936e50d794efeb6529b78039eae2929f19be Mon Sep 17 00:00:00 2001 From: Oliver Townsend <133903322+ogtownsend@users.noreply.github.com> Date: Fri, 25 Sep 2026 23:25:09 +0000 Subject: [PATCH 2/2] bump cl-solana plugin ref (#23828) --- plugins/plugins.public.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/plugins.public.yaml b/plugins/plugins.public.yaml index 97e68ec611f..5e342c7215d 100644 --- a/plugins/plugins.public.yaml +++ b/plugins/plugins.public.yaml @@ -28,7 +28,7 @@ plugins: solana: - moduleURI: "github.com/smartcontractkit/chainlink-solana" - gitRef: "v1.3.1-0.20260910161304-da23c5c00c4b" + gitRef: "v1.3.1-0.20260915153909-e434f8636b23" installPath: "./pkg/solana/cmd/chainlink-solana" starknet: