chore: replace mcms helpers usages [OPT-1911] (#22019)

chore: replace MCMS helper usages with cldf imports

Author: ecPablo

deployment/ccip/changeset/aptos/adapters/mcmsreader.go

@@ -7,12 +7,13 @@ 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"
+
 	mcms_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/mcms"
 	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
 	"github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 
 	"github.com/smartcontractkit/chainlink/deployment/ccip/shared/stateview/aptos"
-	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 )
 
 // AptosCurseMCMSReader implements changesets.MCMSReader for the Aptos family,
@@ -37,7 +38,7 @@ func (r *AptosCurseMCMSReader) GetChainMetadata(e deployment.Environment, chainS
 	}
 	curseMCMSAddr := state.CurseMCMSAddress
 
-	role, err := proposalutils.GetAptosRoleFromAction(input.TimelockAction)
+	role, err := cldfproposalutils.GetAptosRoleFromAction(input.TimelockAction)
 	if err != nil {
 		return mcmstypes.ChainMetadata{}, fmt.Errorf("failed to get role from action: %w", err)
 	}

deployment/ccip/changeset/aptos/cs_deploy_aptos_chain_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/smartcontractkit/chainlink-deployments-framework/chain"
 	aptoschain "github.com/smartcontractkit/chainlink-deployments-framework/chain/aptos"
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
+	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
 	"github.com/smartcontractkit/chainlink-deployments-framework/engine/test/environment"
 	"github.com/smartcontractkit/chainlink-deployments-framework/engine/test/runtime"
 
@@ -109,9 +110,9 @@ func TestDeployAptosChainImp_VerifyPreconditions(t *testing.T) {
 				},
 				MCMSDeployConfigPerChain: map[uint64]types.MCMSWithTimelockConfigV2{
 					4457093679053095497: {
-						Canceller:        proposalutils.SingleGroupMCMSV2(t),
-						Proposer:         proposalutils.SingleGroupMCMSV2(t),
-						Bypasser:         proposalutils.SingleGroupMCMSV2(t),
+						Canceller:        cldftesthelpers.SingleGroupMCMS(t),
+						Proposer:         cldftesthelpers.SingleGroupMCMS(t),
+						Bypasser:         cldftesthelpers.SingleGroupMCMS(t),
 						TimelockMinDelay: nil, // Invalid min delay
 					},
 				},
@@ -260,9 +261,9 @@ func TestDeployAptosChain_Apply(t *testing.T) {
 		},
 		MCMSDeployConfigPerChain: map[uint64]types.MCMSWithTimelockConfigV2{
 			selector: {
-				Canceller:        proposalutils.SingleGroupMCMSV2(t),
-				Proposer:         proposalutils.SingleGroupMCMSV2(t),
-				Bypasser:         proposalutils.SingleGroupMCMSV2(t),
+				Canceller:        cldftesthelpers.SingleGroupMCMS(t),
+				Proposer:         cldftesthelpers.SingleGroupMCMS(t),
+				Bypasser:         cldftesthelpers.SingleGroupMCMS(t),
 				TimelockMinDelay: big.NewInt(1),
 			},
 		},
@@ -277,7 +278,7 @@ func TestDeployAptosChain_Apply(t *testing.T) {
 
 	err = rt.Exec(
 		runtime.ChangesetTask(DeployAptosChain{}, ccipConfig),
-		runtime.SignAndExecuteProposalsTask([]*ecdsa.PrivateKey{proposalutils.TestXXXMCMSSigner}),
+		runtime.SignAndExecuteProposalsTask([]*ecdsa.PrivateKey{cldftesthelpers.TestXXXMCMSSigner}),
 	)
 	require.NoError(t, err)
 

deployment/ccip/changeset/aptos/test_helpers.go

@@ -9,10 +9,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
+
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
+
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/aptos/config"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/shared"
-	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 	"github.com/smartcontractkit/chainlink/deployment/common/types"
 )
 
@@ -76,9 +78,9 @@ func GetMockChainContractParams(t *testing.T, chainSelector uint64) config.Chain
 
 func getMockMCMSConfig(t *testing.T) types.MCMSWithTimelockConfigV2 {
 	return types.MCMSWithTimelockConfigV2{
-		Canceller:        proposalutils.SingleGroupMCMSV2(t),
-		Proposer:         proposalutils.SingleGroupMCMSV2(t),
-		Bypasser:         proposalutils.SingleGroupMCMSV2(t),
+		Canceller:        cldftesthelpers.SingleGroupMCMS(t),
+		Proposer:         cldftesthelpers.SingleGroupMCMS(t),
+		Bypasser:         cldftesthelpers.SingleGroupMCMS(t),
 		TimelockMinDelay: big.NewInt(1),
 	}
 }

