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

fix the last merge conflict #972

Closed
wants to merge 48 commits into from
Closed

fix the last merge conflict #972

wants to merge 48 commits into from

Commits on Oct 16, 2024

  1. Add swapping child's parents to hotkey swap

    @gztensor
    gztensor committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0a34147 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Merge pull request #863 from opentensor/fix/hotkey-swap-parentkeys 

    Fix: Hotkey swap causes parent key to lose emissions from children
    @sam0x17
    sam0x17 authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    aa521f4 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. Merge pull request #875 from opentensor/devnet 

    update testnet 10/25/2024
    @unconst
    unconst authored Oct 25, 2024
    Configuration menu
    Copy the full SHA
    bd2b1ed View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Resolve merge conflicts around stake delta feature

    @gztensor
    gztensor committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    71d7c70 View commit details
    Browse the repository at this point in the history

  2. Make testnet compatible with mainnet

    @gztensor
    gztensor committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    0b11765 View commit details
    Browse the repository at this point in the history

  3. Format

    @gztensor
    gztensor committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    2488fd2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #882 from opentensor/fix/stake-delta-conflicts 

    Fix/stake delta conflicts
    @unconst
    unconst authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    0c4fdfb View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. Merge pull request #903 from opentensor/devnet 

    testnet deploy 11-1-2024
    @unconst
    unconst authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    77698ef View commit details
    Browse the repository at this point in the history

  2. Merge pull request #908 from opentensor/devnet-ready 

    deploy evm to devnet
    @unconst
    unconst authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    b0bce33 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. Merge remote-tracking branch 'origin/main' into testnet

    @gztensor
    gztensor committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    0786624 View commit details
    Browse the repository at this point in the history

  2. Remove manual_inspect from Cargo.toml clippy config

    @gztensor
    gztensor committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    90fdbb1 View commit details
    Browse the repository at this point in the history

  3. try re-adding

    @sam0x17
    sam0x17 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    87d21f8 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. bump CI

    @sam0x17
    sam0x17 committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    9b1f243 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #913 from opentensor/fix/merge-conflicts-testnet-m… 

    …ainnet

Fix/merge conflicts testnet mainnet
    @sam0x17
    sam0x17 authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    21c3b41 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #914 from opentensor/testnet 

    finney deploy 11/5/2024
    @unconst
    unconst authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    e6683ab View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. fix: host functions

    @orriin
    orriin committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    da6d081 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. Hotfix/skip root for emission accum (#933) 

    * skip netuid 0 for pending emission accum

* comment
    @camfairchild @keithtensor
    camfairchild authored and keithtensor committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    f5c3431 View commit details
    Browse the repository at this point in the history

  2. Hotfix/clear stake delta on drain (#934) 

    * 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
    camfairchild authored and keithtensor committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    95411b2 View commit details
    Browse the repository at this point in the history

  3. respect chk for set weights min stake filter (#935) 

    * 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
    camfairchild authored and keithtensor committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    b312704 View commit details
    Browse the repository at this point in the history

  4. use chk for neuron info lite stake (#936)

    @camfairchild @keithtensor
    camfairchild authored and keithtensor committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    7147187 View commit details
    Browse the repository at this point in the history

  5. Hotfix/skip root for emission accum (#933) 

    * skip netuid 0 for pending emission accum

* comment
    @camfairchild @keithtensor
    camfairchild authored and keithtensor committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    c2aba47 View commit details
    Browse the repository at this point in the history

  6. Hotfix/clear stake delta on drain (#934) 

    * 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
    camfairchild authored and keithtensor committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    a308cd4 View commit details
    Browse the repository at this point in the history

  7. respect chk for set weights min stake filter (#935) 

    * 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
    camfairchild authored and keithtensor committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    e21ba0d View commit details
    Browse the repository at this point in the history

  8. use chk for neuron info lite stake (#936)

    @camfairchild @keithtensor
    camfairchild authored and keithtensor committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    e735f72 View commit details
    Browse the repository at this point in the history

  9. Bump spec version to 207

    @gztensor
    gztensor committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    fd7a996 View commit details
    Browse the repository at this point in the history

  10. Empty commit, re-trigger CI

    @gztensor
    gztensor committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    fc972f7 View commit details
    Browse the repository at this point in the history

  11. Bump spec version to 207

    @gztensor
    gztensor committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    00b9b3c View commit details
    Browse the repository at this point in the history

  12. Merge pull request #940 from opentensor/hotfixes-to-devnet-nov-6 

    Hotfixes to devnet nov 6
    @unconst
    unconst authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    3578597 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #941 from opentensor/hotfixes-to-testnet-nov-6 

    Hotfixes to testnet nov 6
    @unconst
    unconst authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    05a53d7 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. Empty commit to trigger CI

    @gztensor
    gztensor committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    480cf32 View commit details
    Browse the repository at this point in the history

  2. fix: host functions

    @orriin
    orriin committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    2de219d View commit details
    Browse the repository at this point in the history

  3. fix: host functions

    @orriin
    orriin committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    bbd5a1e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #948 from opentensor/fix-host-functions-devnet 

    fix: host functions (devnet)
    @unconst
    unconst authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    53c4f5c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #949 from opentensor/fix-host-functions-testnet 

    fix: host functions (testnet)
    @unconst
    unconst authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    4a93ea0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #930 from opentensor/fix-host-functions-main 

    fix: host functions (main)
    @unconst
    unconst authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    a3e5878 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Merge pull request #958 from opentensor/main 

    backpropogate hotfixes
    @unconst
    unconst authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    701be73 View commit details
    Browse the repository at this point in the history

  2. hotfix chainspec build

    @JohnReedV
    JohnReedV committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    09311be View commit details
    Browse the repository at this point in the history

  3. bump CI

    @sam0x17
    sam0x17 committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    6ccd420 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #959 from opentensor/spiigot/hotfix-chainspec-build 

    Hotfix Chainspec Build
    @unconst
    unconst authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    3fe9797 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #962 from opentensor/main 

    backpropagate hotfixes to testnet
    @unconst
    unconst authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    ca1d908 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'testnet' into merge-testnet-to-devnet

    @gztensor
    gztensor committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    c91adae View commit details
    Browse the repository at this point in the history

  7. Merge testnet into devnet in progress

    @gztensor
    gztensor committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    64adce1 View commit details
    Browse the repository at this point in the history

  8. Fix compilation

    @ales-otf
    ales-otf committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    21527a9 View commit details
    Browse the repository at this point in the history

  9. Cleanup imports

    @gztensor
    gztensor committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    510c422 View commit details
    Browse the repository at this point in the history

  10. Fix clippy

    @gztensor
    gztensor committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    8163679 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #968 from opentensor/fix/remove-generics-in-node 

    Fix compilation
    @gztensor
    gztensor authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    712f9e8 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. Merge pull request #970 from opentensor/merge-testnet-to-devnet 

    Merge testnet to devnet
    @unconst
    unconst authored Nov 13, 2024
    Configuration menu
    Copy the full SHA
    cd87781 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/devnet' into devnet-ready

    @sam0x17
    sam0x17 committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    71e0e9c View commit details
    Browse the repository at this point in the history