add fq dests changeset by tt-cll · Pull Request #1921 · smartcontractkit/chainlink-ccip

tt-cll · 2026-03-31T11:07:30Z

No description provided.

Copilot

Pull request overview

Adds a new fee changeset to update FeeQuoter destination-chain configs with “upsert” behavior, and extends fee adapters (EVM/Solana) to support reading/applying dest-chain configs across FeeQuoter versions.

Changes:

Introduce UpdateFeeQuoterDests changeset and its input models.
Extend FeeAdapter with dest-chain config read/default/update methods; implement/register these in EVM/Solana adapters.
Make SetTokenTransferFee use global registries (via init-registered adapters) and update tests/docs accordingly.

Reviewed changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
integration-tests/deployment/update_fq_dests_test.go	Adds an integration test for updating FeeQuoter dest config via the new changeset.
integration-tests/deployment/set_token_transfer_fee_test.go	Updates tests to rely on init-registered fee adapters and new `SetTokenTransferFee()` constructor.
deployment/fees/update_fq_dests.go	New changeset implementation for upserting FeeQuoter destination configs.
deployment/fees/set_token_transfer_fee.go	Changes constructor to pull registries from singletons instead of parameters.
deployment/fees/product.go	Extends the `FeeAdapter` interface with dest-chain config APIs.
deployment/fees/models.go	Adds models for dest-chain config update sequencing and changeset input.
deployment/docs/changesets.md	Updates documented signature for `SetTokenTransferFee`.
chains/solana/deployment/v1_6_0/sequences/connect_chains.go	Adds reverse translation from Solana on-chain dest config to product model.
chains/solana/deployment/v1_6_0/sequences/translate_fq_test.go	Adds round-trip tests for Solana translate/reverse-translate.
chains/solana/deployment/v1_6_0/adapters/init.go	Registers Solana fee adapter in the global fees registry via init.
chains/solana/deployment/v1_6_0/adapters/fees.go	Implements dest-chain config read/default/update sequence for Solana.
chains/evm/deployment/v1_6_0/sequences/update_lanes.go	Adds reverse translation helpers for EVM v1.6 and v2.0 dest configs.
chains/evm/deployment/v1_6_0/sequences/translate_fq_test.go	Adds round-trip tests for EVM translate/reverse-translate (v1 + v2).
chains/evm/deployment/v1_6_0/adapters/init.go	Registers EVM v1.6 fee adapter in the global fees registry via init.
chains/evm/deployment/v1_6_0/adapters/fees.go	Implements dest-chain config read/default/update sequence for EVM v1.6.
chains/evm/deployment/v2_0_0/adapters/fees.go	Implements dest-chain config read/default/update sequence for FeeQuoter v2.0.
chains/evm/deployment/v1_5_0/adapters/init.go	Registers EVM v1.5 fee adapter in the global fees registry via init.
chains/evm/deployment/v1_5_0/adapters/fees.go	Adds “not supported” stubs for new dest-chain config methods (v1.5 has no FeeQuoter).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-03T11:39:41Z

+	"github.com/smartcontractkit/chainlink-deployments-framework/engine/test/environment"
+	"github.com/stretchr/testify/require"
+
+	_ "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/adapters"


The import block includes the same package path twice (once as a blank import and once as a named import). Go does not allow importing the same path more than once in a single file, so this test will not compile. Drop the blank import (the named import already triggers init()).

Suggested change

_ "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/adapters"

Copilot · 2026-04-03T11:39:41Z

+	var base lanes.FeeQuoterDestChainConfig
+	if onchain.IsEnabled {
+		base = onchain
+	} else {
+		base = adapter.GetDefaultDestChainConfig(src, dst)
+	}


resolveDestChainConfig uses onchain.IsEnabled to decide whether to use on-chain values vs defaults. This will treat an existing-but-disabled dest chain config as “missing” and replace it with adapter defaults (which have IsEnabled=true), unintentionally enabling the chain and discarding the configured parameters. Consider distinguishing “not found” from “found but disabled” (e.g., have adapters return a found flag / nil config, or return a typed not-found error) and always use the on-chain config as the base when it exists, regardless of IsEnabled.

Copilot · 2026-04-03T11:39:42Z

