mirror ccip JD key logic#1228
Merged
Merged
Conversation
|
Code coverage report:
|
Contributor
There was a problem hiding this comment.
Pull request overview
Adds cross-family signer translation to the CCV deployment changesets so that committee reconstruction can map on-chain signer addresses back to JD-known NOP aliases even when the signer is recorded in a different chain family (e.g., Canton NOP recorded as an EVM-derived address).
Changes:
- Fetch and expose each NOP’s raw secp256k1 public key from JD alongside per-family signing addresses.
- Introduce cross-family signer translation utilities and use them when building the inverse signer→NOP index.
- Add tests covering Canton→EVM resolution and ensuring direct signer declarations win over derived ones.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| deployment/operations/fetch_signing_keys/fetch_signing_keys.go | Extends JD fetch operation to also return a normalized raw secp256k1 public key per NOP. |
| deployment/go.mod | Promotes go-ethereum to a direct dependency to support pubkey/address derivation. |
| deployment/changesets/signer_translation.go | Adds translation helpers to derive signer representations across chain families (including raw-pubkey↔address cases). |
| deployment/changesets/nop_identities.go | Enhances inverse index building to precompute cross-family signer mappings using raw pubkeys. |
| deployment/changesets/nop_identities_crossfamily_test.go | Adds regression tests for the cross-family reconstruction path. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+119
to
+125
| if rawPubKey := chainConfig.Ocr2Config.OcrKeyBundle.OnchainSigningPubKey; rawPubKey != "" { | ||
| normalized := strings.ToLower(strings.TrimPrefix(rawPubKey, "0x")) | ||
| if existing, ok := output.RawPubKeyByNOP[nopAlias]; ok && existing != normalized { | ||
| return output, fmt.Errorf("NOP %q has conflicting raw public keys across chain configs: %s vs %s — a standalone node registers one key for every chain it declares", nopAlias, existing, normalized) | ||
| } | ||
| output.RawPubKeyByNOP[nopAlias] = normalized | ||
| } |
Comment on lines
+114
to
+116
| case rawPubKeyClassFamilies[sourceFamily] && rawPubKeyClassFamilies[targetFamily]: | ||
| return strings.ToLower(strings.TrimPrefix(value, "0x")), nil | ||
| case rawPubKeyClassFamilies[sourceFamily] && addressClassFamilies[targetFamily]: |
Comment on lines
+128
to
+132
| // Pass 1: addresses each NOP declares directly. | ||
| for alias, byFamily := range signingKeys { | ||
| for family, signer := range byFamily { | ||
| if signer == "" { | ||
| set(family, signer, shared.NOPAlias(alias)) | ||
| } |
makramkd
approved these changes
Jul 3, 2026
makramkd
left a comment
makramkd
left a comment
Collaborator
There was a problem hiding this comment.
Approving because we know this is a temporary situation while we address CCIP-11938
KodeyThomas
approved these changes
Jul 3, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Testing
Checklist
changelogdirectory)just lint fix- no new lint errorsjust generate- mocks and protobufs are up to date