Skip to content

chore: move opsutils back to legacy folder #106

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
ecPablo merged 3 commits into from
Jun 26, 2026
Merged

chore: move opsutils back to legacy folder #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
968a1b3
chore: move opsutils back to legacy folder
ecPablo Jun 26, 2026
d5645bf
fix: move into separate pkg to avoid import cycle
ecPablo Jun 26, 2026
ef68d8a
Merge branch 'main' into ecpablo/move-opsutils-legacy
ecPablo Jun 26, 2026
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ go.work.sum
.idea/
.vscode/
.gocache/
.golangci-cache/
.gomodcache/
2 changes: 1 addition & 1 deletion legacy/mcms/changesets/deploy_mcms_with_timelock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion legacy/mcms/internal/family/evm/changesets/deploy_mcms_with_timelock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion legacy/mcms/internal/family/evm/changesets/grant_timelock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions legacy/mcms/internal/family/evm/operations/op_deploy_call_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions legacy/mcms/internal/family/evm/operations/op_deploy_timelock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions legacy/mcms/internal/family/evm/operations/op_grant_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions legacy/mcms/internal/family/evm/operations/op_set_config_mcm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions legacy/mcms/internal/family/evm/operations/ops_deploy_mcm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion legacy/mcms/internal/family/evm/sequences/seq_grant_roles_for_timelock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion legacy/mcms/internal/family/evm/sequences/seq_mcm_with_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion mcms/evm/operations/oputils.go → legacy/mcms/oputils/oputils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package operations
package oputils

import (
"context"
Expand Down
Loading
Loading