chore: update GasBoostConfig & MCMSWithTimelockConfig to be imported from cldf

deployment/ccip/changeset/aptos/config/deploy_curse_mcms.go

@@ -3,17 +3,17 @@ package config
 import (
 	"fmt"
 
+	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
 	mcmstypes "github.com/smartcontractkit/mcms/types"
 
-	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
-	"github.com/smartcontractkit/chainlink/deployment/common/types"
 )
 
 // DeployCurseMCMSConfig holds per-chain configuration for deploying and
 // configuring a CurseMCMS contract on Aptos chains.
 type DeployCurseMCMSConfig struct {
-	CurseMCMSConfigPerChain    map[uint64]types.MCMSWithTimelockConfigV2
+	CurseMCMSConfigPerChain    map[uint64]cldfproposalutils.MCMSWithTimelockConfig
 	MCMSTimelockConfigPerChain map[uint64]proposalutils.TimelockConfig
 }
 

deployment/ccip/changeset/aptos/sequence/deploy_curse_mcms.go

@@ -5,17 +5,19 @@ import (
 	aptosmcms "github.com/smartcontractkit/mcms/sdk/aptos"
 	mcmstypes "github.com/smartcontractkit/mcms/types"
 
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
+
 	"github.com/smartcontractkit/chainlink-deployments-framework/operations"
+
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/aptos/dependency"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/aptos/operation"
-	"github.com/smartcontractkit/chainlink/deployment/common/types"
 )
 
 // DeployCurseMCMSSeqInput holds the configuration for deploying CurseMCMS.
 type DeployCurseMCMSSeqInput struct {
 	MCMSAddress aptos.AccountAddress
 	CCIPAddress aptos.AccountAddress
-	CurseMCMS   types.MCMSWithTimelockConfigV2
+	CurseMCMS   cldfproposalutils.MCMSWithTimelockConfig
 }
 
 // DeployCurseMCMSSeqOutput holds the deployed address and a CurseMCMS

deployment/ccip/changeset/cs_orchestrate_changesets_test.go