+func makeFQDestsVerify(feeRegistry *FeeAdapterRegistry) func(cldf.Environment, UpdateFeeQuoterDestsInput) error {
+	return func(_ cldf.Environment, cfg UpdateFeeQuoterDestsInput) error {
+		if cfg.Version == nil {
+			return fmt.Errorf("version is required")
+		}
+
+		seenSrc := utils.NewSet[uint64]()
+		for i, src := range cfg.Args {
+			if exists := seenSrc.Add(src.Selector); exists {
+				return fmt.Errorf("duplicate src chain selector at args[%d]: %d", i, src.Selector)
+			}
+
+			seenDst := utils.NewSet[uint64]()
+			for j, dst := range src.Settings {
+				if src.Selector == dst.Selector {
+					return fmt.Errorf("src and dst chain selectors cannot be the same at args[%d].settings[%d]: %d", i, j, src.Selector)
+				}
+
+				if exists := seenDst.Add(dst.Selector); exists {
+					return fmt.Errorf("duplicate dst chain selector at args[%d].settings[%d] (src=%d): %d", i, j, src.Selector, dst.Selector)
+				}
+			}
+
+			srcFamily, err := chain_selectors.GetSelectorFamily(src.Selector)
+			if err != nil {
+				return fmt.Errorf("failed to get chain family for selector %d: %w", src.Selector, err)
+			}
+
+			if _, exists := feeRegistry.GetFeeAdapter(srcFamily, cfg.Version); !exists {
+				return fmt.Errorf("no fee adapter found for chain family %s and version %s", srcFamily, cfg.Version.String())
+			}
+		}


makeFQDestsVerify only checks that a fee adapter exists for the provided Version. Versions like EVM 1.5.0 have a fee adapter but do not support FeeQuoter dest chain config reads/updates, which will cause this changeset to fail later in Apply with a less actionable error. Add validation to reject unsupported versions up front (e.g., require >= 1.6.0, or check adapter capabilities explicitly).

Copilot · 2026-04-03T11:39:42Z

+// DestChainConfigForDst represents a destination chain config override for a single destination.
+// Override is a functional option that mutates the base config (read from on-chain or defaults).
+// If Override is nil, the existing on-chain config is re-applied as-is (noop).
+type DestChainConfigForDst struct {
+	Selector uint64                                  `json:"selector" yaml:"selector"`
+	Override *lanes.FeeQuoterDestChainConfigOverride `json:"-" yaml:"-"`
+}


The comment says that when Override is nil, the existing on-chain config is re-applied as-is (noop). In practice this changeset still builds and executes update operations and may submit transactions even when no values changed. Consider clarifying the comment (e.g., “idempotent re-apply”) or implementing an explicit no-op when Override is nil and the resolved config matches on-chain.

Copilot · 2026-04-03T11:39:42Z

 ### SetTokenTransferFee

 Sets per-token transfer fee configurations on the FeeQuoter for each source-destination pair.

 **Source:** [fees/set_token_transfer_fee.go](../fees/set_token_transfer_fee.go)

 **Constructor:**
 ```go
-func SetTokenTransferFee(feeRegistry *FeeAdapterRegistry, mcmsRegistry *MCMSReaderRegistry) cldf.ChangeSetV2[SetTokenTransferFeeInput]
+func SetTokenTransferFee() cldf.ChangeSetV2[SetTokenTransferFeeInput]
 ```


This doc updates SetTokenTransferFee’s constructor signature but doesn’t document the newly added fee changeset (UpdateFeeQuoterDests). If changesets.md is intended to enumerate available changesets, please add a corresponding section under “Fee Configuration” so users can discover and use it.

chris-de-leon-cll · 2026-04-03T18:45:53Z

+				}
+
+				v := fqRef.Version
+				lookupVersion := semver.MustParse(fmt.Sprintf("%d.%d.0", v.Major(), v.Minor()))


non-blocking: this can be replaced with the helper now

chainlink-ccip/deployment/utils/common.go

Lines 112 to 114 in 8d65a97

func StripPatchVersion(version *semver.Version) *semver.Version {

return semver.New(version.Major(), version.Minor(), 0, version.Prerelease(), version.Metadata())

}

I believe set_token_transfer_fee.go would also need to be updated

chris-de-leon-cll · 2026-04-03T18:48:02Z

+	src := chainsel.TEST_90000001.Selector
+	dst := chainsel.TEST_90000002.Selector
+	chains := []uint64{src, dst}


non-blocking: can we add Solana in this test to improve the coverage?

chris-de-leon-cll · 2026-04-03T18:49:32Z

+		chainInput[sel] = deploy.ContractDeploymentConfigPerChain{
+			Version:                                 v1_6_0,
+			MaxFeeJuelsPerMsg:                       big.NewInt(0).Mul(big.NewInt(200), big.NewInt(1e18)),
+			TokenPriceStalenessThreshold:            uint32(24 * 60 * 60),
+			LinkPremiumMultiplier:                   9e17,
+			NativeTokenPremiumMultiplier:            1e18,
+			PermissionLessExecutionThresholdSeconds: uint32((20 * time.Minute).Seconds()),
+			GasForCallExactCheck:                    uint16(5000),
+		}


non-blocking:

Suggested change

chainInput[sel] = deploy.ContractDeploymentConfigPerChain{

Version: v1_6_0,

MaxFeeJuelsPerMsg: big.NewInt(0).Mul(big.NewInt(200), big.NewInt(1e18)),

TokenPriceStalenessThreshold: uint32(24 * 60 * 60),

LinkPremiumMultiplier: 9e17,

NativeTokenPremiumMultiplier: 1e18,

PermissionLessExecutionThresholdSeconds: uint32((20 * time.Minute).Seconds()),

GasForCallExactCheck: uint16(5000),

}

chainInput[sel] = NewDefaultDeploymentConfigForEVM(v1_6_0)

github-actions · 2026-04-06T21:47:33Z

Metric	`tt/fq`	`main`
Coverage	70.1%	69.8%

tt-cll and others added 4 commits March 30, 2026 12:11

wip

0be7103

tests

86f13f2

tests

2221d06

Merge branch 'main' into tt/fq

f745f05

tt-cll marked this pull request as ready for review April 3, 2026 11:31

Copilot AI review requested due to automatic review settings April 3, 2026 11:31

tt-cll requested review from a team as code owners April 3, 2026 11:31

tt-cll requested review from 0xAustinWang, AmrMohamedRezk, KodeyThomas, agusaldasoro, asoliman92, b-gopalswami, chris-de-leon-cll, makramkd, matYang, mateusz-sekara, ogtownsend and winder April 3, 2026 11:31

Copilot started reviewing on behalf of tt-cll April 3, 2026 11:32 View session

Copilot AI reviewed Apr 3, 2026

View reviewed changes

comments

9f9ab0a

chris-de-leon-cll previously approved these changes Apr 3, 2026

View reviewed changes

tt-cll and others added 2 commits April 6, 2026 11:31

Merge branch 'main' into tt/fq

09e5110

cr comments

6684385

tt-cll dismissed chris-de-leon-cll’s stale review via 6684385 April 6, 2026 19:33

tt-cll and others added 2 commits April 6, 2026 14:18

cr comments

2cfb61f

Merge branch 'main' into tt/fq

ca088e6

chris-de-leon-cll approved these changes Apr 6, 2026

View reviewed changes

tt-cll enabled auto-merge April 6, 2026 23:26

sowgandhi11 approved these changes Apr 7, 2026

View reviewed changes

tt-cll added this pull request to the merge queue Apr 7, 2026

Merged via the queue into main with commit 6eee37e Apr 7, 2026
72 of 75 checks passed

tt-cll deleted the tt/fq branch April 7, 2026 00:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add fq dests changeset#1921

add fq dests changeset#1921
tt-cll merged 9 commits intomainfrom
tt/fq

tt-cll commented Mar 31, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 3, 2026

Uh oh!

Copilot AI Apr 3, 2026

Uh oh!

Copilot AI Apr 3, 2026

Uh oh!

Copilot AI Apr 3, 2026

Uh oh!

Copilot AI Apr 3, 2026

Uh oh!

chris-de-leon-cll Apr 3, 2026 •

edited

Loading

Uh oh!

chris-de-leon-cll Apr 3, 2026

Uh oh!

chris-de-leon-cll Apr 3, 2026

Uh oh!

github-actions bot commented Apr 6, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	func StripPatchVersion(version semver.Version) semver.Version {
	return semver.New(version.Major(), version.Minor(), 0, version.Prerelease(), version.Metadata())
	}

Conversation

tt-cll commented Mar 31, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

chris-de-leon-cll Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chris-de-leon-cll Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

chris-de-leon-cll Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Apr 6, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

chris-de-leon-cll Apr 3, 2026 •

edited

Loading