Skip to content

Conviction updates#2632

Merged
sam0x17 merged 6 commits into
devnet-readyfrom
feat/conviction
May 5, 2026
Merged

Conviction updates#2632
sam0x17 merged 6 commits into
devnet-readyfrom
feat/conviction

Conversation

@gztensor
Copy link
Copy Markdown
Contributor

@gztensor gztensor commented May 4, 2026

Description

  1. Fix coldkey swap for inactive locks: If both the old and new coldkeys have an inactive lock before coldkey swap, they need to be rolled forward and added.
  2. Owner auto-locking: The owner cut will be automatically locked / added to existing owner's lock.
  3. Initial distribution of alpha is locked to subnet owner's hotkey.

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update
  • Other (please describe):

Checklist

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have run ./scripts/fix_rust.sh to ensure my code is formatted and linted correctly
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

@gztensor gztensor added the skip-cargo-audit This PR fails cargo audit but needs to be merged anyway label May 4, 2026
@gztensor gztensor changed the title Fix coldkey swap for inactive locks Conviction updates May 4, 2026
JohnReedV
JohnReedV previously approved these changes May 4, 2026
sam0x17
sam0x17 previously approved these changes May 5, 2026
@github-actions github-actions Bot dismissed stale reviews from sam0x17 and JohnReedV via 6377322 May 5, 2026 02:23
@sam0x17 sam0x17 merged commit 2a8b4e0 into devnet-ready May 5, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-cargo-audit This PR fails cargo audit but needs to be merged anyway

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants