Update PostDeploymentValidation script by simsonraj · Pull Request #21630 · smartcontractkit/chainlink

simsonraj · 2026-03-23T07:05:54Z

Updates Post validation scripts with extensive validation for 1.5 -> 1.6 chain migrations and new chains as well as FQ2.0 migration

github-actions · 2026-03-23T07:06:12Z

👋 simsonraj, thanks for creating this pull request!

To help reviewers, please consider creating future PRs as drafts first. This allows you to self-review and make any final changes before notifying the team.

Once you're ready, you can mark it as "Ready for review" to request feedback. Thanks!

github-actions · 2026-03-23T07:07:17Z

✅ No conflicts with other open PRs targeting develop

Copilot

Pull request overview

Risk Rating: MEDIUM

This PR strengthens CCIP post-deployment validation by (a) collecting multiple validation errors instead of failing fast, (b) adding/expanding EVM chain-level validators (FeeQuoter/NonceManager/RMNProxy/ownership), and (c) adding memory-environment tests to exercise the new validation behavior.

Changes:

Refactors ValidatePostDeploymentState to delegate to an internal helper, optionally skip MCMS ownership validation, and aggregate errors via errors.Join.
Introduces new EVM validation helpers (ValidateFeeQuoter, ValidateNonceManager, ValidateRMNProxy, ValidateContractOwnership) plus extensive unit tests.
Updates FeeQuoter defaults logic and removes a duplicate helper from ops code.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
deployment/ccip/shared/stateview/state.go	Adds “skip MCMS ownership” variant, aggregates validation errors, and adds RMNProxy/ownership validations.
deployment/ccip/shared/stateview/evm/validate.go	New EVM validators for FeeQuoter/NonceManager/RMNProxy/ownership.
deployment/ccip/shared/stateview/evm/validate_test.go	New tests covering happy path, multi-error aggregation, ownership, RMNProxy, NonceManager, FeeQuoter, and home chain validation.
deployment/ccip/shared/stateview/evm/state.go	Improves home-chain validation structure + makes OnRamp/OffRamp checks stricter.
deployment/ccip/operation/evm/v1_6/ops_fee_quoter.go	Removes now-redundant default dest config helper + unused imports.
deployment/ccip/changeset/v1_6/cs_chain_contracts.go	Adjusts FeeQuoter dest default fees based on destination chain type.
deployment/ccip/changeset/testhelpers/test_environment.go	Uses the new “without MCMS ownership” validator in memory env setup.

Targeted areas for scrupulous human review:

deployment/ccip/shared/stateview/state.go: error aggregation + new ownership/RMNProxy validation flow (risk of masking/falsely passing, and nil-panics in error formatting).
deployment/ccip/shared/stateview/evm/validate.go: FeeQuoter “expected defaults” logic (chain classification, version handling, and legacy cross-checks).

Suggested reviewers (per CODEOWNERS for /deployment/ccip):

@smartcontractkit/ccip-tooling, @smartcontractkit/ccip-offchain, @smartcontractkit/operations-platform

trunk-io · 2026-03-23T08:26:02Z

_{View Full Report ↗︎ ⋅ Docs}

…idation

github-actions · 2026-03-24T12:29:55Z

CORA - Pending Reviewers

All codeowners have approved! ✅

For more details, see the full review summary.

github-actions · 2026-03-24T12:30:41Z

I see you updated files related to core. Please run make gocs in the root directory to add a changeset as well as in the text include at least one of the following tags:

#added For any new functionality added.
#breaking_change For any functionality that requires manual action for the node to boot.
#bugfix For bug fixes.
#changed For any change to the existing functionality.
#db_update For any feature that introduces updates to database schema.
#deprecation_notice For any upcoming deprecation functionality.
#internal For changesets that need to be excluded from the final changelog.
#nops For any feature that is NOP facing and needs to be in the official Release Notes for the release.
#removed For any functionality/config that is removed.
#updated For any functionality that is updated.
#wip For any change that is not ready yet and external communication about it should be held off till it is feature complete.

AnieeG · 2026-03-25T19:18:54Z

