@@ -14,9 +14,9 @@ import (
14
14
"github.com/smartcontractkit/chainlink-deployments-framework/operations"
15
15
16
16
"github.com/smartcontractkit/chainlink/deployment"
17
- ccipchangeset "github.com/smartcontractkit/chainlink/deployment/ccip/changeset"
18
17
"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/solana"
19
18
"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/v1_6"
19
+ "github.com/smartcontractkit/chainlink/deployment/ccip/shared/stateview"
20
20
commonstate "github.com/smartcontractkit/chainlink/deployment/common/changeset/state"
21
21
"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
22
22
)
@@ -269,7 +269,7 @@ type AddRemoteChainE2EConfig struct {
269
269
MCMSConfig * proposalutils.TimelockConfig
270
270
}
271
271
272
- func (cfg * AddRemoteChainE2EConfig ) populateAndValidateIndividualCSConfig (env deployment.Environment , evmState ccipchangeset .CCIPOnChainState ) (csInputs , error ) {
272
+ func (cfg * AddRemoteChainE2EConfig ) populateAndValidateIndividualCSConfig (env deployment.Environment , evmState stateview .CCIPOnChainState ) (csInputs , error ) {
273
273
var timelockConfig * proposalutils.TimelockConfig
274
274
if cfg .MCMSConfig != nil {
275
275
timelockConfig = cfg .MCMSConfig
@@ -381,7 +381,7 @@ func (cfg *AddRemoteChainE2EConfig) populateAndValidateIndividualCSConfig(env de
381
381
}
382
382
383
383
func addEVMSolanaPreconditions (env deployment.Environment , input AddRemoteChainE2EConfig ) error {
384
- evmState , err := ccipchangeset .LoadOnchainState (env )
384
+ evmState , err := stateview .LoadOnchainState (env )
385
385
if err != nil {
386
386
return fmt .Errorf ("failed to load onchain evm state: %w" , err )
387
387
}
@@ -390,13 +390,13 @@ func addEVMSolanaPreconditions(env deployment.Environment, input AddRemoteChainE
390
390
timelockConfig = input .MCMSConfig
391
391
}
392
392
// Verify evm Chain
393
- if err := ccipchangeset .ValidateChain (env , evmState , input .EVMChainSelector , timelockConfig ); err != nil {
393
+ if err := stateview .ValidateChain (env , evmState , input .EVMChainSelector , timelockConfig ); err != nil {
394
394
return fmt .Errorf ("failed to validate EVM chain %d: %w" , input .EVMChainSelector , err )
395
395
}
396
396
if _ , ok := env .SolChains [input .SolanaChainSelector ]; ! ok {
397
397
return fmt .Errorf ("failed to find Solana chain in env %d" , input .SolanaChainSelector )
398
398
}
399
- solanaState , err := ccipchangeset .LoadOnchainStateSolana (env )
399
+ solanaState , err := stateview .LoadOnchainStateSolana (env )
400
400
if err != nil {
401
401
return fmt .Errorf ("failed to load onchain solana state: %w" , err )
402
402
}
@@ -407,7 +407,7 @@ func addEVMSolanaPreconditions(env deployment.Environment, input AddRemoteChainE
407
407
}
408
408
409
409
func addEVMAndSolanaLaneLogic (env deployment.Environment , input AddRemoteChainE2EConfig ) (cldf.ChangesetOutput , error ) {
410
- evmState , err := ccipchangeset .LoadOnchainState (env )
410
+ evmState , err := stateview .LoadOnchainState (env )
411
411
if err != nil {
412
412
return cldf.ChangesetOutput {}, fmt .Errorf ("failed to load evm onchain state: %w" , err )
413
413
}
0 commit comments