fix the last merge conflict #972
Closed
Conversation
This file contains 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
Fix: Hotkey swap causes parent key to lose emissions from children
update testnet 10/25/2024
Fix/stake delta conflicts
testnet deploy 11-1-2024
deploy evm to devnet
…ainnet Fix/merge conflicts testnet mainnet
finney deploy 11/5/2024
* 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
* 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
Hotfixes to devnet nov 6
Hotfixes to testnet nov 6
fix: host functions (devnet)
fix: host functions (testnet)
fix: host functions (main)
backpropogate hotfixes
Hotfix Chainspec Build
backpropagate hotfixes to testnet
Fix compilation
Merge testnet to devnet
github-actions
bot
added
the
hotfix
🚨🚨🚨 HOTFIX DETECTED 🚨🚨🚨It looks like you are trying to merge a hotfix PR into . If this isn't what you wanted to do, and you just wanted to make a regular PR, please close this PR, base your changes off the branch and open a new PR into . If you are trying to merge a hotfix PR, please complete the following essential steps:
If you do not complete these steps, your hotfix may be inadvertently removed in the future when branches are promoted to |
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.
The Ballad of Unified Branches
devnet-ready and devnet clashed,
testnet’s trials and main’s steadfast.
A pull request, both bold and true,
Resolved their rift, their strength renewed.
No diff remains, no merge astray,
Peace crowned their code this final day.
devnet-ready, devnet, testnet, main—
Together now, in Git’s domain.