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

The last merge conflict #973

Merged
merged 49 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
0a34147
Add swapping child's parents to hotkey swap
gztensor Oct 16, 2024
aa521f4
Merge pull request #863 from opentensor/fix/hotkey-swap-parentkeys
sam0x17 Oct 18, 2024
bd2b1ed
Merge pull request #875 from opentensor/devnet
unconst Oct 25, 2024
71d7c70
Resolve merge conflicts around stake delta feature
gztensor Oct 29, 2024
0b11765
Make testnet compatible with mainnet
gztensor Oct 29, 2024
2488fd2
Format
gztensor Oct 29, 2024
0c4fdfb
Merge pull request #882 from opentensor/fix/stake-delta-conflicts
unconst Oct 29, 2024
77698ef
Merge pull request #903 from opentensor/devnet
unconst Nov 1, 2024
b0bce33
Merge pull request #908 from opentensor/devnet-ready
unconst Nov 1, 2024
0786624
Merge remote-tracking branch 'origin/main' into testnet
gztensor Nov 4, 2024
90fdbb1
Remove manual_inspect from Cargo.toml clippy config
gztensor Nov 4, 2024
87d21f8
try re-adding
sam0x17 Nov 4, 2024
9b1f243
bump CI
sam0x17 Nov 5, 2024
21c3b41
Merge pull request #913 from opentensor/fix/merge-conflicts-testnet-m…
sam0x17 Nov 5, 2024
e6683ab
Merge pull request #914 from opentensor/testnet
unconst Nov 5, 2024
da6d081
fix: host functions
orriin Nov 6, 2024
f5c3431
Hotfix/skip root for emission accum (#933)
camfairchild Nov 7, 2024
95411b2
Hotfix/clear stake delta on drain (#934)
camfairchild Nov 7, 2024
b312704
respect chk for set weights min stake filter (#935)
camfairchild Nov 7, 2024
7147187
use chk for neuron info lite stake (#936)
camfairchild Nov 7, 2024
c2aba47
Hotfix/skip root for emission accum (#933)
camfairchild Nov 7, 2024
a308cd4
Hotfix/clear stake delta on drain (#934)
camfairchild Nov 7, 2024
e21ba0d
respect chk for set weights min stake filter (#935)
camfairchild Nov 7, 2024
e735f72
use chk for neuron info lite stake (#936)
camfairchild Nov 7, 2024
fd7a996
Bump spec version to 207
gztensor Nov 7, 2024
fc972f7
Empty commit, re-trigger CI
gztensor Nov 7, 2024
00b9b3c
Bump spec version to 207
gztensor Nov 7, 2024
3578597
Merge pull request #940 from opentensor/hotfixes-to-devnet-nov-6
unconst Nov 7, 2024
05a53d7
Merge pull request #941 from opentensor/hotfixes-to-testnet-nov-6
unconst Nov 7, 2024
480cf32
Empty commit to trigger CI
gztensor Nov 8, 2024
2de219d
fix: host functions
orriin Nov 6, 2024
bbd5a1e
fix: host functions
orriin Nov 6, 2024
53c4f5c
Merge pull request #948 from opentensor/fix-host-functions-devnet
unconst Nov 8, 2024
4a93ea0
Merge pull request #949 from opentensor/fix-host-functions-testnet
unconst Nov 8, 2024
a3e5878
Merge pull request #930 from opentensor/fix-host-functions-main
unconst Nov 8, 2024
701be73
Merge pull request #958 from opentensor/main
unconst Nov 12, 2024
09311be
hotfix chainspec build
JohnReedV Nov 12, 2024
6ccd420
bump CI
sam0x17 Nov 12, 2024
3fe9797
Merge pull request #959 from opentensor/spiigot/hotfix-chainspec-build
unconst Nov 12, 2024
ca1d908
Merge pull request #962 from opentensor/main
unconst Nov 12, 2024
c91adae
Merge branch 'testnet' into merge-testnet-to-devnet
gztensor Nov 12, 2024
64adce1
Merge testnet into devnet in progress
gztensor Nov 12, 2024
21527a9
Fix compilation
ales-otf Nov 12, 2024
510c422
Cleanup imports
gztensor Nov 12, 2024
8163679
Fix clippy
gztensor Nov 12, 2024
712f9e8
Merge pull request #968 from opentensor/fix/remove-generics-in-node
gztensor Nov 12, 2024
cd87781
Merge pull request #970 from opentensor/merge-testnet-to-devnet
unconst Nov 13, 2024
71e0e9c
Merge remote-tracking branch 'origin/devnet' into devnet-ready
sam0x17 Nov 13, 2024
850c8e7
remove duplicate code
sam0x17 Nov 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 49 additions & 44 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading