Add GetFQAddressDynamic functionality

ccv/chains/evm/deployment/v1_7_0/adapters/chain_family.go

@@ -2,9 +2,13 @@ package adapters
 
 import (
 	"encoding/binary"
+	"fmt"
 	"math/big"
 
-	"github.com/smartcontractkit/chainlink-deployments-framework/chain"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+
+	cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
 	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
 	"github.com/smartcontractkit/chainlink-deployments-framework/operations"
 
@@ -24,12 +28,12 @@ import (
 type ChainFamilyAdapter struct{}
 
 // ConfigureLaneLegAsSource returns the sequence for configuring a chain of the EVM family as a source chain for CCIP lanes.
-func (c *ChainFamilyAdapter) ConfigureLaneLegAsSource() *operations.Sequence[lanes.UpdateLanesInput, seq_core.OnChainOutput, chain.BlockChains] {
+func (c *ChainFamilyAdapter) ConfigureLaneLegAsSource() *operations.Sequence[lanes.UpdateLanesInput, seq_core.OnChainOutput, cldf_chain.BlockChains] {
 	return sequences.ConfigureLaneLegAsSource
 }
 
 // ConfigureLaneLegAsDest returns the sequence for configuring a chain of the EVM family as a destination chain for CCIP lanes.
-func (c *ChainFamilyAdapter) ConfigureLaneLegAsDest() *operations.Sequence[lanes.UpdateLanesInput, seq_core.OnChainOutput, chain.BlockChains] {
+func (c *ChainFamilyAdapter) ConfigureLaneLegAsDest() *operations.Sequence[lanes.UpdateLanesInput, seq_core.OnChainOutput, cldf_chain.BlockChains] {
 	return sequences.ConfigureLaneLegAsDest
 }
 
@@ -69,7 +73,36 @@ func (a *ChainFamilyAdapter) GetFQAddress(ds datastore.DataStore, chainSelector
 	return addr, nil
 }
 
-func (c *ChainFamilyAdapter) DisableRemoteChain() *operations.Sequence[lanes.DisableRemoteChainInput, seq_core.OnChainOutput, chain.BlockChains] {
+func (a *ChainFamilyAdapter) GetFQAddressDynamic(ds datastore.DataStore, chainSelector uint64, chains cldf_chain.BlockChains) ([]byte, error) {
+	onRampAddr, err := datastore_utils.FindAndFormatRef(ds, datastore.AddressRef{
+		ChainSelector: chainSelector,
+		Type:          datastore.ContractType(onramp.ContractType),
+		Version:       onramp.Version,
+	}, chainSelector, evm_datastore_utils.ToEVMAddressBytes)
+	if err != nil {
+		return nil, fmt.Errorf("failed to find onramp address for chain selector %d: %w", chainSelector, err)
+	}
+
+	chain := chains.EVMChains()[chainSelector]
+
+	onrampContract, err := onramp.NewOnRampContract(common.BytesToAddress(onRampAddr), chain.Client)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create onramp contract instance for chain selector %d: %w", chainSelector, err)
+	}
+
+	dynamicConfig, err := onrampContract.GetDynamicConfig(&bind.CallOpts{})
+	if err != nil {
+		return nil, fmt.Errorf("failed to call GetDynamicConfig on onramp contract for chain selector %d: %w", chainSelector, err)
+	}
+
+	fqAddress := dynamicConfig.FeeQuoter
+	if fqAddress == (common.Address{}) {
+		return nil, fmt.Errorf("fee quoter address is zero in onramp dynamic config for chain selector %d", chainSelector)
+	}
+	return common.Address(fqAddress).Bytes(), nil
+}
+
+func (c *ChainFamilyAdapter) DisableRemoteChain() *operations.Sequence[lanes.DisableRemoteChainInput, seq_core.OnChainOutput, cldf_chain.BlockChains] {
 	return evm_sequences.DisableRemoteChainSequence
 }
 

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

@@ -33,7 +33,7 @@ func NewFeesAdapter(evmAdapter *evmseq.EVMAdapter) *FeesAdapter {
 
 func (a *FeesAdapter) GetFeeContractRef(e cldf.Environment, src uint64, dst uint64) (datastore.AddressRef, error) {
 	ds := e.DataStore
-	fqAddr, err := a.evm.GetFQAddress(ds, src)
+	fqAddr, err := a.evm.GetFQAddressDynamic(ds, src, e.BlockChains)
 	if err != nil {
 		return datastore.AddressRef{}, fmt.Errorf("failed to get FeeQuoter address for chain selector %d: %w", src, err)
 	}

chains/evm/deployment/v1_6_0/sequences/adapter.go

@@ -6,6 +6,7 @@ import (
 	"math/big"
 
 	"github.com/Masterminds/semver/v3"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 
 	chain_selectors "github.com/smartcontractkit/chain-selectors"
@@ -87,6 +88,34 @@ func (a *EVMAdapter) GetFQAddress(ds datastore.DataStore, chainSelector uint64)
 	return evm_datastore_utils.ToEVMAddressBytes(ref)
 }
 
+func (a *EVMAdapter) GetFQAddressDynamic(ds datastore.DataStore, chainSelector uint64, chains cldf_chain.BlockChains) ([]byte, error) {
+	onRampAddr, err := datastore_utils.FindAndFormatRef(ds, datastore.AddressRef{
+		ChainSelector: chainSelector,
+		Type:          datastore.ContractType(onramp.ContractType),
+		Version:       onramp.Version,
+	}, chainSelector, evm_datastore_utils.ToEVMAddressBytes)
+	if err != nil {
+		return nil, fmt.Errorf("failed to find onramp address for chain selector %d: %w", chainSelector, err)
+	}
+
+	chain := chains.EVMChains()[chainSelector]
+
+	onrampContract, err := onramp.NewOnRampContract(common.BytesToAddress(onRampAddr), chain.Client)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create onramp contract instance for chain selector %d: %w", chainSelector, err)
+	}
+	dynamicConfig, err := onrampContract.GetDynamicConfig(&bind.CallOpts{})
+	if err != nil {
+		return nil, fmt.Errorf("failed to call GetDynamicConfig on onramp contract for chain selector %d: %w", chainSelector, err)
+	}
+
+	fqAddress := dynamicConfig.FeeQuoter
+	if fqAddress == (common.Address{}) {
+		return nil, fmt.Errorf("fee quoter address is zero in onramp dynamic config for chain selector %d", chainSelector)
+	}
+	return common.Address(fqAddress).Bytes(), nil
+}
+
 func (a *EVMAdapter) GetRouterAddress(ds datastore.DataStore, chainSelector uint64) ([]byte, error) {
 	addr, err := datastore_utils.FindAndFormatRef(ds, datastore.AddressRef{
 		ChainSelector: chainSelector,
@@ -243,18 +272,26 @@ func (a *EVMAdapter) GetChainFamilySelector() [4]byte {
 
 // GetFQVersion implements the optional FeeQuoterVersionProvider interface so that
 // update_lanes can choose 1.6 vs 2.0 FeeQuoter operations based on the deployed contract version.
-func (a *EVMAdapter) GetFQVersion(ds datastore.DataStore, address []byte, chainSelector uint64) (*semver.Version, error) {
-	refs := ds.Addresses().Filter(
-		datastore.AddressRefByType(datastore.ContractType(fee_quoter.ContractType)),
-		datastore.AddressRefByChainSelector(chainSelector),
-	)
-	ref, err := GetFeeQuoterAddress(refs, chainSelector, nil)
+func (a *EVMAdapter) GetFQVersion(ds datastore.DataStore, address []byte, chainSelector uint64, chains cldf_chain.BlockChains) (*semver.Version, error) {
+	addressOnChain, err := a.GetFQAddressDynamic(ds, chainSelector, chains)
 	if err != nil {
 		return nil, err
 	}
 	// Sanity check that the AddressRef we found matches the one we expect.
-	if ref.Address != common.BytesToAddress(address).Hex() {
-		return nil, fmt.Errorf("fee quoter address mismatch for chain selector %d: expected %s, got %s", chainSelector, common.BytesToAddress(address).Hex(), ref.Address)
+	if common.BytesToAddress(addressOnChain).Hex() != common.BytesToAddress(address).Hex() {
+		return nil, fmt.Errorf("fee quoter address mismatch for chain selector %d: expected %s, got %s", chainSelector, common.BytesToAddress(address).Hex(), common.BytesToAddress(addressOnChain).Hex())
+	}
+
+	ref := ds.Addresses().Filter(
+		datastore.AddressRefByType(datastore.ContractType(fee_quoter.ContractType)),
+		datastore.AddressRefByChainSelector(chainSelector),
+		datastore.AddressRefByAddress(common.BytesToAddress(address).Hex()),
+	)
+	if len(ref) == 0 {
+		return nil, fmt.Errorf("no fee quoter address found for chain selector %d at address %s", chainSelector, common.BytesToAddress(address).Hex())
+	}
+	if len(ref) > 1 {
+		return nil, fmt.Errorf("multiple fee quoter addresses found for chain selector %d at address %s", chainSelector, common.BytesToAddress(address).Hex())
 	}
-	return ref.Version, nil
+	return ref[0].Version, nil
 }

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

@@ -32,7 +32,7 @@ func NewFeesAdapter(evmAdapter *evmseq16.EVMAdapter) *FeesAdapter {
 
 func (a *FeesAdapter) GetFeeContractRef(e cldf.Environment, src uint64, dst uint64) (datastore.AddressRef, error) {
 	ds := e.DataStore
-	fqAddr, err := a.evm.GetFQAddress(ds, src)
+	fqAddr, err := a.evm.GetFQAddressDynamic(ds, src, e.BlockChains)
 	if err != nil {
 		return datastore.AddressRef{}, fmt.Errorf("failed to get FeeQuoter address for chain selector %d: %w", src, err)
 	}

deployment/lanes/connect_chains.go

@@ -154,11 +154,11 @@ func makeApply(laneRegistry *LaneAdapterRegistry, mcmsRegistry *changesets.MCMSR
 			if !exists {
 				return cldf.ChangesetOutput{}, fmt.Errorf("no ChainAdapter registered for chain family '%s'", chainBFamily)
 			}
-			err = populateAddresses(e.DataStore, chainA, chainAAdapter, lane.Version, lane.TestRouter)
+			err = populateAddresses(&e, chainA, chainAAdapter, lane.Version, lane.TestRouter)
 			if err != nil {
 				return cldf.ChangesetOutput{}, fmt.Errorf("error fetching address for src chain %d: %w", chainA.Selector, err)
 			}
-			err = populateAddresses(e.DataStore, chainB, chainBAdapter, lane.Version, lane.TestRouter)
+			err = populateAddresses(&e, chainB, chainBAdapter, lane.Version, lane.TestRouter)
 			if err != nil {
 				return cldf.ChangesetOutput{}, fmt.Errorf("error fetching address for dest chain %d: %w", chainB.Selector, err)
 			}
@@ -257,7 +257,8 @@ func populateCommitteeInputsIfNeeded(e cldf.Environment, lane *LaneConfig, popul
 	return nil
 }
 
-func populateAddresses(ds datastore.DataStore, chainDef *ChainDefinition, adapter LaneAdapter, version *semver.Version, isTestRouter bool) error {
+func populateAddresses(e *cldf.Environment, chainDef *ChainDefinition, adapter LaneAdapter, version *semver.Version, isTestRouter bool) error {
+	ds := e.DataStore
 	var err error
 	chainDef.OnRamp, err = adapter.GetOnRampAddress(ds, chainDef.Selector)
 	if err != nil {
@@ -267,12 +268,19 @@ func populateAddresses(ds datastore.DataStore, chainDef *ChainDefinition, adapte
 	if err != nil {
 		return fmt.Errorf("error fetching offramp address for chain %d: %w", chainDef.Selector, err)
 	}
-	chainDef.FeeQuoter, err = adapter.GetFQAddress(ds, chainDef.Selector)
-	if err != nil {
-		return fmt.Errorf("error fetching fee quoter address for chain %d: %w", chainDef.Selector, err)
+	if dfq, ok := adapter.(DynamicFeeQuoter); ok {
+		chainDef.FeeQuoter, err = dfq.GetFQAddressDynamic(ds, chainDef.Selector, e.BlockChains)
+		if err != nil {
+			return fmt.Errorf("error fetching fee quoter address for chain %d: %w", chainDef.Selector, err)
+		}
+	} else {
+		chainDef.FeeQuoter, err = adapter.GetFQAddress(ds, chainDef.Selector)
+		if err != nil {
+			return fmt.Errorf("error fetching fee quoter address for chain %d: %w", chainDef.Selector, err)
+		}
 	}
 	if vp, ok := adapter.(FeeQuoterVersionProvider); ok {
-		chainDef.FeeQuoterVersion, err = vp.GetFQVersion(ds, chainDef.FeeQuoter, chainDef.Selector)
+		chainDef.FeeQuoterVersion, err = vp.GetFQVersion(ds, chainDef.FeeQuoter, chainDef.Selector, e.BlockChains)
 		if err != nil {
 			return fmt.Errorf("error fetching fee quoter version for chain %d: %w", chainDef.Selector, err)
 		}

deployment/lanes/disable_lane.go

@@ -84,11 +84,11 @@ func makeDisableApply(
 			chainADef := &ChainDefinition{Selector: lane.ChainA}
 			chainBDef := &ChainDefinition{Selector: lane.ChainB}
 
-			err = populateAddresses(e.DataStore, chainADef, chainAAdapter, lane.Version, false)
+			err = populateAddresses(&e, chainADef, chainAAdapter, lane.Version, false)
 			if err != nil {
 				return cldf.ChangesetOutput{}, fmt.Errorf("error fetching addresses for chain %d: %w", lane.ChainA, err)
 			}
-			err = populateAddresses(e.DataStore, chainBDef, chainBAdapter, lane.Version, false)
+			err = populateAddresses(&e, chainBDef, chainBAdapter, lane.Version, false)
 			if err != nil {
 				return cldf.ChangesetOutput{}, fmt.Errorf("error fetching addresses for chain %d: %w", lane.ChainB, err)
 			}

deployment/lanes/product.go

@@ -38,7 +38,12 @@ type LaneAdapter interface {
 // to report the FeeQuoter contract version for a chain (e.g. 1.6.x vs 2.0.x).
 // When set, it is used to choose the correct FeeQuoter operations in update_lanes.
 type FeeQuoterVersionProvider interface {
-	GetFQVersion(ds datastore.DataStore, address []byte, chainSelector uint64) (*semver.Version, error)
+	GetFQVersion(ds datastore.DataStore, address []byte, chainSelector uint64, chains cldf_chain.BlockChains) (*semver.Version, error)
+}
+
+// DynamicFeeQuoter is an optional interface that LaneAdapters can implement to dynamically retrieve the FeeQuoter.
+type DynamicFeeQuoter interface {
+	GetFQAddressDynamic(ds datastore.DataStore, chainSelector uint64, chains cldf_chain.BlockChains) ([]byte, error)
 }
 
 // TokenPriceProvider is an optional interface that LaneAdapters can implement