Port Link Token for ZK

deployment/common/changeset/deploy_link_token.go

@@ -4,10 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"golang.org/x/sync/errgroup"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	"github.com/gagliardetto/solana-go"
+
 	chainsel "github.com/smartcontractkit/chain-selectors"
 
 	solCommomUtil "github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/common"
@@ -110,9 +112,10 @@ func deployLinkTokenContractEVM(
 ) (*deployment.ContractDeploy[*link_token.LinkToken], error) {
 	linkToken, err := deployment.DeployContract[*link_token.LinkToken](lggr, chain, ab,
 		func(chain deployment.Chain) deployment.ContractDeploy[*link_token.LinkToken] {
-			linkTokenAddr, tx, linkToken, err2 := link_token.DeployLinkToken(
-				chain.DeployerKey,
-				chain.Client,
+			linkTokenAddr, tx, linkToken, err2 := deployment.PickXVMDeployFn(
+				chain,
+				link_token.DeployLinkToken,
+				link_token.DeployLinkTokenZk,
 			)
 			return deployment.ContractDeploy[*link_token.LinkToken]{
 				Address:  linkTokenAddr,

deployment/common/changeset/deploy_link_token_test.go

@@ -3,10 +3,31 @@
 import (
 	"testing"
 
+	"go.uber.org/zap/zapcore"
+
 	"github.com/smartcontractkit/chainlink/deployment/common/changeset"
+	"github.com/smartcontractkit/chainlink/deployment/environment/memory"
+	"github.com/smartcontractkit/wsrpc/logger"
 )
 
 func TestDeployLinkToken(t *testing.T) {
 	t.Parallel()
-	changeset.DeployLinkTokenTest(t, 0)
+	lggr := logger.Test(t)
+	solChains := 0
+	e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
+		Chains:    1,
+		SolChains: solChains,
+	})
+	changeset.DeployLinkTokenTest(t, e, solChains)
+}
+
+func TestDeployLinkTokenZK(t *testing.T) {
+	t.Parallel()
+	lggr := logger.Test(t)
+	e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
+		Chains:    0,
+		SolChains: 0,
+		ZkChains:  1,
+	})
+	changeset.DeployLinkTokenTest(t, e, 0)
 }

deployment/common/changeset/test_helpers.go

@@ -6,9 +6,6 @@ import (
 
 	mapset "github.com/deckarep/golang-set/v2"
 	"github.com/stretchr/testify/require"
-	"go.uber.org/zap/zapcore"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 	"github.com/smartcontractkit/chainlink/deployment"
 	commonState "github.com/smartcontractkit/chainlink/deployment/common/changeset/state"
@@ -201,12 +198,7 @@ func ApplyChangesetsV2(t *testing.T, e deployment.Environment, changesetApplicat
 	return currentEnv, nil
 }
 
-func DeployLinkTokenTest(t *testing.T, solChains int) {
-	lggr := logger.Test(t)
-	e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
-		Chains:    1,
-		SolChains: solChains,
-	})
+func DeployLinkTokenTest(t *testing.T, e deployment.Environment, solChains int) {
 	chain1 := e.AllChainSelectors()[0]
 	config := []uint64{chain1}
 	var solChain1 uint64

deployment/helpers.go

@@ -16,6 +16,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/pkg/errors"
+
 	chain_selectors "github.com/smartcontractkit/chain-selectors"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
@@ -165,10 +166,13 @@ func DeployContract[C any](
 		lggr.Errorw("Failed to deploy contract", "chain", chain.String(), "err", contractDeploy.Err)
 		return nil, contractDeploy.Err
 	}
-	_, err := chain.Confirm(contractDeploy.Tx)
-	if err != nil {
-		lggr.Errorw("Failed to confirm deployment", "chain", chain.String(), "Contract", contractDeploy.Tv.String(), "err", err)
-		return nil, err
+	var err error
+	if !chain.IsZk { // tx is confirmed in the deploy process
+		_, err = chain.Confirm(contractDeploy.Tx)
+		if err != nil {
+			lggr.Errorw("Failed to confirm deployment", "chain", chain.String(), "Contract", contractDeploy.Tv.String(), "err", err)
+			return nil, err
+		}
 	}
 	lggr.Infow("Deployed contract", "Contract", contractDeploy.Tv.String(), "addr", contractDeploy.Address, "chain", chain.String())
 	err = addressBook.Save(chain.Selector, contractDeploy.Address.String(), contractDeploy.Tv)

deployment/zksync_chain.go

@@ -0,0 +1,24 @@
+package deployment
+
+import (
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/zksync-sdk/zksync2-go/accounts"
+	"github.com/zksync-sdk/zksync2-go/clients"
+	zkTypes "github.com/zksync-sdk/zksync2-go/types"
+)
+
+func PickXVMDeployFn[C any](
+	chain Chain,
+	deployEVM func(auth *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, C, error),
+	deployZKVM func(deployOpts *accounts.TransactOpts, client *clients.Client, wallet *accounts.Wallet, backend bind.ContractBackend, constructorArgs ...interface{}) (common.Address, *zkTypes.Receipt, C, error),
+	constructorArgs ...interface{},
+) (common.Address, *types.Transaction, C, error) {
+	if !chain.IsZk {
+		return deployEVM(chain.DeployerKey, chain.Client) // , constructorArgs...)
+	}
+
+	address, _, contract, err := deployZKVM(nil, chain.ClientZk, chain.DeployerKeyZk, chain.Client, constructorArgs...)
+	return address, nil, contract, err
+}