Skip to content

Fix can_inc_consumer check blocking session key rotation in pallet_session#11573

Merged
sigurpol merged 3 commits intomasterfrom
sigurpol-fix-session-keys-can_inc_consumers-check
Mar 31, 2026
Merged

Fix can_inc_consumer check blocking session key rotation in pallet_session#11573
sigurpol merged 3 commits intomasterfrom
sigurpol-fix-session-keys-can_inc_consumers-check

Conversation

@sigurpol
Copy link
Copy Markdown
Contributor

@sigurpol sigurpol commented Mar 31, 2026 •
edited
Loading

Check consumer capacity only when we actually increment the consumer count (first-time local registration or external-to-local transition), not on key rotation.

Notes:

  1. setting keys via stakingRcClient didn't suffer of this issue since by-pass do_set_keys()
  2. setting and purging keys via session pallet directly on RC is deprecated and will be removed soon - but better safe than sorry till then

@sigurpol
Fix can_inc_consumer check blocking session key rotation in pallet_se…
a7c298c 
…ssion

Check consumer capacity only when we will actually increment the consumer
count (first-time registration or external-to-local transition), not on
key rotation.
@sigurpol sigurpol requested a review from a team as a code owner March 31, 2026 11:02
@sigurpol
Copy link
Copy Markdown
Contributor Author

sigurpol commented Mar 31, 2026

/cmd prdoc --audience runtime_dev --bump patch

@sigurpol sigurpol added the T2-pallets This PR/Issue is related to a particular pallet. label Mar 31, 2026
Ank4n
Ank4n reviewed Mar 31, 2026
View reviewed changes
Comment thread substrate/frame/session/src/tests.rs
@sigurpol sigurpol added this pull request to the merge queue Mar 31, 2026
Merged via the queue into master with commit 2c99855 Mar 31, 2026
271 of 278 checks passed
@sigurpol sigurpol deleted the sigurpol-fix-session-keys-can_inc_consumers-check branch March 31, 2026 18:43
lexnv added a commit that referenced this pull request Apr 1, 2026
@lexnv
collator-proto/metrics: Fix blindspot in collation fetch latency metrics
4c82a43 
Squashed commit of the following:

commit 1b3ad0b
Author: Alexandru Vasile <alexandru.vasile@parity.io>
Date:   Wed Apr 1 10:55:36 2026 +0000

    Adjust metrics

    Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>

commit 61d37db
Author: Alexandru Vasile <alexandru.vasile@parity.io>
Date:   Wed Apr 1 09:58:38 2026 +0000

    metrics: Bump some other buckets

    Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>

commit ab2a221
Author: Alexandru Vasile <alexandru.vasile@parity.io>
Date:   Wed Apr 1 09:57:11 2026 +0000

    collator-proto/metrics: Fix blindspot in collation fetch latency metrics

    Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>

commit 0d6888a
Author: Ankan <10196091+Ank4n@users.noreply.github.com>
Date:   Wed Apr 1 00:18:21 2026 +0200

    Implement Budget Distribution logic in pallet-dap (#11527)

    Stacked on #11513.
    Extracted from #10844.

    ## Overview

    Adds issuance drip and budget distribution to `pallet-dap`. DAP becomes
    a generic inflation engine: it mints new tokens on a configurable
    cadence and distributes them to registered budget recipients.

    No runtime behavior change: the existing chain configuration continues
    to mint via `EraPayout` trait in staking. DAP can be configured as a
    noop (cadence = 0 or empty budget).

    ## Changes

    ### pallet-dap
    - **Issuance drip**: `drip_issuance()` runs in `on_initialize`. Computes
    mint amount via `IssuanceCurve` (total issuance + elapsed time) and
    distributes to `BudgetRecipient`s per a governance-updatable
    `BudgetAllocation` map that must sum to 100%.
    - **Safety guards**: `MaxElapsedPerDrip` ceiling prevents over-minting
    if the chain stalls. First-block initialization skips drip to avoid
    minting for an unknown period.
    - **Buffer accounting**: buffer's share is deactivated on inflow (mint +
    `OnUnbalanced` slashes).
    - **`set_budget_allocation`** extrinsic (root-only): validates keys
    match registered recipients and percentages sum to exactly 100%.
    - **`BudgetRecipient` impl**: DAP exposes its buffer as a recipient
    (key: `"buffer"`).
    - **Migration**: `MigrateV1ToV2` seeds `LastIssuanceTimestamp` and
    `BudgetAllocation` for existing chains. Not wired up in WAH or other
    runtimes yet.

    ## TODOs
    - [x] Wire benchmark weights.

    ## In Later PR
    - Revert [these
    changes](9b388b2)

    ---------

    Co-authored-by: Paolo La Camera <paolo@parity.io>

