Skip to content

chore: remove state loading evm usages with cld-changesets imports#22261

Open
ecPablo wants to merge 15 commits intodevelopfrom
ecpablo/replace-state-loading-evm
Open

chore: remove state loading evm usages with cld-changesets imports#22261
ecPablo wants to merge 15 commits intodevelopfrom
ecpablo/replace-state-loading-evm

Conversation

@ecPablo
Copy link
Copy Markdown
Contributor

@ecPablo ecPablo commented Apr 30, 2026

Removes the deployment/common/changesets/state/evm.go file from the repo and swaps all the usages to imports to the cld-changesets repo.

  • NOTE: We are still not fully removing the file as there's some usages in CLD that need to be swapped post merge to prevent breaking changes.

AI Summary

This pull request refactors the codebase to use the new evmstate package from cld-changesets/pkg/family/evm instead of the previous common/changeset/state package for EVM-related state management. The changes are largely mechanical but affect many files across deployment, shared state, and test code, ensuring a consistent and centralized approach to EVM state handling.

Key changes include:

Migration to evmstate Package

  • Replaced all imports and usages of common/changeset/state (and related identifiers such as commonstate) with evmstate from cld-changesets/pkg/family/evm across deployment, shared state, and test files. This includes types like MCMSWithTimelockState, LinkTokenState, and related state loading functions. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12]

  • Updated all relevant function signatures, struct fields, and method implementations to use types and functions from the new evmstate package. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17]

View Layer Alignment

  • Updated the view layer (deployment/ccip/view/view.go) to use the MCMSWithTimelockView from the new mcmsv10 package, ensuring consistency with the underlying state changes. [1] [2] [3]

These changes help consolidate EVM state logic into a single, maintained package, reducing duplication and the risk of inconsistencies across the codebase.

ecPablo added 8 commits April 23, 2026 10:55
# Conflicts:
#	core/scripts/go.sum
#	deployment/go.mod
#	deployment/go.sum
#	integration-tests/go.mod
#	integration-tests/go.sum
#	integration-tests/load/go.mod
#	integration-tests/load/go.sum
#	system-tests/lib/go.mod
#	system-tests/lib/go.sum
#	system-tests/tests/go.mod
#	system-tests/tests/go.sum
# Conflicts:
#	core/scripts/go.mod
#	deployment/ccip/view/view.go
#	deployment/common/changeset/state.go
#	deployment/common/changeset/state/evm.go
#	deployment/cre/capabilities_registry/v2/changeset/update_don.go
#	deployment/go.mod
#	integration-tests/go.mod
#	system-tests/lib/go.mod
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 30, 2026

CORA - Pending Reviewers

All codeowners have approved! ✅

Legend: ✅ Approved | ❌ Changes Requested | 💬 Commented | 🚫 Dismissed | ⏳ Pending | ❓ Unknown

For more details, see the full review summary.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 30, 2026

✅ No conflicts with other open PRs targeting develop

@trunk-io
Copy link
Copy Markdown

trunk-io Bot commented Apr 30, 2026

Static BadgeStatic BadgeStatic BadgeStatic Badge

View Full Report ↗︎Docs

This comment was marked as resolved.

@ecPablo ecPablo added the runs-on-opt-out opt-out to self-hosted runners for certain jobs label Apr 30, 2026
@ecPablo ecPablo marked this pull request as ready for review April 30, 2026 19:58
@ecPablo ecPablo requested review from a team as code owners April 30, 2026 19:58
ecPablo added 2 commits April 30, 2026 23:45
# Conflicts:
#	deployment/common/proposalutils/propose.go
@ecPablo ecPablo added runs-on-opt-out opt-out to self-hosted runners for certain jobs and removed runs-on-opt-out opt-out to self-hosted runners for certain jobs labels May 1, 2026
@erikburt erikburt removed the runs-on-opt-out opt-out to self-hosted runners for certain jobs label May 1, 2026
@cl-sonarqube-production
Copy link
Copy Markdown

Quality Gate failed Quality Gate failed

Failed conditions
13.4% Duplication on New Code (required ≤ 10%)

See analysis details on SonarQube

@ecPablo ecPablo marked this pull request as ready for review May 1, 2026 17:10
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.

4 participants