Port deploy chain changeset for ZK Sync

deployment/ccip/changeset/cs_prerequisites_test.go

@@ -3,10 +3,11 @@ package changeset_test
 import (
 	"testing"
 
-	chain_selectors "github.com/smartcontractkit/chain-selectors"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
+	chain_selectors "github.com/smartcontractkit/chain-selectors"
+
 	cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
 
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"

deployment/ccip/changeset/v1_6/cs_deploy_chain.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 	"github.com/smartcontractkit/chainlink-deployments-framework/operations"
 

deployment/ccip/changeset/v1_6/cs_deploy_chain_test.go

@@ -3,10 +3,11 @@ package v1_6_test
 import (
 	"testing"
 
-	chain_selectors "github.com/smartcontractkit/chain-selectors"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
+	chain_selectors "github.com/smartcontractkit/chain-selectors"
+
 	cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
 
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
@@ -37,6 +38,32 @@ func TestDeployChainContractsChangeset(t *testing.T) {
 	})
 	evmSelectors := e.BlockChains.ListChainSelectors(cldf_chain.WithFamily(chain_selectors.FamilyEVM))
 	homeChainSel := evmSelectors[0]
+	testDeployChainContractsChangesetWithEnv(t, e, homeChainSel)
+}
+
+func TestDeployChainContractsChangesetZk(t *testing.T) {
+	t.Parallel()
+	lggr := logger.TestLogger(t)
+	e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
+		Bootstraps: 1,
+		Chains:     1,
+		ZkChains:   1,
+		Nodes:      4,
+	})
+	evmSelectors := e.BlockChains.ListChainSelectors(cldf_chain.WithFamily(chain_selectors.FamilyEVM))
+	var homeChainSel uint64
+	for _, selector := range evmSelectors {
+		chain := e.BlockChains.EVMChains()[selector]
+		if !chain.IsZkSyncVM {
+			homeChainSel = chain.Selector
+			break
+		}
+	}
+	testDeployChainContractsChangesetWithEnv(t, e, homeChainSel)
+}
+
+func testDeployChainContractsChangesetWithEnv(t *testing.T, e cldf.Environment, homeChainSel uint64) {
+	evmSelectors := e.BlockChains.ListChainSelectors(cldf_chain.WithFamily(chain_selectors.FamilyEVM))
 	nodes, err := deployment.NodeInfo(e.NodeIDs, e.Offchain)
 	require.NoError(t, err)
 	p2pIds := nodes.NonBootstraps().PeerIDs()

deployment/ccip/operation/evm/v1_2/ops_router.go

@@ -3,6 +3,7 @@ package v1_2
 import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_2_0/router"
 	cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
@@ -32,12 +33,29 @@ var (
 			deployFn := func(chain cldf_evm.Chain, tv cldf.TypeAndVersion) (cldf.ContractDeploy[*router.Router], error) {
 				r, err := cldf.DeployContract(b.Logger, chain, ab,
 					func(chain cldf_evm.Chain) cldf.ContractDeploy[*router.Router] {
-						routerAddr, tx2, routerC, err2 := router.DeployRouter(
-							chain.DeployerKey,
-							chain.Client,
-							input.WethAddress,
-							input.RMNProxy,
+						var (
+							routerAddr common.Address
+							tx2        *types.Transaction
+							routerC    *router.Router
+							err2       error
 						)
+						if chain.IsZkSyncVM {
+							routerAddr, _, routerC, err2 = router.DeployRouterZk(
+								nil,
+								chain.ClientZkSyncVM,
+								chain.DeployerKeyZkSyncVM,
+								chain.Client,
+								input.WethAddress,
+								input.RMNProxy,
+							)
+						} else {
+							routerAddr, tx2, routerC, err2 = router.DeployRouter(
+								chain.DeployerKey,
+								chain.Client,
+								input.WethAddress,
+								input.RMNProxy,
+							)
+						}
 						return cldf.ContractDeploy[*router.Router]{
 							Address: routerAddr, Contract: routerC, Tx: tx2, Tv: tv, Err: err2,
 						}

deployment/ccip/operation/evm/v1_6/ops_fee_quoter.go

@@ -44,30 +44,65 @@ var (
 			contractParams := input.Params
 			feeQ, err := cldf.DeployContract(b.Logger, chain, ab,
 				func(chain cldf_evm.Chain) cldf.ContractDeploy[*fee_quoter.FeeQuoter] {
-					prAddr, tx2, pr, err2 := fee_quoter.DeployFeeQuoter(
-						chain.DeployerKey,
-						chain.Client,
-						fee_quoter.FeeQuoterStaticConfig{
-							MaxFeeJuelsPerMsg:            contractParams.MaxFeeJuelsPerMsg,
-							LinkToken:                    input.LinkAddr,
-							TokenPriceStalenessThreshold: contractParams.TokenPriceStalenessThreshold,
-						},
-						input.PriceUpdaters,
-						[]common.Address{input.WethAddr, input.LinkAddr}, // fee tokens
-						contractParams.TokenPriceFeedUpdates,
-						contractParams.TokenTransferFeeConfigArgs,
-						append([]fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs{
-							{
-								PremiumMultiplierWeiPerEth: contractParams.LinkPremiumMultiplierWeiPerEth,
-								Token:                      input.LinkAddr,
+					var (
+						prAddr common.Address
+						tx2    *types.Transaction
+						pr     *fee_quoter.FeeQuoter
+						err2   error
+					)
+					if chain.IsZkSyncVM {
+						prAddr, _, pr, err2 = fee_quoter.DeployFeeQuoterZk(
+							nil,
+							chain.ClientZkSyncVM,
+							chain.DeployerKeyZkSyncVM,
+							chain.Client,
+							fee_quoter.FeeQuoterStaticConfig{
+								MaxFeeJuelsPerMsg:            contractParams.MaxFeeJuelsPerMsg,
+								LinkToken:                    input.LinkAddr,
+								TokenPriceStalenessThreshold: contractParams.TokenPriceStalenessThreshold,
 							},
-							{
-								PremiumMultiplierWeiPerEth: contractParams.WethPremiumMultiplierWeiPerEth,
-								Token:                      input.WethAddr,
+							input.PriceUpdaters,
+							[]common.Address{input.WethAddr, input.LinkAddr}, // fee tokens
+							contractParams.TokenPriceFeedUpdates,
+							contractParams.TokenTransferFeeConfigArgs,
+							append([]fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs{
+								{
+									PremiumMultiplierWeiPerEth: contractParams.LinkPremiumMultiplierWeiPerEth,
+									Token:                      input.LinkAddr,
+								},
+								{
+									PremiumMultiplierWeiPerEth: contractParams.WethPremiumMultiplierWeiPerEth,
+									Token:                      input.WethAddr,
+								},
+							}, contractParams.MorePremiumMultiplierWeiPerEth...),
+							contractParams.DestChainConfigArgs,
+						)
+					} else {
+						prAddr, tx2, pr, err2 = fee_quoter.DeployFeeQuoter(
+							chain.DeployerKey,
+							chain.Client,
+							fee_quoter.FeeQuoterStaticConfig{
+								MaxFeeJuelsPerMsg:            contractParams.MaxFeeJuelsPerMsg,
+								LinkToken:                    input.LinkAddr,
+								TokenPriceStalenessThreshold: contractParams.TokenPriceStalenessThreshold,
 							},
-						}, contractParams.MorePremiumMultiplierWeiPerEth...),
-						contractParams.DestChainConfigArgs,
-					)
+							input.PriceUpdaters,
+							[]common.Address{input.WethAddr, input.LinkAddr}, // fee tokens
+							contractParams.TokenPriceFeedUpdates,
+							contractParams.TokenTransferFeeConfigArgs,
+							append([]fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs{
+								{
+									PremiumMultiplierWeiPerEth: contractParams.LinkPremiumMultiplierWeiPerEth,
+									Token:                      input.LinkAddr,
+								},
+								{
+									PremiumMultiplierWeiPerEth: contractParams.WethPremiumMultiplierWeiPerEth,
+									Token:                      input.WethAddr,
+								},
+							}, contractParams.MorePremiumMultiplierWeiPerEth...),
+							contractParams.DestChainConfigArgs,
+						)
+					}
 					return cldf.ContractDeploy[*fee_quoter.FeeQuoter]{
 						Address: prAddr, Contract: pr, Tx: tx2, Tv: cldf.NewTypeAndVersion(shared.FeeQuoter, deployment.Version1_6_0), Err: err2,
 					}

deployment/ccip/operation/evm/v1_6/ops_nonce_manager.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/nonce_manager"
 	cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
@@ -31,11 +32,27 @@ var (
 			chain := deps.Chain
 			nonceManager, err := cldf.DeployContract(b.Logger, chain, ab,
 				func(chain cldf_evm.Chain) cldf.ContractDeploy[*nonce_manager.NonceManager] {
-					nonceManagerAddr, tx2, nonceManager, err2 := nonce_manager.DeployNonceManager(
-						chain.DeployerKey,
-						chain.Client,
-						[]common.Address{}, // Need to add onRamp after
+					var (
+						nonceManagerAddr common.Address
+						tx2              *types.Transaction
+						nonceManager     *nonce_manager.NonceManager
+						err2             error
 					)
+					if chain.IsZkSyncVM {
+						nonceManagerAddr, _, nonceManager, err2 = nonce_manager.DeployNonceManagerZk(
+							nil,
+							chain.ClientZkSyncVM,
+							chain.DeployerKeyZkSyncVM,
+							chain.Client,
+							[]common.Address{},
+						)
+					} else {
+						nonceManagerAddr, tx2, nonceManager, err2 = nonce_manager.DeployNonceManager(
+							chain.DeployerKey,
+							chain.Client,
+							[]common.Address{}, // Need to add onRamp after
+						)
+					}
 					return cldf.ContractDeploy[*nonce_manager.NonceManager]{
 						Address: nonceManagerAddr, Contract: nonceManager, Tx: tx2, Tv: cldf.NewTypeAndVersion(shared.NonceManager, deployment.Version1_6_0), Err: err2,
 					}

deployment/ccip/operation/evm/v1_6/ops_offramp.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/offramp"
 	cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
@@ -27,23 +28,51 @@ var (
 			chain := deps.Chain
 			offRamp, err := cldf.DeployContract(b.Logger, chain, ab,
 				func(chain cldf_evm.Chain) cldf.ContractDeploy[*offramp.OffRamp] {
-					offRampAddr, tx2, offRamp, err2 := offramp.DeployOffRamp(
-						chain.DeployerKey,
-						chain.Client,
-						offramp.OffRampStaticConfig{
-							ChainSelector:        chain.Selector,
-							GasForCallExactCheck: input.Params.GasForCallExactCheck,
-							RmnRemote:            input.RmnRemote,
-							NonceManager:         input.NonceManager,
-							TokenAdminRegistry:   input.TokenAdminRegistry,
-						},
-						offramp.OffRampDynamicConfig{
-							FeeQuoter:                               input.FeeQuoter,
-							PermissionLessExecutionThresholdSeconds: input.Params.PermissionLessExecutionThresholdSeconds,
-							MessageInterceptor:                      input.Params.MessageInterceptor,
-						},
-						[]offramp.OffRampSourceChainConfigArgs{},
+					var (
+						offRampAddr common.Address
+						tx2         *types.Transaction
+						offRamp     *offramp.OffRamp
+						err2        error
 					)
+					if chain.IsZkSyncVM {
+						offRampAddr, _, offRamp, err2 = offramp.DeployOffRampZk(
+							nil,
+							chain.ClientZkSyncVM,
+							chain.DeployerKeyZkSyncVM,
+							chain.Client,
+							offramp.OffRampStaticConfig{
+								ChainSelector:        chain.Selector,
+								GasForCallExactCheck: input.Params.GasForCallExactCheck,
+								RmnRemote:            input.RmnRemote,
+								NonceManager:         input.NonceManager,
+								TokenAdminRegistry:   input.TokenAdminRegistry,
+							},
+							offramp.OffRampDynamicConfig{
+								FeeQuoter:                               input.FeeQuoter,
+								PermissionLessExecutionThresholdSeconds: input.Params.PermissionLessExecutionThresholdSeconds,
+								MessageInterceptor:                      input.Params.MessageInterceptor,
+							},
+							[]offramp.OffRampSourceChainConfigArgs{},
+						)
+					} else {
+						offRampAddr, tx2, offRamp, err2 = offramp.DeployOffRamp(
+							chain.DeployerKey,
+							chain.Client,
+							offramp.OffRampStaticConfig{
+								ChainSelector:        chain.Selector,
+								GasForCallExactCheck: input.Params.GasForCallExactCheck,
+								RmnRemote:            input.RmnRemote,
+								NonceManager:         input.NonceManager,
+								TokenAdminRegistry:   input.TokenAdminRegistry,
+							},
+							offramp.OffRampDynamicConfig{
+								FeeQuoter:                               input.FeeQuoter,
+								PermissionLessExecutionThresholdSeconds: input.Params.PermissionLessExecutionThresholdSeconds,
+								MessageInterceptor:                      input.Params.MessageInterceptor,
+							},
+							[]offramp.OffRampSourceChainConfigArgs{},
+						)
+					}
 					return cldf.ContractDeploy[*offramp.OffRamp]{
 						Address: offRampAddr, Contract: offRamp, Tx: tx2, Tv: cldf.NewTypeAndVersion(shared.OffRamp, deployment.Version1_6_0), Err: err2,
 					}

deployment/ccip/operation/evm/v1_6/ops_onramp.go

@@ -3,6 +3,7 @@ package v1_6
 import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/onramp"
 	cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
@@ -24,21 +25,47 @@ var (
 			chain := deps.Chain
 			onRamp, err := cldf.DeployContract(b.Logger, chain, ab,
 				func(chain cldf_evm.Chain) cldf.ContractDeploy[*onramp.OnRamp] {
-					onRampAddr, tx2, onRamp, err2 := onramp.DeployOnRamp(
-						chain.DeployerKey,
-						chain.Client,
-						onramp.OnRampStaticConfig{
-							ChainSelector:      chain.Selector,
-							RmnRemote:          input.RmnRemote,
-							NonceManager:       input.NonceManager,
-							TokenAdminRegistry: input.TokenAdminRegistry,
-						},
-						onramp.OnRampDynamicConfig{
-							FeeQuoter:     input.FeeQuoter,
-							FeeAggregator: input.FeeAggregator,
-						},
-						[]onramp.OnRampDestChainConfigArgs{},
+					var (
+						onRampAddr common.Address
+						tx2        *types.Transaction
+						onRamp     *onramp.OnRamp
+						err2       error
 					)
+					if chain.IsZkSyncVM {
+						onRampAddr, _, onRamp, err2 = onramp.DeployOnRampZk(
+							nil,
+							chain.ClientZkSyncVM,
+							chain.DeployerKeyZkSyncVM,
+							chain.Client,
+							onramp.OnRampStaticConfig{
+								ChainSelector:      chain.Selector,
+								RmnRemote:          input.RmnRemote,
+								NonceManager:       input.NonceManager,
+								TokenAdminRegistry: input.TokenAdminRegistry,
+							},
+							onramp.OnRampDynamicConfig{
+								FeeQuoter:     input.FeeQuoter,
+								FeeAggregator: input.FeeAggregator,
+							},
+							[]onramp.OnRampDestChainConfigArgs{},
+						)
+					} else {
+						onRampAddr, tx2, onRamp, err2 = onramp.DeployOnRamp(
+							chain.DeployerKey,
+							chain.Client,
+							onramp.OnRampStaticConfig{
+								ChainSelector:      chain.Selector,
+								RmnRemote:          input.RmnRemote,
+								NonceManager:       input.NonceManager,
+								TokenAdminRegistry: input.TokenAdminRegistry,
+							},
+							onramp.OnRampDynamicConfig{
+								FeeQuoter:     input.FeeQuoter,
+								FeeAggregator: input.FeeAggregator,
+							},
+							[]onramp.OnRampDestChainConfigArgs{},
+						)
+					}
 					return cldf.ContractDeploy[*onramp.OnRamp]{
 						Address: onRampAddr, Contract: onRamp, Tx: tx2, Tv: cldf.NewTypeAndVersion(shared.OnRamp, deployment.Version1_6_0), Err: err2,
 					}