Skip to content

Conversation

@archseer
Copy link
Contributor

@archseer archseer commented Oct 3, 2025

No description provided.

@archseer archseer requested a review from tt-cll October 3, 2025 08:01
ConfigDigest: configForOCR3.ConfigDigest,
OcrPluginType: uint8(pluginType),
F: configForOCR3.Config.FRoleDON,
IsSignatureVerificationEnabled: pluginType == ccipocr3.PluginTypeCCIPCommit,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ccipocr3.PluginType was recently added by @ogtownsend to common, we should use them everywhere in core as well and retire the old types

CapabilityVersion = "v1.0.0"
)

var CCIPCapabilityID = hashutil.NewKeccak().Hash(mustABIEncode(`[{"type": "string"}, {"type": "string"}]`, CapabilityLabelledName, CapabilityVersion))
Copy link
Contributor Author

@archseer archseer Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to do something like this in core too, a lot of unnecessary "github.com/smartcontractkit/chainlink-evm/pkg/utils" imports

Comment on lines 43 to 44
state.Chains[homeChainSelector].CapabilityRegistry,
state.Chains[homeChainSelector].CCIPHome,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What should we do here? Need to avoid the stateview dep?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

something like this I think

homeFamily, err := chain_selectors.GetSelectorFamily(homeChainSelector)
if err != nil {
	return nil, err
}
ccipHome, err := registeredChainAdapters[homeFamily].GetCCIPHome(e, homeChainSelector)
if err != nil {
	return nil, err
}
capabilityRegistry, err := registeredChainAdapters[homeFamily].GetCapabilityRegistry(e, homeChainSelector)
if err != nil {
	return nil, err
}
donID, err := internal.DonIDForChain(
		ccipHome,
		capabilityRegistry,
        chainSelector,
)
if err != nil {
	return nil, fmt.Errorf("failed to get DON ID: %w", err)
}

github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250911201806-5a095deaeb52
github.com/smartcontractkit/chainlink-common v0.9.6-0.20250930212138-0b782340a7f5
github.com/smartcontractkit/chainlink-deployments-framework v0.44.0
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250827130336-5922343458be
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made sure we depend on gethwrappers only, chainlink-evm/pkg should be an auto-deny lint

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah let's set up a linter for this separately.

@tt-cll tt-cll marked this pull request as ready for review October 24, 2025 22:39
@tt-cll tt-cll requested review from a team as code owners October 24, 2025 22:39
@github-actions
Copy link

Metric cld-set-ocr3-config main
Coverage 69.4% 68.8%

GetOffRampAddress(e *cldf.Environment, chainSelector uint64) ([]byte, error)
GetRouterAddress(e *cldf.Environment, chainSelector uint64) ([]byte, error)
GetFQAddress(e *cldf.Environment, chainSelector uint64) ([]byte, error)
GetOnRampAddress(ds datastore.DataStore, chainSelector uint64) ([]byte, error)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the motivation behind this change?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basically, we don't need the full environment to fetch the addresses


func setOCR3ConfigVerify(_ *DeployerRegistry, _ *changesets.MCMSReaderRegistry) func(cldf.Environment, SetOCR3ConfigArgs) error {
return func(e cldf.Environment, cfg SetOCR3ConfigArgs) error {
// TODO: implement
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we implement it before merging?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can come back to it later and just unblock for now

@tt-cll tt-cll enabled auto-merge October 27, 2025 18:20
@tt-cll tt-cll added this pull request to the merge queue Oct 27, 2025
Merged via the queue into main with commit f4dfa2e Oct 27, 2025
73 of 77 checks passed
@tt-cll tt-cll deleted the cld-set-ocr3-config branch October 27, 2025 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants