Skip to content

Only load state once in proposal generation #20575

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
carte7000 merged 1 commit into from
Dec 10, 2025
Merged

Only load state once in proposal generation #20575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions deployment/ccip/shared/deployergroup/deployer_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,18 +335,14 @@ func (d *DeployerGroup) Enact() (cldf.ChangesetOutput, error) {
return d.enactDeployer()
}

func ValidateMCMS(env cldf.Environment, selector uint64, mcmConfig *proposalutils.TimelockConfig) error {
func ValidateMCMSWithState(env cldf.Environment, selector uint64, mcmConfig *proposalutils.TimelockConfig, state stateview.CCIPOnChainState) error {
family, err := chain_selectors.GetSelectorFamily(selector)
if err != nil {
return fmt.Errorf("failed to get chain selector family: %w", err)
}

switch family {
case chain_selectors.FamilyEVM:
state, err := stateview.LoadOnchainState(env)
if err != nil {
return fmt.Errorf("failed to load onchain state: %w", err)
}
mcmsState, ok := state.EVMMCMSStateByChain()[selector]
if !ok {
return fmt.Errorf("failed to get mcms state for chain %d", selector)
Expand Down Expand Up @@ -376,7 +372,7 @@ func (d *DeployerGroup) enactMcms() (cldf.ChangesetOutput, error) {
batches := make([]mcmstypes.BatchOperation, 0, len(dc.transactions))
describedBatches := make([][]string, 0, len(dc.transactions))
for selector, txs := range dc.transactions {
err := ValidateMCMS(d.e, selector, d.mcmConfig)
err := ValidateMCMSWithState(d.e, selector, d.mcmConfig, d.state)
if err != nil {
return cldf.ChangesetOutput{}, fmt.Errorf("failed to validate mcms state: %w", err)
}
Expand Down
Loading