Skip to content

test(mcms): replace legacy changeset usage #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graham-chainlink merged 1 commit into from
Jul 1, 2026
Merged

test(mcms): replace legacy changeset usage #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions mcms/evm/firedrill/changeset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import (
mcmstypes "github.com/smartcontractkit/mcms/types"
"github.com/stretchr/testify/require"

legacymcms "github.com/smartcontractkit/cld-changesets/legacy/mcms/changesets"
deploy "github.com/smartcontractkit/cld-changesets/mcms/changesets/deploy"
firedrill "github.com/smartcontractkit/cld-changesets/mcms/changesets/firedrill"

_ "github.com/smartcontractkit/cld-changesets/mcms/evm/deploy"
_ "github.com/smartcontractkit/cld-changesets/mcms/evm/firedrill"
_ "github.com/smartcontractkit/cld-changesets/mcms/evm/readers"
)
Expand Down Expand Up @@ -66,8 +67,10 @@ func newEVMFireDrillRuntime(t *testing.T, selector uint64) *runtime.Runtime {
require.NoError(t, err)

err = rt.Exec(
runtime.ChangesetTask(cldf.CreateLegacyChangeSet(legacymcms.DeployMCMSWithTimelockV2), map[uint64]cldfproposalutils.MCMSWithTimelockConfig{
selector: cldftesthelpers.SingleGroupTimelockConfig(t),
runtime.ChangesetTask(deploy.Changeset{}, deploy.Input{
ConfigByChain: map[uint64]cldfproposalutils.MCMSWithTimelockConfig{
selector: cldftesthelpers.SingleGroupTimelockConfig(t),
},
}),
)
require.NoError(t, err)
Expand Down
10 changes: 6 additions & 4 deletions mcms/evm/grant-role/sequence_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
mcmsevm "github.com/smartcontractkit/mcms/sdk/evm"
mcmstypes "github.com/smartcontractkit/mcms/types"

legacymcms "github.com/smartcontractkit/cld-changesets/legacy/mcms/changesets"
deploy "github.com/smartcontractkit/cld-changesets/mcms/changesets/deploy"
grantrole "github.com/smartcontractkit/cld-changesets/mcms/changesets/grant-role"
evmreaders "github.com/smartcontractkit/cld-changesets/mcms/evm/readers"

_ "github.com/smartcontractkit/cld-changesets/mcms/evm/readers"
_ "github.com/smartcontractkit/cld-changesets/mcms/evm/deploy"
)

func TestRunEVMGrantRole(t *testing.T) {
Expand Down Expand Up @@ -135,8 +135,10 @@ func newEVMGrantRoleRuntime(t *testing.T, selector uint64) *runtime.Runtime {
require.NoError(t, err)

err = rt.Exec(
runtime.ChangesetTask(cldf.CreateLegacyChangeSet(legacymcms.DeployMCMSWithTimelockV2), map[uint64]cldfproposalutils.MCMSWithTimelockConfig{
selector: cldftesthelpers.SingleGroupTimelockConfig(t),
runtime.ChangesetTask(deploy.Changeset{}, deploy.Input{
ConfigByChain: map[uint64]cldfproposalutils.MCMSWithTimelockConfig{
selector: cldftesthelpers.SingleGroupTimelockConfig(t),
},
}),
)
require.NoError(t, err)
Expand Down
90 changes: 57 additions & 33 deletions mcms/evm/set-config/changeset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ import (
"github.com/smartcontractkit/cld-changesets/datastore/refkey"
"github.com/smartcontractkit/cld-changesets/internal/semvers"

// TODO: remove legacymcms import once remaining MCMS changesets are migrated out of legacy/mcms/changesets.
legacymcms "github.com/smartcontractkit/cld-changesets/legacy/mcms/changesets"
evmstate "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/evm"
deploy "github.com/smartcontractkit/cld-changesets/mcms/changesets/deploy"
setconfig "github.com/smartcontractkit/cld-changesets/mcms/changesets/set-config"
transfertotimelock "github.com/smartcontractkit/cld-changesets/mcms/changesets/transfer-to-timelock"

_ "github.com/smartcontractkit/cld-changesets/mcms/evm/transfer-to-timelock"
)
Comment thread
graham-chainlink marked this conversation as resolved.

func TestChangeset_VerifyPreconditions(t *testing.T) {
Expand Down Expand Up @@ -176,7 +178,7 @@ func TestChangeset_EVM(t *testing.T) {
var mcmsInput *cldf.MCMSTimelockProposalInput
if tt.useMCMS {
cfgCanceller := cldftesthelpers.SingleGroupMCMS(t)
cfgCanceller.Signers = append(cfgCanceller.Signers, mcmsState.BypasserMcm.Address())
cfgCanceller.Signers = append(cfgCanceller.Signers, mcmsState.Bypasser)
cfgCanceller.Quorum = 2
targets = []setconfig.ContractSetConfig{
{
Expand All @@ -186,15 +188,15 @@ func TestChangeset_EVM(t *testing.T) {
}
mcmsInput = newMCMSInput(mcmstypes.TimelockActionBypass, "Set config proposal", "")
} else {
timelockAddress := mcmsState.Timelock.Address()
timelockAddress := mcmsState.Timelock

cfgProposer := cldftesthelpers.SingleGroupMCMS(t)
cfgProposer.Signers = append(cfgProposer.Signers, timelockAddress)
cfgProposer.Quorum = 2
cfgCanceller := cldftesthelpers.SingleGroupMCMS(t)
cfgBypasser := cldftesthelpers.SingleGroupMCMS(t)
cfgBypasser.Signers = append(cfgBypasser.Signers, timelockAddress)
cfgBypasser.Signers = append(cfgBypasser.Signers, mcmsState.ProposerMcm.Address())
cfgBypasser.Signers = append(cfgBypasser.Signers, mcmsState.Proposer)
cfgBypasser.Quorum = 3

targets = mcmsTargets(tt.selector, cfgProposer, cfgCanceller, cfgBypasser)
Expand All @@ -211,17 +213,17 @@ func TestChangeset_EVM(t *testing.T) {

if tt.useMCMS {
cfgCanceller := targets[0].Config
newConf, err := inspector.GetConfig(t.Context(), mcmsState.CancellerMcm.Address().Hex())
newConf, err := inspector.GetConfig(t.Context(), mcmsState.Canceller.Hex())
require.NoError(t, err)
require.ElementsMatch(t, cfgCanceller.Signers, newConf.Signers)
require.Equal(t, cfgCanceller.Quorum, newConf.Quorum)

proposerConf, err := inspector.GetConfig(t.Context(), mcmsState.ProposerMcm.Address().Hex())
proposerConf, err := inspector.GetConfig(t.Context(), mcmsState.Proposer.Hex())
require.NoError(t, err)
require.ElementsMatch(t, originalCfg.Signers, proposerConf.Signers)
require.Equal(t, originalCfg.Quorum, proposerConf.Quorum)

bypasserConf, err := inspector.GetConfig(t.Context(), mcmsState.BypasserMcm.Address().Hex())
bypasserConf, err := inspector.GetConfig(t.Context(), mcmsState.Bypasser.Hex())
require.NoError(t, err)
require.ElementsMatch(t, originalCfg.Signers, bypasserConf.Signers)
require.Equal(t, originalCfg.Quorum, bypasserConf.Quorum)
Expand All @@ -233,17 +235,17 @@ func TestChangeset_EVM(t *testing.T) {
cfgCanceller := targets[1].Config
cfgBypasser := targets[2].Config

newConf, err := inspector.GetConfig(t.Context(), mcmsState.ProposerMcm.Address().Hex())
newConf, err := inspector.GetConfig(t.Context(), mcmsState.Proposer.Hex())
require.NoError(t, err)
require.ElementsMatch(t, cfgProposer.Signers, newConf.Signers)
require.Equal(t, cfgProposer.Quorum, newConf.Quorum)

newConf, err = inspector.GetConfig(t.Context(), mcmsState.BypasserMcm.Address().Hex())
newConf, err = inspector.GetConfig(t.Context(), mcmsState.Bypasser.Hex())
require.NoError(t, err)
require.ElementsMatch(t, cfgBypasser.Signers, newConf.Signers)
require.Equal(t, cfgBypasser.Quorum, newConf.Quorum)

newConf, err = inspector.GetConfig(t.Context(), mcmsState.CancellerMcm.Address().Hex())
newConf, err = inspector.GetConfig(t.Context(), mcmsState.Canceller.Hex())
require.NoError(t, err)
require.ElementsMatch(t, cfgCanceller.Signers, newConf.Signers)
require.Equal(t, cfgCanceller.Quorum, newConf.Quorum)
Expand All @@ -260,7 +262,7 @@ func TestChangeset_EVM_PartialTargets(t *testing.T) {
mcmsState, chain := evmMCMSChainState(t, rt, selector)

cfgProposer := cldftesthelpers.SingleGroupMCMS(t)
cfgProposer.Signers = append(cfgProposer.Signers, mcmsState.Timelock.Address())
cfgProposer.Signers = append(cfgProposer.Signers, mcmsState.Timelock)
cfgProposer.Quorum = 2

err := rt.Exec(
Expand All @@ -279,17 +281,17 @@ func TestChangeset_EVM_PartialTargets(t *testing.T) {
inspector := evm.NewInspector(chain.Client)
originalCfg := cldftesthelpers.SingleGroupMCMS(t)

proposerConf, err := inspector.GetConfig(t.Context(), mcmsState.ProposerMcm.Address().Hex())
proposerConf, err := inspector.GetConfig(t.Context(), mcmsState.Proposer.Hex())
require.NoError(t, err)
require.ElementsMatch(t, cfgProposer.Signers, proposerConf.Signers)
require.Equal(t, cfgProposer.Quorum, proposerConf.Quorum)

cancellerConf, err := inspector.GetConfig(t.Context(), mcmsState.CancellerMcm.Address().Hex())
cancellerConf, err := inspector.GetConfig(t.Context(), mcmsState.Canceller.Hex())
require.NoError(t, err)
require.ElementsMatch(t, originalCfg.Signers, cancellerConf.Signers)
require.Equal(t, originalCfg.Quorum, cancellerConf.Quorum)

bypasserConf, err := inspector.GetConfig(t.Context(), mcmsState.BypasserMcm.Address().Hex())
bypasserConf, err := inspector.GetConfig(t.Context(), mcmsState.Bypasser.Hex())
require.NoError(t, err)
require.ElementsMatch(t, originalCfg.Signers, bypasserConf.Signers)
require.Equal(t, originalCfg.Quorum, bypasserConf.Quorum)
Expand All @@ -311,11 +313,11 @@ func TestChangeset_EVM_Qualifier(t *testing.T) {
rmnmcmsConfig.Qualifier = &rmnmcmsQualifier

err := rt.Exec(
runtime.ChangesetTask(cldf.CreateLegacyChangeSet(legacymcms.DeployMCMSWithTimelockV2), map[uint64]cldfproposalutils.MCMSWithTimelockConfig{
selector: cllccipConfig,
runtime.ChangesetTask(deploy.Changeset{}, deploy.Input{
ConfigByChain: map[uint64]cldfproposalutils.MCMSWithTimelockConfig{selector: cllccipConfig},
}),
runtime.ChangesetTask(cldf.CreateLegacyChangeSet(legacymcms.DeployMCMSWithTimelockV2), map[uint64]cldfproposalutils.MCMSWithTimelockConfig{
selector: rmnmcmsConfig,
runtime.ChangesetTask(deploy.Changeset{}, deploy.Input{
ConfigByChain: map[uint64]cldfproposalutils.MCMSWithTimelockConfig{selector: rmnmcmsConfig},
}),
)
require.NoError(t, err)
Expand Down Expand Up @@ -457,7 +459,7 @@ func newEVMRuntimeWithDeploy(t *testing.T, selectors ...uint64) *runtime.Runtime
for _, selector := range selectors {
configByChain[selector] = cfg
}
err := rt.Exec(runtime.ChangesetTask(cldf.CreateLegacyChangeSet(legacymcms.DeployMCMSWithTimelockV2), configByChain))
err := rt.Exec(runtime.ChangesetTask(deploy.Changeset{}, deploy.Input{ConfigByChain: configByChain}))
require.NoError(t, err)

return rt
Expand All @@ -466,16 +468,23 @@ func newEVMRuntimeWithDeploy(t *testing.T, selectors ...uint64) *runtime.Runtime
func transferEVMMCMSToTimelock(t *testing.T, rt *runtime.Runtime, selector uint64) {
t.Helper()

mcmsState, _ := evmMCMSChainState(t, rt, selector)
err := rt.Exec(
runtime.ChangesetTask(cldf.CreateLegacyChangeSet(legacymcms.TransferToMCMSWithTimelockV2), legacymcms.TransferToMCMSWithTimelockConfig{
ContractsByChain: map[uint64][]common.Address{
selector: {
mcmsState.ProposerMcm.Address(),
mcmsState.BypasserMcm.Address(),
mcmsState.CancellerMcm.Address(),
runtime.ChangesetTask(transfertotimelock.Changeset{}, transfertotimelock.Input{
Cfg: transfertotimelock.Config{
ContractsByChain: map[uint64][]refkey.RefKey{
selector: {
contractRef(selector, mcmscontracts.ProposerManyChainMultisig, ""),
contractRef(selector, mcmscontracts.BypasserManyChainMultisig, ""),
contractRef(selector, mcmscontracts.CancellerManyChainMultisig, ""),
},
},
},
MCMS: &cldf.MCMSTimelockProposalInput{
TimelockAction: mcmstypes.TimelockActionBypass,
ValidUntil: uint32(time.Now().Add(2 * time.Hour).UTC().Unix()), //nolint:gosec // test timestamp
TimelockDelay: mcmstypes.NewDuration(0),
Description: "Transfer MCMS ownership to timelock",
},
}),
runtime.SignAndExecuteProposalsTask([]*ecdsa.PrivateKey{cldftesthelpers.TestXXXMCMSSigner}),
)
Expand All @@ -491,15 +500,30 @@ func newEVMRuntimeWithDeployAndTransfer(t *testing.T, selector uint64) *runtime.
return rt
}

func evmMCMSChainState(t *testing.T, rt *runtime.Runtime, selector uint64) (*evmstate.MCMSWithTimelockState, cldf_evm.Chain) {
type evmMCMSChainRefs struct {
Timelock common.Address
Proposer common.Address
Canceller common.Address
Bypasser common.Address
}

func evmMCMSChainState(t *testing.T, rt *runtime.Runtime, selector uint64) (evmMCMSChainRefs, cldf_evm.Chain) {
t.Helper()

chain := rt.Environment().BlockChains.EVMChains()[selector]
addrs, err := rt.State().AddressBook.AddressesForChain(selector)
require.NoError(t, err)
env := rt.Environment()

mcmsState, err := evmstate.MaybeLoadMCMSWithTimelockChainState(chain, addrs)
require.NoError(t, err)
resolve := func(contractType cldf.ContractType) common.Address {
resolved, err := contractRef(selector, contractType, "").Resolve(env)
require.NoError(t, err)

return common.HexToAddress(resolved.Address)
}

return mcmsState, chain
return evmMCMSChainRefs{
Timelock: resolve(mcmscontracts.RBACTimelock),
Proposer: resolve(mcmscontracts.ProposerManyChainMultisig),
Canceller: resolve(mcmscontracts.CancellerManyChainMultisig),
Bypasser: resolve(mcmscontracts.BypasserManyChainMultisig),
}, chain
}
Loading
Loading