Skip to content

Commit 8e845f1

Browse files
authored
1 parent dc7947f commit 8e845f1

File tree

4 files changed

+115
-4
lines changed

4 files changed

+115
-4
lines changed

deployment/environment.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ import (
1313
"github.com/ethereum/go-ethereum/common"
1414
"github.com/ethereum/go-ethereum/core/types"
1515
"github.com/ethereum/go-ethereum/rpc"
16+
"github.com/zksync-sdk/zksync2-go/accounts"
17+
"github.com/zksync-sdk/zksync2-go/clients"
18+
1619
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1720
csav1 "github.com/smartcontractkit/chainlink-protos/job-distributor/v1/csa"
1821
jobv1 "github.com/smartcontractkit/chainlink-protos/job-distributor/v1/job"
@@ -52,6 +55,11 @@ type Chain struct {
5255
// Users are a set of keys that can be used to interact with the chain.
5356
// These are distinct from the deployer key.
5457
Users []*bind.TransactOpts
58+
59+
// ZK deployment specifics
60+
IsZkSyncVM bool
61+
ClientZkSyncVM *clients.Client
62+
DeployerKeyZkSyncVM *accounts.Wallet
5563
}
5664

5765
func (c Chain) String() string {

deployment/helpers.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/ethereum/go-ethereum/common"
1313
"github.com/ethereum/go-ethereum/core/types"
1414
"github.com/ethereum/go-ethereum/rpc"
15+
1516
chain_selectors "github.com/smartcontractkit/chain-selectors"
1617
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1718
)
@@ -128,10 +129,13 @@ func DeployContract[C any](
128129
lggr.Errorw("Failed to deploy contract", "chain", chain.String(), "err", contractDeploy.Err)
129130
return nil, contractDeploy.Err
130131
}
131-
_, err := chain.Confirm(contractDeploy.Tx)
132-
if err != nil {
133-
lggr.Errorw("Failed to confirm deployment", "chain", chain.String(), "Contract", contractDeploy.Tv.String(), "err", err)
134-
return nil, err
132+
var err error
133+
if !chain.IsZkSyncVM {
134+
_, err = chain.Confirm(contractDeploy.Tx)
135+
if err != nil {
136+
lggr.Errorw("Failed to confirm deployment", "chain", chain.String(), "Contract", contractDeploy.Tv.String(), "err", err)
137+
return nil, err
138+
}
135139
}
136140
lggr.Infow("Deployed contract", "Contract", contractDeploy.Tv.String(), "addr", contractDeploy.Address, "chain", chain.String())
137141
err = addressBook.Save(chain.Selector, contractDeploy.Address.String(), contractDeploy.Tv)

go.mod

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ require (
1616
github.com/smartcontractkit/chainlink-protos/job-distributor v0.10.0
1717
github.com/smartcontractkit/mcms v0.16.1
1818
github.com/stretchr/testify v1.10.0
19+
github.com/zksync-sdk/zksync2-go v1.0.0
1920
go.uber.org/zap v1.27.0
2021
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
2122
)
@@ -27,6 +28,10 @@ require (
2728
github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
2829
github.com/bits-and-blooms/bitset v1.17.0 // indirect
2930
github.com/blendle/zapdriver v1.3.1 // indirect
31+
github.com/btcsuite/btcd v0.24.0 // indirect
32+
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
33+
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
34+
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
3035
github.com/coder/websocket v1.8.12 // indirect
3136
github.com/consensys/bavard v0.1.22 // indirect
3237
github.com/consensys/gnark-crypto v0.14.0 // indirect
@@ -63,14 +68,17 @@ require (
6368
github.com/modern-go/reflect2 v1.0.2 // indirect
6469
github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 // indirect
6570
github.com/mr-tron/base58 v1.2.0 // indirect
71+
github.com/pkg/errors v0.9.1 // indirect
6672
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6773
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
6874
github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 // indirect
6975
github.com/spf13/cast v1.7.1 // indirect
76+
github.com/stephenlacy/go-ethereum-hdwallet v0.0.0-20230913225845-a4fa94429863 // indirect
7077
github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 // indirect
7178
github.com/supranational/blst v0.3.14 // indirect
7279
github.com/tklauser/go-sysconf v0.3.15 // indirect
7380
github.com/tklauser/numcpus v0.10.0 // indirect
81+
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
7482
github.com/yusufpapurcu/wmi v1.2.3 // indirect
7583
go.mongodb.org/mongo-driver v1.12.2 // indirect
7684
go.uber.org/multierr v1.11.0 // indirect

0 commit comments

Comments
 (0)