Add FindAndFormatRef for filtering in fees.go for all versions

Author: sowgandhi11

chains/evm/deployment/v1_5_0/adapters/fees.go

@@ -12,6 +12,7 @@ import (
 	evmseq "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_0/sequences"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_0/evm_2_evm_onramp"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/fees"
+	datastore_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences"
 	cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
 	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
@@ -177,17 +178,23 @@ func (a *FeesAdapter) GetFeeContractRef(e cldf.Environment, src uint64, dst uint
 		return datastore.AddressRef{}, fmt.Errorf("no OnRamp address found for src %d and dst %d", src, dst)
 	}
 
-	feecontractref := e.DataStore.Addresses().Filter(
-		datastore.AddressRefByAddress(cacheAddr.Hex()),
-		datastore.AddressRefByType(datastore.ContractType(onramp.ContractType)),
-		datastore.AddressRefByVersion(onramp.Version),
-		datastore.AddressRefByChainSelector(src),
+	filter := datastore.AddressRef{
+		Type:          datastore.ContractType(onramp.ContractType),
+		Address:       cacheAddr.Hex(),
+		ChainSelector: src,
+	}
+	feecontractref, err := datastore_utils.FindAndFormatRef(
+		e.DataStore,
+		filter,
+		src,
+		datastore_utils.FullRef,
 	)
 
-	if len(feecontractref) == 0 || len(feecontractref) > 1 {
-		return datastore.AddressRef{}, fmt.Errorf("incorrect number of address ref found for OnRamp contract at address %s on chain selector %d", cacheAddr.Hex(), src)
+	if err != nil {
+		return datastore.AddressRef{}, fmt.Errorf("failed to find FeeQuoter address ref for chain selector %d: %w", src, err)
 	}
-	return feecontractref[0], nil
+
+	return feecontractref, nil
 }
 
 func (a *FeesAdapter) GetDefaultTokenTransferFeeConfig(src uint64, dst uint64) fees.TokenTransferFeeArgs {

chains/evm/deployment/v1_6_0/adapters/fees.go

@@ -10,6 +10,7 @@ import (
 	evmseq "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/sequences"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_3/fee_quoter"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/fees"
+	datastore_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences"
 	cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
 	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
@@ -36,18 +37,25 @@ func (a *FeesAdapter) GetFeeContractRef(e cldf.Environment, src uint64, dst uint
 		return datastore.AddressRef{}, fmt.Errorf("failed to get FeeQuoter address for chain selector %d: %w", src, err)
 	}
 
-	feecontractref := ds.Addresses().Filter(
-		datastore.AddressRefByAddress(common.BytesToAddress(fqAddr).Hex()),
-		datastore.AddressRefByType(datastore.ContractType(fqops.ContractType)),
-		datastore.AddressRefByChainSelector(src),
+	filter := datastore.AddressRef{
+		Type:          datastore.ContractType(fqops.ContractType),
+		Address:       common.BytesToAddress(fqAddr).Hex(),
+		ChainSelector: src,
+	}
+	feecontractref, err := datastore_utils.FindAndFormatRef(
+		ds,
+		filter,
+		src,
+		datastore_utils.FullRef,
 	)
 
-	if len(feecontractref) == 0 {
-		return datastore.AddressRef{}, fmt.Errorf("no address ref found for FeeQuoter contract at address %s on chain selector %d", common.BytesToAddress(fqAddr).Hex(), src)
+	if err != nil {
+		return datastore.AddressRef{}, fmt.Errorf("failed to find FeeQuoter address ref for chain selector %d: %w", src, err)
+
 	}
 
 	// Since we're filtering by address+type+chain selector, there should be exactly one match
-	return feecontractref[0], nil
+	return feecontractref, nil
 }
 
 func (a *FeesAdapter) GetDefaultTokenTransferFeeConfig(src uint64, dst uint64) fees.TokenTransferFeeArgs {

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

@@ -10,6 +10,7 @@ import (
 	fqops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/fee_quoter"
 	evmseq "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/sequences"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/fees"
+	datastore_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences"
 	cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
 	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
@@ -36,17 +37,24 @@ func (a *FeesAdapter) GetFeeContractRef(e cldf.Environment, src uint64, dst uint
 		return datastore.AddressRef{}, fmt.Errorf("failed to get FeeQuoter address for chain selector %d: %w", src, err)
 	}
 
-	feecontractref := ds.Addresses().Filter(
-		datastore.AddressRefByAddress(common.BytesToAddress(fqAddr).Hex()),
-		datastore.AddressRefByType(datastore.ContractType(fqops.ContractType)),
-		datastore.AddressRefByChainSelector(src),
+	filter := datastore.AddressRef{
+		Type:          datastore.ContractType(fqops.ContractType),
+		Address:       common.BytesToAddress(fqAddr).Hex(),
+		ChainSelector: src,
+	}
+	feecontractref, err := datastore_utils.FindAndFormatRef(
+		ds,
+		filter,
+		src,
+		datastore_utils.FullRef,
 	)
 
-	if len(feecontractref) == 0 || len(feecontractref) > 1 {
-		return datastore.AddressRef{}, fmt.Errorf("incorrect number of address ref found for FeeQuoter contract at address %s on chain selector %d", common.BytesToAddress(fqAddr).Hex(), src)
+	if err != nil {
+		return datastore.AddressRef{}, fmt.Errorf("failed to find FeeQuoter address ref for chain selector %d: %w", src, err)
+
 	}
 
-	return feecontractref[0], nil
+	return feecontractref, nil
 }
 
 func (a *FeesAdapter) GetDefaultTokenTransferFeeConfig(src uint64, dst uint64) fees.TokenTransferFeeArgs {