Skip to content

Commit 92a195e

Browse files
tt-clltt-cll
committed
batch ops
1 parent 405eda5 commit 92a195e

File tree

11 files changed

+21
-17
lines changed

11 files changed

+21
-17
lines changed

‎chains/evm/deployment/fastcurse_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func TestFastCurse(t *testing.T) {
152152
evmDeployer := &adapters.EVMDeployer{}
153153
dReg := deploy.GetRegistry()
154154
dReg.RegisterDeployer(chainsel.FamilyEVM, deploy.MCMSVersion, evmDeployer)
155-
cs := deploy.DeployMCMS(dReg)
155+
cs := deploy.DeployMCMS(dReg, nil)
156156
evmChain1 := env.BlockChains.EVMChains()[chain1]
157157
evmChain2 := env.BlockChains.EVMChains()[chain2]
158158
output, err := cs.Apply(*env, deploy.MCMSDeploymentConfig{
@@ -459,7 +459,7 @@ func TestFastCurseGlobalCurseOnChain(t *testing.T) {
459459
evmDeployer := &adapters.EVMDeployer{}
460460
dReg := deploy.GetRegistry()
461461
dReg.RegisterDeployer(chainsel.FamilyEVM, deploy.MCMSVersion, evmDeployer)
462-
cs := deploy.DeployMCMS(dReg)
462+
cs := deploy.DeployMCMS(dReg, nil)
463463
mcmsChainInput := make(map[uint64]deploy.MCMSDeploymentConfigPerChain)
464464
for _, sel := range []uint64{chain1, chain2, chain3} {
465465
evmChain := env.BlockChains.EVMChains()[sel]

‎chains/evm/deployment/v1_0_0/adapters/deployer_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestDeployMCMS(t *testing.T) {
3636
evmDeployer := &adapters.EVMDeployer{}
3737
dReg := deployops.GetRegistry()
3838
dReg.RegisterDeployer(chainsel.FamilyEVM, deployops.MCMSVersion, evmDeployer)
39-
cs := deployops.DeployMCMS(dReg)
39+
cs := deployops.DeployMCMS(dReg, nil)
4040
output, err := cs.Apply(*env, deployops.MCMSDeploymentConfig{
4141
AdapterVersion: semver.MustParse("1.0.0"),
4242
Chains: map[uint64]deployops.MCMSDeploymentConfigPerChain{

‎chains/evm/deployment/v1_0_0/adapters/transfer_ownership_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestTransferOwnership(t *testing.T) {
4949
evmDeployer := &adapters.EVMDeployer{}
5050
dReg := deploy.GetRegistry()
5151
dReg.RegisterDeployer(chainsel.FamilyEVM, deploy.MCMSVersion, evmDeployer)
52-
deployMCMS := deploy.DeployMCMS(dReg)
52+
deployMCMS := deploy.DeployMCMS(dReg, nil)
5353
output, err := deployMCMS.Apply(*env, deploy.MCMSDeploymentConfig{
5454
AdapterVersion: semver.MustParse("1.0.0"),
5555
Chains: map[uint64]deploy.MCMSDeploymentConfigPerChain{

‎chains/evm/deployment/v1_6_4/changesets/siloed_usdc_token_pool_deploy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestSiloedUSDCTokenPoolDeployChangeset(t *testing.T) {
8383
evmDeployer := &adapters.EVMDeployer{}
8484
dReg := deploy.GetRegistry()
8585
dReg.RegisterDeployer(chain_selectors.FamilyEVM, deploy.MCMSVersion, evmDeployer)
86-
cs := deploy.DeployMCMS(dReg)
86+
cs := deploy.DeployMCMS(dReg, nil)
8787
output, err := cs.Apply(*e, deploy.MCMSDeploymentConfig{
8888
AdapterVersion: semver.MustParse("1.0.0"),
8989
Chains: map[uint64]deploy.MCMSDeploymentConfigPerChain{

‎chains/evm/deployment/v1_6_4/changesets/update_lock_release_pool_addresses_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func TestUpdateLockReleasePoolAddressesChangeset(t *testing.T) {
124124
evmDeployer := &adapters.EVMDeployer{}
125125
dReg := deploy.GetRegistry()
126126
dReg.RegisterDeployer(chain_selectors.FamilyEVM, deploy.MCMSVersion, evmDeployer)
127-
cs := deploy.DeployMCMS(dReg)
127+
cs := deploy.DeployMCMS(dReg, nil)
128128
output, err := cs.Apply(*e, deploy.MCMSDeploymentConfig{
129129
AdapterVersion: semver.MustParse("1.0.0"),
130130
Chains: map[uint64]deploy.MCMSDeploymentConfigPerChain{

‎chains/evm/deployment/v1_6_4/changesets/usdc_token_pool_cctp_v2_deploy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func TestUSDCTokenPoolCCTPV2DeployChangeset(t *testing.T) {
109109
evmDeployer := &adapters.EVMDeployer{}
110110
dReg := deploy.GetRegistry()
111111
dReg.RegisterDeployer(chain_selectors.FamilyEVM, deploy.MCMSVersion, evmDeployer)
112-
cs := deploy.DeployMCMS(dReg)
112+
cs := deploy.DeployMCMS(dReg, nil)
113113
output, err := cs.Apply(*e, deploy.MCMSDeploymentConfig{
114114
AdapterVersion: semver.MustParse("1.0.0"),
115115
Chains: map[uint64]deploy.MCMSDeploymentConfigPerChain{

‎chains/evm/deployment/v1_6_4/changesets/usdc_token_pool_deploy_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func TestUSDCTokenPoolDeployChangeset_NoExisting_MessageTransmitter_Proxy(t *tes
111111
evmDeployer := &adapters.EVMDeployer{}
112112
dReg := deploy.GetRegistry()
113113
dReg.RegisterDeployer(chain_selectors.FamilyEVM, deploy.MCMSVersion, evmDeployer)
114-
cs := deploy.DeployMCMS(dReg)
114+
cs := deploy.DeployMCMS(dReg, nil)
115115
output, err := cs.Apply(*e, deploy.MCMSDeploymentConfig{
116116
AdapterVersion: semver.MustParse("1.0.0"),
117117
Chains: map[uint64]deploy.MCMSDeploymentConfigPerChain{
@@ -312,7 +312,7 @@ func TestUSDCTokenPoolDeployChangeset_Existing_MessageTransmitter_Proxy(t *testi
312312
evmDeployer := &adapters.EVMDeployer{}
313313
dReg := deploy.GetRegistry()
314314
dReg.RegisterDeployer(chain_selectors.FamilyEVM, deploy.MCMSVersion, evmDeployer)
315-
cs := deploy.DeployMCMS(dReg)
315+
cs := deploy.DeployMCMS(dReg, nil)
316316
output, err := cs.Apply(*e, deploy.MCMSDeploymentConfig{
317317
AdapterVersion: semver.MustParse("1.0.0"),
318318
Chains: map[uint64]deploy.MCMSDeploymentConfigPerChain{

‎chains/evm/deployment/v1_6_4/changesets/usdc_token_pool_proxy_deploy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestDeployUSDCTokenPoolProxyChangeset(t *testing.T) {
7373
evmDeployer := &adapters.EVMDeployer{}
7474
dReg := deploy.GetRegistry()
7575
dReg.RegisterDeployer(chain_selectors.FamilyEVM, deploy.MCMSVersion, evmDeployer)
76-
cs := deploy.DeployMCMS(dReg)
76+
cs := deploy.DeployMCMS(dReg, nil)
7777
output, err := cs.Apply(*e, deploy.MCMSDeploymentConfig{
7878
AdapterVersion: semver.MustParse("1.0.0"),
7979
Chains: map[uint64]deploy.MCMSDeploymentConfigPerChain{

‎deployment/deploy/mcms.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
1111
cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
1212
cldf_ops "github.com/smartcontractkit/chainlink-deployments-framework/operations"
13+
mcms_types "github.com/smartcontractkit/mcms/types"
1314
mcmstypes "github.com/smartcontractkit/mcms/types"
1415

1516
"github.com/smartcontractkit/chainlink-ccip/deployment/utils/changesets"
@@ -37,11 +38,11 @@ type MCMSDeploymentConfigPerChainWithAddress struct {
3738
ExistingAddresses []datastore.AddressRef
3839
}
3940

40-
func DeployMCMS(deployerReg *DeployerRegistry) cldf.ChangeSetV2[MCMSDeploymentConfig] {
41-
return cldf.CreateChangeSet(deployMCMSApply(deployerReg), deployMCMSVerify(deployerReg))
41+
func DeployMCMS(deployerReg *DeployerRegistry, mcmsRegistry *changesets.MCMSReaderRegistry) cldf.ChangeSetV2[MCMSDeploymentConfig] {
42+
return cldf.CreateChangeSet(deployMCMSApply(deployerReg, mcmsRegistry), deployMCMSVerify(deployerReg, mcmsRegistry))
4243
}
4344

44-
func deployMCMSVerify(_ *DeployerRegistry) func(cldf.Environment, MCMSDeploymentConfig) error {
45+
func deployMCMSVerify(_ *DeployerRegistry, _ *changesets.MCMSReaderRegistry) func(cldf.Environment, MCMSDeploymentConfig) error {
4546
return func(e cldf.Environment, cfg MCMSDeploymentConfig) error {
4647
// TODO: implement
4748
if cfg.AdapterVersion == nil {
@@ -51,9 +52,10 @@ func deployMCMSVerify(_ *DeployerRegistry) func(cldf.Environment, MCMSDeployment
5152
}
5253
}
5354

54-
func deployMCMSApply(d *DeployerRegistry) func(cldf.Environment, MCMSDeploymentConfig) (cldf.ChangesetOutput, error) {
55+
func deployMCMSApply(d *DeployerRegistry, mcmsRegistry *changesets.MCMSReaderRegistry) func(cldf.Environment, MCMSDeploymentConfig) (cldf.ChangesetOutput, error) {
5556
return func(e cldf.Environment, cfg MCMSDeploymentConfig) (cldf.ChangesetOutput, error) {
5657
reports := make([]cldf_ops.Report[any, any], 0)
58+
batchOps := make([]mcms_types.BatchOperation, 0)
5759
ds := datastore.NewMemoryDataStore()
5860
for selector, mcmsCfg := range cfg.Chains {
5961
family, err := chain_selectors.GetSelectorFamily(selector)
@@ -83,12 +85,14 @@ func deployMCMSApply(d *DeployerRegistry) func(cldf.Environment, MCMSDeploymentC
8385
return cldf.ChangesetOutput{}, fmt.Errorf("failed to add %s %s with address %v on chain with selector %d to datastore: %w", r.Type, r.Version, r, r.ChainSelector, err)
8486
}
8587
}
88+
batchOps = append(batchOps, deployReport.Output.BatchOps...)
8689
reports = append(reports, deployReport.ExecutionReports...)
8790
}
8891

89-
return changesets.NewOutputBuilder(e, nil).
92+
return changesets.NewOutputBuilder(e, mcmsRegistry).
9093
WithReports(reports).
9194
WithDataStore(ds).
95+
WithBatchOps(batchOps).
9296
Build(mcms.Input{}) // for deployment, we don't need an MCMS proposal
9397
}
9498
}

‎integration-tests/deployment/fastcurse_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func TestFastCurseSolanaAndEVM(t *testing.T) {
192192
// deploy mcms
193193
evmDeployer := &adapters.EVMDeployer{}
194194
dReg.RegisterDeployer(chainsel.FamilyEVM, deploy.MCMSVersion, evmDeployer)
195-
cs := deploy.DeployMCMS(dReg)
195+
cs := deploy.DeployMCMS(dReg, nil)
196196
evmChain1 := env.BlockChains.EVMChains()[chain1]
197197
evmChain2 := env.BlockChains.EVMChains()[chain2]
198198
output, err := cs.Apply(*env, deploy.MCMSDeploymentConfig{

0 commit comments

Comments
 (0)