add TON support for OrchestrateChangesets#21570
Open
huangzhen1997 wants to merge 4 commits intodevelopfrom
Open
add TON support for OrchestrateChangesets#21570huangzhen1997 wants to merge 4 commits intodevelopfrom
huangzhen1997 wants to merge 4 commits intodevelopfrom
Conversation
huangzhen1997
requested review from
0xAustinWang,
KodeyThomas,
asoliman92,
chris-de-leon-cll,
Copilot,
matYang,
mateusz-sekara and
winder
Contributor
There was a problem hiding this comment.
Pull request overview
Risk Rating: HIGH — this extends shared proposal aggregation logic (AggregateProposalsV2) used across deployment tooling and introduces a new chain-family path (TON) that can affect how multi-chain MCMS timelock proposals are constructed.
This PR aims to add TON support to OrchestrateChangesets by wiring TON MCMS/timelock state into the aggregated proposal flow.
Changes:
- Add TON MCMS role selection (
MCMBasedOnActionTON) and TON support inAggregateProposalsV2. - Extend the on-chain state view to load TON MCMS state by chain.
- Attempt to pass TON MCMS state into
OrchestrateChangesetsaggregation.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
deployment/common/proposalutils/propose.go |
Adds TON MCMS role selection + adds TON branch to multi-family proposal aggregation. |
deployment/ccip/shared/stateview/state.go |
Adds a TON MCMS state loader method returning (map, error). |
deployment/ccip/changeset/cs_orchestrate_changesets.go |
Plumbs TON MCMS state into orchestration’s call to AggregateProposalsV2. |
Requires scrupulous human review:
deployment/common/proposalutils/propose.goTON aggregation branch (qualifier selection semantics and how TON timelock/MCMS addresses are derived).- End-to-end correctness of TON aggregated proposals given
buildProposalMetadataV2currently has no TON handling (metadata requirements should be confirmed against the MCMS proposal format).
Suggested reviewers (per CODEOWNERS):
@smartcontractkit/operations-platform(owns/deployment/common)@smartcontractkit/ccip-tooling,@smartcontractkit/ccip-offchain,@smartcontractkit/operations-platform,@smartcontractkit/core(own/deployment/ccip)
You can also share your feedback on Copilot code review. Take the survey.
Comment on lines
+61
to
+85
| func (tc *TimelockConfig) MCMBasedOnActionTON(s *tonstate.MCMSSuiteState) (string, error) { | ||
| // if MCMSAction is not set, default to timelock.Schedule, this is to ensure no breaking changes for existing code | ||
| if tc.MCMSAction == "" { | ||
| tc.MCMSAction = types.TimelockActionSchedule | ||
| } | ||
| switch tc.MCMSAction { | ||
| case types.TimelockActionSchedule: | ||
| if s.Proposer == nil { | ||
| return "", errors.New("missing TON proposer") | ||
| } | ||
| return s.Proposer.String(), nil | ||
| case types.TimelockActionCancel: | ||
| if s.Canceller == nil { | ||
| return "", errors.New("missing TON canceller") | ||
| } | ||
| return s.Canceller.String(), nil | ||
| case types.TimelockActionBypass: | ||
| if s.Bypasser == nil { | ||
| return "", errors.New("missing TON bypasser") | ||
| } | ||
| return s.Bypasser.String(), nil | ||
| default: | ||
| return "", errors.New("invalid MCMS action") | ||
| } | ||
| } |
Comment on lines
+476
to
+495
| tonMCMS, exists := mcmsTimelockStates.MCMSTONState[chainSel] | ||
| if !exists { | ||
| return nil, fmt.Errorf("missing MCMS state for TON chain %d", chainSel) | ||
| } | ||
| qualifier := mcmsConfig.TimelockQualifierPerChain[chainSel] | ||
| // Get the default qualifier suite (or iterate ByQualifier) | ||
| suite, ok := tonMCMS.ByQualifier[qualifier] // default qualifier? | ||
| if !ok || suite == nil { | ||
| return nil, fmt.Errorf("missing TON timelock for chain %d qualifier %q", chainSel, qualifier) | ||
| } | ||
| if suite.Timelock == nil { | ||
| return nil, fmt.Errorf("missing TON timelock address for chain %d", chainSel) | ||
| } | ||
| timelocks[chainSel] = suite.Timelock.String() | ||
| // Select MCMS address based on action | ||
| mcmsAddr, err := mcmsConfig.MCMBasedOnActionTON(suite) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| mcmsPerChain[chainSel] = mcmsAddr |
tt-cll
previously approved these changes
Mar 17, 2026
Contributor
|
✅ No conflicts with other open PRs targeting |
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Requires
Supports
Resolve TON MCMS contract address