[CAL][2] - implement metadata() and GetContractAddress()

Author: ogtownsend

mocks/pkg/contractreader/extended.go

@@ -2,6 +2,7 @@ package chainaccessor
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
@@ -40,13 +41,35 @@ func NewLegacyAccessor(
 }
 
 func (l *LegacyAccessor) Metadata() cciptypes.AccessorMetadata {
-	// TODO(NONEVM-1865): implement
-	panic("implement me")
+	allBindings := l.contractReader.GetAllBindings()
+	contracts := make(map[string]cciptypes.UnknownAddress, len(allBindings))
+	for contractName, binding := range allBindings {
+		addressBytes, err := l.addrCodec.AddressStringToBytes(binding[0].Binding.Address, l.chainSelector)
+		if err != nil {
+			l.lggr.Errorf("failed to convert address to bytes : %v", err)
+			continue
+		}
+		contracts[contractName] = addressBytes
+	}
+
+	return cciptypes.AccessorMetadata{
+		ChainSelector: l.chainSelector,
+		Contracts:     contracts,
+	}
 }
 
 func (l *LegacyAccessor) GetContractAddress(contractName string) ([]byte, error) {
-	// TODO(NONEVM-1865): implement
-	panic("implement me")
+	bindings := l.contractReader.GetBindings(contractName)
+	if len(bindings) != 1 {
+		return nil, fmt.Errorf("expected one binding for the %s contract, got %d", contractName, len(bindings))
+	}
+
+	addressBytes, err := l.addrCodec.AddressStringToBytes(bindings[0].Binding.Address, l.chainSelector)
+	if err != nil {
+		return nil, fmt.Errorf("convert address %s to bytes: %w", bindings[0].Binding.Address, err)
+	}
+
+	return addressBytes, nil
 }
 
 func (l *LegacyAccessor) GetChainFeeComponents(

pkg/chainaccessor/legacy_accessor.go

@@ -33,6 +33,9 @@ type Extended interface {
 	// GetBindings returns current bindings for a given contract reader.
 	GetBindings(contractName string) []ExtendedBoundContract
 
+	// GetAllBindings returns all bindings for all contracts associated with this reader.
+	GetAllBindings() map[string][]ExtendedBoundContract
+
 	// ExtendedQueryKey performs automatic binding from contractName to the first bound contract.
 	// An error is generated if there are more than one bound contract for the contractName.
 	ExtendedQueryKey(
@@ -298,6 +301,18 @@ func (e *extendedContractReader) GetBindings(contractName string) []ExtendedBoun
 	return bindings
 }
 
+func (e *extendedContractReader) GetAllBindings() map[string][]ExtendedBoundContract {
+	e.mu.RLock()
+	defer e.mu.RUnlock()
+
+	allBindings := make(map[string][]ExtendedBoundContract, len(e.contractBindingsByName))
+	for key, bindings := range e.contractBindingsByName {
+		allBindings[key] = bindings
+	}
+
+	return allBindings
+}
+
 func (e *extendedContractReader) bindingExists(b types.BoundContract) bool {
 	e.mu.RLock()
 	defer e.mu.RUnlock()

pkg/contractreader/extended.go

@@ -510,15 +510,18 @@ func (r *ccipChainReader) MsgsBetweenSeqNums(
 	ctx context.Context, sourceChainSelector cciptypes.ChainSelector, seqNumRange cciptypes.SeqNumRange,
 ) ([]cciptypes.Message, error) {
 	lggr := logutil.WithContextValues(ctx, r.lggr)
-	if err := validateReaderExistence(r.contractReaders, sourceChainSelector); err != nil {
+
+	if err := validateAccessorExistence(r.accessors, sourceChainSelector); err != nil {
 		return nil, err
 	}
-
-	onRampAddress, err := r.GetContractAddress(consts.ContractNameOnRamp, sourceChainSelector)
+	onRampAddress, err := r.accessors[sourceChainSelector].GetContractAddress(consts.ContractNameOnRamp)
 	if err != nil {
 		return nil, fmt.Errorf("get onRamp address: %w", err)
 	}
 
+	if err := validateReaderExistence(r.contractReaders, sourceChainSelector); err != nil {
+		return nil, err
+	}
 	seq, err := r.contractReaders[sourceChainSelector].ExtendedQueryKey(
 		ctx,
 		consts.ContractNameOnRamp,
@@ -557,7 +560,7 @@ func (r *ccipChainReader) MsgsBetweenSeqNums(
 		return nil, fmt.Errorf("failed to query onRamp: %w", err)
 	}
 
-	onRampAddressAfterQuery, err := r.GetContractAddress(consts.ContractNameOnRamp, sourceChainSelector)
+	onRampAddressAfterQuery, err := r.accessors[sourceChainSelector].GetContractAddress(consts.ContractNameOnRamp)
 	if err != nil {
 		return nil, fmt.Errorf("get onRamp address after query: %w", err)
 	}
@@ -1126,7 +1129,11 @@ func (r *ccipChainReader) GetRMNRemoteConfig(ctx context.Context) (cciptypes.Rem
 
 	// RMNRemote address stored in the offramp static config is actually the proxy contract address.
 	// Here we will get the RMNRemote address from the proxy contract by calling the RMNProxy contract.
-	proxyContractAddress, err := r.GetContractAddress(consts.ContractNameRMNRemote, r.destChain)
+	destChainAccessor := r.accessors[r.destChain]
+	if destChainAccessor == nil {
+		return cciptypes.RemoteConfig{}, fmt.Errorf("chain accessor not found for dest chain %d", r.destChain)
+	}
+	proxyContractAddress, err := destChainAccessor.GetContractAddress(consts.ContractNameRMNRemote)
 	if err != nil {
 		return cciptypes.RemoteConfig{}, fmt.Errorf("get RMNRemote proxy contract address: %w", err)
 	}
@@ -1380,6 +1387,7 @@ func (r *ccipChainReader) Sync(ctx context.Context, contracts ContractAddresses)
 	return errors.Join(errs...)
 }
 
+// TODO(NONEVM-1865): remove this function once from CCIPReader interface once CAL migration is complete.
 func (r *ccipChainReader) GetContractAddress(contractName string, chain cciptypes.ChainSelector) ([]byte, error) {
 	return r.donAddressBook.GetContractAddress(addressbook.ContractName(contractName), chain)
 }

pkg/reader/ccip.go

@@ -10,6 +10,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/query/primitives"
 
+	"github.com/smartcontractkit/chainlink-ccip/pkg/chainaccessor"
 	"github.com/smartcontractkit/chainlink-ccip/pkg/contractreader"
 	cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
 )
@@ -149,7 +150,7 @@ func NewCCIPChainReader(
 func NewCCIPReaderWithExtendedContractReaders(
 	ctx context.Context,
 	lggr logger.Logger,
-	contractReaders map[cciptypes.ChainSelector]contractreader.Extended,
+	extendedContractReaders map[cciptypes.ChainSelector]contractreader.Extended,
 	contractWriters map[cciptypes.ChainSelector]types.ContractWriter,
 	destChain cciptypes.ChainSelector,
 	offrampAddress []byte,
@@ -160,9 +161,19 @@ func NewCCIPReaderWithExtendedContractReaders(
 		// Panic here since right now this is only called from tests in core
 		panic(fmt.Errorf("failed to create CCIP reader: %w", err))
 	}
-	for ch, extendedCr := range contractReaders {
+	var cas = make(map[cciptypes.ChainSelector]cciptypes.ChainAccessor)
+	for ch, extendedCr := range extendedContractReaders {
 		cr.WithExtendedContractReader(ch, extendedCr)
+		cas[ch] = chainaccessor.NewLegacyAccessor(
+			lggr,
+			ch,
+			extendedCr,
+			contractWriters[ch],
+			addrCodec,
+		)
 	}
+
+	cr.accessors = cas
 	return cr
 }
 

pkg/reader/ccip_interface.go

@@ -80,3 +80,13 @@ func validateReaderExistence[T contractreader.ContractReaderFacade](
 	}
 	return nil
 }
+
+func validateAccessorExistence(
+	accessors map[cciptypes.ChainSelector]cciptypes.ChainAccessor,
+	chainSelector cciptypes.ChainSelector,
+) error {
+	if _, exists := accessors[chainSelector]; !exists {
+		return fmt.Errorf("chain accessor not found for chain %d", chainSelector)
+	}
+	return nil
+}

pkg/reader/helpers.go

@@ -36,7 +36,7 @@ type AllAccessors interface {
 	// GetContractAddress returns the contract address that is registered for the provided contract name and chain.
 	// WARNING: This function will fail if the oracle does not support the requested chain.
 	//
-	// Deprecated: use Metadata() instead.
+	// TODO(NONEVM-1865): do we want to mark this as deprecated in favor of Metadata()?
 	GetContractAddress(contractName string) ([]byte, error)
 
 	// GetAllConfig looks up all configurations available to the accessor. This