Skip to content

Merge testnet to devnet#970

Merged
unconst merged 37 commits into
devnetfrom
merge-testnet-to-devnet
Nov 13, 2024
Merged

Merge testnet to devnet#970
unconst merged 37 commits into
devnetfrom
merge-testnet-to-devnet

Conversation

@gztensor

Copy link
Copy Markdown
Contributor

Description

Resolve merge conflicts for testnet to devnet merge

Related Issue(s)

n/a

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): merge

Breaking Change

n/a

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 cargo fmt and cargo clippy 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

Screenshots (if applicable)

n/a

Additional Notes

n/a

gztensor and others added 30 commits October 16, 2024 16:22
Fix: Hotkey swap causes parent key to lose emissions from children
…ainnet

Fix/merge conflicts testnet mainnet
* skip netuid 0 for pending emission accum

* comment
* add comment also

* chore: fmt

* add back delta handling in helpers

* track removals in stake delta

* handle stake delta in ck swap func

* add tests back

* add tests for staking back

* add back test for ck swap
* respect chk for set weights min stake filter

* use for test func

* respect chk in set weights call also

* add tests back

* fix weights min stake tests also
@gztensor gztensor requested a review from unconst as a code owner November 12, 2024 23:51
@gztensor gztensor requested review from ales-otf and sam0x17 November 12, 2024 23:52
@unconst unconst merged commit cd87781 into devnet Nov 13, 2024
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.

7 participants