From aeafd447dac54f6e5563f0ea1989cd9fbe7f87f5 Mon Sep 17 00:00:00 2001 From: Michael Street <5597260+MStreet3@users.noreply.github.com> Date: Tue, 18 Feb 2025 20:56:49 -0500 Subject: [PATCH] refactor(common/changeset): removes bundle check Removes check that the addresses contains all the types and versions defined in a bundle. It is not required that the MCMS state contracts be non-nil. There is a Validate() method and the docstring states that nil values are possible. --- deployment/common/changeset/state.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/deployment/common/changeset/state.go b/deployment/common/changeset/state.go index 09e17e4e1a3..c0497925650 100644 --- a/deployment/common/changeset/state.go +++ b/deployment/common/changeset/state.go @@ -103,21 +103,8 @@ func MaybeLoadMCMSWithTimelockChainState( // the same contract can have different roles multichain = deployment.NewTypeAndVersion(types.ManyChainMultisig, deployment.Version1_0_0) - - // Convert map keys to a slice - wantTypes = []deployment.TypeAndVersion{timelock, proposer, canceller, bypasser, callProxy} ) - // Ensure the addresses contains the bundle of wanted contract types - ok, err := deployment.AddressesContainBundle(addresses, wantTypes) - if err != nil { - return nil, fmt.Errorf("unable to check MCMS contracts on chain %s error: %w", chain.Name(), err) - } - - if !ok { - return nil, fmt.Errorf("missing a contract from bundle on chain %s", chain.Name()) - } - for address, tv := range addresses { switch { case tv.Type == timelock.Type && tv.Version.String() == timelock.Version.String():