Use address book in deploy TON contracts changeset + general fixes (#226)

* add-address-book-to-deploy-chain-changeset

* fix add lanes - onramp dest chain configs when empty

* fix ab

* fix

* fx

Author: nicolasgnr

deployment/ccip/cs_deploy_ton_chain.go

@@ -92,8 +92,8 @@ func (cs DeployCCIPContracts) Apply(env cldf.Environment, config DeployCCIPContr
 	s.FeeQuoter = *ccipSeqReport.Output.FeeQuoterAddress
 	s.OffRamp = *ccipSeqReport.Output.OffRampAddress
 
-	// Save state
-	err = state.SaveOnchainState(selector, s, env)
+	// Get address book
+	ab, err := state.GetAddressBook(selector, s)
 	deps.CCIPOnChainState[selector] = s
 	if err != nil {
 		return cldf.ChangesetOutput{}, err
@@ -128,5 +128,6 @@ func (cs DeployCCIPContracts) Apply(env cldf.Environment, config DeployCCIPContr
 	return cldf.ChangesetOutput{
 		MCMSTimelockProposals: proposals,
 		Reports:               seqReports,
+		AddressBook:           ab,
 	}, nil
 }

deployment/ccip/operation/onramp.go

@@ -106,6 +106,12 @@ var UpdateOnRampDestChainConfigsOp = operations.NewOperation(
 func updateOnRampDestChainConfigs(b operations.Bundle, deps TonDeps, in UpdateOnRampDestChainConfigsInput) ([][]byte, error) {
 	addr := deps.CCIPOnChainState[deps.TonChain.Selector].OnRamp
 
+	if len(in.Updates) == 0 {
+		b.Logger.Info("Skipping onramp.updateOnRampDestChainConfigs, no updates")
+		// Nothing to update
+		return nil, nil
+	}
+
 	configs := make([]onramp.UpdateDestChainConfig, 0, len(in.Updates))
 
 	for selector, update := range in.Updates {

deployment/state/state.go

@@ -134,46 +134,46 @@ func (s CCIPChainState) GenerateView(e *cldf.Environment, selector uint64, chain
 	return tonView, errGroup.Wait()
 }
 
-func SaveOnchainState(chainSelector uint64, state CCIPChainState, e cldf.Environment) error {
+func GetAddressBook(chainSelector uint64, state CCIPChainState) (cldf.AddressBook, error) {
 	// TODO: use DataStore
-	ab := e.ExistingAddresses
+	ab := cldf.NewMemoryAddressBook()
 	if !state.LinkTokenAddress.IsAddrNone() {
 		err := ab.Save(chainSelector, state.LinkTokenAddress.String(), cldf.NewTypeAndVersion(LinkToken, Version1_6_0))
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
 	if !state.ReceiverAddress.IsAddrNone() {
 		err := ab.Save(chainSelector, state.ReceiverAddress.String(), cldf.NewTypeAndVersion(TonReceiver, Version1_6_0))
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
 	if !state.OffRamp.IsAddrNone() {
 		err := ab.Save(chainSelector, state.OffRamp.String(), cldf.NewTypeAndVersion(OffRamp, Version1_6_0))
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
 	if !state.Router.IsAddrNone() {
 		err := ab.Save(chainSelector, state.Router.String(), cldf.NewTypeAndVersion(Router, Version1_6_0))
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
 	if !state.OnRamp.IsAddrNone() {
 		err := ab.Save(chainSelector, state.OnRamp.String(), cldf.NewTypeAndVersion(OnRamp, Version1_6_0))
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
 	if !state.FeeQuoter.IsAddrNone() {
 		err := ab.Save(chainSelector, state.FeeQuoter.String(), cldf.NewTypeAndVersion(FeeQuoter, Version1_6_0))
 		if err != nil {
-			return err
+			return nil, err
 		}
 	}
-	return nil
+	return ab, nil
 }
 
 func LoadOnchainState(e cldf.Environment) (map[uint64]CCIPChainState, error) {