Merge branch 'main' of github.com:smartcontractkit/chainlink-ccip

Author: AnieeG

chains/evm/deployment/v2_0_0/adapters/feequoterupdater.go

@@ -29,18 +29,23 @@ func (fqu FeeQuoterUpdater[FeeQUpdateArgs]) SequenceFeeQuoterInputCreation() *cl
 			if !ok {
 				return zero, fmt.Errorf("chain with selector %d not found in environment", input.ChainSelector)
 			}
-			// get the FeeQuoterUpdateOutput from both v1.6.0 and v1.5.0 sequences and combine them to create the input for the fee quoter update sequence
-			report, err := cldf_ops.ExecuteSequence(b, fqseq.CreateFeeQuoterUpdateInputFromV16x, chain, input)
-			if err != nil {
-				return zero, fmt.Errorf("failed to create FeeQuoterUpdateInput from v1.6.0: %w", err)
-			}
-			output16 := report.Output
-
-			report15, err := cldf_ops.ExecuteSequence(b, fqseq.CreateFeeQuoterUpdateInputFromV150, chain, input)
-			if err != nil {
-				return zero, fmt.Errorf("failed to create FeeQuoterUpdateInput from v1.5.0: %w", err)
+			var output16, output15 fqseq.FeeQuoterUpdate
+			for _, version := range input.PreviousVersions {
+				switch version.String() {
+				case "1.6.0":
+					report, err := cldf_ops.ExecuteSequence(b, fqseq.CreateFeeQuoterUpdateInputFromV16x, chain, input)
+					if err != nil {
+						return zero, fmt.Errorf("failed to create FeeQuoterUpdateInput from v1.6.0: %w", err)
+					}
+					output16 = report.Output
+				case "1.5.0":
+					report15, err := cldf_ops.ExecuteSequence(b, fqseq.CreateFeeQuoterUpdateInputFromV150, chain, input)
+					if err != nil {
+						return zero, fmt.Errorf("failed to create FeeQuoterUpdateInput from v1.5.0: %w", err)
+					}
+					output15 = report15.Output
+				}
 			}
-			output15 := report15.Output
 			// combine the outputs from both sequences to create the input for the fee quoter update sequence
 			out, err := fqseq.MergeFeeQuoterUpdateOutputs(output16, output15)
 			if err != nil {

chains/evm/deployment/v2_0_0/sequences/fee_quoter.go

@@ -519,7 +519,27 @@ var (
 // output16 takes precedence and output15 fills in only missing entries.
 func MergeFeeQuoterUpdateOutputs(output16, output15 FeeQuoterUpdate) (FeeQuoterUpdate, error) {
 	result := output16
+	empty16, err := output16.IsEmpty()
+	if err != nil {
+		return FeeQuoterUpdate{}, fmt.Errorf("failed to check if output16 is empty: %w", err)
+	}
+	empty15, err := output15.IsEmpty()
+	if err != nil {
+		return FeeQuoterUpdate{}, fmt.Errorf("failed to check if output15 is empty: %w", err)
+	}
 
+	if empty16 && empty15 {
+		return FeeQuoterUpdate{}, nil
+	}
+	
+	// if output16 is empty, we can just return output15
+	if empty16 {
+		return output15, nil
+	}
+	// if output15 is empty, we can just return output16
+	if empty15 {
+		return output16, nil
+	}
 	// ConstructorArgs: use output15 if output16 is empty
 	if IsConstructorArgsEmpty(result.ConstructorArgs) {
 		result.ConstructorArgs = output15.ConstructorArgs

chains/evm/deployment/v2_0_0/sequences/sequence_fee_quoter_input_creation_test.go

@@ -821,6 +821,10 @@ func TestSequenceFeeQuoterInputCreation(t *testing.T) {
 		if chainSelector == 5009297550715157269 {
 			input.RemoteChainSelectors = []uint64{15971525489660198786}
 		}
+		input.PreviousVersions = []*semver.Version{
+			semver.MustParse("1.5.0"),
+			semver.MustParse("1.6.0"),
+		}
 		// Execute the sequence
 		report, err := cldf_ops.ExecuteSequence(
 			e.OperationsBundle,

deployment/deploy/feequoterupdater.go

@@ -44,8 +44,12 @@ type AdditionalFeeQuoterConfig struct {
 }
 
 type FeeQuoterUpdateInput struct {
-	ChainSelector        uint64
-	ExistingAddresses    []datastore.AddressRef
+	ChainSelector     uint64
+	ExistingAddresses []datastore.AddressRef
+	// PreviousVersions lists the supported config-importer / lane versions that
+	// should be consulted when deriving the FeeQuoter configuration for this chain.
+	// It does NOT refer to previous FeeQuoter contract deployment versions.
+	PreviousVersions     []*semver.Version
 	RemoteChainSelectors []uint64
 	AdditionalConfig     *AdditionalFeeQuoterConfig
 	ContractMeta         []datastore.ContractMetadata
@@ -330,6 +334,7 @@ func updateFeeQuoterApply() func(cldf.Environment, UpdateFeeQuoterInput) (cldf.C
 					RemoteChainSelectors: perChainInput.RemoteChainSelectors,
 					TimelockAddress:      timelockAddr,
 					AdditionalConfig:     perChainInput.FeeQuoterConfig,
+					PreviousVersions:     configImporterVersions,
 				})
 				if err != nil {
 					return cldf.ChangesetOutput{}, fmt.Errorf("failed to create FeeQuoterUpdateInput for chain %d: %w", chainSel, err)