Skip to content

Commit 17e9549

Browse files
simsonrajsimsonraj
committed
Revert "Port deploy chain changeset for ZK Sync (#17829)"
This reverts commit 6356fef.
1 parent 30418fd commit 17e9549

File tree

13 files changed

+89
-503
lines changed

13 files changed

+89
-503
lines changed

‎deployment/ccip/changeset/cs_prerequisites_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ package changeset_test
33
import (
44
"testing"
55

6+
chain_selectors "github.com/smartcontractkit/chain-selectors"
67
"github.com/stretchr/testify/require"
78
"go.uber.org/zap/zapcore"
89

9-
chain_selectors "github.com/smartcontractkit/chain-selectors"
10-
1110
cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
1211

1312
cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"

‎deployment/ccip/changeset/v1_6/cs_deploy_chain.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"github.com/ethereum/go-ethereum/accounts/abi/bind"
88
"github.com/ethereum/go-ethereum/common/hexutil"
9-
109
cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
1110
"github.com/smartcontractkit/chainlink-deployments-framework/operations"
1211

‎deployment/ccip/changeset/v1_6/cs_deploy_chain_test.go‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ package v1_6_test
33
import (
44
"testing"
55

6+
chain_selectors "github.com/smartcontractkit/chain-selectors"
67
"github.com/stretchr/testify/require"
78
"go.uber.org/zap/zapcore"
89

9-
chain_selectors "github.com/smartcontractkit/chain-selectors"
10-
1110
cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
1211

1312
cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
@@ -38,32 +37,6 @@ func TestDeployChainContractsChangeset(t *testing.T) {
3837
})
3938
evmSelectors := e.BlockChains.ListChainSelectors(cldf_chain.WithFamily(chain_selectors.FamilyEVM))
4039
homeChainSel := evmSelectors[0]
41-
testDeployChainContractsChangesetWithEnv(t, e, homeChainSel)
42-
}
43-
44-
func TestDeployChainContractsChangesetZk(t *testing.T) {
45-
t.Parallel()
46-
lggr := logger.TestLogger(t)
47-
e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
48-
Bootstraps: 1,
49-
Chains: 1,
50-
ZkChains: 1,
51-
Nodes: 4,
52-
})
53-
evmSelectors := e.BlockChains.ListChainSelectors(cldf_chain.WithFamily(chain_selectors.FamilyEVM))
54-
var homeChainSel uint64
55-
for _, selector := range evmSelectors {
56-
chain := e.BlockChains.EVMChains()[selector]
57-
if !chain.IsZkSyncVM {
58-
homeChainSel = chain.Selector
59-
break
60-
}
61-
}
62-
testDeployChainContractsChangesetWithEnv(t, e, homeChainSel)
63-
}
64-
65-
func testDeployChainContractsChangesetWithEnv(t *testing.T, e cldf.Environment, homeChainSel uint64) {
66-
evmSelectors := e.BlockChains.ListChainSelectors(cldf_chain.WithFamily(chain_selectors.FamilyEVM))
6740
nodes, err := deployment.NodeInfo(e.NodeIDs, e.Offchain)
6841
require.NoError(t, err)
6942
p2pIds := nodes.NonBootstraps().PeerIDs()

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

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package v1_2
33
import (
44
"github.com/Masterminds/semver/v3"
55
"github.com/ethereum/go-ethereum/common"
6-
"github.com/ethereum/go-ethereum/core/types"
76

87
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_2_0/router"
98
cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
@@ -33,29 +32,12 @@ var (
3332
deployFn := func(chain cldf_evm.Chain, tv cldf.TypeAndVersion) (cldf.ContractDeploy[*router.Router], error) {
3433
r, err := cldf.DeployContract(b.Logger, chain, ab,
3534
func(chain cldf_evm.Chain) cldf.ContractDeploy[*router.Router] {
36-
var (
37-
routerAddr common.Address
38-
tx2 *types.Transaction
39-
routerC *router.Router
40-
err2 error
35+
routerAddr, tx2, routerC, err2 := router.DeployRouter(
36+
chain.DeployerKey,
37+
chain.Client,
38+
input.WethAddress,
39+
input.RMNProxy,
4140
)
42-
if chain.IsZkSyncVM {
43-
routerAddr, _, routerC, err2 = router.DeployRouterZk(
44-
nil,
45-
chain.ClientZkSyncVM,
46-
chain.DeployerKeyZkSyncVM,
47-
chain.Client,
48-
input.WethAddress,
49-
input.RMNProxy,
50-
)
51-
} else {
52-
routerAddr, tx2, routerC, err2 = router.DeployRouter(
53-
chain.DeployerKey,
54-
chain.Client,
55-
input.WethAddress,
56-
input.RMNProxy,
57-
)
58-
}
5941
return cldf.ContractDeploy[*router.Router]{
6042
Address: routerAddr, Contract: routerC, Tx: tx2, Tv: tv, Err: err2,
6143
}

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

Lines changed: 22 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -44,65 +44,30 @@ var (
4444
contractParams := input.Params
4545
feeQ, err := cldf.DeployContract(b.Logger, chain, ab,
4646
func(chain cldf_evm.Chain) cldf.ContractDeploy[*fee_quoter.FeeQuoter] {
47-
var (
48-
prAddr common.Address
49-
tx2 *types.Transaction
50-
pr *fee_quoter.FeeQuoter
51-
err2 error
52-
)
53-
if chain.IsZkSyncVM {
54-
prAddr, _, pr, err2 = fee_quoter.DeployFeeQuoterZk(
55-
nil,
56-
chain.ClientZkSyncVM,
57-
chain.DeployerKeyZkSyncVM,
58-
chain.Client,
59-
fee_quoter.FeeQuoterStaticConfig{
60-
MaxFeeJuelsPerMsg: contractParams.MaxFeeJuelsPerMsg,
61-
LinkToken: input.LinkAddr,
62-
TokenPriceStalenessThreshold: contractParams.TokenPriceStalenessThreshold,
47+
prAddr, tx2, pr, err2 := fee_quoter.DeployFeeQuoter(
48+
chain.DeployerKey,
49+
chain.Client,
50+
fee_quoter.FeeQuoterStaticConfig{
51+
MaxFeeJuelsPerMsg: contractParams.MaxFeeJuelsPerMsg,
52+
LinkToken: input.LinkAddr,
53+
TokenPriceStalenessThreshold: contractParams.TokenPriceStalenessThreshold,
54+
},
55+
input.PriceUpdaters,
56+
[]common.Address{input.WethAddr, input.LinkAddr}, // fee tokens
57+
contractParams.TokenPriceFeedUpdates,
58+
contractParams.TokenTransferFeeConfigArgs,
59+
append([]fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs{
60+
{
61+
PremiumMultiplierWeiPerEth: contractParams.LinkPremiumMultiplierWeiPerEth,
62+
Token: input.LinkAddr,
6363
},
64-
input.PriceUpdaters,
65-
[]common.Address{input.WethAddr, input.LinkAddr}, // fee tokens
66-
contractParams.TokenPriceFeedUpdates,
67-
contractParams.TokenTransferFeeConfigArgs,
68-
append([]fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs{
69-
{
70-
PremiumMultiplierWeiPerEth: contractParams.LinkPremiumMultiplierWeiPerEth,
71-
Token: input.LinkAddr,
72-
},
73-
{
74-
PremiumMultiplierWeiPerEth: contractParams.WethPremiumMultiplierWeiPerEth,
75-
Token: input.WethAddr,
76-
},
77-
}, contractParams.MorePremiumMultiplierWeiPerEth...),
78-
contractParams.DestChainConfigArgs,
79-
)
80-
} else {
81-
prAddr, tx2, pr, err2 = fee_quoter.DeployFeeQuoter(
82-
chain.DeployerKey,
83-
chain.Client,
84-
fee_quoter.FeeQuoterStaticConfig{
85-
MaxFeeJuelsPerMsg: contractParams.MaxFeeJuelsPerMsg,
86-
LinkToken: input.LinkAddr,
87-
TokenPriceStalenessThreshold: contractParams.TokenPriceStalenessThreshold,
64+
{
65+
PremiumMultiplierWeiPerEth: contractParams.WethPremiumMultiplierWeiPerEth,
66+
Token: input.WethAddr,
8867
},
89-
input.PriceUpdaters,
90-
[]common.Address{input.WethAddr, input.LinkAddr}, // fee tokens
91-
contractParams.TokenPriceFeedUpdates,
92-
contractParams.TokenTransferFeeConfigArgs,
93-
append([]fee_quoter.FeeQuoterPremiumMultiplierWeiPerEthArgs{
94-
{
95-
PremiumMultiplierWeiPerEth: contractParams.LinkPremiumMultiplierWeiPerEth,
96-
Token: input.LinkAddr,
97-
},
98-
{
99-
PremiumMultiplierWeiPerEth: contractParams.WethPremiumMultiplierWeiPerEth,
100-
Token: input.WethAddr,
101-
},
102-
}, contractParams.MorePremiumMultiplierWeiPerEth...),
103-
contractParams.DestChainConfigArgs,
104-
)
105-
}
68+
}, contractParams.MorePremiumMultiplierWeiPerEth...),
69+
contractParams.DestChainConfigArgs,
70+
)
10671
return cldf.ContractDeploy[*fee_quoter.FeeQuoter]{
10772
Address: prAddr, Contract: pr, Tx: tx2, Tv: cldf.NewTypeAndVersion(shared.FeeQuoter, deployment.Version1_6_0), Err: err2,
10873
}

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

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"github.com/Masterminds/semver/v3"
88
"github.com/ethereum/go-ethereum/common"
9-
"github.com/ethereum/go-ethereum/core/types"
109

1110
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/nonce_manager"
1211
cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
@@ -32,27 +31,11 @@ var (
3231
chain := deps.Chain
3332
nonceManager, err := cldf.DeployContract(b.Logger, chain, ab,
3433
func(chain cldf_evm.Chain) cldf.ContractDeploy[*nonce_manager.NonceManager] {
35-
var (
36-
nonceManagerAddr common.Address
37-
tx2 *types.Transaction
38-
nonceManager *nonce_manager.NonceManager
39-
err2 error
34+
nonceManagerAddr, tx2, nonceManager, err2 := nonce_manager.DeployNonceManager(
35+
chain.DeployerKey,
36+
chain.Client,
37+
[]common.Address{}, // Need to add onRamp after
4038
)
41-
if chain.IsZkSyncVM {
42-
nonceManagerAddr, _, nonceManager, err2 = nonce_manager.DeployNonceManagerZk(
43-
nil,
44-
chain.ClientZkSyncVM,
45-
chain.DeployerKeyZkSyncVM,
46-
chain.Client,
47-
[]common.Address{},
48-
)
49-
} else {
50-
nonceManagerAddr, tx2, nonceManager, err2 = nonce_manager.DeployNonceManager(
51-
chain.DeployerKey,
52-
chain.Client,
53-
[]common.Address{}, // Need to add onRamp after
54-
)
55-
}
5639
return cldf.ContractDeploy[*nonce_manager.NonceManager]{
5740
Address: nonceManagerAddr, Contract: nonceManager, Tx: tx2, Tv: cldf.NewTypeAndVersion(shared.NonceManager, deployment.Version1_6_0), Err: err2,
5841
}

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

Lines changed: 16 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
"github.com/Masterminds/semver/v3"
77
"github.com/ethereum/go-ethereum/common"
8-
"github.com/ethereum/go-ethereum/core/types"
98

109
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/offramp"
1110
cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
@@ -28,51 +27,23 @@ var (
2827
chain := deps.Chain
2928
offRamp, err := cldf.DeployContract(b.Logger, chain, ab,
3029
func(chain cldf_evm.Chain) cldf.ContractDeploy[*offramp.OffRamp] {
31-
var (
32-
offRampAddr common.Address
33-
tx2 *types.Transaction
34-
offRamp *offramp.OffRamp
35-
err2 error
30+
offRampAddr, tx2, offRamp, err2 := offramp.DeployOffRamp(
31+
chain.DeployerKey,
32+
chain.Client,
33+
offramp.OffRampStaticConfig{
34+
ChainSelector: chain.Selector,
35+
GasForCallExactCheck: input.Params.GasForCallExactCheck,
36+
RmnRemote: input.RmnRemote,
37+
NonceManager: input.NonceManager,
38+
TokenAdminRegistry: input.TokenAdminRegistry,
39+
},
40+
offramp.OffRampDynamicConfig{
41+
FeeQuoter: input.FeeQuoter,
42+
PermissionLessExecutionThresholdSeconds: input.Params.PermissionLessExecutionThresholdSeconds,
43+
MessageInterceptor: input.Params.MessageInterceptor,
44+
},
45+
[]offramp.OffRampSourceChainConfigArgs{},
3646
)
37-
if chain.IsZkSyncVM {
38-
offRampAddr, _, offRamp, err2 = offramp.DeployOffRampZk(
39-
nil,
40-
chain.ClientZkSyncVM,
41-
chain.DeployerKeyZkSyncVM,
42-
chain.Client,
43-
offramp.OffRampStaticConfig{
44-
ChainSelector: chain.Selector,
45-
GasForCallExactCheck: input.Params.GasForCallExactCheck,
46-
RmnRemote: input.RmnRemote,
47-
NonceManager: input.NonceManager,
48-
TokenAdminRegistry: input.TokenAdminRegistry,
49-
},
50-
offramp.OffRampDynamicConfig{
51-
FeeQuoter: input.FeeQuoter,
52-
PermissionLessExecutionThresholdSeconds: input.Params.PermissionLessExecutionThresholdSeconds,
53-
MessageInterceptor: input.Params.MessageInterceptor,
54-
},
55-
[]offramp.OffRampSourceChainConfigArgs{},
56-
)
57-
} else {
58-
offRampAddr, tx2, offRamp, err2 = offramp.DeployOffRamp(
59-
chain.DeployerKey,
60-
chain.Client,
61-
offramp.OffRampStaticConfig{
62-
ChainSelector: chain.Selector,
63-
GasForCallExactCheck: input.Params.GasForCallExactCheck,
64-
RmnRemote: input.RmnRemote,
65-
NonceManager: input.NonceManager,
66-
TokenAdminRegistry: input.TokenAdminRegistry,
67-
},
68-
offramp.OffRampDynamicConfig{
69-
FeeQuoter: input.FeeQuoter,
70-
PermissionLessExecutionThresholdSeconds: input.Params.PermissionLessExecutionThresholdSeconds,
71-
MessageInterceptor: input.Params.MessageInterceptor,
72-
},
73-
[]offramp.OffRampSourceChainConfigArgs{},
74-
)
75-
}
7647
return cldf.ContractDeploy[*offramp.OffRamp]{
7748
Address: offRampAddr, Contract: offRamp, Tx: tx2, Tv: cldf.NewTypeAndVersion(shared.OffRamp, deployment.Version1_6_0), Err: err2,
7849
}

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

Lines changed: 14 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package v1_6
33
import (
44
"github.com/Masterminds/semver/v3"
55
"github.com/ethereum/go-ethereum/common"
6-
"github.com/ethereum/go-ethereum/core/types"
76

87
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/onramp"
98
cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
@@ -25,47 +24,21 @@ var (
2524
chain := deps.Chain
2625
onRamp, err := cldf.DeployContract(b.Logger, chain, ab,
2726
func(chain cldf_evm.Chain) cldf.ContractDeploy[*onramp.OnRamp] {
28-
var (
29-
onRampAddr common.Address
30-
tx2 *types.Transaction
31-
onRamp *onramp.OnRamp
32-
err2 error
27+
onRampAddr, tx2, onRamp, err2 := onramp.DeployOnRamp(
28+
chain.DeployerKey,
29+
chain.Client,
30+
onramp.OnRampStaticConfig{
31+
ChainSelector: chain.Selector,
32+
RmnRemote: input.RmnRemote,
33+
NonceManager: input.NonceManager,
34+
TokenAdminRegistry: input.TokenAdminRegistry,
35+
},
36+
onramp.OnRampDynamicConfig{
37+
FeeQuoter: input.FeeQuoter,
38+
FeeAggregator: input.FeeAggregator,
39+
},
40+
[]onramp.OnRampDestChainConfigArgs{},
3341
)
34-
if chain.IsZkSyncVM {
35-
onRampAddr, _, onRamp, err2 = onramp.DeployOnRampZk(
36-
nil,
37-
chain.ClientZkSyncVM,
38-
chain.DeployerKeyZkSyncVM,
39-
chain.Client,
40-
onramp.OnRampStaticConfig{
41-
ChainSelector: chain.Selector,
42-
RmnRemote: input.RmnRemote,
43-
NonceManager: input.NonceManager,
44-
TokenAdminRegistry: input.TokenAdminRegistry,
45-
},
46-
onramp.OnRampDynamicConfig{
47-
FeeQuoter: input.FeeQuoter,
48-
FeeAggregator: input.FeeAggregator,
49-
},
50-
[]onramp.OnRampDestChainConfigArgs{},
51-
)
52-
} else {
53-
onRampAddr, tx2, onRamp, err2 = onramp.DeployOnRamp(
54-
chain.DeployerKey,
55-
chain.Client,
56-
onramp.OnRampStaticConfig{
57-
ChainSelector: chain.Selector,
58-
RmnRemote: input.RmnRemote,
59-
NonceManager: input.NonceManager,
60-
TokenAdminRegistry: input.TokenAdminRegistry,
61-
},
62-
onramp.OnRampDynamicConfig{
63-
FeeQuoter: input.FeeQuoter,
64-
FeeAggregator: input.FeeAggregator,
65-
},
66-
[]onramp.OnRampDestChainConfigArgs{},
67-
)
68-
}
6942
return cldf.ContractDeploy[*onramp.OnRamp]{
7043
Address: onRampAddr, Contract: onRamp, Tx: tx2, Tv: cldf.NewTypeAndVersion(shared.OnRamp, deployment.Version1_6_0), Err: err2,
7144
}

0 commit comments

Comments
 (0)