Skip to content

feat(cld): show proposed jobs for NOP #19989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MStreet3 merged 2 commits into from
Oct 21, 2025
Merged

feat(cld): show proposed jobs for NOP #19989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce5f3a2
feat: shows proposed jobs in view
MStreet3 Oct 21, 2025
39a6846
deps: bumps changeset
MStreet3 Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/dull-cycles-yell.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#internal exposes proposed jobs as nop view
20 changes: 16 additions & 4 deletions deployment/common/view/nops.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ type NopView struct {
IsEnabled bool `json:"isEnabled"`
Labels []LabelView `json:"labels,omitempty"`
ApprovedJobspecs map[string]JobView `json:"approvedJobspecs,omitempty"` // jobID => jobSpec
ProposedJobspecs map[string]JobView `json:"proposedJobspecs,omitempty"` // jobID => jobSpec
}

type JobView struct {
Expand Down Expand Up @@ -78,7 +79,7 @@ func GenerateNopsView(lggr logger.Logger, nodeIDs []string, oc cldf_offchain.Cli
}
return nil
}
jobspecs, err := approvedJobspecs(context.Background(), lggr, nodeIDs, oc)
jobspecs, proposedSpecs, err := approvedJobspecs(context.Background(), lggr, nodeIDs, oc)
if err != nil {
// best effort on job specs
lggr.Warnf("Failed to get approved jobspecs: %v", err)
Expand Down Expand Up @@ -112,6 +113,7 @@ func GenerateNopsView(lggr logger.Logger, nodeIDs []string, oc cldf_offchain.Cli
IsEnabled: nodeDetails.IsEnabled,
Labels: labels,
ApprovedJobspecs: jobspecs[node.NodeID],
ProposedJobspecs: proposedSpecs[node.NodeID],
}
for details, ocrConfig := range node.SelToOCRConfig {
nop.OCRKeys[details.ChainName] = OCRKeyView{
Expand All @@ -128,16 +130,17 @@ func GenerateNopsView(lggr logger.Logger, nodeIDs []string, oc cldf_offchain.Cli
return nv, nil
}

func approvedJobspecs(ctx context.Context, lggr logger.Logger, nodeIDs []string, oc cldf_offchain.Client) (nodeJobsView map[string]map[string]JobView, verr error) {
func approvedJobspecs(ctx context.Context, lggr logger.Logger, nodeIDs []string, oc cldf_offchain.Client) (nodeJobsView map[string]map[string]JobView, proposedJobsView map[string]map[string]JobView, verr error) {
nodeJobsView = make(map[string]map[string]JobView)
proposedJobsView = make(map[string]map[string]JobView)

jobs, err := oc.ListJobs(ctx, &jobv1.ListJobsRequest{
Filter: &jobv1.ListJobsRequest_Filter{
NodeIds: nodeIDs,
},
})
if err != nil {
return nodeJobsView, fmt.Errorf("failed to list jobs for nodes %v: %w", nodeIDs, err)
return nodeJobsView, proposedJobsView, fmt.Errorf("failed to list jobs for nodes %v: %w", nodeIDs, err)
}
nodeJobIDs := make(map[string]map[string]*jobv1.Job) // node id -> job id -> job
for i, j := range jobs.Jobs {
Expand All @@ -154,6 +157,7 @@ func approvedJobspecs(ctx context.Context, lggr logger.Logger, nodeIDs []string,
// list proposals for each node
for nodeID, jobs := range nodeJobIDs {
jv := make(map[string]JobView) // job id -> view
proposed := make(map[string]JobView)
lresp, err := oc.ListProposals(ctx, &jobv1.ListProposalsRequest{
Filter: &jobv1.ListProposalsRequest_Filter{
JobIds: slices.Collect(maps.Keys(jobs)),
Expand All @@ -166,6 +170,13 @@ func approvedJobspecs(ctx context.Context, lggr logger.Logger, nodeIDs []string,
continue
}
for _, p := range lresp.Proposals {
if p.Status == jobv1.ProposalStatus_PROPOSAL_STATUS_PROPOSED {
proposed[p.JobId] = JobView{
ProposalID: p.Id,
UUID: jobs[p.JobId].Uuid,
Spec: p.Spec,
}
}
if p.Status == jobv1.ProposalStatus_PROPOSAL_STATUS_APPROVED {
jv[p.JobId] = JobView{
ProposalID: p.Id,
Expand All @@ -175,6 +186,7 @@ func approvedJobspecs(ctx context.Context, lggr logger.Logger, nodeIDs []string,
}
}
nodeJobsView[nodeID] = jv
proposedJobsView[nodeID] = proposed
}
return nodeJobsView, verr
return nodeJobsView, proposedJobsView, verr
}
Loading