From 095820959ce7dd18350fb1fb818cf2810181ddee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBy=C5=BAniewski?= Date: Wed, 22 Jan 2025 17:22:36 +0100 Subject: [PATCH 01/31] test: use asynccontextmanager for FastAPI lifespan --- tests/unit_tests/test_axon.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/unit_tests/test_axon.py b/tests/unit_tests/test_axon.py index 5dac992d21..20fdee4369 100644 --- a/tests/unit_tests/test_axon.py +++ b/tests/unit_tests/test_axon.py @@ -16,6 +16,7 @@ # DEALINGS IN THE SOFTWARE. +import contextlib import re import threading import time @@ -795,6 +796,7 @@ async def test_threaded_fastapi(): server_started = threading.Event() server_stopped = threading.Event() + @contextlib.asynccontextmanager async def lifespan(app): server_started.set() yield From 321d359a14c1fc7b3fff5debeb206eee6da23cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBy=C5=BAniewski?= Date: Wed, 22 Jan 2025 18:11:30 +0100 Subject: [PATCH 02/31] test: wait for uvicorn server to start completly --- tests/unit_tests/test_axon.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/unit_tests/test_axon.py b/tests/unit_tests/test_axon.py index 20fdee4369..47533a2487 100644 --- a/tests/unit_tests/test_axon.py +++ b/tests/unit_tests/test_axon.py @@ -16,6 +16,7 @@ # DEALINGS IN THE SOFTWARE. +import asyncio import contextlib import re import threading @@ -816,6 +817,9 @@ async def lifespan(app): server_started.wait() + while not (server.started or server_stopped.is_set()): + await asyncio.sleep(1) + assert server.is_running is True async with aiohttp.ClientSession( From e6d00ad17f94d0e06ab147a19caf91ae9db873ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBy=C5=BAniewski?= Date: Mon, 3 Feb 2025 12:40:28 +0100 Subject: [PATCH 03/31] tests: add timeouts --- tests/unit_tests/test_axon.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/unit_tests/test_axon.py b/tests/unit_tests/test_axon.py index 47533a2487..88c6bb2d7d 100644 --- a/tests/unit_tests/test_axon.py +++ b/tests/unit_tests/test_axon.py @@ -815,10 +815,11 @@ async def lifespan(app): ) server.start() - server_started.wait() + server_started.wait(3.0) - while not (server.started or server_stopped.is_set()): - await asyncio.sleep(1) + async with asyncio.timeout(3.0): + while not (server.started or server_stopped.is_set()): + await asyncio.sleep(1.0) assert server.is_running is True From 52558f59dd48fa109ebb69cef8ac192d82c7f477 Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Mon, 3 Feb 2025 14:21:05 +0200 Subject: [PATCH 04/31] Python 3.9 compatibility. --- tests/unit_tests/test_axon.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/unit_tests/test_axon.py b/tests/unit_tests/test_axon.py index 88c6bb2d7d..0363dc0135 100644 --- a/tests/unit_tests/test_axon.py +++ b/tests/unit_tests/test_axon.py @@ -817,10 +817,12 @@ async def lifespan(app): server_started.wait(3.0) - async with asyncio.timeout(3.0): + async def wait_for_server(): while not (server.started or server_stopped.is_set()): await asyncio.sleep(1.0) + await asyncio.wait_for(wait_for_server(), 7.0) + assert server.is_running is True async with aiohttp.ClientSession( From 9a5b538e1be950aac7202ea32095def854d28268 Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Mon, 3 Feb 2025 14:24:24 +0200 Subject: [PATCH 05/31] Compatibility if uvloop is installed. --- tests/unit_tests/test_axon.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit_tests/test_axon.py b/tests/unit_tests/test_axon.py index 0363dc0135..bca8f2a954 100644 --- a/tests/unit_tests/test_axon.py +++ b/tests/unit_tests/test_axon.py @@ -811,6 +811,7 @@ async def lifespan(app): server = FastAPIThreadedServer( uvicorn.Config( app, + loop="none" ), ) server.start() From 7fe707659dfc767233b9a21f7e4792f2887e5694 Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Mon, 3 Feb 2025 14:26:36 +0200 Subject: [PATCH 06/31] Ruff --- tests/unit_tests/test_axon.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/unit_tests/test_axon.py b/tests/unit_tests/test_axon.py index bca8f2a954..5415999d2a 100644 --- a/tests/unit_tests/test_axon.py +++ b/tests/unit_tests/test_axon.py @@ -809,10 +809,7 @@ async def lifespan(app): app.get("/")(lambda: "Hello World") server = FastAPIThreadedServer( - uvicorn.Config( - app, - loop="none" - ), + uvicorn.Config(app, loop="none"), ) server.start() From 79c85d4a80431489079782c246ed941a586e436f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBy=C5=BAniewski?= Date: Wed, 22 Jan 2025 14:37:15 +0100 Subject: [PATCH 07/31] test(2472): offline unittests --- tests/unit_tests/conftest.py | 30 ++++++++++++++ .../extrinsics/asyncex/test_commit_reveal.py | 2 +- .../extrinsics/test_commit_reveal.py | 11 ------ .../extrinsics/test_commit_weights.py | 15 +------ tests/unit_tests/extrinsics/test_transfer.py | 14 ------- tests/unit_tests/test_axon.py | 21 +++++++--- tests/unit_tests/test_dendrite.py | 13 ++++--- tests/unit_tests/test_subtensor.py | 36 +++-------------- tests/unit_tests/utils/test_networking.py | 39 +++++++++++++++++-- 9 files changed, 96 insertions(+), 85 deletions(-) diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py index a5503f8961..9933746279 100644 --- a/tests/unit_tests/conftest.py +++ b/tests/unit_tests/conftest.py @@ -1,5 +1,8 @@ import pytest from aioresponses import aioresponses +from async_substrate_interface.sync_substrate import SubstrateInterface + +import bittensor.core.subtensor @pytest.fixture @@ -11,3 +14,30 @@ def force_legacy_torch_compatible_api(monkeypatch): def mock_aio_response(): with aioresponses() as m: yield m + + +@pytest.fixture +def mock_substrate_interface(mocker): + mocked = mocker.MagicMock( + autospec=SubstrateInterface, + ) + + mocker.patch("bittensor.core.subtensor.SubstrateInterface", return_value=mocked) + + return mocked + + +@pytest.fixture +def subtensor(mock_substrate_interface): + return bittensor.core.subtensor.Subtensor() + + +@pytest.fixture +def mock_get_external_ip(mocker): + mocked = mocker.Mock( + return_value="192.168.1.1", + ) + + mocker.patch("bittensor.utils.networking.get_external_ip", mocked) + + return mocked diff --git a/tests/unit_tests/extrinsics/asyncex/test_commit_reveal.py b/tests/unit_tests/extrinsics/asyncex/test_commit_reveal.py index 5df1225b18..fd09bd106b 100644 --- a/tests/unit_tests/extrinsics/asyncex/test_commit_reveal.py +++ b/tests/unit_tests/extrinsics/asyncex/test_commit_reveal.py @@ -11,7 +11,7 @@ @pytest.fixture def subtensor(mocker): fake_substrate = mocker.AsyncMock() - fake_substrate.websocket.sock.getsockopt.return_value = 0 + fake_substrate.websocket.socket.getsockopt.return_value = 0 mocker.patch.object( subtensor_module, "AsyncSubstrateInterface", return_value=fake_substrate ) diff --git a/tests/unit_tests/extrinsics/test_commit_reveal.py b/tests/unit_tests/extrinsics/test_commit_reveal.py index d91dde2673..33825dfd53 100644 --- a/tests/unit_tests/extrinsics/test_commit_reveal.py +++ b/tests/unit_tests/extrinsics/test_commit_reveal.py @@ -6,17 +6,6 @@ from bittensor.core import subtensor as subtensor_module from bittensor.core.chain_data import SubnetHyperparameters from bittensor.core.extrinsics import commit_reveal -from bittensor.core.subtensor import Subtensor - - -@pytest.fixture -def subtensor(mocker): - fake_substrate = mocker.MagicMock() - fake_substrate.websocket.sock.getsockopt.return_value = 0 - mocker.patch.object( - subtensor_module, "SubstrateInterface", return_value=fake_substrate - ) - yield Subtensor() @pytest.fixture diff --git a/tests/unit_tests/extrinsics/test_commit_weights.py b/tests/unit_tests/extrinsics/test_commit_weights.py index 18b9e987dd..14993562a2 100644 --- a/tests/unit_tests/extrinsics/test_commit_weights.py +++ b/tests/unit_tests/extrinsics/test_commit_weights.py @@ -1,23 +1,10 @@ -import pytest from bittensor_wallet import Wallet -from bittensor.core import subtensor as subtensor_module -from bittensor.core.settings import version_as_int -from bittensor.core.subtensor import Subtensor from bittensor.core.extrinsics.commit_weights import ( _do_commit_weights, _do_reveal_weights, ) - - -@pytest.fixture -def subtensor(mocker): - fake_substrate = mocker.MagicMock() - fake_substrate.websocket.sock.getsockopt.return_value = 0 - mocker.patch.object( - subtensor_module, "SubstrateInterface", return_value=fake_substrate - ) - return Subtensor() +from bittensor.core.settings import version_as_int def test_do_commit_weights(subtensor, mocker): diff --git a/tests/unit_tests/extrinsics/test_transfer.py b/tests/unit_tests/extrinsics/test_transfer.py index 607d703758..95f1cf8de5 100644 --- a/tests/unit_tests/extrinsics/test_transfer.py +++ b/tests/unit_tests/extrinsics/test_transfer.py @@ -1,21 +1,7 @@ -import pytest - -from bittensor.core import subtensor as subtensor_module from bittensor.core.extrinsics.transfer import _do_transfer -from bittensor.core.subtensor import Subtensor from bittensor.utils.balance import Balance -@pytest.fixture -def subtensor(mocker): - fake_substrate = mocker.MagicMock() - fake_substrate.websocket.sock.getsockopt.return_value = 0 - mocker.patch.object( - subtensor_module, "SubstrateInterface", return_value=fake_substrate - ) - return Subtensor() - - def test_do_transfer_is_success_true(subtensor, mocker): """Successful do_transfer call.""" # Prep diff --git a/tests/unit_tests/test_axon.py b/tests/unit_tests/test_axon.py index 512b4635ae..86688bda9f 100644 --- a/tests/unit_tests/test_axon.py +++ b/tests/unit_tests/test_axon.py @@ -26,7 +26,7 @@ ) -def test_attach_initial(): +def test_attach_initial(mock_get_external_ip): # Create a mock AxonServer instance server = Axon() @@ -71,7 +71,7 @@ def wrong_verify_fn(synapse: TestSynapse) -> bool: server.attach(forward_fn, blacklist_fn, priority_fn, wrong_verify_fn) -def test_attach(): +def test_attach(mock_get_external_ip): # Create a mock AxonServer instance server = Axon() @@ -144,7 +144,7 @@ def mock_request(): @pytest.fixture -def axon_instance(): +def axon_instance(mock_get_external_ip): axon = Axon() axon.required_hash_fields = {"test_endpoint": ["field1", "field2"]} axon.forward_class_types = { @@ -329,7 +329,7 @@ async def test_verify_body_integrity_error_cases( (MockInfo(), "MockInfoString", "edge_case_empty_string"), ], ) -def test_to_string(info_return, expected_output, test_id): +def test_to_string(info_return, expected_output, test_id, mock_get_external_ip): # Arrange axon = Axon() with patch.object(axon, "info", return_value=info_return): @@ -358,7 +358,9 @@ def test_to_string(info_return, expected_output, test_id): ), ], ) -def test_valid_ipv4_and_ipv6_address(ip, port, expected_ip_type, test_id): +def test_valid_ipv4_and_ipv6_address( + ip, port, expected_ip_type, test_id, mock_get_external_ip +): # Arrange hotkey = MockHotkey("5EemgxS7cmYbD34esCFoBgUZZC8JdnGtQvV5Qw3QFUCRRtGP") coldkey = MockHotkey("5EemgxS7cmYbD34esCFoBgUZZC8JdnGtQvV5Qw3QFUCRRtGP") @@ -431,7 +433,14 @@ def test_invalid_ip_address(ip, port, expected_exception): ], ) def test_axon_str_representation( - ip, port, ss58_address, started, forward_fns, expected_str, test_id + ip, + port, + ss58_address, + started, + forward_fns, + expected_str, + test_id, + mock_get_external_ip, ): # Arrange hotkey = MockHotkey(ss58_address) diff --git a/tests/unit_tests/test_dendrite.py b/tests/unit_tests/test_dendrite.py index 113138bef1..2f5018337e 100644 --- a/tests/unit_tests/test_dendrite.py +++ b/tests/unit_tests/test_dendrite.py @@ -29,7 +29,7 @@ def dummy(synapse: SynapseDummy) -> SynapseDummy: @pytest.fixture -def setup_dendrite(): +def setup_dendrite(mock_get_external_ip): # Assuming bittensor.Wallet() returns a wallet object user_wallet = get_mock_wallet() dendrite_obj = Dendrite(user_wallet) @@ -51,7 +51,10 @@ def axon_info(): @pytest.fixture(scope="session") def setup_axon(): wallet = get_mock_wallet() - axon = Axon(wallet) + axon = Axon( + wallet, + external_ip="192.168.1.1", + ) axon.attach(forward_fn=dummy) axon.start() yield axon @@ -103,7 +106,7 @@ def __await__(self): return self().__await__() -def test_dendrite_create_wallet(): +def test_dendrite_create_wallet(mock_get_external_ip): d = Dendrite(get_mock_wallet()) d = Dendrite(get_mock_wallet().hotkey) d = Dendrite(get_mock_wallet().coldkeypub) @@ -111,7 +114,7 @@ def test_dendrite_create_wallet(): @pytest.mark.asyncio -async def test_forward_many(): +async def test_forward_many(mock_get_external_ip): n = 10 d = Dendrite(wallet=get_mock_wallet()) d.call = AsyncMock() @@ -128,7 +131,7 @@ async def test_forward_many(): assert len([resp]) == 1 -def test_pre_process_synapse(): +def test_pre_process_synapse(mock_get_external_ip): d = Dendrite(wallet=get_mock_wallet()) s = Synapse() synapse = d.preprocess_synapse_for_request( diff --git a/tests/unit_tests/test_subtensor.py b/tests/unit_tests/test_subtensor.py index 385bb45501..494da7d2b0 100644 --- a/tests/unit_tests/test_subtensor.py +++ b/tests/unit_tests/test_subtensor.py @@ -73,7 +73,7 @@ def call_params_with_certificate(): return params -def test_methods_comparable(mocker): +def test_methods_comparable(mock_substrate_interface): """Verifies that methods in sync and async Subtensors are comparable.""" # Preps subtensor = Subtensor(_mock=True) @@ -142,9 +142,7 @@ def test_serve_axon_with_external_ip_set(): assert axon_info.ip == external_ip -def test_serve_axon_with_external_port_set(): - external_ip: str = "2001:0db8:85a3:0000:0000:8a2e:0370:7334" - +def test_serve_axon_with_external_port_set(mock_get_external_ip): internal_port: int = 1234 external_port: int = 5678 @@ -179,14 +177,10 @@ def test_serve_axon_with_external_port_set(): config=mock_config, ) - with mock.patch( - "bittensor.utils.networking.get_external_ip", return_value=external_ip - ): - # mock the get_external_ip function to return the external ip - mock_subtensor.serve_axon( - netuid=-1, - axon=mock_axon_with_external_port_set, - ) + mock_subtensor.serve_axon( + netuid=-1, + axon=mock_axon_with_external_port_set, + ) mock_serve_axon.assert_called_once() # verify that the axon is served to the network with the external port @@ -294,24 +288,6 @@ def test_determine_chain_endpoint_and_network( assert result_endpoint == expected_endpoint -@pytest.fixture -def subtensor(mocker): - fake_substrate = mocker.MagicMock() - fake_substrate.websocket.sock.getsockopt.return_value = 0 - mocker.patch.object( - subtensor_module, "SubstrateInterface", return_value=fake_substrate - ) - mocker.patch.object( - sync_substrate, - "connect", - return_value=mocker.MagicMock(), - ) - fake_websocket = mocker.MagicMock() - fake_websocket.client.connect.return_value = 0 - # mocker.patch.object(subtensor_module, "ws_client", return_value=fake_websocket) - return Subtensor() - - @pytest.fixture def mock_logger(): with mock.patch.object(logging, "warning") as mock_warning: diff --git a/tests/unit_tests/utils/test_networking.py b/tests/unit_tests/utils/test_networking.py index 2037718578..a3f2c54ac6 100644 --- a/tests/unit_tests/utils/test_networking.py +++ b/tests/unit_tests/utils/test_networking.py @@ -83,13 +83,42 @@ def test_int_to_ip6_underflow(): # Test getting external IP address -def test_get_external_ip(): +def test_get_external_ip(mocker): """Test getting the external IP address.""" - assert utils.networking.get_external_ip() + mocked_requests_get = mock.Mock( + return_value=mock.Mock( + **{ + "text": "192.168.1.1", + }, + ), + ) + + mocker.patch.object( + requests, + "get", + mocked_requests_get, + ) + + assert utils.networking.get_external_ip() == "192.168.1.1" + + mocked_requests_get.assert_called_once_with("https://checkip.amazonaws.com") -def test_get_external_ip_os_broken(): +def test_get_external_ip_os_broken(mocker): """Test getting the external IP address when os.popen is broken.""" + mocked_requests_get = mock.Mock( + return_value=mock.Mock( + **{ + "text": "192.168.1.1", + }, + ), + ) + + mocker.patch.object( + requests, + "get", + mocked_requests_get, + ) class FakeReadline: def readline(self): @@ -99,7 +128,9 @@ def mock_call(): return FakeReadline() with mock.patch.object(os, "popen", new=mock_call): - assert utils.networking.get_external_ip() + assert utils.networking.get_external_ip() == "192.168.1.1" + + mocked_requests_get.assert_called_once_with("https://checkip.amazonaws.com") def test_get_external_ip_os_request_urllib_broken(): From 8eb31922ad24c8e1635537bd326326f84afa4aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBy=C5=BAniewski?= Date: Thu, 13 Feb 2025 20:22:34 +0100 Subject: [PATCH 08/31] tests: missing imports --- tests/unit_tests/test_axon.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/unit_tests/test_axon.py b/tests/unit_tests/test_axon.py index 4a3a82132c..f521eabc09 100644 --- a/tests/unit_tests/test_axon.py +++ b/tests/unit_tests/test_axon.py @@ -1,20 +1,23 @@ import asyncio import contextlib import re +import threading import time from dataclasses import dataclass from typing import Any, Optional, Tuple from unittest import IsolatedAsyncioTestCase from unittest.mock import AsyncMock, MagicMock, patch +import aiohttp import fastapi import netaddr import pydantic import pytest +import uvicorn from fastapi.testclient import TestClient from starlette.requests import Request -from bittensor.core.axon import AxonMiddleware, Axon +from bittensor.core.axon import Axon, AxonMiddleware, FastAPIThreadedServer from bittensor.core.errors import RunException from bittensor.core.settings import version_as_int from bittensor.core.stream import StreamingSynapse From 046c52d41e5cd8074f6f9d5b505c22c1028daa1c Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Fri, 14 Feb 2025 12:18:31 +0200 Subject: [PATCH 09/31] Ensures that alpha symbols are always rendered to the right of the value. --- bittensor/utils/balance.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bittensor/utils/balance.py b/bittensor/utils/balance.py index 29ce2faeaa..33d56be13c 100644 --- a/bittensor/utils/balance.py +++ b/bittensor/utils/balance.py @@ -53,8 +53,13 @@ def __float__(self): return self.tao def __str__(self): - """Returns the Balance object as a string in the format "symbolvalue", where the value is in tao.""" - return f"{self.unit}{float(self.tao):,.9f}" + """ + Returns the Balance object as a string in the format "symbolvalue", where the value is in tao. + """ + if self.unit == units[0]: + return f"{self.unit}{float(self.tao):,.9f}" + else: + return f"\u200e{float(self.tao):,.9f}{self.unit}\u200e" def __rich__(self): int_tao, fract_tao = format(float(self.tao), "f").split(".") From dba23ec67475bf99232908865cde634f134bfff8 Mon Sep 17 00:00:00 2001 From: Roman Date: Fri, 14 Feb 2025 10:40:40 -0800 Subject: [PATCH 10/31] fix test --- tests/e2e_tests/test_commit_weights.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/e2e_tests/test_commit_weights.py b/tests/e2e_tests/test_commit_weights.py index 2f7594b727..7e02411ac3 100644 --- a/tests/e2e_tests/test_commit_weights.py +++ b/tests/e2e_tests/test_commit_weights.py @@ -167,6 +167,9 @@ async def test_commit_weights_uses_next_nonce(local_chain, subtensor, alice_wall Raises: AssertionError: If any of the checks or verifications fail """ + # Wait for 2 tempos to pass as CR3 only reveals weights after 2 tempos + subtensor.wait_for_block(20) + netuid = 2 print("Testing test_commit_and_reveal_weights") # Register root as Alice From 6c4699721a881de5687f830f7eaaeb6c69fe21d9 Mon Sep 17 00:00:00 2001 From: Roman Date: Fri, 14 Feb 2025 14:00:09 -0800 Subject: [PATCH 11/31] fix `tests.e2e_tests.test_incentive.test_incentive` --- tests/e2e_tests/test_incentive.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/e2e_tests/test_incentive.py b/tests/e2e_tests/test_incentive.py index 7824e8e797..5245139d36 100644 --- a/tests/e2e_tests/test_incentive.py +++ b/tests/e2e_tests/test_incentive.py @@ -23,6 +23,9 @@ async def test_incentive(local_chain, subtensor, templates, alice_wallet, bob_wa AssertionError: If any of the checks or verifications fail """ + # Wait for 2 tempos to spin up chain properly + subtensor.wait_for_block(20) + print("Testing test_incentive") netuid = 2 From 2002fc22728db823e8f988bb2d9837ee4f58079b Mon Sep 17 00:00:00 2001 From: Roman Date: Fri, 14 Feb 2025 15:36:53 -0800 Subject: [PATCH 12/31] remove back merge changes --- CHANGELOG.md | 84 -------------------------------------- VERSION | 2 +- bittensor/core/settings.py | 2 +- 3 files changed, 2 insertions(+), 86 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c042ed9bd0..6e0e29a339 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,89 +1,5 @@ # Changelog -## 9.0.0 /2025-02-13 - -## What's Changed -* Optimisations and tests for Async Sync Subtensor by @thewhaleking in https://github.com/opentensor/bittensor/pull/2569 -* [SDK] Get rid of py-substrate-interface (DO NOT MERGE) by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2565 -* Uses the new async_substrate_interface lib by @thewhaleking in https://github.com/opentensor/bittensor/pull/2572 -* AsyncSubstrateInterface Overhaul (with Sync AsyncSubstrate) by @thewhaleking in https://github.com/opentensor/bittensor/pull/2526 -* [SDK] Small improvements by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2575 -* Sync Subtensor warning by @thewhaleking in https://github.com/opentensor/bittensor/pull/2578 -* [SDK] Fixes types in async by @thewhaleking in https://github.com/opentensor/bittensor/pull/2577 -* Release/8.5.2 by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2584 -* fix: typos in documentation files by @leopardracer in https://github.com/opentensor/bittensor/pull/2580 -* fix(2337): btlogging setLevel by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2588 -* perf: don't use 2 threads to create FastAPI server by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2592 -* fix(2188): don't allow uvicorn to reconfigure event_loop_policy by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2591 -* Fix spelling errors by @Dimitrolito in https://github.com/opentensor/bittensor/pull/2586 -* Make code as beautiful as it has never been before by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2599 -* test: bring back old (sync subtensor) tests and fix them by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2600 -* YAASO: Yet Another AsyncSubtensor Overhaul by @thewhaleking in https://github.com/opentensor/bittensor/pull/2579 -* Add alias for `Subtensor.commit` as `set_commitment` by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2606 -* [RAO] Add methods to fetch metagraph data from the chain by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2605 -* Rewrite config.py by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2607 -* Update metagraph class with `rao` stuff by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2611 -* [RAO] fix for unit test + refactoring by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2612 -* fix integration metagraph test by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2613 -* Cleanups, fixes, improvements for rao by @thewhaleking in https://github.com/opentensor/bittensor/pull/2614 -* Adds deprecation notice for non-balance amounts by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2615 -* Staging pre merge port rao (New async substrate) by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2610 -* Tests for SyncSubtensor by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2617 -* Many small fixes by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2619 -* Use async-substrate-interface for runtime decoding by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2618 -* Pins torch version to 2.5.1 by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2623 -* Fixes, adds stake and other methods by @thewhaleking in https://github.com/opentensor/bittensor/pull/2622 -* Fix typos by @Marcofann in https://github.com/opentensor/bittensor/pull/2620 -* Add `subnet_volume` field to `MetagraphInfo` and `DynamicInfo` by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2624 -* Update wallet creation command logs post-install by @HudsonGraeme in https://github.com/opentensor/bittensor/pull/2621 -* fix subtensor methods for async by @thewhaleking in https://github.com/opentensor/bittensor/pull/2628 -* Subnet burn cost return type by @thewhaleking in https://github.com/opentensor/bittensor/pull/2629 -* Specifies a range of torch versions, rather than a pinned version. by @thewhaleking in https://github.com/opentensor/bittensor/pull/2632 -* Adds subnet registration extrinsic by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2630 -* Bumps btwallet 302 by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2633 -* SKD implementation for Subtensor `Feat/RPC Upgrades`. PR #1205 by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2627 -* Bug fixes after release SDK v9.0.0rc1 by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2637 -* Adds Latent Lite endpoint to the SDK by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2641 -* Bringing meta fields to a common form with float values float(TAO) instead of Balance and Tensor by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2642 -* Adds `get_all_commitments` and fixes commitment tests and `query_map` by @thewhaleking in https://github.com/opentensor/bittensor/pull/2644 -* Fix for extra fields from chain data by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2647 -* Fix InfoBase + dataclasses by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2649 -* fix integration tests by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2651 -* feat: Add logging for unexpected header keys in Synapse by @crStiv in https://github.com/opentensor/bittensor/pull/2587 -* Fixes Dendrite new loop close by @thewhaleking in https://github.com/opentensor/bittensor/pull/2654 -* Fix e2e tests by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2639 -* feat/roman/deps by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2655 -* Metagraph Improvements by @thewhaleking in https://github.com/opentensor/bittensor/pull/2659 -* add name and symbol fields to metagraph by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2658 -* Using one determine_chain_endpoint_and_network by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2661 -* Tests: separate `templates` fixture by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2660 -* Merge `async-pre-merge-new-async` to `staging` by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2656 -* Add `set_subnet_identity_extrinsic` and related stuff by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2662 -* Changes the logging level for unexpected header keys to trace by @thewhaleking in https://github.com/opentensor/bittensor/pull/2666 -* Remove logs by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2667 -* Tests: properly handle subprocesses (subtensor, miner, validator) by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2664 -* Last-minute requests by @thewhaleking in https://github.com/opentensor/bittensor/pull/2665 -* Updates tao_weights for mainnet by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2669 -* Update deps and default network/endpoint by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2670 - -## New Contributors -* @leopardracer made their first contribution in https://github.com/opentensor/bittensor/pull/2580 -* @Dimitrolito made their first contribution in https://github.com/opentensor/bittensor/pull/2586 -* @Marcofann made their first contribution in https://github.com/opentensor/bittensor/pull/2620 -* @HudsonGraeme made their first contribution in https://github.com/opentensor/bittensor/pull/2621 -* @crStiv made their first contribution in https://github.com/opentensor/bittensor/pull/2587 - -**Full Changelog**: https://github.com/opentensor/bittensor/compare/v8.5.2...v9.0.0 - -## 9.0.0rc6 /2025-02-11 -* Using one determine_chain_endpoint_and_network by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2661 -* Tests: separate templates fixture by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2660 -* add name and symbol fields to metagraph by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2658 -* Metagraph Improvements by @thewhaleking in https://github.com/opentensor/bittensor/pull/2659 -* feat/roman/add-subnet-identity-with-subnet-creation by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2662 - -**Full Changelog**: https://github.com/opentensor/bittensor/compare/v9.0.0rc5...v9.0.0rc6 - ## 9.0.0rc5 /2025-02-07 * Fix InfoBase + dataclasses @roman-opentensor in https://github.com/opentensor/bittensor/pull/2649 diff --git a/VERSION b/VERSION index c9277c5a60..dd477240eb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.0.0 \ No newline at end of file +9.0.0rc5 \ No newline at end of file diff --git a/bittensor/core/settings.py b/bittensor/core/settings.py index 42c4141921..73b9e92d77 100644 --- a/bittensor/core/settings.py +++ b/bittensor/core/settings.py @@ -1,4 +1,4 @@ -__version__ = "9.0.0" +__version__ = "9.0.0rc5" import os import re From 7db5f150b3fe767aa3809bbcc41ea26c5a5801d8 Mon Sep 17 00:00:00 2001 From: Arthurdw Date: Tue, 18 Feb 2025 10:25:51 +0100 Subject: [PATCH 13/31] feat: add readonly check before modifying FS --- bittensor/core/settings.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bittensor/core/settings.py b/bittensor/core/settings.py index 42c4141921..22906be0d9 100644 --- a/bittensor/core/settings.py +++ b/bittensor/core/settings.py @@ -7,15 +7,18 @@ from munch import munchify +READ_ONLY = os.getenv("READ_ONLY") == "1" + HOME_DIR = Path.home() USER_BITTENSOR_DIR = HOME_DIR / ".bittensor" WALLETS_DIR = USER_BITTENSOR_DIR / "wallets" MINERS_DIR = USER_BITTENSOR_DIR / "miners" -# Create dirs if they don't exist -WALLETS_DIR.mkdir(parents=True, exist_ok=True) -MINERS_DIR.mkdir(parents=True, exist_ok=True) +if not READ_ONLY: + # Create dirs if they don't exist + WALLETS_DIR.mkdir(parents=True, exist_ok=True) + MINERS_DIR.mkdir(parents=True, exist_ok=True) # Bittensor networks name NETWORKS = ["finney", "test", "archive", "local", "subvortex", "rao", "latent-lite"] From be914a8521933df2d80f21aff4bf2d0437f5bc20 Mon Sep 17 00:00:00 2001 From: Arthurdw Date: Tue, 18 Feb 2025 11:33:16 +0100 Subject: [PATCH 14/31] fix: when readonly don't save logs --- bittensor/utils/btlogging/loggingmachine.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bittensor/utils/btlogging/loggingmachine.py b/bittensor/utils/btlogging/loggingmachine.py index de33f39905..3b0a26b660 100644 --- a/bittensor/utils/btlogging/loggingmachine.py +++ b/bittensor/utils/btlogging/loggingmachine.py @@ -16,6 +16,7 @@ from statemachine import State, StateMachine +from bittensor.core.settings import READ_ONLY from bittensor.core.config import Config from bittensor.utils.btlogging.console import BittensorConsole from .defines import ( @@ -584,9 +585,7 @@ def add_args(cls, parser: argparse.ArgumentParser, prefix: str = None): default_logging_info = os.getenv("BT_LOGGING_INFO") or False default_logging_trace = os.getenv("BT_LOGGING_TRACE") or False default_logging_record_log = os.getenv("BT_LOGGING_RECORD_LOG") or False - default_logging_logging_dir = os.getenv( - "BT_LOGGING_LOGGING_DIR" - ) or os.path.join("~", ".bittensor", "miners") + default_logging_logging_dir = None if READ_ONLY else os.getenv("BT_LOGGING_LOGGING_DIR") or os.path.join("~", ".bittensor", "miners") parser.add_argument( "--" + prefix_str + "logging.debug", action="store_true", From 76a10dbd26e8ce42c658d4ca21cf9996f876238d Mon Sep 17 00:00:00 2001 From: BD Himes <37844818+thewhaleking@users.noreply.github.com> Date: Tue, 18 Feb 2025 17:06:21 +0200 Subject: [PATCH 15/31] Ruff --- bittensor/utils/btlogging/loggingmachine.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bittensor/utils/btlogging/loggingmachine.py b/bittensor/utils/btlogging/loggingmachine.py index 3b0a26b660..a8803e70fd 100644 --- a/bittensor/utils/btlogging/loggingmachine.py +++ b/bittensor/utils/btlogging/loggingmachine.py @@ -585,7 +585,12 @@ def add_args(cls, parser: argparse.ArgumentParser, prefix: str = None): default_logging_info = os.getenv("BT_LOGGING_INFO") or False default_logging_trace = os.getenv("BT_LOGGING_TRACE") or False default_logging_record_log = os.getenv("BT_LOGGING_RECORD_LOG") or False - default_logging_logging_dir = None if READ_ONLY else os.getenv("BT_LOGGING_LOGGING_DIR") or os.path.join("~", ".bittensor", "miners") + default_logging_logging_dir = ( + None + if READ_ONLY + else os.getenv("BT_LOGGING_LOGGING_DIR") + or os.path.join("~", ".bittensor", "miners") + ) parser.add_argument( "--" + prefix_str + "logging.debug", action="store_true", From 8563a339a1de54b6e3ef827777fa6a788ce557f1 Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Tue, 18 Feb 2025 19:27:56 +0200 Subject: [PATCH 16/31] Add methods for retrieving all neuron certificates on a given netuid. --- bittensor/core/async_subtensor.py | 34 +++++++++++++++++++++++++++++++ bittensor/core/subtensor.py | 25 +++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/bittensor/core/async_subtensor.py b/bittensor/core/async_subtensor.py index 8e357aa141..6fa56c4bd4 100644 --- a/bittensor/core/async_subtensor.py +++ b/bittensor/core/async_subtensor.py @@ -1479,6 +1479,40 @@ async def get_neuron_certificate( return None return None + async def get_all_neuron_certificates( + self, + netuid: int, + block: Optional[int] = None, + block_hash: Optional[str] = None, + reuse_block: bool = False, + ) -> dict[str, Certificate]: + """ + Retrieves the TLS certificates for neurons within a specified subnet (netuid) of the Bittensor network. + + Arguments: + netuid: The unique identifier of the subnet. + block: The blockchain block number for the query. + block_hash: The hash of the block to retrieve the parameter from. Do not specify if using block or + reuse_block. + reuse_block: Whether to use the last-used block. Do not set if using block_hash or block. + + Returns: + {ss58: Certificate} for the key/Certificate pairs on the subnet + + This function is used for certificate discovery for setting up mutual tls communication between neurons. + """ + query_certificates = await self.query_map( + module="SubtensorModule", + name="NeuronCertificates", + block=block, + block_hash=block_hash, + reuse_block=reuse_block, + ) + output = {} + async for key, item in query_certificates: + output[decode_account_id(key)] = Certificate(item.value) + return output + async def get_neuron_for_pubkey_and_subnet( self, hotkey_ss58: str, diff --git a/bittensor/core/subtensor.py b/bittensor/core/subtensor.py index 03c32a6072..d055e873a2 100644 --- a/bittensor/core/subtensor.py +++ b/bittensor/core/subtensor.py @@ -1123,6 +1123,31 @@ def get_neuron_certificate( return None return None + def get_all_neuron_certificates( + self, netuid: int, block: Optional[int] = None + ) -> dict[str, Certificate]: + """ + Retrieves the TLS certificates for neurons within a specified subnet (netuid) of the Bittensor network. + + Arguments: + netuid: The unique identifier of the subnet. + block: The blockchain block number for the query. + + Returns: + {ss58: Certificate} for the key/Certificate pairs on the subnet + + This function is used for certificate discovery for setting up mutual tls communication between neurons. + """ + query_certificates = self.query_map( + module="SubtensorModule", + name="NeuronCertificates", + block=block, + ) + output = {} + for key, item in query_certificates: + output[decode_account_id(key)] = Certificate(item.value) + return output + def get_neuron_for_pubkey_and_subnet( self, hotkey_ss58: str, netuid: int, block: Optional[int] = None ) -> Optional["NeuronInfo"]: From b5a8d5c1e68bfd70a9d70d464b4db3aac0ac6fbb Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Tue, 18 Feb 2025 19:29:08 +0200 Subject: [PATCH 17/31] Add netuid --- bittensor/core/async_subtensor.py | 1 + bittensor/core/subtensor.py | 1 + 2 files changed, 2 insertions(+) diff --git a/bittensor/core/async_subtensor.py b/bittensor/core/async_subtensor.py index 6fa56c4bd4..d83c373140 100644 --- a/bittensor/core/async_subtensor.py +++ b/bittensor/core/async_subtensor.py @@ -1504,6 +1504,7 @@ async def get_all_neuron_certificates( query_certificates = await self.query_map( module="SubtensorModule", name="NeuronCertificates", + params=[netuid], block=block, block_hash=block_hash, reuse_block=reuse_block, diff --git a/bittensor/core/subtensor.py b/bittensor/core/subtensor.py index d055e873a2..e2d9ffda19 100644 --- a/bittensor/core/subtensor.py +++ b/bittensor/core/subtensor.py @@ -1141,6 +1141,7 @@ def get_all_neuron_certificates( query_certificates = self.query_map( module="SubtensorModule", name="NeuronCertificates", + params=[netuid], block=block, ) output = {} From bf5e391640fdf5bfb9f02fbc26fe3c87f179b42f Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Tue, 18 Feb 2025 19:34:10 +0200 Subject: [PATCH 18/31] Added test --- tests/e2e_tests/test_neuron_certificate.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/e2e_tests/test_neuron_certificate.py b/tests/e2e_tests/test_neuron_certificate.py index 245f9bc9fa..674a4ce27c 100644 --- a/tests/e2e_tests/test_neuron_certificate.py +++ b/tests/e2e_tests/test_neuron_certificate.py @@ -47,5 +47,8 @@ async def test_neuron_certificate(subtensor, alice_wallet): ) == encoded_certificate ) + all_certs_query = subtensor.get_all_neuron_certificates(netuid=netuid) + assert alice_wallet.hotkey.ss58_address in all_certs_query.keys() + assert all_certs_query[alice_wallet.hotkey.ss58_address] == encoded_certificate logging.info("✅ Passed test_neuron_certificate") From d93bc7dc71eeeff74d9e914908aa38055002fa21 Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Tue, 18 Feb 2025 19:48:54 +0200 Subject: [PATCH 19/31] Added unit test --- tests/unit_tests/test_subtensor.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/unit_tests/test_subtensor.py b/tests/unit_tests/test_subtensor.py index 385bb45501..b6d63d72f7 100644 --- a/tests/unit_tests/test_subtensor.py +++ b/tests/unit_tests/test_subtensor.py @@ -3084,3 +3084,16 @@ def test_set_subnet_identity(mocker, subtensor): wait_for_inclusion=False, ) assert result == mocked_extrinsic.return_value + + +def test_get_all_neuron_certificates(mocker, subtensor): + fake_netuid = 12 + mocked_query_map_subtensor = mocker.MagicMock() + mocker.patch.object(subtensor.substrate, "query_map", mocked_query_map_subtensor) + subtensor.get_all_neuron_certificates(fake_netuid) + mocked_query_map_subtensor.assert_called_once_with( + module="SubtensorModule", + storage_function="NeuronCertificates", + params=[fake_netuid], + block_hash=None, + ) From 1c85c5309afbad429d2834085895f5d9fcc80dc4 Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Tue, 18 Feb 2025 19:57:52 +0200 Subject: [PATCH 20/31] ut --- tests/unit_tests/test_async_subtensor.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/unit_tests/test_async_subtensor.py b/tests/unit_tests/test_async_subtensor.py index 83a29f3298..11b57dec23 100644 --- a/tests/unit_tests/test_async_subtensor.py +++ b/tests/unit_tests/test_async_subtensor.py @@ -2676,3 +2676,18 @@ async def test_set_subnet_identity(mocker, subtensor): wait_for_inclusion=False, ) assert result == mocked_extrinsic.return_value + + +@pytest.mark.asyncio +async def test_get_all_neuron_certificates(mocker, subtensor): + fake_netuid = 12 + mocked_query_map_subtensor = mocker.AsyncMock() + mocker.patch.object(subtensor.substrate, "query_map", mocked_query_map_subtensor) + await subtensor.get_all_neuron_certificates(fake_netuid) + mocked_query_map_subtensor.assert_called_once_with( + module="SubtensorModule", + storage_function="NeuronCertificates", + params=[fake_netuid], + block_hash=None, + reuse_block_hash=False, + ) From 7c144a45e45c5b1c5e024eb3cb7d57d9f4c83914 Mon Sep 17 00:00:00 2001 From: BD Himes <37844818+thewhaleking@users.noreply.github.com> Date: Tue, 18 Feb 2025 20:00:59 +0200 Subject: [PATCH 21/31] Update tests/unit_tests/test_async_subtensor.py Co-authored-by: Roman <167799377+roman-opentensor@users.noreply.github.com> --- tests/unit_tests/test_async_subtensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit_tests/test_async_subtensor.py b/tests/unit_tests/test_async_subtensor.py index 11b57dec23..b328044dbc 100644 --- a/tests/unit_tests/test_async_subtensor.py +++ b/tests/unit_tests/test_async_subtensor.py @@ -2684,7 +2684,7 @@ async def test_get_all_neuron_certificates(mocker, subtensor): mocked_query_map_subtensor = mocker.AsyncMock() mocker.patch.object(subtensor.substrate, "query_map", mocked_query_map_subtensor) await subtensor.get_all_neuron_certificates(fake_netuid) - mocked_query_map_subtensor.assert_called_once_with( + mocked_query_map_subtensor.assert_awaited_once_with( module="SubtensorModule", storage_function="NeuronCertificates", params=[fake_netuid], From fb8c0ea0c44d513636131183874df57554a2137f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBy=C5=BAniewski?= Date: Tue, 21 Jan 2025 12:54:50 +0100 Subject: [PATCH 22/31] fix(2188): don't allow uvicorn to reconfigure event_loop_policy --- bittensor/core/axon.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bittensor/core/axon.py b/bittensor/core/axon.py index 5e4a64805b..a51f1c3e2d 100644 --- a/bittensor/core/axon.py +++ b/bittensor/core/axon.py @@ -386,7 +386,11 @@ def __init__( self.app = FastAPI() log_level = "trace" if logging.__trace_on__ else "critical" self.fast_config = uvicorn.Config( - self.app, host="0.0.0.0", port=self._config.axon.port, log_level=log_level + self.app, + host="0.0.0.0", + log_level=log_level, + loop="none", + port=self._config.axon.port, ) self.fast_server = FastAPIThreadedServer(config=self.fast_config) self.router = APIRouter() From 574dbe46734f0ccd6123c99f6baee4cc9188f4f6 Mon Sep 17 00:00:00 2001 From: ibraheem-opentensor Date: Tue, 18 Feb 2025 11:33:55 -0800 Subject: [PATCH 23/31] Removes extra assignments for stake, total_stake --- bittensor/core/metagraph.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/bittensor/core/metagraph.py b/bittensor/core/metagraph.py index 93128f6f01..2f68709ab2 100644 --- a/bittensor/core/metagraph.py +++ b/bittensor/core/metagraph.py @@ -773,14 +773,6 @@ def _set_metagraph_attributes(self, block: int): [neuron.validator_trust for neuron in self.neurons], dtype=self._dtype_registry["float32"], ) - self.total_stake = self._create_tensor( - [neuron.total_stake.tao for neuron in self.neurons], - dtype=self._dtype_registry["float32"], - ) - self.stake = self._create_tensor( - [neuron.stake.tao for neuron in self.neurons], - dtype=self._dtype_registry["float32"], - ) self.axons = [n.axon_info for n in self.neurons] def save(self, root_dir: Optional[list[str]] = None) -> "MetagraphMixin": @@ -1634,7 +1626,7 @@ def __init__( subtensor: Optional["Subtensor"] = None, ): super().__init__(netuid, network, lite, sync, subtensor) - if sync: + if self.should_sync: self.sync() def sync( From 7445b5adc6be3e3d53b48bda6b714368389a0973 Mon Sep 17 00:00:00 2001 From: ibraheem-opentensor Date: Tue, 18 Feb 2025 17:43:24 -0800 Subject: [PATCH 24/31] Adds stake weight to metagraph info --- bittensor/core/chain_data/metagraph_info.py | 3 ++- bittensor/core/metagraph.py | 5 ++--- bittensor/core/settings.py | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bittensor/core/chain_data/metagraph_info.py b/bittensor/core/chain_data/metagraph_info.py index f79f0d4cc4..6700b11ddd 100644 --- a/bittensor/core/chain_data/metagraph_info.py +++ b/bittensor/core/chain_data/metagraph_info.py @@ -1,6 +1,7 @@ from dataclasses import dataclass from typing import Optional, Union +from bittensor.core import settings from bittensor.core.chain_data.axon_info import AxonInfo from bittensor.core.chain_data.chain_identity import ChainIdentity from bittensor.core.chain_data.info_base import InfoBase @@ -234,7 +235,7 @@ def _from_dict(cls, decoded: dict) -> "MetagraphInfo": rank=[u16tf(rk) for rk in decoded.get("rank", [])], block_at_registration=decoded["block_at_registration"], alpha_stake=[_tbwu(ast, _netuid) for ast in decoded["alpha_stake"]], - tao_stake=[_tbwu(ts) for ts in decoded["tao_stake"]], + tao_stake=[_tbwu(ts)*settings.ROOT_TAO_STAKE_WEIGHT for ts in decoded["tao_stake"]], total_stake=[_tbwu(ts, _netuid) for ts in decoded["total_stake"]], # Dividend break down tao_dividends_per_hotkey=[ diff --git a/bittensor/core/metagraph.py b/bittensor/core/metagraph.py index 2f68709ab2..acf44c7c70 100644 --- a/bittensor/core/metagraph.py +++ b/bittensor/core/metagraph.py @@ -42,7 +42,6 @@ Tensor = Union["torch.nn.Parameter", NDArray] -ROOT_TAO_STAKES_WEIGHT = 0.18 METAGRAPH_STATE_DICT_NDARRAY_KEYS = [ @@ -1598,7 +1597,7 @@ async def _get_all_stakes_from_chain(self): dtype=self._dtype_registry["float32"], ) self.tao_stake = self._create_tensor( - [b.tao * ROOT_TAO_STAKES_WEIGHT for b in subnet_state.tao_stake], + [b.tao * settings.ROOT_TAO_STAKE_WEIGHT for b in subnet_state.tao_stake], dtype=self._dtype_registry["float32"], ) self.total_stake = self.stake = self._create_tensor( @@ -1902,7 +1901,7 @@ def _get_all_stakes_from_chain(self): dtype=self._dtype_registry["float32"], ) self.tao_stake = self._create_tensor( - [b.tao * ROOT_TAO_STAKES_WEIGHT for b in subnet_state.tao_stake], + [b.tao * settings.ROOT_TAO_STAKE_WEIGHT for b in subnet_state.tao_stake], dtype=self._dtype_registry["float32"], ) self.total_stake = self.stake = self._create_tensor( diff --git a/bittensor/core/settings.py b/bittensor/core/settings.py index ec51adafdc..b33d174986 100644 --- a/bittensor/core/settings.py +++ b/bittensor/core/settings.py @@ -6,6 +6,7 @@ from munch import munchify +ROOT_TAO_STAKE_WEIGHT = 0.18 READ_ONLY = os.getenv("READ_ONLY") == "1" From b7eec15bb3e77e70939cc09b017ce7e91e511763 Mon Sep 17 00:00:00 2001 From: ibraheem-opentensor Date: Tue, 18 Feb 2025 17:43:57 -0800 Subject: [PATCH 25/31] ruff --- bittensor/core/chain_data/metagraph_info.py | 5 ++++- bittensor/core/metagraph.py | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/bittensor/core/chain_data/metagraph_info.py b/bittensor/core/chain_data/metagraph_info.py index 6700b11ddd..1ed2733124 100644 --- a/bittensor/core/chain_data/metagraph_info.py +++ b/bittensor/core/chain_data/metagraph_info.py @@ -235,7 +235,10 @@ def _from_dict(cls, decoded: dict) -> "MetagraphInfo": rank=[u16tf(rk) for rk in decoded.get("rank", [])], block_at_registration=decoded["block_at_registration"], alpha_stake=[_tbwu(ast, _netuid) for ast in decoded["alpha_stake"]], - tao_stake=[_tbwu(ts)*settings.ROOT_TAO_STAKE_WEIGHT for ts in decoded["tao_stake"]], + tao_stake=[ + _tbwu(ts) * settings.ROOT_TAO_STAKE_WEIGHT + for ts in decoded["tao_stake"] + ], total_stake=[_tbwu(ts, _netuid) for ts in decoded["total_stake"]], # Dividend break down tao_dividends_per_hotkey=[ diff --git a/bittensor/core/metagraph.py b/bittensor/core/metagraph.py index acf44c7c70..06b9a66bb2 100644 --- a/bittensor/core/metagraph.py +++ b/bittensor/core/metagraph.py @@ -1597,7 +1597,10 @@ async def _get_all_stakes_from_chain(self): dtype=self._dtype_registry["float32"], ) self.tao_stake = self._create_tensor( - [b.tao * settings.ROOT_TAO_STAKE_WEIGHT for b in subnet_state.tao_stake], + [ + b.tao * settings.ROOT_TAO_STAKE_WEIGHT + for b in subnet_state.tao_stake + ], dtype=self._dtype_registry["float32"], ) self.total_stake = self.stake = self._create_tensor( @@ -1901,7 +1904,10 @@ def _get_all_stakes_from_chain(self): dtype=self._dtype_registry["float32"], ) self.tao_stake = self._create_tensor( - [b.tao * settings.ROOT_TAO_STAKE_WEIGHT for b in subnet_state.tao_stake], + [ + b.tao * settings.ROOT_TAO_STAKE_WEIGHT + for b in subnet_state.tao_stake + ], dtype=self._dtype_registry["float32"], ) self.total_stake = self.stake = self._create_tensor( From 70454755b61b6ecc1fab8520741e74300af76f27 Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Thu, 20 Feb 2025 14:59:16 +0200 Subject: [PATCH 26/31] Refactored the logic of `__aenter__` for `AsyncSubtensor` so that it doesn't close the websocket immediately. --- bittensor/core/async_subtensor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bittensor/core/async_subtensor.py b/bittensor/core/async_subtensor.py index d83c373140..2f718d7c29 100644 --- a/bittensor/core/async_subtensor.py +++ b/bittensor/core/async_subtensor.py @@ -173,8 +173,8 @@ async def __aenter__(self): f"[magenta]Connecting to Substrate:[/magenta] [blue]{self}[/blue][magenta]...[/magenta]" ) try: - async with self.substrate: - return self + await self.substrate.initialize() + return self except TimeoutError: logging.error( f"[red]Error[/red]: Timeout occurred connecting to substrate." From c5b0986e36bb517ea491c24acf6b397887902ca2 Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Thu, 20 Feb 2025 15:07:04 +0200 Subject: [PATCH 27/31] Fix tests. --- tests/unit_tests/test_async_subtensor.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/unit_tests/test_async_subtensor.py b/tests/unit_tests/test_async_subtensor.py index b328044dbc..ca2b6d187d 100644 --- a/tests/unit_tests/test_async_subtensor.py +++ b/tests/unit_tests/test_async_subtensor.py @@ -128,9 +128,8 @@ async def test_async_subtensor_magic_methods(mocker): pass # Asserts - fake_async_substrate.__aenter__.assert_called_once() - fake_async_substrate.__aexit__.assert_called_once() - fake_async_substrate.close.assert_awaited_once() + fake_async_substrate.initialize.assert_called_once() + fake_async_substrate.close.assert_called_once() @pytest.mark.parametrize( From 80f917425f0a662fdfa19679e375b2e8459b6e4f Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Thu, 20 Feb 2025 20:03:50 +0200 Subject: [PATCH 28/31] Fix tests. --- tests/unit_tests/test_async_subtensor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit_tests/test_async_subtensor.py b/tests/unit_tests/test_async_subtensor.py index ca2b6d187d..b6102b1cc9 100644 --- a/tests/unit_tests/test_async_subtensor.py +++ b/tests/unit_tests/test_async_subtensor.py @@ -144,7 +144,7 @@ async def test_async_subtensor_aenter_connection_refused_error( # Preps fake_async_substrate = mocker.AsyncMock( autospec=async_subtensor.AsyncSubstrateInterface, - __aenter__=mocker.AsyncMock(side_effect=error), + initialize=mocker.AsyncMock(side_effect=error), ) mocker.patch.object( async_subtensor, "AsyncSubstrateInterface", return_value=fake_async_substrate @@ -157,7 +157,7 @@ async def test_async_subtensor_aenter_connection_refused_error( pass # Asserts - fake_async_substrate.__aenter__.assert_called_once() + fake_async_substrate.initialize.assert_called_once() @pytest.mark.asyncio From f7a93150003f042aa14f1a27429b34d64d4f2f12 Mon Sep 17 00:00:00 2001 From: Benjamin Himes Date: Thu, 20 Feb 2025 20:10:31 +0200 Subject: [PATCH 29/31] called -> awaited --- tests/unit_tests/test_async_subtensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit_tests/test_async_subtensor.py b/tests/unit_tests/test_async_subtensor.py index b6102b1cc9..5123ce7607 100644 --- a/tests/unit_tests/test_async_subtensor.py +++ b/tests/unit_tests/test_async_subtensor.py @@ -157,7 +157,7 @@ async def test_async_subtensor_aenter_connection_refused_error( pass # Asserts - fake_async_substrate.initialize.assert_called_once() + fake_async_substrate.initialize.assert_awaited_once() @pytest.mark.asyncio From b0b6145bae66f0b105254f999dcf90a110940a82 Mon Sep 17 00:00:00 2001 From: ibraheem-opentensor Date: Thu, 20 Feb 2025 11:26:48 -0800 Subject: [PATCH 30/31] merge master to staging --- CHANGELOG.md | 84 ++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- bittensor/core/settings.py | 2 +- 3 files changed, 86 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e0e29a339..c042ed9bd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,89 @@ # Changelog +## 9.0.0 /2025-02-13 + +## What's Changed +* Optimisations and tests for Async Sync Subtensor by @thewhaleking in https://github.com/opentensor/bittensor/pull/2569 +* [SDK] Get rid of py-substrate-interface (DO NOT MERGE) by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2565 +* Uses the new async_substrate_interface lib by @thewhaleking in https://github.com/opentensor/bittensor/pull/2572 +* AsyncSubstrateInterface Overhaul (with Sync AsyncSubstrate) by @thewhaleking in https://github.com/opentensor/bittensor/pull/2526 +* [SDK] Small improvements by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2575 +* Sync Subtensor warning by @thewhaleking in https://github.com/opentensor/bittensor/pull/2578 +* [SDK] Fixes types in async by @thewhaleking in https://github.com/opentensor/bittensor/pull/2577 +* Release/8.5.2 by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2584 +* fix: typos in documentation files by @leopardracer in https://github.com/opentensor/bittensor/pull/2580 +* fix(2337): btlogging setLevel by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2588 +* perf: don't use 2 threads to create FastAPI server by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2592 +* fix(2188): don't allow uvicorn to reconfigure event_loop_policy by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2591 +* Fix spelling errors by @Dimitrolito in https://github.com/opentensor/bittensor/pull/2586 +* Make code as beautiful as it has never been before by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2599 +* test: bring back old (sync subtensor) tests and fix them by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2600 +* YAASO: Yet Another AsyncSubtensor Overhaul by @thewhaleking in https://github.com/opentensor/bittensor/pull/2579 +* Add alias for `Subtensor.commit` as `set_commitment` by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2606 +* [RAO] Add methods to fetch metagraph data from the chain by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2605 +* Rewrite config.py by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2607 +* Update metagraph class with `rao` stuff by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2611 +* [RAO] fix for unit test + refactoring by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2612 +* fix integration metagraph test by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2613 +* Cleanups, fixes, improvements for rao by @thewhaleking in https://github.com/opentensor/bittensor/pull/2614 +* Adds deprecation notice for non-balance amounts by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2615 +* Staging pre merge port rao (New async substrate) by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2610 +* Tests for SyncSubtensor by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2617 +* Many small fixes by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2619 +* Use async-substrate-interface for runtime decoding by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2618 +* Pins torch version to 2.5.1 by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2623 +* Fixes, adds stake and other methods by @thewhaleking in https://github.com/opentensor/bittensor/pull/2622 +* Fix typos by @Marcofann in https://github.com/opentensor/bittensor/pull/2620 +* Add `subnet_volume` field to `MetagraphInfo` and `DynamicInfo` by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2624 +* Update wallet creation command logs post-install by @HudsonGraeme in https://github.com/opentensor/bittensor/pull/2621 +* fix subtensor methods for async by @thewhaleking in https://github.com/opentensor/bittensor/pull/2628 +* Subnet burn cost return type by @thewhaleking in https://github.com/opentensor/bittensor/pull/2629 +* Specifies a range of torch versions, rather than a pinned version. by @thewhaleking in https://github.com/opentensor/bittensor/pull/2632 +* Adds subnet registration extrinsic by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2630 +* Bumps btwallet 302 by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2633 +* SKD implementation for Subtensor `Feat/RPC Upgrades`. PR #1205 by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2627 +* Bug fixes after release SDK v9.0.0rc1 by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2637 +* Adds Latent Lite endpoint to the SDK by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2641 +* Bringing meta fields to a common form with float values float(TAO) instead of Balance and Tensor by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2642 +* Adds `get_all_commitments` and fixes commitment tests and `query_map` by @thewhaleking in https://github.com/opentensor/bittensor/pull/2644 +* Fix for extra fields from chain data by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2647 +* Fix InfoBase + dataclasses by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2649 +* fix integration tests by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2651 +* feat: Add logging for unexpected header keys in Synapse by @crStiv in https://github.com/opentensor/bittensor/pull/2587 +* Fixes Dendrite new loop close by @thewhaleking in https://github.com/opentensor/bittensor/pull/2654 +* Fix e2e tests by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2639 +* feat/roman/deps by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2655 +* Metagraph Improvements by @thewhaleking in https://github.com/opentensor/bittensor/pull/2659 +* add name and symbol fields to metagraph by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2658 +* Using one determine_chain_endpoint_and_network by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2661 +* Tests: separate `templates` fixture by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2660 +* Merge `async-pre-merge-new-async` to `staging` by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2656 +* Add `set_subnet_identity_extrinsic` and related stuff by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2662 +* Changes the logging level for unexpected header keys to trace by @thewhaleking in https://github.com/opentensor/bittensor/pull/2666 +* Remove logs by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2667 +* Tests: properly handle subprocesses (subtensor, miner, validator) by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2664 +* Last-minute requests by @thewhaleking in https://github.com/opentensor/bittensor/pull/2665 +* Updates tao_weights for mainnet by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2669 +* Update deps and default network/endpoint by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2670 + +## New Contributors +* @leopardracer made their first contribution in https://github.com/opentensor/bittensor/pull/2580 +* @Dimitrolito made their first contribution in https://github.com/opentensor/bittensor/pull/2586 +* @Marcofann made their first contribution in https://github.com/opentensor/bittensor/pull/2620 +* @HudsonGraeme made their first contribution in https://github.com/opentensor/bittensor/pull/2621 +* @crStiv made their first contribution in https://github.com/opentensor/bittensor/pull/2587 + +**Full Changelog**: https://github.com/opentensor/bittensor/compare/v8.5.2...v9.0.0 + +## 9.0.0rc6 /2025-02-11 +* Using one determine_chain_endpoint_and_network by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2661 +* Tests: separate templates fixture by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2660 +* add name and symbol fields to metagraph by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2658 +* Metagraph Improvements by @thewhaleking in https://github.com/opentensor/bittensor/pull/2659 +* feat/roman/add-subnet-identity-with-subnet-creation by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2662 + +**Full Changelog**: https://github.com/opentensor/bittensor/compare/v9.0.0rc5...v9.0.0rc6 + ## 9.0.0rc5 /2025-02-07 * Fix InfoBase + dataclasses @roman-opentensor in https://github.com/opentensor/bittensor/pull/2649 diff --git a/VERSION b/VERSION index dd477240eb..c9277c5a60 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.0.0rc5 \ No newline at end of file +9.0.0 \ No newline at end of file diff --git a/bittensor/core/settings.py b/bittensor/core/settings.py index b33d174986..0b925374d0 100644 --- a/bittensor/core/settings.py +++ b/bittensor/core/settings.py @@ -1,4 +1,4 @@ -__version__ = "9.0.0rc5" +__version__ = "9.0.0" import os import re From c228c6c7b5670c1338b5557c2576c37a92ff5ea7 Mon Sep 17 00:00:00 2001 From: ibraheem-opentensor Date: Thu, 20 Feb 2025 11:52:51 -0800 Subject: [PATCH 31/31] Updates version and changelog --- CHANGELOG.md | 20 ++++++++++++++++++++ VERSION | 2 +- bittensor/core/settings.py | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c042ed9bd0..70d29a1875 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## What's Changed +* Release/9.0.0 by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2671 +* fix e2e test by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2673 +* fix e2e test incentive by @roman-opentensor in https://github.com/opentensor/bittensor/pull/2674 +* Add compatibility for read-only systems by @Arthurdw in https://github.com/opentensor/bittensor/pull/2676 +* test: use asynccontextmanager for FastAPI lifespan by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2597 +* test(2472): offline unittests by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2596 +* Removes redundant assignments in Metagraph by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2680 +* Alpha str formatting by @thewhaleking in https://github.com/opentensor/bittensor/pull/2672 +* Add method for fetching all Neuron Certificates on a Netuid by @thewhaleking in https://github.com/opentensor/bittensor/pull/2677 +* Updates tao_stake in MetagraphInfo by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2682 +* fix(2188): configure uvicorn event loop by @zyzniewski-reef in https://github.com/opentensor/bittensor/pull/2679 +* Refactor AsyncSubtensor aenter logic by @thewhaleking in https://github.com/opentensor/bittensor/pull/2684 +* Backmerge master to staging 900 by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/2685 + +## New Contributors +* @Arthurdw made their first contribution in https://github.com/opentensor/bittensor/pull/2676 + +**Full Changelog**: https://github.com/opentensor/bittensor/compare/v9.0.0...v9.0.1 + ## 9.0.0 /2025-02-13 ## What's Changed diff --git a/VERSION b/VERSION index c9277c5a60..6768f7e446 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.0.0 \ No newline at end of file +9.0.1 \ No newline at end of file diff --git a/bittensor/core/settings.py b/bittensor/core/settings.py index 0b925374d0..f505f23f56 100644 --- a/bittensor/core/settings.py +++ b/bittensor/core/settings.py @@ -1,4 +1,4 @@ -__version__ = "9.0.0" +__version__ = "9.0.1" import os import re