chore: move opsutils back to legacy folder (#106)

ecPablo · web-flow · commit 2da693119182 · 2026-06-25T22:38:43.000-06:00
`opsutils.go` is only used by legacy code. The only usages in non-legacy mcms is currentlly in `grant-roles` pkg, which will be refactored in this PR #104
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,5 @@ go.work.sum
 .idea/
 .vscode/
 .gocache/
+.golangci-cache/
+.gomodcache/
diff --git a/legacy/mcms/changesets/deploy_mcms_with_timelock.go b/legacy/mcms/changesets/deploy_mcms_with_timelock.go
@@ -21,9 +21,9 @@ import (
 	"github.com/smartcontractkit/chainlink-deployments-framework/operations"
 
 	evmchangesets "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/changesets"
+	evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
 	"github.com/smartcontractkit/cld-changesets/legacy/pkg/family/evm"
 	solchangesets "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/solana/changesets"
-	evmops "github.com/smartcontractkit/cld-changesets/mcms/evm/operations"
 )
 
 // migrateAddressBookWithQualifiers migrates an address book to a data store,
diff --git a/legacy/mcms/internal/family/evm/changesets/deploy_mcms_with_timelock.go b/legacy/mcms/internal/family/evm/changesets/deploy_mcms_with_timelock.go
@@ -12,8 +12,8 @@ import (
 
 	opevm "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/operations"
 	seqevm "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/sequences"
+	evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
 	evmstate "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/evm"
-	evmops "github.com/smartcontractkit/cld-changesets/mcms/evm/operations"
 )
 
 // DeployMCMSOption is a function that modifies a TypeAndVersion before or after deployment.
diff --git a/legacy/mcms/internal/family/evm/changesets/grant_timelock.go b/legacy/mcms/internal/family/evm/changesets/grant_timelock.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/smartcontractkit/cld-changesets/internal/mcmsrole"
 	seqevm "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/sequences"
-	evmops "github.com/smartcontractkit/cld-changesets/mcms/evm/operations"
+	evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
 )
 
 // GrantRolesForTimelock grants RBACTimelock roles to the MCMS contracts in timelockContracts.
diff --git a/legacy/mcms/internal/family/evm/operations/op_deploy_call_proxy.go b/legacy/mcms/internal/family/evm/operations/op_deploy_call_proxy.go
@@ -9,20 +9,20 @@ import (
 	zkbindings "github.com/smartcontractkit/mcms/sdk/zksync/bindings"
 
 	"github.com/smartcontractkit/cld-changesets/internal/semvers"
-	"github.com/smartcontractkit/cld-changesets/mcms/evm/operations"
+	"github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
 )
 
 type OpDeployCallProxyInput struct {
 	Timelock common.Address `json:"timelock"`
 }
 