deployment/ccip/changeset/aptos/utils/mcms.go

@@ -16,6 +16,8 @@ import (
 	"github.com/smartcontractkit/chainlink-aptos/bindings/compile"
 	mcmsbind "github.com/smartcontractkit/chainlink-aptos/bindings/mcms"
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
+	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
+
 	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 )
 
@@ -30,7 +32,7 @@ func GenerateProposal(
 	mcmsCfg proposalutils.TimelockConfig,
 ) (*mcms.TimelockProposal, error) {
 	// Get role from action
-	role, err := proposalutils.GetAptosRoleFromAction(mcmsCfg.MCMSAction)
+	role, err := cldfproposalutils.GetAptosRoleFromAction(mcmsCfg.MCMSAction)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get role from action: %w", err)
 	}
@@ -60,7 +62,7 @@ func GenerateCurseMCMSProposal(
 	description string,
 	mcmsCfg proposalutils.TimelockConfig,
 ) (*mcms.TimelockProposal, error) {
-	role, err := proposalutils.GetAptosRoleFromAction(mcmsCfg.MCMSAction)
+	role, err := cldfproposalutils.GetAptosRoleFromAction(mcmsCfg.MCMSAction)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get role from action: %w", err)
 	}

deployment/ccip/changeset/crossfamily/v1_6/cs_add_evm_solana_lane_test.go

