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.

Sign up for GitHub

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

Jump to bottom

Merge testnet to devnet #970

Merged
merged 37 commits into from
Nov 13, 2024
Merged

Merge testnet to devnet #970

merged 37 commits into from
Nov 13, 2024

Conversation

gztensor
Copy link
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
@gztensor
Add swapping child's parents to hotkey swap
0a34147
@sam0x17
Merge pull request #863 from opentensor/fix/hotkey-swap-parentkeys
aa521f4 
Fix: Hotkey swap causes parent key to lose emissions from children
@unconst
Merge pull request #875 from opentensor/devnet
bd2b1ed 
update testnet 10/25/2024
@gztensor
Resolve merge conflicts around stake delta feature
71d7c70
@gztensor
Make testnet compatible with mainnet
0b11765
@gztensor
Format
2488fd2
@unconst
Merge pull request #882 from opentensor/fix/stake-delta-conflicts
0c4fdfb 
Fix/stake delta conflicts
@unconst
Merge pull request #903 from opentensor/devnet
77698ef 
testnet deploy 11-1-2024
@gztensor
Merge remote-tracking branch 'origin/main' into testnet
0786624
@gztensor
Remove manual_inspect from Cargo.toml clippy config
90fdbb1
@sam0x17
try re-adding
87d21f8
@sam0x17
bump CI
9b1f243
@sam0x17
Merge pull request #913 from opentensor/fix/merge-conflicts-testnet-m…
21c3b41 
…ainnet

Fix/merge conflicts testnet mainnet
@unconst
Merge pull request #914 from opentensor/testnet
e6683ab 
finney deploy 11/5/2024
@orriin
fix: host functions
da6d081
@camfairchild @keithtensor
Hotfix/skip root for emission accum (#933)
c2aba47 
* skip netuid 0 for pending emission accum

* comment
@camfairchild @keithtensor
Hotfix/clear stake delta on drain (#934)
a308cd4 
* 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
@camfairchild @keithtensor
respect chk for set weights min stake filter (#935)
e21ba0d 
* 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
@camfairchild @keithtensor
use chk for neuron info lite stake (#936)
e735f72
@gztensor
Bump spec version to 207
fd7a996
@gztensor
Empty commit, re-trigger CI
fc972f7
@unconst
Merge pull request #941 from opentensor/hotfixes-to-testnet-nov-6
05a53d7 
Hotfixes to testnet nov 6
@gztensor
Empty commit to trigger CI
480cf32
@orriin
fix: host functions
bbd5a1e
@unconst
Merge pull request #949 from opentensor/fix-host-functions-testnet
4a93ea0 
fix: host functions (testnet)
@unconst
Merge pull request #930 from opentensor/fix-host-functions-main
a3e5878 
fix: host functions (main)
@unconst
Merge pull request #958 from opentensor/main
701be73 
backpropogate hotfixes
@JohnReedV
hotfix chainspec build
09311be
@sam0x17
bump CI
6ccd420
@unconst
Merge pull request #959 from opentensor/spiigot/hotfix-chainspec-build
3fe9797 
Hotfix Chainspec Build
@unconst unconst merged commit cd87781 into devnet Nov 13, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@unconst unconst unconst approved these changes

@camfairchild camfairchild camfairchild approved these changes

@sam0x17 sam0x17 sam0x17 approved these changes

@ales-otf ales-otf Awaiting requested review from ales-otf

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@gztensor @sam0x17 @camfairchild @unconst @orriin @JohnReedV @ales-otf