Fixing configuration for tokenVerifier

Author: mateusz-sekara

build/devenv/services/tokenVerifier.go

@@ -9,6 +9,9 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/cctp_verifier"
+	"github.com/smartcontractkit/chainlink-ccv/verifier/token/cctp"
+
 	"github.com/BurntSushi/toml"
 	"github.com/Masterminds/semver/v3"
 
@@ -50,6 +53,8 @@ type TokenVerifierInput struct {
 	DefaultExecutorOnRampAddresses map[string]string `toml:"default_executor_on_ramp_addresses"`
 	// Maps to rmn_remote_addresses in the verifier config toml.
 	RMNRemoteAddresses map[string]string `toml:"rmn_remote_addresses"`
+
+	CCTPVerifierAddresses map[string]string `toml:"cctp_verifier_addresses"`
 }
 
 type TokenVerifierOutput struct {
@@ -85,6 +90,9 @@ func NewTokenVerifier(in *TokenVerifierInput) (*TokenVerifierOutput, error) {
 		return nil, fmt.Errorf("failed to generate verifier config for token verifier %w", err)
 	}
 
+	fmt.Println("kurczaki - token verifier config:")
+	fmt.Println(string(config))
+
 	confDir := util.CCVConfigDir()
 	configFilePath := filepath.Join(confDir, "verifier-config.toml")
 	if err := os.WriteFile(configFilePath, config, 0o644); err != nil {
@@ -202,6 +210,26 @@ func (v *TokenVerifierInput) buildVerifierConfiguration(config *token.Config) er
 	config.VerifierID = v.ContainerName
 	config.OnRampAddresses = v.OnRampAddresses
 	config.RMNRemoteAddresses = v.RMNRemoteAddresses
+	if len(config.TokenVerifiers) == 0 {
+		config.TokenVerifiers = make([]token.VerifierConfig, 0)
+	}
+
+	if len(v.CCTPVerifierAddresses) > 0 {
+		verifiers := make(map[string]any)
+		for k, addr := range v.CCTPVerifierAddresses {
+			verifiers[k] = addr
+		}
+		config.TokenVerifiers = append(config.TokenVerifiers, token.VerifierConfig{
+			Type:    "cctp",
+			Version: "2.0",
+			CCTPConfig: &cctp.CCTPConfig{
+				AttestationAPI:         "localhost:8080",
+				AttestationAPIInterval: 60 * time.Second,
+				AttestationAPITimeout:  10 * time.Second,
+				Verifiers:              verifiers,
+			},
+		})
+	}
 
 	return nil
 }
@@ -210,6 +238,7 @@ func ResolveContractsForTokenVerifier(ds datastore.DataStore, blockchains []*blo
 	ver.OnRampAddresses = make(map[string]string)
 	ver.DefaultExecutorOnRampAddresses = make(map[string]string)
 	ver.RMNRemoteAddresses = make(map[string]string)
+	ver.CCTPVerifierAddresses = make(map[string]string)
 
 	for _, chain := range blockchains {
 		networkInfo, err := chainsel.GetChainDetailsByChainIDAndFamily(chain.ChainID, chainsel.FamilyEVM)
@@ -218,6 +247,20 @@ func ResolveContractsForTokenVerifier(ds datastore.DataStore, blockchains []*blo
 		}
 		selectorStr := strconv.FormatUint(networkInfo.ChainSelector, 10)
 
+		cctpTokenVerifierAddressRef, err := ds.Addresses().Get(datastore.NewAddressRefKey(
+			networkInfo.ChainSelector,
+			datastore.ContractType(cctp_verifier.ResolverType),
+			semver.MustParse(cctp_verifier.Deploy.Version()),
+			"CCTP",
+		))
+		if err != nil {
+			framework.L.Info().
+				Str("chainID", chain.ChainID).
+				Msg("Failed to get CCTP Verifier address from datastore")
+		} else {
+			ver.CCTPVerifierAddresses[selectorStr] = cctpTokenVerifierAddressRef.Address
+		}
+
 		onRampAddressRef, err := ds.Addresses().Get(datastore.NewAddressRefKey(
 			networkInfo.ChainSelector,
 			datastore.ContractType(onrampoperations.ContractType),

build/devenv/services/tokenVerifier.template.toml

@@ -13,28 +13,6 @@ MetricReaderInterval = 5
 TraceSampleRatio = 1.0
 TraceBatchTimeout = 10
 
-[[token_verifiers]]
-type = "lbtc"
-version = "1.0"
-attestation_api = "https://lbtc-api.example.com"
-attestation_api_timeout = "10s"
-attestation_api_interval = "100ms"
-
-[token_verifiers.addresses]
-3379446385462418246 = "0x9ac06ca36bb3dfd6a70eeb508ea5a33dadecca55"
-12922642891491394802 = "0xabb9d2d6f21b2be4d7250de972bd9f778accb3c5"
-
-[[token_verifiers]]
-type = "cctp"
-version = "2.0"
-attestation_api = "https://cctp-api.example.com"
-attestation_api_timeout = "10s"
-attestation_api_interval = "100ms"
-
-[token_verifiers.addresses]
-3379446385462418246 = "0x9ac06ca36bb3dfd6a70eeb508ea5a33dadecca55"
-12922642891491394802 = "0xabb9d2d6f21b2be4d7250de972bd9f778accb3c5"
-
 
 #[blockchain_infos]
 #  [blockchain_infos.3379446385462418246]

common/toml.go

@@ -55,7 +55,12 @@ func ParseAddressesMap(val any) (map[protocol.ChainSelector]protocol.UnknownAddr
 				return nil, nil, fmt.Errorf("invalid verifier address for chain selector %s: expected string, got %T", key, value)
 			}
 
-			result[protocol.ChainSelector(chainSelector)] = protocol.UnknownAddress(address)
+			addr, err := protocol.NewUnknownAddressFromHex(address)
+			if err != nil {
+				return nil, nil, fmt.Errorf("invalid verifier address for chain selector %s: %w", key, err)
+			}
+
+			result[protocol.ChainSelector(chainSelector)] = addr
 		}
 		return result, v, nil
 	}