add fq dests changeset (#1921)

* wip

* tests

* tests

* comments

* cr comments

* cr comments

Author: tt-cll

chains/evm/deployment/v1_0_0/adapters/pool_adapter.go

@@ -178,6 +178,12 @@ func (a *EVMPoolAdapter) ManualRegistration() *cldf_ops.Sequence[tokensapi.Manua
 				return sequences.OnChainOutput{}, fmt.Errorf("failed to get token admin registry address for chain %d: %w", chain.Selector, err)
 			}
 
+			// Token address resolution strategy:
+			// 1. If TokenRef already has an address, use it directly (skip datastore).
+			// 2. Otherwise look up the token in the datastore using TokenRef fields.
+			// 3. If step 2 fails (e.g. ambiguous or missing), fall back to reading
+			//    the token address from the on-chain token pool contract via TokenPoolRef.
+			// 4. If none of the above work, return an error.
 			tokenRef := input.TokenRef
 			if tokenRef.Address == "" {
 				if tokRef, err := datastore_utils.FindAndFormatRef(input.ExistingDataStore, tokenRef, chain.Selector, datastore_utils.FullRef); err != nil {

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"
+	"github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
 	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"
@@ -306,3 +307,25 @@ func (a *FeesAdapter) SetTokenTransferFee(e cldf.Environment) *operations.Sequen
 		},
 	)
 }
+
+// GetDefaultDestChainConfig is not supported for v1.5 (no FeeQuoter contract).
+func (a *FeesAdapter) GetDefaultDestChainConfig(src, dst uint64) lanes.FeeQuoterDestChainConfig {
+	return lanes.FeeQuoterDestChainConfig{}
+}
+
+// GetOnchainDestChainConfig is not supported for v1.5 (no FeeQuoter contract).
+func (a *FeesAdapter) GetOnchainDestChainConfig(_ cldf.Environment, _, _ uint64) (lanes.FeeQuoterDestChainConfig, error) {
+	return lanes.FeeQuoterDestChainConfig{}, fmt.Errorf("FeeQuoter dest chain config reads are not supported for v1.5 (no FeeQuoter contract)")
+}
+
+// ApplyDestChainConfigUpdates is not supported for v1.5 (no FeeQuoter contract).
+func (a *FeesAdapter) ApplyDestChainConfigUpdates(e cldf.Environment) *operations.Sequence[fees.ApplyDestChainConfigSequenceInput, sequences.OnChainOutput, cldf_chain.BlockChains] {
+	return operations.NewSequence(
+		"ApplyDestChainConfigUpdatesV1_5",
+		semver.MustParse("1.5.0"),
+		"Not supported for v1.5 — no FeeQuoter contract exists",
+		func(b operations.Bundle, chains cldf_chain.BlockChains, input fees.ApplyDestChainConfigSequenceInput) (sequences.OnChainOutput, error) {
+			return sequences.OnChainOutput{}, fmt.Errorf("FeeQuoter dest chain config updates are not supported for v1.5 (no FeeQuoter contract)")
+		},
+	)
+}

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

@@ -5,6 +5,7 @@ import (
 	chainsel "github.com/smartcontractkit/chain-selectors"
 
 	"github.com/smartcontractkit/chainlink-ccip/deployment/fastcurse"
+	"github.com/smartcontractkit/chainlink-ccip/deployment/fees"
 )
 
 func init() {
@@ -15,4 +16,8 @@ func init() {
 		CurseAdapter:        NewCurseAdapter(),
 		CurseSubjectAdapter: NewCurseAdapter(),
 	})
+
+	defaultConcurrency := 10
+	feeReg := fees.GetRegistry()
+	feeReg.RegisterFeeAdapter(chainsel.FamilyEVM, semver.MustParse("1.5.0"), NewFeesAdapter(&defaultConcurrency))
 }

chains/evm/deployment/v1_5_1/adapters/tokens.go