commit 8b53323
Author: Javier Viola <363911+pepoviola@users.noreply.github.com>
Date:   Tue Mar 31 21:26:58 2026 +0200

    bump zombienet version to v0.4.9 (#11569)

    This version move the internal monitor to a diff log target, eliminating
    the current spam of tracing logs.

    Thx!

    ---------

    Co-authored-by: Bastian Köcher <git@kchr.de>

commit 129a48a
Author: Ankan <10196091+Ank4n@users.noreply.github.com>
Date:   Tue Mar 31 19:06:21 2026 +0200

    [Staking] Add issuance and budget traits in prep for Budget Split (#11513)

    # Overview

    Moves `EraPayout` trait to `sp-staking` and adds new traits for
    issuance, budget distribution, and reward calculation.

    Extracted changes from the main PR: #10844
    Also see: #11512

    ## Changes

    ### sp-staking
    - `EraPayout`: moved from `pallet-staking` and `pallet-staking-async` to
    `sp-staking`, eliminating the duplicate definitions.
    - `budget` module: stake independent traits:
    - `IssuanceCurve`: successor to `EraPayout`, computes issuance from
    total supply + elapsed time (no staking state dependency).
    - `BudgetRecipient` / `BudgetRecipientList`: register pot accounts for
    inflation distribution. Runtime wires as a tuple.
      - `BudgetKey`: bounded identifier for budget categories.
    - `StakerRewardCalculator`: trait for calculating validator incentive
    weights and staker reward splits.

    ### pallet-staking / pallet-staking-async
    - Removed local `EraPayout` definitions, re-exported from `sp-staking`.

    ---------

    Co-authored-by: Paolo La Camera <paolo@parity.io>

commit 10a517e
Author: Dmitry Markin <dmitry@markin.tech>
Date:   Tue Mar 31 18:37:01 2026 +0300

    Implement `bitswap_v1_get` RPC method (#11521)

    Implement `bitswap_v1_get` RPC method according to the
    [spec](https://github.com/paritytech/json-rpc-interface-spec/blob/main/src/api/bitswap_v1_get.md).

    ---------

    Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: Lukasz Rubaszewski <117115317+lrubasze@users.noreply.github.com>

commit 2c99855
Author: Paolo La Camera <paolo@parity.io>
Date:   Tue Mar 31 16:42:03 2026 +0200

    Fix can_inc_consumer check blocking session key rotation in pallet_session (#11573)

    Check consumer capacity only when we actually increment the consumer
    count (first-time local registration or external-to-local transition),
    not on key rotation.

    Notes:
    1. setting keys via `stakingRcClient` didn't suffer of this issue since
    by-pass `do_set_keys()`
    2. setting and purging keys via session pallet directly on RC is
    deprecated and will be removed soon - but better safe than sorry till
    then

    ---------

    Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit de0a245
Author: Luka Ciric <luka.ciric2106@gmail.com>
Date:   Tue Mar 31 16:39:48 2026 +0200

    Raise offence queue eras bound limit (#11435)

    Fixes a bug where **OffenceQueueEras** bound (BondingDuration) was
    incorrect when `SlashDeferDuration=0`. The oldest reportable offence era
    formula allowed more eras than the bound could hold.

    ---------

    Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: Ankan <10196091+Ank4n@users.noreply.github.com>

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
franciscoaguirre pushed a commit that referenced this pull request Apr 7, 2026
@sigurpol @github-actions @franciscoaguirre
Fix can_inc_consumer check blocking session key rotation in pallet_se…
92eb08f 
…ssion (#11573)

Check consumer capacity only when we actually increment the consumer
count (first-time local registration or external-to-local transition),
not on key rotation.

Notes:
1. setting keys via `stakingRcClient` didn't suffer of this issue since
by-pass `do_set_keys()`
2. setting and purging keys via session pallet directly on RC is
deprecated and will be removed soon - but better safe than sorry till
then

---------

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

Reviewers

@Ank4n Ank4n Ank4n approved these changes

@cirko33 cirko33 cirko33 approved these changes

@kianenigma kianenigma Awaiting requested review from kianenigma

@andreitrand andreitrand Awaiting requested review from andreitrand

@patriciobcs patriciobcs Awaiting requested review from patriciobcs

Assignees

No one assigned

Labels

T2-pallets This PR/Issue is related to a particular pallet.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sigurpol @Ank4n @cirko33