add sol chains to serialized output

deployment/ccip/changeset/cs_deploy_chain_test.go

@@ -99,7 +99,7 @@ func TestDeployCCIPContracts(t *testing.T) {
 	// Deploy all the CCIP contracts.
 	state, err := LoadOnchainState(e.Env)
 	require.NoError(t, err)
-	snap, err := state.View(e.Env.AllChainSelectors())
+	snap, _, err := state.View(e.Env.AllChainSelectors())
 	require.NoError(t, err)
 
 	// Assert expect every deployed address to be in the address book.

deployment/ccip/changeset/cs_home_chain_test.go

@@ -41,7 +41,7 @@ func TestDeployHomeChain(t *testing.T) {
 	require.NotNil(t, state.Chains[homeChainSel].CapabilityRegistry)
 	require.NotNil(t, state.Chains[homeChainSel].CCIPHome)
 	require.NotNil(t, state.Chains[homeChainSel].RMNHome)
-	snap, err := state.View([]uint64{homeChainSel})
+	snap, _, err := state.View([]uint64{homeChainSel})
 	require.NoError(t, err)
 	chainName := e.Chains[homeChainSel].Name()
 	_, ok := snap[chainName]

deployment/ccip/changeset/solana_state.go

@@ -1,6 +1,9 @@
 package changeset
 
+// TODO: create similar struct as CCIPChainState, but with Sol specific primitives
 // SolChainState holds a Go binding for all the currently deployed CCIP programs
 // on a chain. If a binding is nil, it means here is no such contract on the chain.
 type SolCCIPChainState struct {
 }
+
+// TODO: create GenerateSolanaView function similar to GenerateView

deployment/ccip/changeset/state.go

@@ -289,29 +289,32 @@ func (s CCIPOnChainState) GetAllTimeLocksForChains(chains []uint64) (map[uint64]
 	return timelocks, nil
 }
 
-func (s CCIPOnChainState) View(chains []uint64) (map[string]view.ChainView, error) {
+func (s CCIPOnChainState) View(chains []uint64) (map[string]view.ChainView, map[string]view.SolChainView, error) {
 	m := make(map[string]view.ChainView)
+	sm := make(map[string]view.SolChainView)
 	for _, chainSelector := range chains {
 		chainInfo, err := deployment.ChainInfo(chainSelector)
 		if err != nil {
-			return m, err
+			return m, sm, err
 		}
 		if _, ok := s.Chains[chainSelector]; !ok {
-			return m, fmt.Errorf("chain not supported %d", chainSelector)
+			return m, sm, fmt.Errorf("chain not supported %d", chainSelector)
 		}
 		chainState := s.Chains[chainSelector]
+		// TODO: call Solana view generation here (switch case on chainSelector)
 		chainView, err := chainState.GenerateView()
 		if err != nil {
-			return m, err
+			return m, sm, err
 		}
 		m[chainInfo.ChainName] = chainView
 	}
-	return m, nil
+	return m, sm, nil
 }
 
 func LoadOnchainState(e deployment.Environment) (CCIPOnChainState, error) {
 	state := CCIPOnChainState{
-		Chains: make(map[uint64]CCIPChainState),
+		Chains:    make(map[uint64]CCIPChainState),
+		SolChains: make(map[uint64]SolCCIPChainState),
 	}
 	for chainSelector, chain := range e.Chains {
 		addresses, err := e.ExistingAddresses.AddressesForChain(chainSelector)
@@ -323,6 +326,7 @@ func LoadOnchainState(e deployment.Environment) (CCIPOnChainState, error) {
 				return state, err
 			}
 		}
+		// TODO: Load Solana state here based on chainSelector
 		chainState, err := LoadChainState(chain, addresses)
 		if err != nil {
 			return state, err
@@ -333,6 +337,7 @@ func LoadOnchainState(e deployment.Environment) (CCIPOnChainState, error) {
 }
 
 // LoadChainState Loads all state for a chain into state
+// TODO: Add function LoadSolanaChainState
 func LoadChainState(chain deployment.Chain, addresses map[string]deployment.TypeAndVersion) (CCIPChainState, error) {
 	var state CCIPChainState
 	mcmsWithTimelock, err := commoncs.MaybeLoadMCMSWithTimelockChainState(chain, addresses)

deployment/ccip/changeset/state_test.go

@@ -10,6 +10,6 @@ func TestSmokeState(t *testing.T) {
 	tenv := NewMemoryEnvironment(t, WithChains(3))
 	state, err := LoadOnchainState(tenv.Env)
 	require.NoError(t, err)
-	_, err = state.View(tenv.Env.AllChainSelectors())
+	_, _, err = state.View(tenv.Env.AllChainSelectors())
 	require.NoError(t, err)
 }

deployment/ccip/changeset/view.go

@@ -15,7 +15,7 @@ func ViewCCIP(e deployment.Environment) (json.Marshaler, error) {
 	if err != nil {
 		return nil, err
 	}
-	chainView, err := state.View(e.AllChainSelectors())
+	chainView, solChainView, err := state.View(e.AllChainSelectors())
 	if err != nil {
 		return nil, err
 	}
@@ -24,7 +24,8 @@ func ViewCCIP(e deployment.Environment) (json.Marshaler, error) {
 		return nil, err
 	}
 	return ccipview.CCIPView{
-		Chains: chainView,
-		Nops:   nopsView,
+		Chains:    chainView,
+		SolChains: solChainView,
+		Nops:      nopsView,
 	}, nil
 }

deployment/ccip/view/view.go

@@ -59,9 +59,17 @@ func NewChain() ChainView {
 	}
 }
 
+type SolChainView struct {
+}
+
+func NewSolChain() SolChainView {
+	return SolChainView{}
+}
+
 type CCIPView struct {
-	Chains map[string]ChainView    `json:"chains,omitempty"`
-	Nops   map[string]view.NopView `json:"nops,omitempty"`
+	Chains    map[string]ChainView    `json:"chains,omitempty"`
+	SolChains map[string]SolChainView `json:"solChains,omitempty"`
+	Nops      map[string]view.NopView `json:"nops,omitempty"`
 }
 
 func (v CCIPView) MarshalJSON() ([]byte, error) {