[wip] feat(deployments): synced with solana-mcms-deploy branch

deployment/common/changeset/deploy_mcms_solana.go

@@ -28,7 +28,7 @@ func DeployMCMSWithTimelockContractsSolana(
 	state MCMSSolanaState,
 	chain deployment.SolChain,
 	addressBook deployment.AddressBook,
-	config types.MCMSWithTimelockConfig,
+	config types.MCMSWithTimelockConfigV2,
 ) (any, error) { // FIXME: define return type
 	err := deployMCMSSolana(e, state, chain, addressBook, config)
 	if err != nil {
@@ -55,7 +55,7 @@ func DeployMCMSWithTimelockContractsSolana(
 
 func deployMCMSSolana(
 	e deployment.Environment, state MCMSSolanaState, chain deployment.SolChain, addressBook deployment.AddressBook,
-	_ types.MCMSWithTimelockConfig,
+	_ types.MCMSWithTimelockConfigV2,
 ) error {
 	var mcmProgram solana.PublicKey
 	if state.MCM.IsZero() {
@@ -92,7 +92,7 @@ func deployMCMSSolana(
 
 func deployTimelockSolana(
 	e deployment.Environment, state MCMSSolanaState, chain deployment.SolChain, addressBook deployment.AddressBook,
-	config types.MCMSWithTimelockConfig,
+	config types.MCMSWithTimelockConfigV2,
 ) error {
 	var timelockProgram solana.PublicKey
 	if state.Timelock.IsZero() {
@@ -129,7 +129,7 @@ func deployTimelockSolana(
 
 func deployAccessControllerSolana(
 	e deployment.Environment, state MCMSSolanaState, chain deployment.SolChain, addressBook deployment.AddressBook,
-	_ types.MCMSWithTimelockConfig,
+	_ types.MCMSWithTimelockConfigV2,
 ) error {
 	var accessControllerProgram solana.PublicKey
 	if state.AccessController.IsZero() {
@@ -258,6 +258,7 @@ func initializeTimelock(
 	var bypasserRoleAccessController solana.PublicKey
 
 	instruction, err := timelockBindings.NewInitializeInstruction(
+		timelockID,
 		minDelay.Uint64(), // minDelay,
 		GetTimelockConfigPDA(timelockProgram, timelockID),
 		chain.DeployerKey.PublicKey(),

deployment/common/changeset/deploy_mcms_with_timelock.go

@@ -11,12 +11,27 @@ import (
 
 	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/deployment/common/changeset/internal"
+	"github.com/smartcontractkit/chainlink/deployment/common/changeset/internal/mcmsnew/evm"
 	"github.com/smartcontractkit/chainlink/deployment/common/types"
 )
 
 var _ deployment.ChangeSet[map[uint64]types.MCMSWithTimelockConfig] = DeployMCMSWithTimelock
+var _ deployment.ChangeSet[map[uint64]types.MCMSWithTimelockConfigV2] = DeployMCMSWithTimelockV2
 
 func DeployMCMSWithTimelock(e deployment.Environment, cfgByChain map[uint64]types.MCMSWithTimelockConfig) (deployment.ChangesetOutput, error) {
+    newAddresses := deployment.NewMemoryAddressBook()
+    err := internal.DeployMCMSWithTimelockContractsBatch(
+        e.Logger, e.Chains, newAddresses, cfgByChain,
+    )
+    if err != nil {
+        return deployment.ChangesetOutput{AddressBook: newAddresses}, err
+    }
+    return deployment.ChangesetOutput{AddressBook: newAddresses}, nil
+}
+
+func DeployMCMSWithTimelockV2(
+	e deployment.Environment, cfgByChain map[uint64]types.MCMSWithTimelockConfigV2,
+) (deployment.ChangesetOutput, error) {
 	newAddresses := deployment.NewMemoryAddressBook()
 
 	for chainSelector, config := range cfgByChain {
@@ -29,10 +44,11 @@ func DeployMCMSWithTimelock(e deployment.Environment, cfgByChain map[uint64]type
 				return deployment.ChangesetOutput{AddressBook: newAddresses}, err
 			}
 
-			_, err := internal.DeployMCMSWithTimelockContracts(e.Logger, chain, newAddresses, config)
+			_, err := evm.DeployMCMSWithTimelockContractsEVM(e.Logger, chain, newAddresses, config)
 			if err != nil {
 				return deployment.ChangesetOutput{AddressBook: newAddresses}, err
 			}
+
 		case chainselectors.FamilySolana:
 			chain, found := e.SolChains[chainSelector]
 			if !found {
@@ -50,6 +66,7 @@ func DeployMCMSWithTimelock(e deployment.Environment, cfgByChain map[uint64]type
 			if err != nil {
 				return deployment.ChangesetOutput{AddressBook: newAddresses}, err
 			}
+
 		default:
 			return deployment.ChangesetOutput{AddressBook: newAddresses}, fmt.Errorf("unsupported chain family: %s", family)
 		}

deployment/common/changeset/internal/mcmsnew/evm/mcms.go

@@ -9,7 +9,6 @@ import (
 	mcmsTypes "github.com/smartcontractkit/mcms/types"
 
 	"github.com/smartcontractkit/chainlink/deployment"
-	"github.com/smartcontractkit/chainlink/deployment/common/changeset/internal/mcmsnew"
 	"github.com/smartcontractkit/chainlink/deployment/common/types"
 	"github.com/smartcontractkit/chainlink/deployment/common/view/v1_0"
 )
@@ -70,11 +69,11 @@ func deployMCMSWithConfigEVM(
 // MCMS contracts for the given configuration
 // as well as the timelock. It's not necessarily the only way to use
 // the timelock and MCMS, but its reasonable pattern.
-func deployMCMSWithTimelockContractsEVM(
+func DeployMCMSWithTimelockContractsEVM(
 	lggr logger.Logger,
 	chain deployment.Chain,
 	ab deployment.AddressBook,
-	config mcmsnew.MCMSWithTimelockConfig,
+	config types.MCMSWithTimelockConfigV2,
 ) (*MCMSWithTimelockEVMDeploy, error) {
 	bypasser, err := deployMCMSWithConfigEVM(types.BypasserManyChainMultisig, lggr, chain, ab, config.Bypasser)
 	if err != nil {

deployment/common/changeset/mcmsnew/deploy_mcms_with_timelock.go

@@ -1,18 +1,18 @@
 package mcmsnew
 
-import (
-	"github.com/smartcontractkit/chainlink/deployment"
-	"github.com/smartcontractkit/chainlink/deployment/common/changeset/internal/mcmsnew"
-	"github.com/smartcontractkit/chainlink/deployment/common/types"
-)
-
-var _ deployment.ChangeSet[map[uint64]types.MCMSWithTimelockConfig] = DeployMCMSWithTimelockSolana
-
-func DeployMCMSWithTimelockSolana(e deployment.Environment, cfgByChain map[uint64]types.MCMSWithTimelockConfig) (deployment.ChangesetOutput, error) {
-	newAddresses := deployment.NewMemoryAddressBook()
-	err := mcmsnew.DeployMCMSWithTimelockContractsBatch(e.Logger, e.SolChains, newAddresses, cfgByChain)
-	if err != nil {
-		return deployment.ChangesetOutput{AddressBook: newAddresses}, err
-	}
-	return deployment.ChangesetOutput{AddressBook: newAddresses}, nil
-}
+// import (
+// 	"github.com/smartcontractkit/chainlink/deployment"
+// 	"github.com/smartcontractkit/chainlink/deployment/common/changeset/internal/mcmsnew"
+// 	"github.com/smartcontractkit/chainlink/deployment/common/types"
+// )
+//
+// var _ deployment.ChangeSet[map[uint64]types.MCMSWithTimelockConfig] = DeployMCMSWithTimelockSolana
+//
+// func DeployMCMSWithTimelockSolana(e deployment.Environment, cfgByChain map[uint64]types.MCMSWithTimelockConfig) (deployment.ChangesetOutput, error) {
+// 	newAddresses := deployment.NewMemoryAddressBook()
+// 	err := mcmsnew.DeployMCMSWithTimelockContractsBatch(e.Logger, e.SolChains, newAddresses, cfgByChain)
+// 	if err != nil {
+// 		return deployment.ChangesetOutput{AddressBook: newAddresses}, err
+// 	}
+// 	return deployment.ChangesetOutput{AddressBook: newAddresses}, nil
+// }

deployment/common/types/types.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/smartcontractkit/ccip-owner-contracts/pkg/config"
+	mcmstypes "github.com/smartcontractkit/mcms/types"
 
 	"github.com/smartcontractkit/chainlink/deployment"
 )
@@ -35,6 +36,14 @@ type MCMSWithTimelockConfig struct {
 	TimelockMinDelay *big.Int
 }
 
+type MCMSWithTimelockConfigV2 struct {
+	Seed             [16]byte // application specific identifier; must be unique per chain
+	Canceller        mcmstypes.Config
+	Bypasser         mcmstypes.Config
+	Proposer         mcmstypes.Config
+	TimelockMinDelay *big.Int
+}
+
 type OCRParameters struct {
 	DeltaProgress                           time.Duration
 	DeltaResend                             time.Duration