@@ -13,6 +13,9 @@ import (
 	"github.com/smartcontractkit/mcms/types"
 	"github.com/stretchr/testify/require"
 
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
+	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
+
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
@@ -27,7 +30,6 @@ import (
 	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 
 	commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
-	commontypes "github.com/smartcontractkit/chainlink/deployment/common/types"
 )
 
 var multiplyBy2 = operations.NewOperation(
@@ -102,8 +104,8 @@ func newRuntimeWithMCMS(t *testing.T) *runtime.Runtime {
 	require.NoError(t, err)
 
 	err = rt.Exec(
-		runtime.ChangesetTask(cldf.CreateLegacyChangeSet(commonchangeset.DeployMCMSWithTimelockV2), map[uint64]commontypes.MCMSWithTimelockConfigV2{
-			selector: proposalutils.SingleGroupTimelockConfigV2(t),
+		runtime.ChangesetTask(cldf.CreateLegacyChangeSet(commonchangeset.DeployMCMSWithTimelockV2), map[uint64]cldfproposalutils.MCMSWithTimelockConfig{
+			selector: cldftesthelpers.SingleGroupTimelockConfig(t),
 		}),
 	)
 	require.NoError(t, err)

deployment/ccip/changeset/solana_v0_1_0/cs_deploy_chain.go

@@ -15,6 +15,8 @@ import (
 	"github.com/smartcontractkit/mcms"
 	mcmsTypes "github.com/smartcontractkit/mcms/types"
 
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
+
 	cldf_solana "github.com/smartcontractkit/chainlink-deployments-framework/chain/solana"
 
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
@@ -76,7 +78,7 @@ type DeployChainContractsConfig struct {
 	BurnMintTokenPoolMetadata    string
 	LockReleaseTokenPoolMetadata string
 	// if specified, the mcms contracts will be deployed and initialized if they are not already deployed
-	MCMSWithTimelockConfig *types.MCMSWithTimelockConfigV2
+	MCMSWithTimelockConfig *cldfproposalutils.MCMSWithTimelockConfig
 }
 
 type ChainContractParams struct {

deployment/ccip/changeset/solana_v0_1_1/cs_deploy_chain.go

@@ -14,6 +14,8 @@ import (
 	"github.com/smartcontractkit/mcms"
 	mcmsTypes "github.com/smartcontractkit/mcms/types"
 
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
+
 	cldf_solana "github.com/smartcontractkit/chainlink-deployments-framework/chain/solana"
 
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
@@ -78,7 +80,7 @@ type DeployChainContractsConfig struct {
 	BurnMintTokenPoolMetadata    []string
 	LockReleaseTokenPoolMetadata []string
 	// if specified, the mcms contracts will be deployed and initialized if they are not already deployed
-	MCMSWithTimelockConfig *types.MCMSWithTimelockConfigV2
+	MCMSWithTimelockConfig *cldfproposalutils.MCMSWithTimelockConfig
 }
 
 type ChainContractParams struct {

deployment/ccip/changeset/solana_v0_1_1/cs_deploy_chain_test.go

@@ -12,6 +12,8 @@ import (
 	"github.com/smartcontractkit/quarantine"
 	"github.com/stretchr/testify/require"
 
+	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
+
 	cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 	"github.com/smartcontractkit/chainlink-deployments-framework/engine/test/environment"
@@ -39,7 +41,7 @@ func initialDeployCS(t *testing.T, e cldf.Environment, buildConfig *ccipChangese
 	require.NoError(t, err)
 	feeAggregatorPrivKey, _ := solana.NewRandomPrivateKey()
 	feeAggregatorPubKey := feeAggregatorPrivKey.PublicKey()
-	mcmsConfig := proposalutils.SingleGroupTimelockConfigV2(t)
+	mcmsConfig := cldftesthelpers.SingleGroupTimelockConfig(t)
 	solLinkTokenPrivKey, _ := solana.NewRandomPrivateKey()
 	return []commonchangeset.ConfiguredChangeSet{
 		commonchangeset.Configure(

deployment/ccip/changeset/solana_v0_1_1/transfer_ccip_to_mcms_with_timelock_test.go

@@ -11,6 +11,8 @@ import (
 	chainselectors "github.com/smartcontractkit/chain-selectors"
 	"github.com/stretchr/testify/require"
 
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
+
 	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
 
 	"github.com/smartcontractkit/chainlink-ccip/chains/solana/contracts/tests/testutils"
@@ -38,7 +40,6 @@ import (
 	solanastateview "github.com/smartcontractkit/chainlink/deployment/ccip/shared/stateview/solana"
 	commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
 	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
-	commontypes "github.com/smartcontractkit/chainlink/deployment/common/types"
 	"github.com/smartcontractkit/chainlink/deployment/internal/soltestutils"
 )
 
@@ -275,7 +276,7 @@ func prepareEnvironmentForOwnershipTransfer(t *testing.T) (cldf.Environment, sta
 		),
 		commonchangeset.Configure(
 			cldf.CreateLegacyChangeSet(commonchangeset.DeployMCMSWithTimelockV2),
-			map[uint64]commontypes.MCMSWithTimelockConfigV2{
+			map[uint64]cldfproposalutils.MCMSWithTimelockConfig{
 				solChainSel: {
 					Canceller:        cldftesthelpers.SingleGroupMCMS(t),
 					Proposer:         cldftesthelpers.SingleGroupMCMS(t),

deployment/ccip/changeset/testhelpers/test_environment.go

@@ -26,6 +26,9 @@ import (
 	"github.com/xssnick/tonutils-go/tlb"
 	"go.uber.org/zap/zapcore"
 
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
+	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
+
 	ops "github.com/smartcontractkit/chainlink-ton/deployment/ccip"
 	tonOperation "github.com/smartcontractkit/chainlink-ton/deployment/ccip/operation"
 	"github.com/smartcontractkit/chainlink-ton/deployment/utils"
@@ -73,6 +76,7 @@ import (
 	"github.com/smartcontractkit/chainlink-ccip/pluginconfig"
 
 	"github.com/smartcontractkit/chainlink-common/keystore/corekeys/p2pkey"
+
 	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/globals"
 	ccipChangeSetSolana "github.com/smartcontractkit/chainlink/deployment/ccip/changeset/solana_v0_1_0"
@@ -725,9 +729,9 @@ func NewEnvironmentWithPrerequisitesContracts(t *testing.T, tEnv TestEnvironment
 	e := NewEnvironment(t, tEnv)
 	evmChains := e.Env.BlockChains.ListChainSelectors(cldf_chain.WithFamily(chain_selectors.FamilyEVM))
 	solChains := e.Env.BlockChains.ListChainSelectors(cldf_chain.WithFamily(chain_selectors.FamilySolana))
-	mcmsCfg := make(map[uint64]commontypes.MCMSWithTimelockConfigV2)
+	mcmsCfg := make(map[uint64]cldfproposalutils.MCMSWithTimelockConfig)
 	for _, c := range e.Env.BlockChains.ListChainSelectors(cldf_chain.WithFamily(chain_selectors.FamilyEVM)) {
-		mcmsCfg[c] = proposalutils.SingleGroupTimelockConfigV2(t)
+		mcmsCfg[c] = cldftesthelpers.SingleGroupTimelockConfig(t)
 	}
 	prereqCfg := make([]changeset.DeployPrerequisiteConfigPerChain, 0)
 	for _, chain := range evmChains {
@@ -855,15 +859,15 @@ func NewEnvironmentWithJobsAndContracts(t *testing.T, tEnv TestEnvironment) Depl
 }
 
 func DeployChainContractsToSolChainCSV0_1_1(e DeployedEnv, solChainSelector uint64, preload bool, buildSolConfig *ccipChangeSetSolanaV0_1_1.BuildSolanaConfig) ([]commonchangeset.ConfiguredChangeSet, error) {
-	var mcmsCfg *commontypes.MCMSWithTimelockConfigV2
+	var mcmsCfg *cldfproposalutils.MCMSWithTimelockConfig
 	if preload {
 		// Pre load default programs
 		err := SavePreloadedSolAddresses(e.Env, solChainSelector)
 		if err != nil {
 			return nil, err
 		}
 	} else {
-		mcmsCfg = &commontypes.MCMSWithTimelockConfigV2{
+		mcmsCfg = &cldfproposalutils.MCMSWithTimelockConfig{
 			Proposer: mcmstypes.Config{
 				Quorum:  1,
 				Signers: []common.Address{common.HexToAddress("0x0000000000000000000000000000000000000001")},
@@ -927,15 +931,15 @@ func DeployChainContractsToSolChainCSV0_1_1(e DeployedEnv, solChainSelector uint
 }
 
 func DeployChainContractsToSolChainCS(e DeployedEnv, solChainSelector uint64, preload bool, buildSolConfig *ccipChangeSetSolanaV0_1_1.BuildSolanaConfig) ([]commonchangeset.ConfiguredChangeSet, error) {
-	var mcmsCfg *commontypes.MCMSWithTimelockConfigV2
+	var mcmsCfg *cldfproposalutils.MCMSWithTimelockConfig
 	if preload {
 		// Pre load default programs
 		err := SavePreloadedSolAddresses(e.Env, solChainSelector)
 		if err != nil {
 			return nil, err
 		}
 	} else {
-		mcmsCfg = &commontypes.MCMSWithTimelockConfigV2{
+		mcmsCfg = &cldfproposalutils.MCMSWithTimelockConfig{
 			Proposer: mcmstypes.Config{
 				Quorum:  1,
 				Signers: []common.Address{common.HexToAddress("0x0000000000000000000000000000000000000001")},

deployment/ccip/changeset/testhelpers/test_helpers_solana_v0_1_0.go

@@ -28,6 +28,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
 
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
+
 	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
 
 	cldlegacysolmcms "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/solana"
@@ -2448,7 +2450,7 @@ func TransferOwnershipSolanaV0_1_0(
 		*e, _, err = commoncs.ApplyChangesets(t, *e, []commoncs.ConfiguredChangeSet{
 			commoncs.Configure(
 				cldf.CreateLegacyChangeSet(commoncs.DeployMCMSWithTimelockV2),
-				map[uint64]commontypes.MCMSWithTimelockConfigV2{
+				map[uint64]cldfproposalutils.MCMSWithTimelockConfig{
 					solSelector: {
 						Canceller:        cldftesthelpers.SingleGroupMCMS(t),
 						Proposer:         cldftesthelpers.SingleGroupMCMS(t),

deployment/ccip/changeset/testhelpers/test_helpers_solana_v0_1_1.go

@@ -17,6 +17,8 @@ import (
 	"github.com/gagliardetto/solana-go/rpc"
 	"github.com/stretchr/testify/require"
 
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
+
 	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
 
 	tonOps "github.com/smartcontractkit/chainlink-ton/deployment/ccip"
@@ -50,7 +52,6 @@ import (
 	solanastateview "github.com/smartcontractkit/chainlink/deployment/ccip/shared/stateview/solana"
 	commoncs "github.com/smartcontractkit/chainlink/deployment/common/changeset"
 	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
-	commontypes "github.com/smartcontractkit/chainlink/deployment/common/types"
 	"github.com/smartcontractkit/chainlink/deployment/utils/solutils"
 )
 
@@ -66,7 +67,7 @@ func TransferOwnershipSolanaV0_1_1(
 		*e, _, err = commoncs.ApplyChangesets(t, *e, []commoncs.ConfiguredChangeSet{
 			commoncs.Configure(
 				cldf.CreateLegacyChangeSet(commoncs.DeployMCMSWithTimelockV2),
-				map[uint64]commontypes.MCMSWithTimelockConfigV2{
+				map[uint64]cldfproposalutils.MCMSWithTimelockConfig{
 					solSelector: {
 						Canceller:        cldftesthelpers.SingleGroupMCMS(t),
 						Proposer:         cldftesthelpers.SingleGroupMCMS(t),

deployment/ccip/changeset/testhelpers/test_token_helpers.go

@@ -11,6 +11,8 @@ import (
 	chain_selectors "github.com/smartcontractkit/chain-selectors"
 	"github.com/stretchr/testify/require"
 
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
+
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/token_pool"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/initial/burn_mint_erc677"
@@ -22,6 +24,7 @@ import (
 	"github.com/smartcontractkit/chainlink-deployments-framework/engine/test/runtime"
 
 	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
+
 	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/v1_5_1"
@@ -30,7 +33,6 @@ import (
 	"github.com/smartcontractkit/chainlink/deployment/ccip/shared/stateview"
 	commoncs "github.com/smartcontractkit/chainlink/deployment/common/changeset"
 	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
-	commontypes "github.com/smartcontractkit/chainlink/deployment/common/types"
 )
 
 const (
@@ -83,9 +85,9 @@ func SetupTwoChainEnvironmentWithTokens(
 		}
 	}
 
-	mcmsCfg := make(map[uint64]commontypes.MCMSWithTimelockConfigV2)
+	mcmsCfg := make(map[uint64]cldfproposalutils.MCMSWithTimelockConfig)
 	for _, selector := range selectors {
-		mcmsCfg[selector] = proposalutils.SingleGroupTimelockConfigV2(t)
+		mcmsCfg[selector] = cldftesthelpers.SingleGroupTimelockConfig(t)
 	}
 
 	// Deploy one burn-mint token per chain to use in the tests

deployment/ccip/changeset/v1_6/cs_add_new_chain_e2e.go

@@ -10,6 +10,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	mcmslib "github.com/smartcontractkit/mcms"
 
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
+
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 
 	"github.com/smartcontractkit/chainlink/deployment"
@@ -20,13 +22,12 @@ import (
 	"github.com/smartcontractkit/chainlink/deployment/ccip/shared"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/shared/stateview"
 
-	commoncs "github.com/smartcontractkit/chainlink/deployment/common/changeset"
-	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
-	commontypes "github.com/smartcontractkit/chainlink/deployment/common/types"
-
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/don_id_claimer"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_3/fee_quoter"
 
+	commoncs "github.com/smartcontractkit/chainlink/deployment/common/changeset"
+	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
+
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
 )
 
@@ -102,7 +103,7 @@ type AddCandidatesForNewChainConfig struct {
 	// RemoteChains defines the remote chains to be connected to the new chain.
 	RemoteChains []ChainDefinition `json:"remoteChains"`
 	// MCMSDeploymentConfig configures the MCMS deployment to the new chain.
-	MCMSDeploymentConfig *commontypes.MCMSWithTimelockConfigV2 `json:"mcmsDeploymentConfig,omitempty"`
+	MCMSDeploymentConfig *cldfproposalutils.MCMSWithTimelockConfig `json:"mcmsDeploymentConfig,omitempty"`
 	// MCMSConfig defines the MCMS configuration for the changeset.
 	MCMSConfig *proposalutils.TimelockConfig `json:"mcmsConfig,omitempty"`
 	// The offset to adjust the donID in DonIDClaimer (useful when certain DON IDs are dropped)
@@ -285,7 +286,7 @@ func addCandidatesForNewChainLogic(e cldf.Environment, c AddCandidatesForNewChai
 		// Deploy MCMS contracts
 		if c.MCMSDeploymentConfig != nil {
 			err = runAndSaveAddresses(func() (cldf.ChangesetOutput, error) {
-				return commoncs.DeployMCMSWithTimelockV2(e, map[uint64]commontypes.MCMSWithTimelockConfigV2{
+				return commoncs.DeployMCMSWithTimelockV2(e, map[uint64]cldfproposalutils.MCMSWithTimelockConfig{
 					c.NewChain.Selector: *c.MCMSDeploymentConfig,
 				})
 			}, newAddresses, e.ExistingAddresses)

deployment/ccip/changeset/v1_6/cs_add_new_chain_e2e_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	chain_selectors "github.com/smartcontractkit/chain-selectors"
+	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
 
 	"github.com/smartcontractkit/chainlink-ccip/chainconfig"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_2_0/router"
@@ -398,7 +399,7 @@ func TestAddAndPromoteCandidatesForNewChain(t *testing.T) {
 			// Build new chain configuration
 			nodeInfo, err := deployment.NodeInfo(e.NodeIDs, e.Offchain)
 			require.NoError(t, err, "must get node info")
-			mcmsDeploymentCfg := proposalutils.SingleGroupTimelockConfigV2(t)
+			mcmsDeploymentCfg := cldftesthelpers.SingleGroupTimelockConfig(t)
 			newChain := newChainConfigHelper(newChainSelector, deployedEnvironment.FeedChainSel, linkAddress, &nodeInfo, len(nodeInfo.NonBootstraps().PeerIDs()))
 
 			if test.ErrStr != "" {
@@ -643,7 +644,7 @@ func TestValidateTransmitterAddresses(t *testing.T) {
 			FeeQuoterDestChainConfig: v1_6.DefaultFeeQuoterDestChainConfig(true),
 		}
 
-		mcmsDeploymentCfg := proposalutils.SingleGroupTimelockConfigV2(t)
+		mcmsDeploymentCfg := cldftesthelpers.SingleGroupTimelockConfig(t)
 		donIDOffSet := uint32(0)
 		state, err := stateview.LoadOnchainState(e)
 		require.NoError(t, err, "must load onchain state")