-var OpDeployCallProxy = operations.NewEVMDeployOperation(
+var OpDeployCallProxy = oputils.NewEVMDeployOperation(
 	"evm-call-proxy-deploy",
 	semver.MustParse("1.0.0"),
 	"Deploys CallProxy contract on the specified EVM chains",
 	mcmscontracts.CallProxy,
 	bindings.CallProxyMetaData,
-	&operations.ContractOpts{
+	&oputils.ContractOpts{
 		Version:          &semvers.V1_0_0,
 		EVMBytecode:      common.FromHex(bindings.CallProxyBin),
 		ZkSyncVMBytecode: zkbindings.CallProxyZkBytecode,
diff --git a/legacy/mcms/internal/family/evm/operations/op_deploy_timelock.go b/legacy/mcms/internal/family/evm/operations/op_deploy_timelock.go
@@ -11,7 +11,7 @@ import (
 	zkbindings "github.com/smartcontractkit/mcms/sdk/zksync/bindings"
 
 	"github.com/smartcontractkit/cld-changesets/internal/semvers"
-	"github.com/smartcontractkit/cld-changesets/mcms/evm/operations"
+	"github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
 )
 
 type OpDeployTimelockInput struct {
@@ -23,13 +23,13 @@ type OpDeployTimelockInput struct {
 	Bypassers        []common.Address `json:"bypassers"`  // Bypasser of the timelock contract, usually the deployer key
 }
 
-var OpDeployTimelock = operations.NewEVMDeployOperation(
+var OpDeployTimelock = oputils.NewEVMDeployOperation(
 	"evm-timelock-deploy",
 	semver.MustParse("1.0.0"),
 	"Deploys Timelock contract on the specified EVM chains",
 	mcmscontracts.RBACTimelock,
 	bindings.RBACTimelockMetaData,
-	&operations.ContractOpts{
+	&oputils.ContractOpts{
 		Version:          &semvers.V1_0_0,
 		EVMBytecode:      common.FromHex(bindings.RBACTimelockBin),
 		ZkSyncVMBytecode: zkbindings.RBACTimelockZkBytecode,
diff --git a/legacy/mcms/internal/family/evm/operations/op_grant_role.go b/legacy/mcms/internal/family/evm/operations/op_grant_role.go
@@ -9,15 +9,15 @@ import (
 	mcmscontracts "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/contracts/mcms"
 	"github.com/smartcontractkit/mcms/sdk/evm/bindings"
 
-	"github.com/smartcontractkit/cld-changesets/mcms/evm/operations"
+	"github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
 )
 
 type OpGrantRoleInput struct {
 	Account common.Address `json:"account"`
 	RoleID  [32]byte       `json:"roleID"`
 }
 
-var OpGrantRole = operations.NewEVMCallOperation(
+var OpGrantRole = oputils.NewEVMCallOperation(
 	"evm-timelock-grant-role",
 	semver.MustParse("1.0.0"),
 	"Grants specified role to the ManyChainMultiSig contract on the EVM Timelock contract",
diff --git a/legacy/mcms/internal/family/evm/operations/op_set_config_mcm.go b/legacy/mcms/internal/family/evm/operations/op_set_config_mcm.go
@@ -9,7 +9,7 @@ import (
 	bindings "github.com/smartcontractkit/ccip-owner-contracts/pkg/gethwrappers"
 	mcmscontracts "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/contracts/mcms"
 
-	"github.com/smartcontractkit/cld-changesets/mcms/evm/operations"
+	"github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
 )
 
 type OpEVMSetConfigMCMInput struct {
@@ -19,7 +19,7 @@ type OpEVMSetConfigMCMInput struct {
 	GroupParents    [32]uint8        `json:"groupParents"`
 }
 
-var OpEVMSetConfigMCM = operations.NewEVMCallOperation(
+var OpEVMSetConfigMCM = oputils.NewEVMCallOperation(
 	"evm-mcm-set-config",
 	semver.MustParse("1.0.0"),
 	"Sets Config on the deployed MCM contract",
diff --git a/legacy/mcms/internal/family/evm/operations/ops_deploy_mcm.go b/legacy/mcms/internal/family/evm/operations/ops_deploy_mcm.go
@@ -9,20 +9,20 @@ import (
 	zkbindings "github.com/smartcontractkit/mcms/sdk/zksync/bindings"
 
 	"github.com/smartcontractkit/cld-changesets/internal/semvers"
-	"github.com/smartcontractkit/cld-changesets/mcms/evm/operations"
+	"github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
 )
 
 type OpEVMDeployMCMOutput struct {
 	Address common.Address `json:"address"`
 }
 
-var OpDeployProposerMCM = operations.NewEVMDeployOperation(
+var OpDeployProposerMCM = oputils.NewEVMDeployOperation(
 	"evm-proposer-mcm-deploy",
 	semver.MustParse("1.0.0"),
 	"Deploys Proposer MCM contract",
 	mcmscontracts.ProposerManyChainMultisig,
 	bindings.ManyChainMultiSigMetaData,
-	&operations.ContractOpts{
+	&oputils.ContractOpts{
 		Version:          &semvers.V1_0_0,
 		EVMBytecode:      common.FromHex(bindings.ManyChainMultiSigBin),
 		ZkSyncVMBytecode: zkbindings.ManyChainMultiSigZkBytecode,
@@ -32,13 +32,13 @@ var OpDeployProposerMCM = operations.NewEVMDeployOperation(
 	},
 )
 
-var OpDeployBypasserMCM = operations.NewEVMDeployOperation(
+var OpDeployBypasserMCM = oputils.NewEVMDeployOperation(
 	"evm-bypasser-mcm-deploy",
 	semver.MustParse("1.0.0"),
 	"Deploys Bypasser MCM contract",
 	mcmscontracts.BypasserManyChainMultisig,
 	bindings.ManyChainMultiSigMetaData,
-	&operations.ContractOpts{
+	&oputils.ContractOpts{
 		Version:          &semvers.V1_0_0,
 		EVMBytecode:      common.FromHex(bindings.ManyChainMultiSigBin),
 		ZkSyncVMBytecode: zkbindings.ManyChainMultiSigZkBytecode,
@@ -48,13 +48,13 @@ var OpDeployBypasserMCM = operations.NewEVMDeployOperation(
 	},
 )
 
-var OpDeployCancellerMCM = operations.NewEVMDeployOperation(
+var OpDeployCancellerMCM = oputils.NewEVMDeployOperation(
 	"evm-canceller-mcm-deploy",
 	semver.MustParse("1.0.0"),
 	"Deploys Canceller MCM contract",
 	mcmscontracts.CancellerManyChainMultisig,
 	bindings.ManyChainMultiSigMetaData,
-	&operations.ContractOpts{
+	&oputils.ContractOpts{
 		Version:          &semvers.V1_0_0,
 		EVMBytecode:      common.FromHex(bindings.ManyChainMultiSigBin),
 		ZkSyncVMBytecode: zkbindings.ManyChainMultiSigZkBytecode,
diff --git a/legacy/mcms/internal/family/evm/sequences/seq_grant_roles_for_timelock.go b/legacy/mcms/internal/family/evm/sequences/seq_grant_roles_for_timelock.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/smartcontractkit/cld-changesets/internal/mcmsrole"
 	opevmlegacy "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/operations"
-	evmops "github.com/smartcontractkit/cld-changesets/mcms/evm/operations"
+	evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
 )
 
 type SeqGrantRolesTimelockDeps struct {
diff --git a/legacy/mcms/internal/family/evm/sequences/seq_mcm_with_config.go b/legacy/mcms/internal/family/evm/sequences/seq_mcm_with_config.go
@@ -15,7 +15,7 @@ import (
 	mcmsTypes "github.com/smartcontractkit/mcms/types"
 
 	opevmlegacy "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/operations"
-	evmops "github.com/smartcontractkit/cld-changesets/mcms/evm/operations"
+	evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
 )
 
 type SeqDeployMCMWithConfigInput struct {
diff --git a/legacy/mcms/oputils/oputils.go b/legacy/mcms/oputils/oputils.go
@@ -1,4 +1,4 @@
-package operations
+package oputils
 
 import (
 	"context"
diff --git a/legacy/mcms/oputils/oputils_test.go b/legacy/mcms/oputils/oputils_test.go
diff --git a/mcms/evm/grant-role/operation.go b/mcms/evm/grant-role/operation.go
diff --git a/mcms/evm/grant-role/operation_test.go b/mcms/evm/grant-role/operation_test.go

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ import (`
`21`	`21`	`"github.com/smartcontractkit/chainlink-deployments-framework/operations"`
`22`	`22`
`23`	`23`	`evmchangesets "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/changesets"`
	`24`	`+ evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"`
`24`	`25`	`"github.com/smartcontractkit/cld-changesets/legacy/pkg/family/evm"`
`25`	`26`	`solchangesets "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/solana/changesets"`
`26`		`- evmops "github.com/smartcontractkit/cld-changesets/mcms/evm/operations"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`// migrateAddressBookWithQualifiers migrates an address book to a data store,`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ import (`
`12`	`12`
`13`	`13`	`opevm "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/operations"`
`14`	`14`	`seqevm "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/sequences"`
	`15`	`+ evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"`
`15`	`16`	`evmstate "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/evm"`
`16`		`- evmops "github.com/smartcontractkit/cld-changesets/mcms/evm/operations"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`// DeployMCMSOption is a function that modifies a TypeAndVersion before or after deployment.`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`
`22`	`22`	`"github.com/smartcontractkit/cld-changesets/internal/mcmsrole"`
`23`	`23`	`seqevm "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/sequences"`
`24`		`- evmops "github.com/smartcontractkit/cld-changesets/mcms/evm/operations"`
	`24`	`+ evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`// GrantRolesForTimelock grants RBACTimelock roles to the MCMS contracts in timelockContracts.`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`bindings "github.com/smartcontractkit/ccip-owner-contracts/pkg/gethwrappers"`
`10`	`10`	`mcmscontracts "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/contracts/mcms"`
`11`	`11`
`12`		`- "github.com/smartcontractkit/cld-changesets/mcms/evm/operations"`
	`12`	`+ "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`type OpEVMSetConfigMCMInput struct {`
`@@ -19,7 +19,7 @@ type OpEVMSetConfigMCMInput struct {`
`19`	`19`	GroupParents [32]uint8 `json:"groupParents"`
`20`	`20`	`}`
`21`	`21`
`22`		`-var OpEVMSetConfigMCM = operations.NewEVMCallOperation(`
	`22`	`+var OpEVMSetConfigMCM = oputils.NewEVMCallOperation(`
`23`	`23`	`"evm-mcm-set-config",`
`24`	`24`	`semver.MustParse("1.0.0"),`
`25`	`25`	`"Sets Config on the deployed MCM contract",`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`
`16`	`16`	`"github.com/smartcontractkit/cld-changesets/internal/mcmsrole"`
`17`	`17`	`opevmlegacy "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/operations"`
`18`		`- evmops "github.com/smartcontractkit/cld-changesets/mcms/evm/operations"`
	`18`	`+ evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`type SeqGrantRolesTimelockDeps struct {`