+			name, _ := chain_selectors.GetChainNameFromSelector(destChainSelector[0])
+			if strings.HasPrefix(name, "ethereum") {
+				networkFeeUSDCents = 50
+				defaultTokenFeeUSDCents = 150


This is going to set these values for a lot of chains though, a lot of chain names start with ethereum, example - ethereum-mainnet-unichain-1

ah good catch, i fixed it in another file, but missed to propagate this here

AnieeG · 2026-03-25T20:14:05Z

+	familySelector, _ := hex.DecodeString(EVMFamilySelector)
+	networkFeeUSDCents := uint32(10)


DefaultFeeQuoterDestChainConfig accepts multiple destChainSelector and always consider the first one? why do we need multiple then?

This was already functioning that way here (cs_chain_contracts)
https://github.com/smartcontractkit/chainlink/pull/21630/changes#diff-e8b395a3a7f5dab0bcc777f295eccf0b017ec8bfc4e7696bf55fa7f51c45dc93R1745
I just moved it here to be shared & this function before was not being used anywhere.
But this shouldnt have any impact as it is only referenced by tests and they dont usually classify a chain as Ethereum or not for these settings, but my tests does but its always just the 1 chain

AnieeG · 2026-03-25T20:14:58Z

-		GasMultiplierWeiPerEth:            11e17, // Gas multiplier in wei per eth is scaled by 1e18, so 11e17 is 1.1 = 110%
-		NetworkFeeUSDCents:                10,
+		GasMultiplierWeiPerEth:            11e17,
+		NetworkFeeUSDCents:                networkFeeUSDCents,


no gasPriceStalenessthreashold?

Same as previous, I just moved it to the shared package & remove the unused method, but this is good point, I think this is the reason why all the integrations have been setting the staleness threshold to zero, so I added it now

AnieeG · 2026-03-25T20:36:49Z

+				}
+				for _, ft := range feeTokens {
+					if !v16Set[ft] {
+						errs = append(errs, fmt.Errorf("FeeQuoter v2.0 %s has fee token %s not present in v1.6 FeeQuoter",


FeeQuoter 2.0 can have a fee token which might not be present in 1.6 -
Any token that has a price is considered a fee token in FQ2.0
https://github.com/smartcontractkit/chainlink-ccip/blob/main/chains/evm/contracts/FeeQuoter.sol#L150C64-L153
It's added here - https://github.com/smartcontractkit/chainlink-ccip/blob/main/chains/evm/contracts/FeeQuoter.sol#L279

Ah did not know this, updated it

cl-sonarqube-production · 2026-03-26T08:20:26Z

Quality Gate passed

Issues
5 New issues
2 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

* Update PostValidation script * Lint fixes * Updates perf fix & v2 FQ * fixes * refactor * Fixes * Lint fixes & others * run go modtidy * refactor * Addressed comments & fixes * formatting * Add GasPriceStalenessThreshold back * FQ test fixes

Update PostValidation script

2e74cfa

Copilot AI review requested due to automatic review settings March 23, 2026 07:05

simsonraj requested review from a team as code owners March 23, 2026 07:05

simsonraj requested review from 0xAustinWang, KodeyThomas, asoliman92, b-gopalswami, chris-de-leon-cll, mateusz-sekara and winder March 23, 2026 07:05

product-security-plaid-production Bot requested a review from jkongie March 23, 2026 07:06

Copilot started reviewing on behalf of simsonraj March 23, 2026 07:06 View session

Copilot AI reviewed Mar 23, 2026

View reviewed changes

Lint fixes

efbb078

simsonraj added 7 commits March 23, 2026 20:19

Updates perf fix & v2 FQ

163e971

fixes

6ce952d

refactor

b795326

Fixes

ea7fc33

Lint fixes & others

7bdd75f

Merge remote-tracking branch 'origin' into update-post-deployment-val…

9b87769

…idation

run go modtidy

df2dfd0

simsonraj requested a review from a team as a code owner March 24, 2026 12:29

product-security-plaid-production Bot requested a review from jmank88 March 24, 2026 12:29

jmank88 previously approved these changes Mar 24, 2026

View reviewed changes

refactor

87146c3

simsonraj dismissed jmank88’s stale review via 87146c3 March 25, 2026 17:20

AnieeG reviewed Mar 25, 2026

View reviewed changes

simsonraj added 2 commits March 26, 2026 01:14

Addressed comments & fixes

8bb1246

formatting

ffe4cbf

AnieeG reviewed Mar 25, 2026

View reviewed changes

simsonraj added 2 commits March 26, 2026 12:57

Add GasPriceStalenessThreshold back

c3631d5

FQ test fixes

50565be

simsonraj changed the title ~~Update PostValidation script~~ Update PostDeploymentValidation script Mar 26, 2026

AnieeG approved these changes Mar 26, 2026

View reviewed changes

athegaul approved these changes Mar 26, 2026

View reviewed changes

simsonraj enabled auto-merge March 26, 2026 17:04

jmank88 approved these changes Mar 26, 2026

View reviewed changes

simsonraj added this pull request to the merge queue Mar 26, 2026

Merged via the queue into develop with commit eceff97 Mar 26, 2026
267 of 271 checks passed

simsonraj deleted the update-post-deployment-validation branch March 26, 2026 17:33

		familySelector, _ := hex.DecodeString(EVMFamilySelector)
		networkFeeUSDCents := uint32(10)

Conversation

simsonraj commented Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Mar 23, 2026

Uh oh!

github-actions Bot commented Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

trunk-io Bot commented Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CORA - Pending Reviewers

Uh oh!

github-actions Bot commented Mar 24, 2026

Uh oh!

AnieeG Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

simsonraj Mar 25, 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!

AnieeG Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

simsonraj Mar 26, 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!

AnieeG Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

simsonraj Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

AnieeG Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

simsonraj Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

cl-sonarqube-production Bot commented Mar 26, 2026

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

simsonraj commented Mar 23, 2026 •

edited

Loading

github-actions Bot commented Mar 23, 2026 •

edited

Loading

trunk-io Bot commented Mar 23, 2026 •

edited

Loading

github-actions Bot commented Mar 24, 2026 •

edited

Loading

simsonraj Mar 25, 2026 •

edited

Loading

simsonraj Mar 26, 2026 •

edited

Loading