Skip to content

collator-protocol revamp: Send RC PeerId with ApprovedPeer UMP signal#12388

Merged
tdimitrov merged 4 commits into
masterfrom
tsv-collator-approved-peer-ump-fix
Jul 7, 2026
Merged

collator-protocol revamp: Send RC PeerId with ApprovedPeer UMP signal#12388
tdimitrov merged 4 commits into
masterfrom
tsv-collator-approved-peer-ump-fix

Conversation

@tdimitrov

@tdimitrov tdimitrov commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

Currently the collator sends its parachain PeerId within the ApprovedPeer UMP signal, which is wrong because this peer id is not known on the relay chain.
As a result on CandidateIncluded event the score is bumped for the wrong PeerId and the collator remains with zero reputation no matter its honest work.

@tdimitrov tdimitrov changed the title [DNM] collator-protocol revamp: Send RC PeerId with ApprovedPeer UMP signal collator-protocol revamp: Send RC PeerId with ApprovedPeer UMP signal Jun 16, 2026
@tdimitrov

Copy link
Copy Markdown
Contributor Author

/cmd prdoc --audience node_dev --bump patch

@tdimitrov tdimitrov added T9-cumulus This PR/Issue is related to cumulus. A4-backport-stable2603 Pull request must be backported to the stable2603 release branch A4-backport-unstable2604 Pull request must be backported to the unstable2604 release branch A4-backport-stable2606 Pull request must be backported to the stable2606 release branch labels Jun 16, 2026
@tdimitrov tdimitrov requested review from alindima and serban300 June 16, 2026 13:41

@alindima alindima left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Good catch!

Fix looks good but as discussed let's also invest time in ensuring that our negative tests actually work in catching these issues

@tdimitrov tdimitrov enabled auto-merge July 6, 2026 13:02
@tdimitrov tdimitrov added this pull request to the merge queue Jul 6, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jul 6, 2026
@tdimitrov tdimitrov added this pull request to the merge queue Jul 7, 2026
Merged via the queue into master with commit 44b3a38 Jul 7, 2026
325 of 342 checks passed
@tdimitrov tdimitrov deleted the tsv-collator-approved-peer-ump-fix branch July 7, 2026 06:23
@paritytech-release-backport-bot

Copy link
Copy Markdown

Created backport PR for stable2603:

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-12388-to-stable2603
git worktree add --checkout .worktree/backport-12388-to-stable2603 backport-12388-to-stable2603
cd .worktree/backport-12388-to-stable2603
git reset --hard HEAD^
git cherry-pick -x 44b3a384d3ac58acd5e4dac23a661532ba380ad7

@paritytech-release-backport-bot

Copy link
Copy Markdown

Successfully created backport PR for unstable2604:

@paritytech-release-backport-bot

Copy link
Copy Markdown

Successfully created backport PR for stable2606:

tdimitrov added a commit that referenced this pull request Jul 7, 2026
…#12388)

Currently the collator sends its parachain PeerId within the
ApprovedPeer UMP signal, which is wrong because this peer id is not
known on the relay chain.
As a result on CandidateIncluded event the score is bumped for the wrong
PeerId and the collator remains with zero reputation no matter its
honest work.

---------

Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 44b3a38)
EgorPopelyaev pushed a commit that referenced this pull request Jul 7, 2026
Backport #12388 into `stable2606` from tdimitrov.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

Co-authored-by: Tsvetomir Dimitrov <tsvetomir@parity.io>
Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
EgorPopelyaev pushed a commit that referenced this pull request Jul 10, 2026
Backport #12388 into `stable2603` from tdimitrov.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

Co-authored-by: Tsvetomir Dimitrov <tsvetomir@parity.io>
Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A4-backport-stable2603 Pull request must be backported to the stable2603 release branch A4-backport-stable2606 Pull request must be backported to the stable2606 release branch A4-backport-unstable2604 Pull request must be backported to the unstable2604 release branch T9-cumulus This PR/Issue is related to cumulus.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants