add deploy api (#1314)

* add deploy api

* change versioning

* tests

* package name

* top level

* top level

Author: tt-cll

chains/evm/deployment/v1_0_0/deployer.go

@@ -12,13 +12,18 @@ import (
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract"
 	ops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations"
 	seq "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/sequences"
+	ccipapi "github.com/smartcontractkit/chainlink-ccip/deployment/deploy"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/utils"
 	sequtil "github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences"
-	ccipapi "github.com/smartcontractkit/chainlink-ccip/deployment/v1_0"
 )
 
 type EVMDeployer struct{}
 
+func (a *EVMDeployer) DeployChainContracts() *cldf_ops.Sequence[ccipapi.ContractDeploymentConfigPerChainWithAddress, sequtil.OnChainOutput, cldf_chain.BlockChains] {
+	// Not implemented for the 1.0.0 deployer
+	return nil
+}
+
 func (d *EVMDeployer) DeployMCMS() *cldf_ops.Sequence[ccipapi.MCMSDeploymentConfigPerChainWithAddress, sequtil.OnChainOutput, cldf_chain.BlockChains] {
 	return cldf_ops.NewSequence(
 		"deploy-mcms",

chains/evm/deployment/v1_0_0/deployer_test.go

@@ -4,6 +4,7 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/Masterminds/semver/v3"
 	"github.com/aws/smithy-go/ptr"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
@@ -13,8 +14,8 @@ import (
 	"github.com/smartcontractkit/mcms/sdk/evm/bindings"
 	"github.com/stretchr/testify/require"
 
+	deployops "github.com/smartcontractkit/chainlink-ccip/deployment/deploy"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/utils"
-	"github.com/smartcontractkit/chainlink-ccip/deployment/v1_0"
 )
 
 func TestDeployMCMS(t *testing.T) {
@@ -27,15 +28,17 @@ func TestDeployMCMS(t *testing.T) {
 	evmChain := env.BlockChains.EVMChains()[selector]
 
 	evmDeployer := &EVMDeployer{}
-	dReg := v1_0.GetRegistry()
-	dReg.RegisterDeployer(chainsel.FamilyEVM, v1_0.MCMSVersion, evmDeployer)
-	cs := v1_0.DeployMCMS(dReg)
-	output, err := cs.Apply(*env, v1_0.MCMSDeploymentConfig{
-		Chains: map[uint64]v1_0.MCMSDeploymentConfigPerChain{
+	dReg := deployops.GetRegistry()
+	version := semver.MustParse("1.0.0")
+	dReg.RegisterDeployer(chainsel.FamilyEVM, version, evmDeployer)
+	cs := deployops.DeployMCMS(dReg)
+	output, err := cs.Apply(*env, deployops.MCMSDeploymentConfig{
+		Version: version,
+		Chains: map[uint64]deployops.MCMSDeploymentConfigPerChain{
 			selector: {
-				Canceller:        v1_0.SingleGroupMCMSV2(),
-				Bypasser:         v1_0.SingleGroupMCMSV2(),
-				Proposer:         v1_0.SingleGroupMCMSV2(),
+				Canceller:        deployops.SingleGroupMCMSV2(),
+				Bypasser:         deployops.SingleGroupMCMSV2(),
+				Proposer:         deployops.SingleGroupMCMSV2(),
 				TimelockMinDelay: big.NewInt(0),
 				Qualifier:        ptr.String("test"),
 				TimelockAdmin:    evmChain.DeployerKey.From,

chains/evm/deployment/v1_6_0/changesets/connect_chains_test.go

@@ -4,13 +4,11 @@ import (
 	"encoding/hex"
 	"math/big"
 	"testing"
+	"time"
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ethereum/go-ethereum/common"
 	chain_selectors "github.com/smartcontractkit/chain-selectors"
-	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/changesets"
-	fqops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/fee_quoter"
-	offrampops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/offramp"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/sequences"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_2_0/router"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/fee_quoter"
@@ -22,6 +20,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	ccipapi "github.com/smartcontractkit/chainlink-ccip/deployment"
+	deployops "github.com/smartcontractkit/chainlink-ccip/deployment/deploy"
 	lanesapi "github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
 	fdeployment "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 )
@@ -141,14 +140,22 @@ func TestConnectChains_EVM2EVM_NoMCMS(t *testing.T) {
 	require.NotNil(t, e, "Environment should be created")
 
 	mcmsRegistry := cs_core.NewMCMSReaderRegistry()
+	dReg := deployops.GetRegistry()
+	version := semver.MustParse("1.6.0")
 	for _, chainSel := range chains {
-		out, err := changesets.DeployChainContracts(mcmsRegistry).Apply(*e, cs_core.WithMCMS[changesets.DeployChainContractsCfg]{
+		out, err := deployops.DeployContracts(dReg).Apply(*e, deployops.ContractDeploymentConfig{
 			MCMS: mcms.Input{},
-			Cfg: changesets.DeployChainContractsCfg{
-				ChainSel: chainSel,
-				Params: sequences.ContractParams{
-					FeeQuoter: fqops.DefaultFeeQuoterParams(),
-					OffRamp:   offrampops.DefaultOffRampParams(),
+			Chains: map[uint64]deployops.ContractDeploymentConfigPerChain{
+				chainSel: {
+					Version: version,
+					// FEE QUOTER CONFIG
+					MaxFeeJuelsPerMsg:            big.NewInt(0).Mul(big.NewInt(200), big.NewInt(1e18)),
+					TokenPriceStalenessThreshold: uint32(24 * 60 * 60),
+					LinkPremiumMultiplier:        9e17, // 0.9 ETH
+					NativeTokenPremiumMultiplier: 1e18, // 1.0 ETH
+					// OFFRAMP CONFIG
+					PermissionLessExecutionThresholdSeconds: uint32((20 * time.Minute).Seconds()),
+					GasForCallExactCheck:                    uint16(5000),
 				},
 			},
 		})
@@ -158,7 +165,6 @@ func TestConnectChains_EVM2EVM_NoMCMS(t *testing.T) {
 	}
 	evmEncoded, err := hex.DecodeString(ccipapi.EVMFamilySelector)
 	require.NoError(t, err, "Failed to decode EVM family selector")
-	laneVersion := semver.MustParse("1.6.0")
 	chain1 := lanesapi.ChainDefinition{
 		Selector:                 chain_selectors.ETHEREUM_MAINNET.Selector,
 		GasPrice:                 big.NewInt(1e17),
@@ -173,7 +179,7 @@ func TestConnectChains_EVM2EVM_NoMCMS(t *testing.T) {
 	_, err = lanesapi.ConnectChains(lanesapi.GetLaneAdapterRegistry(), mcmsRegistry).Apply(*e, lanesapi.ConnectChainsConfig{
 		Lanes: []lanesapi.LaneConfig{
 			{
-				Version: laneVersion,
+				Version: version,
 				Source:  chain1,
 				Dest:    chain2,
 			},
@@ -184,11 +190,11 @@ func TestConnectChains_EVM2EVM_NoMCMS(t *testing.T) {
 	src, dest := chains[0], chains[1]
 	srcFamily, err := chain_selectors.GetSelectorFamily(src)
 	require.NoError(t, err, "must get selector family for src")
-	srcAdapter, exists := laneRegistry.GetLaneAdapter(srcFamily, laneVersion)
+	srcAdapter, exists := laneRegistry.GetLaneAdapter(srcFamily, version)
 	require.True(t, exists, "must have ChainAdapter registered for src chain family")
 	destFamily, err := chain_selectors.GetSelectorFamily(dest)
 	require.NoError(t, err, "must get selector family for dest")
-	destAdapter, exists := laneRegistry.GetLaneAdapter(destFamily, laneVersion)
+	destAdapter, exists := laneRegistry.GetLaneAdapter(destFamily, version)
 	require.True(t, exists, "must have ChainAdapter registered for dest chain family")
 	checkBidirectionalLaneConnectivity(t, e, chain1, chain2, srcAdapter, destAdapter, false, false)
 }

chains/evm/deployment/v1_6_0/changesets/deploy_chain_contracts.go

@@ -1,18 +1,16 @@
 package changesets_test
 
 import (
+	"math/big"
 	"testing"
+	"time"
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ethereum/go-ethereum/common"
 	chain_selectors "github.com/smartcontractkit/chain-selectors"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/link"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/weth"
-	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/changesets"
-	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/fee_quoter"
-	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/offramp"
-	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/sequences"
-	cs_core "github.com/smartcontractkit/chainlink-ccip/deployment/utils/changesets"
+	deployops "github.com/smartcontractkit/chainlink-ccip/deployment/deploy"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/utils/mcms"
 	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
 	"github.com/smartcontractkit/chainlink-deployments-framework/engine/test/environment"
@@ -28,36 +26,48 @@ func TestDeployChainContracts_VerifyPreconditions(t *testing.T) {
 
 	tests := []struct {
 		desc        string
-		input       cs_core.WithMCMS[changesets.DeployChainContractsCfg]
+		input       deployops.ContractDeploymentConfig
 		expectedErr string
 	}{
 		{
 			desc: "valid input",
-			input: cs_core.WithMCMS[changesets.DeployChainContractsCfg]{
+			input: deployops.ContractDeploymentConfig{
 				MCMS: mcms.Input{},
-				Cfg: changesets.DeployChainContractsCfg{
-					ChainSel: chain_selectors.ETHEREUM_MAINNET.Selector,
-					Params:   sequences.ContractParams{},
+				Chains: map[uint64]deployops.ContractDeploymentConfigPerChain{
+					chain_selectors.ETHEREUM_MAINNET.Selector: {
+						Version: semver.MustParse("1.6.0"),
+					},
+				},
+			},
+		},
+		{
+			desc: "invalid version nil",
+			input: deployops.ContractDeploymentConfig{
+				MCMS: mcms.Input{},
+				Chains: map[uint64]deployops.ContractDeploymentConfigPerChain{
+					chain_selectors.ETHEREUM_MAINNET.Selector: {
+						Version: nil,
+					},
 				},
 			},
+			expectedErr: "no version specified for chain with selector 5009297550715157269",
 		},
 		{
 			desc: "invalid chain selector",
-			input: cs_core.WithMCMS[changesets.DeployChainContractsCfg]{
+			input: deployops.ContractDeploymentConfig{
 				MCMS: mcms.Input{},
-				Cfg: changesets.DeployChainContractsCfg{
-					ChainSel: 12345,
-					Params:   sequences.ContractParams{},
+				Chains: map[uint64]deployops.ContractDeploymentConfigPerChain{
+					12345: {},
 				},
 			},
-			expectedErr: "no EVM chain with selector 12345 found in environment",
+			expectedErr: "no selector 12345 found in environment: unknown chain selector 12345",
 		},
 	}
 
 	for _, test := range tests {
 		t.Run(test.desc, func(t *testing.T) {
-			mcmsRegistry := cs_core.NewMCMSReaderRegistry()
-			err := changesets.DeployChainContracts(mcmsRegistry).VerifyPreconditions(*e, test.input)
+			dReg := deployops.GetRegistry()
+			err := deployops.DeployContracts(dReg).VerifyPreconditions(*e, test.input)
 			if test.expectedErr != "" {
 				require.ErrorContains(t, err, test.expectedErr, "Expected error containing %q but got none", test.expectedErr)
 			} else {
@@ -112,14 +122,21 @@ func TestDeployChainContracts_Apply(t *testing.T) {
 			require.NoError(t, err, "Failed to fetch addresses from datastore")
 			e.DataStore = ds.Seal() // Override datastore in environment to include existing addresses
 
-			mcmsRegistry := cs_core.NewMCMSReaderRegistry()
-			out, err := changesets.DeployChainContracts(mcmsRegistry).Apply(*e, cs_core.WithMCMS[changesets.DeployChainContractsCfg]{
+			dReg := deployops.GetRegistry()
+			version := semver.MustParse("1.6.0")
+			out, err := deployops.DeployContracts(dReg).Apply(*e, deployops.ContractDeploymentConfig{
 				MCMS: mcms.Input{},
-				Cfg: changesets.DeployChainContractsCfg{
-					ChainSel: chain_selectors.ETHEREUM_MAINNET.Selector,
-					Params: sequences.ContractParams{
-						FeeQuoter: fee_quoter.DefaultFeeQuoterParams(),
-						OffRamp:   offramp.DefaultOffRampParams(),
+				Chains: map[uint64]deployops.ContractDeploymentConfigPerChain{
+					chain_selectors.ETHEREUM_MAINNET.Selector: {
+						Version: version,
+						// FEE QUOTER CONFIG
+						MaxFeeJuelsPerMsg:            big.NewInt(0).Mul(big.NewInt(200), big.NewInt(1e18)),
+						TokenPriceStalenessThreshold: uint32(24 * 60 * 60),
+						LinkPremiumMultiplier:        9e17, // 0.9 ETH
+						NativeTokenPremiumMultiplier: 1e18, // 1.0 ETH
+						// OFFRAMP CONFIG
+						PermissionLessExecutionThresholdSeconds: uint32((20 * time.Minute).Seconds()),
+						GasForCallExactCheck:                    uint16(5000),
 					},
 				},
 			})

chains/evm/deployment/v1_6_0/changesets/deploy_chain_contracts_test.go

@@ -92,16 +92,3 @@ func (c FeeQuoterParams) Validate() error {
 	}
 	return nil
 }
-
-func DefaultFeeQuoterParams() FeeQuoterParams {
-	return FeeQuoterParams{
-		MaxFeeJuelsPerMsg:              big.NewInt(0).Mul(big.NewInt(2e2), big.NewInt(1e18)),
-		TokenPriceStalenessThreshold:   uint32(24 * 60 * 60),
-		LinkPremiumMultiplierWeiPerEth: 9e17, // 0.9 ETH
-		WethPremiumMultiplierWeiPerEth: 1e18, // 1.0 ETH
-		TokenPriceFeedUpdates:          []fee_quoter.FeeQuoterTokenPriceFeedUpdate{},
-		TokenTransferFeeConfigArgs:     []fee_quoter.FeeQuoterTokenTransferFeeConfigArgs{},
-		MorePremiumMultiplierWeiPerEth: []fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs{},
-		DestChainConfigArgs:            []fee_quoter.FeeQuoterDestChainConfigArgs{},
-	}
-}

chains/evm/deployment/v1_6_0/operations/fee_quoter/fee_quoter.go

@@ -1,8 +1,6 @@
 package offramp
 
 import (
-	"time"
-
 	"github.com/Masterminds/semver/v3"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
@@ -59,10 +57,3 @@ var OffRampApplySourceChainConfigUpdates = contract.NewWrite(contract.WriteParam
 		return offRamp.ApplySourceChainConfigUpdates(opts, args)
 	},
 })
-
-func DefaultOffRampParams() OffRampParams {
-	return OffRampParams{
-		GasForCallExactCheck:                    uint16(5000),
-		PermissionLessExecutionThresholdSeconds: uint32((1 * time.Hour).Seconds()),
-	}
-}

chains/evm/deployment/v1_6_0/operations/offramp/offramp.go

@@ -13,6 +13,7 @@ import (
 	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 
+	deployops "github.com/smartcontractkit/chainlink-ccip/deployment/deploy"
 	ccipapi "github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
 )
 
@@ -22,6 +23,7 @@ func init() {
 		panic(err)
 	}
 	ccipapi.GetLaneAdapterRegistry().RegisterLaneAdapter(chain_selectors.FamilyEVM, v, &EVMAdapter{})
+	deployops.GetRegistry().RegisterDeployer(chain_selectors.FamilyEVM, v, &EVMAdapter{})
 }
 
 type EVMAdapter struct{}