Skip to content

consolidate deployment types#1039

Open
tt-cll wants to merge 16 commits intomainfrom
tt/offchain2
Open

consolidate deployment types#1039
tt-cll wants to merge 16 commits intomainfrom
tt/offchain2

Conversation

@tt-cll
Copy link
Copy Markdown
Contributor

@tt-cll tt-cll commented Apr 21, 2026

No description provided.

Base automatically changed from tt/offchain to main April 22, 2026 02:08
@github-actions
Copy link
Copy Markdown

Code coverage report:

Package main tt/offchain2 diff
github.com/smartcontractkit/chainlink-ccv/aggregator 47.86% 48.46% +0.60%
github.com/smartcontractkit/chainlink-ccv/bootstrap 42.60% 42.60% +0.00%
github.com/smartcontractkit/chainlink-ccv/cli 65.13% 65.13% +0.00%
github.com/smartcontractkit/chainlink-ccv/cmd 0.00% 0.00% +0.00%
github.com/smartcontractkit/chainlink-ccv/common 50.74% 50.74% +0.00%
github.com/smartcontractkit/chainlink-ccv/executor 45.97% 45.97% +0.00%
github.com/smartcontractkit/chainlink-ccv/indexer 37.72% 37.69% -0.03%
github.com/smartcontractkit/chainlink-ccv/integration 47.68% 47.68% +0.00%
github.com/smartcontractkit/chainlink-ccv/pkg 100.00% 84.62% -15.38%
github.com/smartcontractkit/chainlink-ccv/pricer 0.00% 0.00% +0.00%
github.com/smartcontractkit/chainlink-ccv/protocol 65.19% 65.19% +0.00%
github.com/smartcontractkit/chainlink-ccv/verifier 32.73% 32.74% +0.01%

@tt-cll tt-cll marked this pull request as ready for review April 22, 2026 11:47
@tt-cll tt-cll requested a review from a team as a code owner April 22, 2026 11:47
Copilot AI review requested due to automatic review settings April 22, 2026 11:47
@tt-cll tt-cll requested a review from a team as a code owner April 22, 2026 11:47
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR consolidates duplicated “deployment/config” types (notably monitoring and generated offchain config types) into canonical packages, and updates deployment tooling and devenv to use those shared definitions.

Changes:

  • Introduces pkg/monitoring as the canonical home for monitoring config + validation, and replaces per-service copies with type aliases.
  • Removes deployment-local generated config structs (aggregator/indexer/token verifier) and updates env metadata + changesets to store/use the canonical types directly.
  • Updates devenv + CCIP interfaces to use deployment.EnvironmentTopology directly (keeping a compatibility shim for CCIP offchain topology conversion).

Reviewed changes

Copilot reviewed 28 out of 28 changed files in this pull request and generated 9 comments.

Show a summary per file
File Description
verifier/pkg/vtypes/config.go Replaces local monitoring structs with aliases to pkg/monitoring.
pkg/monitoring/config.go Adds canonical monitoring config structs + validation.
indexer/pkg/config/monitoring.go Aliases indexer monitoring config to pkg/monitoring.
indexer/pkg/config/config.go Adds JSON tags to generated indexer config structs.
executor/config.go Aliases executor monitoring config to pkg/monitoring.
deployment/topology.go Aliases deployment monitoring config to pkg/monitoring.
deployment/env_metadata_util.go Stores aggregator/indexer/token-verifier offchain configs using canonical package types.
deployment/changesets/* Updates changesets to build/persist canonical types (removes conversion helpers).
deployment/{aggregator.go,indexer.go,token_verifier.go} Removes deployment-local type definitions (now sourced from canonical packages).
build/devenv/** Removes offchainloader indirection; switches devenv topology plumbing to deployment.EnvironmentTopology.
aggregator/pkg/model/config.go Adds JSON tags and aliases aggregator monitoring config to pkg/monitoring.
build/devenv/offchainloader/loader.go Removed (no longer needed after using canonical types directly).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread build/devenv/services/executor.go
Comment thread build/devenv/services/executor/base.go
Comment thread build/devenv/services/executor/base.go
Comment thread build/devenv/services/committeeverifier/base.go
Comment thread pkg/monitoring/config.go
Comment thread pkg/monitoring/config.go
Comment thread indexer/pkg/config/config.go
Comment thread build/devenv/services/common.go
Comment thread build/devenv/services/tokenVerifier.go
@tt-cll tt-cll enabled auto-merge April 22, 2026 12:01
Copy link
Copy Markdown
Collaborator

@makramkd makramkd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants