Skip to content

Commit d5645bf

Browse files
ecPabloecPablo
committed
fix: move into separate pkg to avoid import cycle
1 parent 968a1b3 commit d5645bf

14 files changed

Lines changed: 67 additions & 67 deletions

‎legacy/mcms/changesets/deploy_mcms_with_timelock.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/smartcontractkit/chainlink-deployments-framework/operations"
2222

2323
evmchangesets "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/changesets"
24-
evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/operations"
24+
evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
2525
"github.com/smartcontractkit/cld-changesets/legacy/pkg/family/evm"
2626
solchangesets "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/solana/changesets"
2727
)

‎legacy/mcms/internal/family/evm/changesets/deploy_mcms_with_timelock.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
opevm "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/operations"
1414
seqevm "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/sequences"
15-
evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/operations"
15+
evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
1616
evmstate "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/evm"
1717
)
1818

‎legacy/mcms/internal/family/evm/changesets/grant_timelock.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/smartcontractkit/cld-changesets/internal/mcmsrole"
2323
seqevm "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/sequences"
24-
evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/operations"
24+
evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
2525
)
2626

2727
// GrantRolesForTimelock grants RBACTimelock roles to the MCMS contracts in timelockContracts.

‎legacy/mcms/internal/family/evm/operations/op_deploy_call_proxy.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ import (
99
zkbindings "github.com/smartcontractkit/mcms/sdk/zksync/bindings"
1010

1111
"github.com/smartcontractkit/cld-changesets/internal/semvers"
12-
"github.com/smartcontractkit/cld-changesets/legacy/mcms/operations"
12+
"github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
1313
)
1414

1515
type OpDeployCallProxyInput struct {
1616
Timelock common.Address `json:"timelock"`
1717
}
1818

19-
var OpDeployCallProxy = operations.NewEVMDeployOperation(
19+
var OpDeployCallProxy = oputils.NewEVMDeployOperation(
2020
"evm-call-proxy-deploy",
2121
semver.MustParse("1.0.0"),
2222
"Deploys CallProxy contract on the specified EVM chains",
2323
mcmscontracts.CallProxy,
2424
bindings.CallProxyMetaData,
25-
&operations.ContractOpts{
25+
&oputils.ContractOpts{
2626
Version: &semvers.V1_0_0,
2727
EVMBytecode: common.FromHex(bindings.CallProxyBin),
2828
ZkSyncVMBytecode: zkbindings.CallProxyZkBytecode,

‎legacy/mcms/internal/family/evm/operations/op_deploy_timelock.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
zkbindings "github.com/smartcontractkit/mcms/sdk/zksync/bindings"
1212

1313
"github.com/smartcontractkit/cld-changesets/internal/semvers"
14-
"github.com/smartcontractkit/cld-changesets/legacy/mcms/operations"
14+
"github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
1515
)
1616

1717
type OpDeployTimelockInput struct {
@@ -23,13 +23,13 @@ type OpDeployTimelockInput struct {
2323
Bypassers []common.Address `json:"bypassers"` // Bypasser of the timelock contract, usually the deployer key
2424
}
2525

26-
var OpDeployTimelock = operations.NewEVMDeployOperation(
26+
var OpDeployTimelock = oputils.NewEVMDeployOperation(
2727
"evm-timelock-deploy",
2828
semver.MustParse("1.0.0"),
2929
"Deploys Timelock contract on the specified EVM chains",
3030
mcmscontracts.RBACTimelock,
3131
bindings.RBACTimelockMetaData,
32-
&operations.ContractOpts{
32+
&oputils.ContractOpts{
3333
Version: &semvers.V1_0_0,
3434
EVMBytecode: common.FromHex(bindings.RBACTimelockBin),
3535
ZkSyncVMBytecode: zkbindings.RBACTimelockZkBytecode,

‎legacy/mcms/internal/family/evm/operations/op_grant_role.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import (
99
mcmscontracts "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/contracts/mcms"
1010
"github.com/smartcontractkit/mcms/sdk/evm/bindings"
1111

12-
"github.com/smartcontractkit/cld-changesets/legacy/mcms/operations"
12+
"github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
1313
)
1414

1515
type OpGrantRoleInput struct {
1616
Account common.Address `json:"account"`
1717
RoleID [32]byte `json:"roleID"`
1818
}
1919

20-
var OpGrantRole = operations.NewEVMCallOperation(
20+
var OpGrantRole = oputils.NewEVMCallOperation(
2121
"evm-timelock-grant-role",
2222
semver.MustParse("1.0.0"),
2323
"Grants specified role to the ManyChainMultiSig contract on the EVM Timelock contract",

‎legacy/mcms/internal/family/evm/operations/op_set_config_mcm.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
bindings "github.com/smartcontractkit/ccip-owner-contracts/pkg/gethwrappers"
1010
mcmscontracts "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/contracts/mcms"
1111

12-
"github.com/smartcontractkit/cld-changesets/legacy/mcms/operations"
12+
"github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
1313
)
1414

1515
type OpEVMSetConfigMCMInput struct {
@@ -19,7 +19,7 @@ type OpEVMSetConfigMCMInput struct {
1919
GroupParents [32]uint8 `json:"groupParents"`
2020
}
2121

22-
var OpEVMSetConfigMCM = operations.NewEVMCallOperation(
22+
var OpEVMSetConfigMCM = oputils.NewEVMCallOperation(
2323
"evm-mcm-set-config",
2424
semver.MustParse("1.0.0"),
2525
"Sets Config on the deployed MCM contract",

‎legacy/mcms/internal/family/evm/operations/ops_deploy_mcm.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ import (
99
zkbindings "github.com/smartcontractkit/mcms/sdk/zksync/bindings"
1010

1111
"github.com/smartcontractkit/cld-changesets/internal/semvers"
12-
"github.com/smartcontractkit/cld-changesets/legacy/mcms/operations"
12+
"github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
1313
)
1414

1515
type OpEVMDeployMCMOutput struct {
1616
Address common.Address `json:"address"`
1717
}
1818

19-
var OpDeployProposerMCM = operations.NewEVMDeployOperation(
19+
var OpDeployProposerMCM = oputils.NewEVMDeployOperation(
2020
"evm-proposer-mcm-deploy",
2121
semver.MustParse("1.0.0"),
2222
"Deploys Proposer MCM contract",
2323
mcmscontracts.ProposerManyChainMultisig,
2424
bindings.ManyChainMultiSigMetaData,
25-
&operations.ContractOpts{
25+
&oputils.ContractOpts{
2626
Version: &semvers.V1_0_0,
2727
EVMBytecode: common.FromHex(bindings.ManyChainMultiSigBin),
2828
ZkSyncVMBytecode: zkbindings.ManyChainMultiSigZkBytecode,
@@ -32,13 +32,13 @@ var OpDeployProposerMCM = operations.NewEVMDeployOperation(
3232
},
3333
)
3434

35-
var OpDeployBypasserMCM = operations.NewEVMDeployOperation(
35+
var OpDeployBypasserMCM = oputils.NewEVMDeployOperation(
3636
"evm-bypasser-mcm-deploy",
3737
semver.MustParse("1.0.0"),
3838
"Deploys Bypasser MCM contract",
3939
mcmscontracts.BypasserManyChainMultisig,
4040
bindings.ManyChainMultiSigMetaData,
41-
&operations.ContractOpts{
41+
&oputils.ContractOpts{
4242
Version: &semvers.V1_0_0,
4343
EVMBytecode: common.FromHex(bindings.ManyChainMultiSigBin),
4444
ZkSyncVMBytecode: zkbindings.ManyChainMultiSigZkBytecode,
@@ -48,13 +48,13 @@ var OpDeployBypasserMCM = operations.NewEVMDeployOperation(
4848
},
4949
)
5050

51-
var OpDeployCancellerMCM = operations.NewEVMDeployOperation(
51+
var OpDeployCancellerMCM = oputils.NewEVMDeployOperation(
5252
"evm-canceller-mcm-deploy",
5353
semver.MustParse("1.0.0"),
5454
"Deploys Canceller MCM contract",
5555
mcmscontracts.CancellerManyChainMultisig,
5656
bindings.ManyChainMultiSigMetaData,
57-
&operations.ContractOpts{
57+
&oputils.ContractOpts{
5858
Version: &semvers.V1_0_0,
5959
EVMBytecode: common.FromHex(bindings.ManyChainMultiSigBin),
6060
ZkSyncVMBytecode: zkbindings.ManyChainMultiSigZkBytecode,

‎legacy/mcms/internal/family/evm/sequences/seq_grant_roles_for_timelock.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
"github.com/smartcontractkit/cld-changesets/internal/mcmsrole"
1717
opevmlegacy "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/operations"
18-
evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/operations"
18+
evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
1919
)
2020

2121
type SeqGrantRolesTimelockDeps struct {

‎legacy/mcms/internal/family/evm/sequences/seq_mcm_with_config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
mcmsTypes "github.com/smartcontractkit/mcms/types"
1616

1717
opevmlegacy "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/operations"
18-
evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/operations"
18+
evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
1919
)
2020

2121
type SeqDeployMCMWithConfigInput struct {

0 commit comments

Comments
 (0)