@@ -13,7 +13,7 @@ import (
 	tarseq "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_0/sequences"
 	tpOps "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_1/operations/token_pool"
 	tpSeq "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_1/sequences/token_pool"
-	v1_6_0_seq "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/sequences"
+	v1_5_1_seq "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_1/sequences"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/token_pool"
 	tokensapi "github.com/smartcontractkit/chainlink-ccip/deployment/tokens"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences"
@@ -38,7 +38,7 @@ func NewTokenAdapter() *TokenAdapter {
 	return &TokenAdapter{
 		EVMPoolAdapter: evm1_0_0.EVMPoolAdapter{
 			Ops:                &poolOpsV151{},
-			DeployTokenPoolSeq: v1_6_0_seq.DeployTokenPool,
+			DeployTokenPoolSeq: v1_5_1_seq.DeployTokenPool,
 		},
 	}
 }

chains/evm/deployment/v1_5_1/sequences/deploy_token_pool.go

@@ -0,0 +1,228 @@
+package sequences
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	mcms_types "github.com/smartcontractkit/mcms/types"
+
+	cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
+	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
+	"github.com/smartcontractkit/chainlink-deployments-framework/deployment"
+	cldf_ops "github.com/smartcontractkit/chainlink-deployments-framework/operations"
+	"github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/initial/burn_mint_erc20"
+
+	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract"
+	rmnproxyops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/operations/rmn_proxy"
+	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_2_0/operations/router"
+	v1_5_1_burn_from_mint_token_pool "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_1/operations/burn_from_mint_token_pool"
+	v1_5_1_burn_mint_token_pool "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_1/operations/burn_mint_token_pool"
+	v1_5_1_burn_to_address_mint_token_pool "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_1/operations/burn_to_address_mint_token_pool"
+	v1_5_1_burn_with_from_mint_token_pool "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_1/operations/burn_with_from_mint_token_pool"
+	v1_5_1_lock_release_token_pool "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_1/operations/lock_release_token_pool"
+	tokenapi "github.com/smartcontractkit/chainlink-ccip/deployment/tokens"
+	common_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils"
+	datastore_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
+	"github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences"
+)
+
+var DeployTokenPool = cldf_ops.NewSequence(
+	"deploy-token-pool-v1.5.1",
+	common_utils.Version_1_5_1,
+	"Deploy v1.5.1 token pool contracts",
+	func(b cldf_ops.Bundle, chains cldf_chain.BlockChains, input tokenapi.DeployTokenPoolInput) (sequences.OnChainOutput, error) {
+		if input.TokenPoolVersion == nil {
+			return sequences.OnChainOutput{}, fmt.Errorf("TokenPoolVersion is required")
+		}
+
+		chain := chains.EVMChains()[input.ChainSelector]
+		qualifier := input.TokenPoolQualifier
+
+		tokenAddr, err := resolveTokenAddress(input)
+		if err != nil {
+			return sequences.OnChainOutput{}, err
+		}
+		if qualifier == "" {
+			qualifier = tokenAddr
+		}
+
+		matches := input.ExistingDataStore.Addresses().Filter(
+			datastore.AddressRefByType(datastore.ContractType(input.PoolType)),
+			datastore.AddressRefByChainSelector(input.ChainSelector),
+			datastore.AddressRefByQualifier(qualifier),
+			datastore.AddressRefByVersion(input.TokenPoolVersion),
+		)
+		if len(matches) > 1 {
+			return sequences.OnChainOutput{}, fmt.Errorf(
+				"multiple token pools found in datastore with type '%s', version '%s', qualifier '%s' on chain with selector %d",
+				input.PoolType, input.TokenPoolVersion.String(), qualifier, input.ChainSelector,
+			)
+		}
+		if len(matches) == 1 {
+			b.Logger.Info("Token pool already deployed at address:", matches[0].Address)
+			return sequences.OnChainOutput{}, nil
+		}
+
+		token, err := burn_mint_erc20.NewBurnMintERC20(common.HexToAddress(tokenAddr), chain.Client)
+		if err != nil {
+			return sequences.OnChainOutput{}, fmt.Errorf("failed to instantiate token contract at address '%s': %w", tokenAddr, err)
+		}
+		tokenDecimal, err := token.Decimals(&bind.CallOpts{Context: b.GetContext()})
+		if err != nil {
+			return sequences.OnChainOutput{}, fmt.Errorf("failed to get token decimals for token at address '%s': %w", tokenAddr, err)
+		}
+
+		routerAddr, err := datastore_utils.FindAndFormatRef(input.ExistingDataStore, datastore.AddressRef{
+			ChainSelector: input.ChainSelector,
+			Type:          datastore.ContractType(router.ContractType),
+		}, input.ChainSelector, datastore_utils.FullRef)
+		if err != nil {
+			return sequences.OnChainOutput{}, fmt.Errorf("failed to find router address in datastore for chain with selector %d: %w", input.ChainSelector, err)
+		}
+
+		rmpProxyAddr, err := datastore_utils.FindAndFormatRef(input.ExistingDataStore, datastore.AddressRef{
+			ChainSelector: input.ChainSelector,
+			Type:          datastore.ContractType(rmnproxyops.ContractType),
+		}, input.ChainSelector, datastore_utils.FullRef)
+		if err != nil {
+			return sequences.OnChainOutput{}, fmt.Errorf("failed to find rmnproxy address in datastore for chain with selector %d: %w", input.ChainSelector, err)
+		}
+
+		var allowlist []common.Address
+		if len(input.Allowlist) > 0 {
+			allowlist = make([]common.Address, 0, len(input.Allowlist))
+			for _, addr := range input.Allowlist {
+				allowlist = append(allowlist, common.HexToAddress(addr))
+			}
+		}
+
+		var poolRef datastore.AddressRef
+		typeAndVersion := deployment.NewTypeAndVersion(deployment.ContractType(input.PoolType), *input.TokenPoolVersion).String()
+
+		switch typeAndVersion {
+		case v1_5_1_burn_mint_token_pool.TypeAndVersion.String():
+			poolRef, err = contract.MaybeDeployContract(b, v1_5_1_burn_mint_token_pool.Deploy, chain, contract.DeployInput[v1_5_1_burn_mint_token_pool.ConstructorArgs]{
+				TypeAndVersion: v1_5_1_burn_mint_token_pool.TypeAndVersion,
+				ChainSelector:  chain.Selector,
+				Args: v1_5_1_burn_mint_token_pool.ConstructorArgs{
+					Token:              common.HexToAddress(tokenAddr),
+					LocalTokenDecimals: tokenDecimal,
+					Allowlist:          allowlist,
+					RmnProxy:           common.HexToAddress(rmpProxyAddr.Address),
+					Router:             common.HexToAddress(routerAddr.Address),
+				},
+				Qualifier: &qualifier,
+			}, nil)
+			if err != nil {
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to deploy BurnMintTokenPool v1.5.1: %w", err)
+			}
+
+		case v1_5_1_burn_from_mint_token_pool.TypeAndVersion.String():
+			poolRef, err = contract.MaybeDeployContract(b, v1_5_1_burn_from_mint_token_pool.Deploy, chain, contract.DeployInput[v1_5_1_burn_from_mint_token_pool.ConstructorArgs]{
+				TypeAndVersion: v1_5_1_burn_from_mint_token_pool.TypeAndVersion,
+				ChainSelector:  chain.Selector,
+				Args: v1_5_1_burn_from_mint_token_pool.ConstructorArgs{
+					Token:              common.HexToAddress(tokenAddr),
+					LocalTokenDecimals: tokenDecimal,
+					Allowlist:          allowlist,
+					RmnProxy:           common.HexToAddress(rmpProxyAddr.Address),
+					Router:             common.HexToAddress(routerAddr.Address),
+				},
+				Qualifier: &qualifier,
+			}, nil)
+			if err != nil {
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to deploy BurnFromMintTokenPool v1.5.1: %w", err)
+			}
+
+		case v1_5_1_burn_to_address_mint_token_pool.TypeAndVersion.String():
+			poolRef, err = contract.MaybeDeployContract(b, v1_5_1_burn_to_address_mint_token_pool.Deploy, chain, contract.DeployInput[v1_5_1_burn_to_address_mint_token_pool.ConstructorArgs]{
+				TypeAndVersion: v1_5_1_burn_to_address_mint_token_pool.TypeAndVersion,
+				ChainSelector:  chain.Selector,
+				Args: v1_5_1_burn_to_address_mint_token_pool.ConstructorArgs{
+					Token:              common.HexToAddress(tokenAddr),
+					LocalTokenDecimals: tokenDecimal,
+					Allowlist:          allowlist,
+					RmnProxy:           common.HexToAddress(rmpProxyAddr.Address),
+					Router:             common.HexToAddress(routerAddr.Address),
+					BurnAddress:        common.HexToAddress(input.BurnAddress),
+				},
+				Qualifier: &qualifier,
+			}, nil)
+			if err != nil {
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to deploy BurnToAddressMintTokenPool v1.5.1: %w", err)
+			}
+
+		case v1_5_1_burn_with_from_mint_token_pool.TypeAndVersion.String():
+			poolRef, err = contract.MaybeDeployContract(b, v1_5_1_burn_with_from_mint_token_pool.Deploy, chain, contract.DeployInput[v1_5_1_burn_with_from_mint_token_pool.ConstructorArgs]{
+				TypeAndVersion: v1_5_1_burn_with_from_mint_token_pool.TypeAndVersion,
+				ChainSelector:  chain.Selector,
+				Args: v1_5_1_burn_with_from_mint_token_pool.ConstructorArgs{
+					Token:              common.HexToAddress(tokenAddr),
+					LocalTokenDecimals: tokenDecimal,
+					Allowlist:          allowlist,
+					RmnProxy:           common.HexToAddress(rmpProxyAddr.Address),
+					Router:             common.HexToAddress(routerAddr.Address),
+				},
+				Qualifier: &qualifier,
+			}, nil)
+			if err != nil {
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to deploy BurnWithFromMintTokenPool v1.5.1: %w", err)
+			}
+
+		case v1_5_1_lock_release_token_pool.TypeAndVersion.String():
+			poolRef, err = contract.MaybeDeployContract(b, v1_5_1_lock_release_token_pool.Deploy, chain, contract.DeployInput[v1_5_1_lock_release_token_pool.ConstructorArgs]{
+				TypeAndVersion: v1_5_1_lock_release_token_pool.TypeAndVersion,
+				ChainSelector:  chain.Selector,
+				Args: v1_5_1_lock_release_token_pool.ConstructorArgs{
+					Token:              common.HexToAddress(tokenAddr),
+					LocalTokenDecimals: tokenDecimal,
+					Allowlist:          allowlist,
+					RmnProxy:           common.HexToAddress(rmpProxyAddr.Address),
+					AcceptLiquidity:    *input.AcceptLiquidity,
+					Router:             common.HexToAddress(routerAddr.Address),
+				},
+				Qualifier: &qualifier,
+			}, nil)
+			if err != nil {
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to deploy LockReleaseTokenPool v1.5.1: %w", err)
+			}
+
+		default:
+			return sequences.OnChainOutput{}, fmt.Errorf("unsupported v1.5.1 token pool type and version: %s", typeAndVersion)
+		}
+
+		batchOp, err := contract.NewBatchOperationFromWrites(nil)
+		if err != nil {
+			return sequences.OnChainOutput{}, fmt.Errorf("failed to create batch operation from writes: %w", err)
+		}
+
+		return sequences.OnChainOutput{
+			Addresses: []datastore.AddressRef{poolRef},
+			BatchOps:  []mcms_types.BatchOperation{batchOp},
+		}, nil
+	},
+)
+
+func resolveTokenAddress(input tokenapi.DeployTokenPoolInput) (string, error) {
+	var tokenAddr string
+	if input.TokenRef != nil && input.TokenRef.Address != "" {
+		tokenAddr = input.TokenRef.Address
+	}
+	if input.TokenRef != nil && input.TokenRef.Qualifier != "" {
+		storedAddr, err := datastore_utils.FindAndFormatRef(input.ExistingDataStore, *input.TokenRef, input.ChainSelector, datastore_utils.FullRef)
+		if err != nil {
+			return "", fmt.Errorf("token with symbol '%s' is not found in datastore, %v", input.TokenRef.Qualifier, err)
+		}
+		if tokenAddr != "" && storedAddr.Address != tokenAddr {
+			return "", fmt.Errorf("provided token address '%s' does not match address '%s' found in datastore for symbol '%s'", tokenAddr, storedAddr.Address, input.TokenRef.Qualifier)
+		}
+		if tokenAddr == "" {
+			tokenAddr = storedAddr.Address
+		}
+	}
+	if tokenAddr == "" {
+		return "", fmt.Errorf("token address must be provided either directly or via a datastore reference")
+	}
+	return tokenAddr, nil
+}