Add map from version -> adapter / input for batching sequences to execute

Author: sowgandhi11

deployment/fees/set_token_transfer_fee.go

@@ -112,26 +112,30 @@ func makeApply(feeRegistry *FeeAdapterRegistry, mcmsRegistry *changesets.MCMSRea
 				return cldf.ChangesetOutput{}, fmt.Errorf("no fee adapter found for chain family %s and version %s", srcFamily, cfg.Version.String())
 			}
 
-			// Retreieve correct contract Go bindings to use in sequence execution
-			if len(src.Settings) == 0 {
-				return cldf.ChangesetOutput{}, fmt.Errorf("no destination settings provided for selector %d", src.Selector)
-			}
-			feeContractRef, err := adapter.GetFeeContractRef(e, src.Selector, src.Settings[0].Selector) // feeContractRef is only used for verifying which GoBindings to use
-			if err != nil {
-				return cldf.ChangesetOutput{}, fmt.Errorf("failed to get fee contract ref for src %d and dst %d: %w", src.Selector, src.Settings[0].Selector, err)
-			}
-
-			v := feeContractRef.Version
-			lookupVersion := semver.MustParse(fmt.Sprintf("%d.%d.0", v.Major(), v.Minor()))
-
-			updater, exists := feeRegistry.GetFeeAdapter(srcFamily, lookupVersion)
-			if !exists {
-				return cldf.ChangesetOutput{}, fmt.Errorf("no fee adapter found for chain family %s and version %s", srcFamily, feeContractRef.Version.String())
-			}
+			// Build version-grouped settings: version -> settings map
+			versionGroups := map[string]struct {
+				version  *semver.Version
+				adapter  FeeAdapter
+				settings map[uint64]map[string]*TokenTransferFeeArgs
+			}{}
 
 			settings := map[uint64]map[string]*TokenTransferFeeArgs{}
 			for _, dst := range src.Settings {
 
+				feeContractRef, err := adapter.GetFeeContractRef(e, src.Selector, dst.Selector)
+				if err != nil {
+					return cldf.ChangesetOutput{}, fmt.Errorf("failed to get fee contract ref for src %d and dst %d: %w", src.Selector, src.Settings[0].Selector, err)
+				}
+
+				// Normalize fee contract version to major.minor.0 for adapter lookup, as patch versions should not affect compatibility
+				v := feeContractRef.Version
+				lookupVersion := semver.MustParse(fmt.Sprintf("%d.%d.0", v.Major(), v.Minor()))
+
+				updater, exists := feeRegistry.GetFeeAdapter(srcFamily, lookupVersion)
+				if !exists {
+					return cldf.ChangesetOutput{}, fmt.Errorf("no fee adapter found for chain family %s and version %s", srcFamily, feeContractRef.Version.String())
+				}
+
 				settings[dst.Selector] = map[string]*TokenTransferFeeArgs{}
 				for _, feeCfg := range dst.Settings {
 					if args, err := inferTokenTransferFeeArgs(adapter, e, src.Selector, dst.Selector, feeCfg); err != nil {
@@ -140,23 +144,43 @@ func makeApply(feeRegistry *FeeAdapterRegistry, mcmsRegistry *changesets.MCMSRea
 						settings[dst.Selector][feeCfg.Address] = args
 					}
 				}
+
+				versionKey := lookupVersion.String()
+				if _, exists := versionGroups[versionKey]; !exists {
+					versionGroups[versionKey] = struct {
+						version  *semver.Version
+						adapter  FeeAdapter
+						settings map[uint64]map[string]*TokenTransferFeeArgs
+					}{
+						version:  feeContractRef.Version,
+						adapter:  updater,
+						settings: map[uint64]map[string]*TokenTransferFeeArgs{},
+					}
+				}
+
+				// Process settings for this dst with its version's adapter
+				versionGroups[versionKey].settings[dst.Selector] = settings[dst.Selector]
 			}
 
-			report, err := cldf_ops.ExecuteSequence(
-				e.OperationsBundle,
-				updater.SetTokenTransferFee(e),
-				e.BlockChains,
-				SetTokenTransferFeeSequenceInput{
-					Selector: src.Selector,
-					Settings: settings,
-				},
-			)
-			if err != nil {
-				return cldf.ChangesetOutput{}, fmt.Errorf("failed to set token transfer fee config for selector %d: %w", src.Selector, err)
+			// Execute updates grouped by adapter version
+			for _, group := range versionGroups {
+				report, err := cldf_ops.ExecuteSequence(
+					e.OperationsBundle,
+					group.adapter.SetTokenTransferFee(e),
+					e.BlockChains,
+					SetTokenTransferFeeSequenceInput{
+						Selector: src.Selector,
+						Settings: group.settings,
+					},
+				)
+				if err != nil {
+					return cldf.ChangesetOutput{}, fmt.Errorf("failed to set token transfer fee config for selector %d: %w", src.Selector, err)
+				}
+
+				batchOps = append(batchOps, report.Output.BatchOps...)
+				reports = append(reports, report.ExecutionReports...)
 			}
 
-			batchOps = append(batchOps, report.Output.BatchOps...)
-			reports = append(reports, report.ExecutionReports...)
 		}
 
 		return changesets.NewOutputBuilder(e, mcmsRegistry).