@@ -10,6 +10,8 @@ import (
 	"github.com/gagliardetto/solana-go"
 	"github.com/stretchr/testify/require"
 
+	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
+
 	chain_selectors "github.com/smartcontractkit/chain-selectors"
 	"github.com/smartcontractkit/quarantine"
 
@@ -149,11 +151,11 @@ func TestAddEVMSolanaLaneBidirectional(t *testing.T) {
 			// if MCMS is enabled, we need to run the proposal
 			if tc.mcmsEnabled {
 				for _, prop := range out.MCMSTimelockProposals {
-					mcmProp := proposalutils.SignMCMSTimelockProposal(t, e, &prop, false)
+					mcmProp := cldftesthelpers.SignMCMSTimelockProposal(t, e, &prop, false)
 					// return the error so devs can ensure expected reversions
-					err = proposalutils.ExecuteMCMSProposalV2(t, e, mcmProp)
+					err = cldftesthelpers.ExecuteMCMSProposalV2(t, e, mcmProp)
 					require.NoError(t, err)
-					err = proposalutils.ExecuteMCMSTimelockProposalV2(t, e, &prop)
+					err = cldftesthelpers.ExecuteMCMSTimelockProposalV2(t, e, &prop)
 					require.NoError(t, err)
 				}
 			}

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"
 
+	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
+
 	"github.com/smartcontractkit/chainlink-ccip/chains/solana/contracts/tests/testutils"
 	burnmint "github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/v0_1_1/burnmint_token_pool"
 	"github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/v0_1_1/ccip_offramp"
@@ -275,9 +277,9 @@ func prepareEnvironmentForOwnershipTransfer(t *testing.T) (cldf.Environment, sta
 			cldf.CreateLegacyChangeSet(commonchangeset.DeployMCMSWithTimelockV2),
 			map[uint64]commontypes.MCMSWithTimelockConfigV2{
 				solChainSel: {
-					Canceller:        proposalutils.SingleGroupMCMSV2(t),
-					Proposer:         proposalutils.SingleGroupMCMSV2(t),
-					Bypasser:         proposalutils.SingleGroupMCMSV2(t),
+					Canceller:        cldftesthelpers.SingleGroupMCMS(t),
+					Proposer:         cldftesthelpers.SingleGroupMCMS(t),
+					Bypasser:         cldftesthelpers.SingleGroupMCMS(t),
 					TimelockMinDelay: big.NewInt(0),
 				},
 			},

deployment/ccip/changeset/testhelpers/test_helpers_aptos.go

@@ -17,6 +17,8 @@ import (
 	mcmstypes "github.com/smartcontractkit/mcms/types"
 	"github.com/stretchr/testify/require"
 
+	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
+
 	aptosBind "github.com/smartcontractkit/chainlink-aptos/bindings/bind"
 	"github.com/smartcontractkit/chainlink-aptos/bindings/ccip"
 	"github.com/smartcontractkit/chainlink-aptos/bindings/ccip_dummy_receiver"
@@ -39,6 +41,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 	"github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/initial/burn_mint_erc677"
+
 	"github.com/smartcontractkit/chainlink/deployment"
 	aptoscs "github.com/smartcontractkit/chainlink/deployment/ccip/changeset/aptos"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/aptos/config"
@@ -82,9 +85,9 @@ func DeployChainContractsToAptosCS(t *testing.T, e DeployedEnv, chainSelector ui
 		},
 		MCMSDeployConfigPerChain: map[uint64]commontypes.MCMSWithTimelockConfigV2{
 			chainSelector: {
-				Canceller:        proposalutils.SingleGroupMCMSV2(t),
-				Proposer:         proposalutils.SingleGroupMCMSV2(t),
-				Bypasser:         proposalutils.SingleGroupMCMSV2(t),
+				Canceller:        cldftesthelpers.SingleGroupMCMS(t),
+				Proposer:         cldftesthelpers.SingleGroupMCMS(t),
+				Bypasser:         cldftesthelpers.SingleGroupMCMS(t),
 				TimelockMinDelay: big.NewInt(1),
 			},
 		},

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"
 
+	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
+
 	aptos_fee_quoter "github.com/smartcontractkit/chainlink-aptos/bindings/ccip/fee_quoter"
 	"github.com/smartcontractkit/chainlink-aptos/bindings/helpers"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_2_0/router"
@@ -68,6 +70,7 @@ import (
 	tonOps "github.com/smartcontractkit/chainlink-ton/deployment/ccip"
 	tonCfg "github.com/smartcontractkit/chainlink-ton/deployment/ccip/config"
 	tonrouter "github.com/smartcontractkit/chainlink-ton/pkg/ccip/bindings/router"
+
 	"github.com/smartcontractkit/chainlink/deployment"
 	aptoscs "github.com/smartcontractkit/chainlink/deployment/ccip/changeset/aptos"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/aptos/config"
@@ -2445,9 +2448,9 @@ func TransferOwnershipSolanaV0_1_0(
 				cldf.CreateLegacyChangeSet(commoncs.DeployMCMSWithTimelockV2),
 				map[uint64]commontypes.MCMSWithTimelockConfigV2{
 					solSelector: {
-						Canceller:        proposalutils.SingleGroupMCMSV2(t),
-						Proposer:         proposalutils.SingleGroupMCMSV2(t),
-						Bypasser:         proposalutils.SingleGroupMCMSV2(t),
+						Canceller:        cldftesthelpers.SingleGroupMCMS(t),
+						Proposer:         cldftesthelpers.SingleGroupMCMS(t),
+						Bypasser:         cldftesthelpers.SingleGroupMCMS(t),
 						TimelockMinDelay: big.NewInt(0),
 					},
 				},

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"
 
+	cldftesthelpers "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils/testhelpers"
+
 	tonOps "github.com/smartcontractkit/chainlink-ton/deployment/ccip"
 	tonrouter "github.com/smartcontractkit/chainlink-ton/pkg/ccip/bindings/router"
 
@@ -64,9 +66,9 @@ func TransferOwnershipSolanaV0_1_1(
 				cldf.CreateLegacyChangeSet(commoncs.DeployMCMSWithTimelockV2),
 				map[uint64]commontypes.MCMSWithTimelockConfigV2{
 					solSelector: {
-						Canceller:        proposalutils.SingleGroupMCMSV2(t),
-						Proposer:         proposalutils.SingleGroupMCMSV2(t),
-						Bypasser:         proposalutils.SingleGroupMCMSV2(t),
+						Canceller:        cldftesthelpers.SingleGroupMCMS(t),
+						Proposer:         cldftesthelpers.SingleGroupMCMS(t),
+						Bypasser:         cldftesthelpers.SingleGroupMCMS(t),
 						TimelockMinDelay: big.NewInt(0),
 					},
 				},

deployment/ccip/changeset/testhelpers/test_token_helpers.go

@@ -21,6 +21,7 @@ import (
 	"github.com/smartcontractkit/chainlink-deployments-framework/engine/test/environment"
 	"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"
@@ -140,7 +141,7 @@ func SetupTwoChainEnvironmentWithTokens(
 					MinDelay: 0 * time.Second,
 				},
 			}),
-			runtime.SignAndExecuteProposalsTask([]*ecdsa.PrivateKey{proposalutils.TestXXXMCMSSigner}),
+			runtime.SignAndExecuteProposalsTask([]*ecdsa.PrivateKey{cldftesthelpers.TestXXXMCMSSigner}),
 		)
 		require.NoError(t, err)
 	}