Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix merge conflicts / bring in last week of PRs #1290

Merged
merged 767 commits into from
Feb 14, 2025

Conversation

sam0x17
Copy link
Contributor

@sam0x17 sam0x17 commented Feb 13, 2025

we had some merge conflicts reach devnet/testnet, this brings in all the changes for the last week with devnet / testnet at a clean state matching main

sam0x17 and others added 30 commits January 29, 2025 12:28
…ders

Add allow_partial parameter for add_stake_limit and remove_stake_limit
Fix TotalIssuance on migration and TotalStake check
JohnReedV and others added 22 commits February 12, 2025 14:58
…-in-no-tao-in-check

Fix/include pow reg disabled in no tao in check
…p-add-stake

Feat/dont let coldkey in swap add stake
…ake-info

Add tao_emission to StakeInfo runtime
…e-stake

Remove ownership check from transition stake validation
…ing-children

remove call from coinbase. already in block_step
Add M series Mac support to README
devnet deploy 2/13/2025 (post-dtao hotfixes)
@sam0x17 sam0x17 self-assigned this Feb 13, 2025
@sam0x17 sam0x17 requested a review from unconst as a code owner February 13, 2025 22:20
@sam0x17 sam0x17 merged commit 7adb0a2 into devnet-ready Feb 14, 2025
14 checks passed
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.

10 participants