chore: update GasBoostConfig & MCMSWithTimelockConfig to be imported from cldf#22393
Conversation
# Conflicts: # deployment/go.mod # deployment/go.sum
# Conflicts: # deployment/ccip/changeset/crossfamily/v1_6/cs_add_evm_solana_lane.go # deployment/ccip/shared/deployergroup/deployer_group.go # deployment/ccip/shared/stateview/state.go # deployment/common/changeset/example/solana_transfer_mcm.go # deployment/common/changeset/mcms_firedrill.go # deployment/common/changeset/set_config_mcms.go # deployment/common/changeset/set_config_mcms_test.go # deployment/common/changeset/solana/fund_mcm_pdas.go # deployment/common/proposalutils/propose.go # go.md
# Conflicts: # integration-tests/go.mod # integration-tests/load/go.mod # system-tests/lib/go.mod
CORA - Pending ReviewersAll codeowners have approved! ✅ Legend: ✅ Approved | ❌ Changes Requested | 💬 Commented | 🚫 Dismissed | ⏳ Pending | ❓ Unknown For more details, see the full review summary. |
|
✅ No conflicts with other open PRs targeting |
|
I see you updated files related to
|
There was a problem hiding this comment.
Pull request overview
Risk Rating: MEDIUM — Broad refactor across deployment + integration test codepaths and shared changeset/opsutils interfaces, but mostly mechanical type/source swaps.
This PR migrates usage of MCMS/timelock config (and related gas-boost config) types to come from the Chainlink Deployments Framework (cldf) proposalutils package, replacing the previously used deployment/common/types variants.
Changes:
- Replaces many
commontypes.MCMSWithTimelockConfigV2usages withcldfproposalutils.MCMSWithTimelockConfig. - Replaces several
proposalutils.SingleGroupTimelockConfigV2(t)test helpers withcldftesthelpers.SingleGroupTimelockConfig(t). - Switches gas boosting types and helper signatures to use
cldfproposalutils.GasBoostConfigacross opsutils and CCIP sequencing/config structs.
Reviewed changes
Copilot reviewed 67 out of 67 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| integration-tests/smoke/ccip/ccip_cs_update_rmn_config_test.go | Updates MCMS config map/type and helper to CLDF proposalutils equivalents. |
| integration-tests/smoke/ccip/ccip_add_chain_e2e_test.go | Uses CLDF test helper for MCMS deployment config in add-chain E2E flow. |
| deployment/vault/view/view_test.go | Switches vault MCMS setup test to CLDF MCMSWithTimelockConfig + helper. |
| deployment/vault/changeset/batch_native_transfer_test.go | Updates MCMS config map/type in vault batch transfer integration test. |
| deployment/keystone/changeset/test/env_setup.go | Updates keystone test env MCMS config map/type + helper. |
| deployment/keystone/changeset/accept_ownership_test.go | Updates DeployMCMSWithTimelockV2 input map type + helper. |
| deployment/environment/crib/ccip_deployer.go | Updates deployer-side MCMS config map/type construction to CLDF types. |
| deployment/data-feeds/changeset/update_data_id_proxy_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/data-feeds/changeset/set_feed_config_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/data-feeds/changeset/set_feed_admin_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/data-feeds/changeset/set_bundle_feed_config_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/data-feeds/changeset/remove_feed_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/data-feeds/changeset/remove_feed_config_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/data-feeds/changeset/remove_dataid_proxy_mapping_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/data-feeds/changeset/propose_aggregator_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/data-feeds/changeset/new_feed_with_proxy_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/data-feeds/changeset/confirm_aggregator_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/data-feeds/changeset/accept_ownership_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/cre/workflow_registry/v2/changeset/fixture_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/cre/test/env_setup.go | Switches MCMS config map/type + helper in CRE env setup. |
| deployment/cre/mcms/changeset/deploy.go | Changes MCMS per-chain config map type to CLDF proposalutils type. |
| deployment/cre/mcms/changeset/deploy_test.go | Updates test MCMS config type to CLDF proposalutils type. |
| deployment/cre/mcms/changeset/configure.go | Updates config struct field type to CLDF proposalutils MCMSWithTimelockConfig. |
| deployment/cre/mcms/changeset/configure_test.go | Updates test MCMS config type to CLDF proposalutils type. |
| deployment/cre/contracts/contracts_test.go | Switches MCMS deploy config type and helper to CLDF equivalents. |
| deployment/cre/capabilities_registry/v2/changeset/update_don_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/cre/capabilities_registry/v2/changeset/multiple_mcms_test.go | Switches MCMS deploy config map types and helpers to CLDF equivalents. |
| deployment/cre/capabilities_registry/v2/changeset/configure_capabilities_registry_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/common/types/types.go | Updates MCMSWithTimelockConfigV2.GasBoostConfig to use CLDF proposalutils GasBoostConfig. |
| deployment/common/proposalutils/propose_test.go | Updates DeployMCMSWithTimelockV2 input map type to CLDF proposalutils type. |
| deployment/common/opsutils/evm.go | Switches gas boost helpers and retry options to CLDF proposalutils GasBoostConfig types. |
| deployment/common/opsutils/evm_test.go | Updates tests to use CLDF proposalutils GasBoostConfig types. |
| deployment/common/changeset/transfer_to_mcms_with_timelock_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/common/changeset/state/solana_test.go | Switches solana MCMS config type to CLDF proposalutils MCMSWithTimelockConfig. |
| deployment/common/changeset/solana/setup_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/common/changeset/solana/mcms/mcms.go | Updates Solana deploy function signature to accept CLDF proposalutils MCMSWithTimelockConfig. |
| deployment/common/changeset/set_config_mcms_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/common/changeset/mcms_firedrill_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/common/changeset/example/solana_transfer_mcm_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/common/changeset/example/link_transfer_test.go | Switches MCMS deploy config map type to CLDF proposalutils type. |
| deployment/common/changeset/evm/mcms/seqs/seq_mcm_with_config.go | Updates seq input gas boost config type to CLDF proposalutils GasBoostConfig. |
| deployment/common/changeset/evm/mcms/seqs/seq_grant_roles_for_timelock.go | Updates seq input gas boost config type to CLDF proposalutils GasBoostConfig. |
| deployment/common/changeset/evm/mcms/mcms.go | Updates EVM deploy helper signature and gas boost types to CLDF proposalutils equivalents. |
| deployment/common/changeset/evm/mcms/mcms_test.go | Switches timelock config helper to CLDF test helper. |
| deployment/common/changeset/deploy_mcms_with_timelock.go | Changes DeployMCMSWithTimelockV2 input type and gas boost map type to CLDF proposalutils equivalents. |
| deployment/common/changeset/deploy_mcms_with_timelock_test.go | Switches MCMS deploy config map types and helpers to CLDF equivalents. |
| deployment/ccip/shared/stateview/state_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/ccip/shared/stateview/evm/validate_feequoter_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/ccip/shared/deployergroup/deployer_group_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/ccip/sequence/evm/v1_6/seq_deploy_chain.go | Switches GasBoostConfigPerChain fields to CLDF proposalutils GasBoostConfig. |
| deployment/ccip/changeset/v1_6/cs_translate_onramp_to_feequoter_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/ccip/changeset/v1_6/cs_deploy_registry_module_test.go | Switches MCMS deploy config map types and helpers to CLDF equivalents. |
| deployment/ccip/changeset/v1_6/cs_deploy_chain_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/ccip/changeset/v1_6/cs_add_registry_module_test.go | Switches MCMS deploy config map types and helpers to CLDF equivalents. |
| deployment/ccip/changeset/v1_6/cs_add_new_chain_e2e.go | Switches AddCandidates config MCMSDeploymentConfig pointer type and deploy call map type to CLDF proposalutils type. |
| deployment/ccip/changeset/v1_6/cs_add_new_chain_e2e_test.go | Switches MCMS deployment config helper to CLDF test helper. |
| deployment/ccip/changeset/testhelpers/test_token_helpers.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/ccip/changeset/testhelpers/test_helpers_solana_v0_1_1.go | Switches Solana MCMS deploy config map type to CLDF proposalutils type. |
| deployment/ccip/changeset/testhelpers/test_helpers_solana_v0_1_0.go | Switches Solana MCMS deploy config map type to CLDF proposalutils type. |
| deployment/ccip/changeset/testhelpers/test_environment.go | Switches prereq env MCMS deploy config map type and Sol deploy config pointer type to CLDF proposalutils types. |
| deployment/ccip/changeset/solana_v0_1_1/transfer_ccip_to_mcms_with_timelock_test.go | Switches Solana MCMS deploy config map type to CLDF proposalutils type. |
| deployment/ccip/changeset/solana_v0_1_1/cs_deploy_chain.go | Switches Solana deploy config MCMSWithTimelockConfig pointer type to CLDF proposalutils type. |
| deployment/ccip/changeset/solana_v0_1_1/cs_deploy_chain_test.go | Switches timelock config helper to CLDF test helper. |
| deployment/ccip/changeset/solana_v0_1_0/cs_deploy_chain.go | Switches Solana deploy config MCMSWithTimelockConfig pointer type to CLDF proposalutils type. |
| deployment/ccip/changeset/cs_orchestrate_changesets_test.go | Switches MCMS deploy config map type and helper to CLDF equivalents. |
| deployment/ccip/changeset/aptos/sequence/deploy_curse_mcms.go | Switches CurseMCMS config type to CLDF proposalutils MCMSWithTimelockConfig. |
| deployment/ccip/changeset/aptos/config/deploy_curse_mcms.go | Switches per-chain CurseMCMS config map type to CLDF proposalutils MCMSWithTimelockConfig. |
Replaces usages of the type
GasBoostConfig&MCMSWithTimelockConfigto import from cldf