Merge pull request #120 from eclipsevortex/release/3.1.1

eclipsevortex · web-flow · commit 3a3513fbed1b · 2025-05-27T07:40:49.000+01:00
Release/3.1.1
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.0
+3.1.1
diff --git a/subvortex/core/metagraph/checker.py b/subvortex/core/metagraph/checker.py
@@ -57,7 +57,11 @@ async def run(self):
             expected_neuron = scmm.Neuron.from_proto(neuron)
 
             if self.with_country:
-                expected_neuron.country = sccc.get_country(expected_neuron.ip)
+                expected_neuron.country = (
+                    sccc.get_country(expected_neuron.ip)
+                    if expected_neuron.ip != "0.0.0.0"
+                    else None
+                )
 
             mismatches = []
             for key, expected_value in expected_neuron.__dict__.items():
diff --git a/subvortex/core/model/neuron/model_neuron_210.py b/subvortex/core/model/neuron/model_neuron_210.py
@@ -54,8 +54,8 @@ async def write_all(self, redis: Redis, neurons: list[Neuron]):
                 pipe.hmset(key, data)
             await pipe.execute()
 
-    async def delete(self, redis: Redis, hotkey: str):
-        key = self._key(hotkey)
+    async def delete(self, redis: Redis, neuron: Neuron):
+        key = self._key(neuron.hotkey)
         await redis.delete(key)
 
     async def delete_all(self, redis: Redis, neurons: list[Neuron]):
diff --git a/subvortex/miner/metagraph/manifest.json b/subvortex/miner/metagraph/manifest.json
@@ -2,9 +2,9 @@
   "id": "miner-metagraph",
   "name": "subvortex-miner-metagraph",
   "description": "SubVortex Miner Metagraph",
-  "version": "3.1.0",
-  "miner.version": "3.1.0",
-  "miner.metagraph.version": "3.1.0",
+  "version": "3.1.1",
+  "miner.version": "3.1.1",
+  "miner.metagraph.version": "3.1.1",
   "type": "python",
   "neuron": "miner",
   "component": "metagraph",
diff --git a/subvortex/miner/metagraph/metadata.json b/subvortex/miner/metagraph/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "miner-metagraph",
   "name": "subvortex-miner-metagraph",
-  "version": "3.1.0",
-  "miner.version": "3.1.0",
-  "miner.metagraph.version": "3.1.0",
+  "version": "3.1.1",
+  "miner.version": "3.1.1",
+  "miner.metagraph.version": "3.1.1",
   "depends_on": [
     "miner-redis"
   ]
diff --git a/subvortex/miner/metagraph/pyproject.toml b/subvortex/miner/metagraph/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex-miner-metagraph"
-version = "3.1.0"
+version = "3.1.1"
 description = "SubVortex Miner Metagraph"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"
diff --git a/subvortex/miner/neuron/manifest.json b/subvortex/miner/neuron/manifest.json
@@ -2,9 +2,9 @@
   "id": "miner-neuron",
   "name": "subvortex-miner-neuron",
   "description": "SubVortex Miner Neuron",
-  "version": "3.1.0",
-  "miner.version": "3.1.0",
-  "miner.neuron.version": "3.1.0",
+  "version": "3.1.1",
+  "miner.version": "3.1.1",
+  "miner.neuron.version": "3.1.1",
   "type": "python",
   "neuron": "miner",
   "component": "neuron",
diff --git a/subvortex/miner/neuron/metadata.json b/subvortex/miner/neuron/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "miner-neuron",
   "name": "subvortex-miner-neuron",
-  "version": "3.1.0",
-  "miner.version": "3.1.0",
-  "miner.neuron.version": "3.1.0",
+  "version": "3.1.1",
+  "miner.version": "3.1.1",
+  "miner.neuron.version": "3.1.1",
   "depends_on": [
     "miner-redis",
     "miner-metagraph"
diff --git a/subvortex/miner/neuron/pyproject.toml b/subvortex/miner/neuron/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex-miner-neuron"
-version = "3.1.0"
+version = "3.1.1"
 description = "SubVortex Miner Neuron"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"
diff --git a/subvortex/miner/redis/manifest.json b/subvortex/miner/redis/manifest.json
@@ -2,9 +2,9 @@
   "id": "miner-redis",
   "name": "subvortex-miner-redis",
   "description": "SubVortex Miner Redis",
-  "version": "3.1.0",
-  "miner.version": "3.1.0",
-  "miner.redis.version": "3.1.0",
+  "version": "3.1.1",
+  "miner.version": "3.1.1",
+  "miner.redis.version": "3.1.1",
   "type": "package",
   "neuron": "miner",
   "component": "redis",
diff --git a/subvortex/miner/redis/metadata.json b/subvortex/miner/redis/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "miner-redis",
   "name": "subvortex-miner-redis",
-  "version": "3.1.0",
-  "miner.version": "3.1.0",
-  "miner.redis.version": "3.1.0",
+  "version": "3.1.1",
+  "miner.version": "3.1.1",
+  "miner.redis.version": "3.1.1",
   "migration_type": "redis",
   "migration": "./migrations/versions",
   "depends_on": []
diff --git a/subvortex/miner/redis/version.py b/subvortex/miner/redis/version.py
@@ -1 +1 @@
-__version__ = "3.1.0"
+__version__ = "3.1.1"
diff --git a/subvortex/miner/version.py b/subvortex/miner/version.py
@@ -1 +1 @@
-__version__ = "3.1.0"
+__version__ = "3.1.1"
diff --git a/subvortex/pyproject.toml b/subvortex/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex"
-version = "3.1.0"
+version = "3.1.1"
 description = "SubVortex"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"
diff --git a/subvortex/validator/metagraph/manifest.json b/subvortex/validator/metagraph/manifest.json
@@ -2,9 +2,9 @@
   "id": "validator-metagraph",
   "name": "subvortex-validator-metagraph",
   "description": "SubVortex Validator Metagraph",
-  "version": "3.1.0",
-  "validator.version": "3.1.0",
-  "validator.metagraph.version": "3.1.0",
+  "version": "3.1.1",
+  "validator.version": "3.1.1",
+  "validator.metagraph.version": "3.1.1",
   "type": "python",
   "neuron": "validator",
   "component": "metagraph",
diff --git a/subvortex/validator/metagraph/metadata.json b/subvortex/validator/metagraph/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "validator-metagraph",
   "name": "subvortex-validator-metagraph",
-  "version": "3.1.0",
-  "validator.version": "3.1.0",
-  "validator.metagraph.version": "3.1.0",
+  "version": "3.1.1",
+  "validator.version": "3.1.1",
+  "validator.metagraph.version": "3.1.1",
   "depends_on": [
     "validator-redis"
   ]
diff --git a/subvortex/validator/metagraph/pyproject.toml b/subvortex/validator/metagraph/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex-validator-metagraph"
-version = "3.1.0"
+version = "3.1.1"
 description = "SubVortex Validator Metagraph"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"
diff --git a/subvortex/validator/metagraph/src/checker.py b/subvortex/validator/metagraph/src/checker.py
@@ -12,7 +12,7 @@
 import subvortex.core.metagraph.checker as scmc
 import subvortex.core.metagraph.database as scmms
 
-import subvortex.miner.metagraph.src.settings as smme
+import subvortex.validator.metagraph.src.settings as smme
 
 # Load the environment variables for the whole process
 load_dotenv(override=True)
diff --git a/subvortex/validator/neuron/manifest.json b/subvortex/validator/neuron/manifest.json
@@ -2,9 +2,9 @@
   "id": "validator-neuron",
   "name": "subvortex-validator-neuron",
   "description": "SubVortex Validator Neuron",
-  "version": "3.1.0",
-  "validator.version": "3.1.0",
-  "validator.neuron.version": "3.1.0",
+  "version": "3.1.1",
+  "validator.version": "3.1.1",
+  "validator.neuron.version": "3.1.1",
   "type": "python",
   "neuron": "validator",
   "component": "neuron",
diff --git a/subvortex/validator/neuron/metadata.json b/subvortex/validator/neuron/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "validator-neuron",
   "name": "subvortex-validator-neuron",
-  "version": "3.1.0",
-  "validator.version": "3.1.0",
-  "validator.neuron.version": "3.1.0",
+  "version": "3.1.1",
+  "validator.version": "3.1.1",
+  "validator.neuron.version": "3.1.1",
   "depends_on": [
     "validator-redis",
     "validator-metagraph"
diff --git a/subvortex/validator/neuron/pyproject.toml b/subvortex/validator/neuron/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex-validator-neuron"
-version = "3.1.0"
+version = "3.1.1"
 description = "SubVortex Validator Neuron"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"
diff --git a/subvortex/validator/neuron/src/main.py b/subvortex/validator/neuron/src/main.py
@@ -248,7 +248,7 @@ async def run(self):
                     btul.logging.debug(f"Locations loaded {len(locations)}")
 
                     # Sync the miners
-                    await sync_miners(
+                    self.miners = await sync_miners(
                         database=self.database,
                         neurons=neurons,
                         miners=self.miners,
diff --git a/subvortex/validator/neuron/src/miner.py b/subvortex/validator/neuron/src/miner.py
@@ -62,6 +62,8 @@ async def sync_miners(
     validator: Neuron,
     locations: List[str],
 ) -> List[Miner]:
+    miners_updates: List[Miner] = []
+
     # Resync the miners
     for hotkey, neuron in neurons.items():
         # Get the associated miner
@@ -70,17 +72,26 @@ async def sync_miners(
         # Check if the miner did not exist
         if current_miner is None:
             # Create the new miner
-            miner = Miner.create_new_miner(
+            current_miner = Miner.create_new_miner(
                 uid=neuron.uid,
             )
+        elif current_miner.hotkey != hotkey:
+            # Remove the old miner
+            await database.remove_miner(miner=current_miner)
 
-            # Add the new miner
-            await database.add_miner(miner)
+            # Reset the updated miner
+            current_miner.reset()
 
-            # Add the new miner to the list
-            miners.append(miner)
+            # Log the success
+            btul.logging.success(
+                f"[{current_miner.uid}] New miner {hotkey} added to the list"
+            )
 
-            continue
+        # Check if the miner has changed localisation
+        if current_miner.ip != neuron.ip:
+            btul.logging.success(
+                f"[{current_miner.uid}] Miner moved from {current_miner.ip} to {neuron.ip}"
+            )
 
         # Create an updated miner
         miner = current_miner.clone()
@@ -95,31 +106,13 @@ async def sync_miners(
         miner.placeholder1 = neuron.placeholder1
         miner.placeholder2 = neuron.placeholder2
 
-        # Check if the miner has changed ownership
-        if current_miner.hotkey != hotkey:
-            # Remove the old miner
-            await database.remove_miner(miner=miner)
-
-            # Reset the updated miner
-            miner.reset()
-
-            # Add the new miner
-            await database.add_miner(miner=miner)
-
-            # Log the success
-            btul.logging.success(f"[{miner.uid}] New miner {hotkey} added to the list")
-
-        # Check if the miner has changed localisation
-        if current_miner.ip != neuron.ip:
-            btul.logging.success(
-                f"[{miner.uid}] Miner moved from {miner} to {neuron.ip}"
-            )
+        miners_updates.append(miner)
 
     # Define the ip occurences
     ip_occurrences = Counter(neuron.ip for neuron in neurons.values())
 
     # Recompute the miners scores
-    for miner in miners:
+    for miner in miners_updates:
         # Define if miner has ip conflicts or not
         has_ip_conflicts = ip_occurrences.get(miner.ip, 0) > 1
 
@@ -139,6 +132,8 @@ async def sync_miners(
         # Refresh the final score
         miner.score = compute_final_score(miner)
 
+    return miners_updates
+
 
 async def reset_reliability_score(database: Database, miners: List[Miner]):
     btul.logging.info("reset_reliability_score() reset reliability statistics.")
diff --git a/subvortex/validator/neuron/src/models/miner/model_miner_210.py b/subvortex/validator/neuron/src/models/miner/model_miner_210.py
@@ -73,9 +73,9 @@ async def write_all(self, redis: Redis, miners: list[Miner]):
 
         await pipe.execute()
 
-    async def delete(self, redis: Redis, ss58_address: str):
+    async def delete(self, redis: Redis, miner: Miner):
         """
         Delete the statistics entry for a given hotkey.
         """
-        key = self._key(ss58_address)
+        key = self._key(miner.hotkey)
         await redis.delete(key)
diff --git a/subvortex/validator/neuron/tests/src/test_miner.py b/subvortex/validator/neuron/tests/src/test_miner.py
@@ -54,11 +54,11 @@ async def test_sync_miners_adds_missing_miners():
     validator = fake_neuron(999, country="US")
     locations = ["US", "CA"]
 
-    await sync_miners(db, neurons, miners, validator, locations)
+    result = await sync_miners(db, neurons, miners, validator, locations)
 
-    assert len(miners) == 1
-    assert miners[0].uid == 1
-    db.add_miner.assert_called_once()
+    assert len(result) == 1
+    assert result[0].uid == 1
+    # db.add_miner.assert_called_once()
 
 
 @pytest.mark.asyncio
@@ -73,7 +73,6 @@ async def test_sync_miners_handles_hotkey_change():
     await sync_miners(db, neurons, miners, validator, locations)
 
     db.remove_miner.assert_called_once()
-    db.add_miner.assert_called()
 
 
 @pytest.mark.asyncio
@@ -116,4 +115,27 @@ async def test_reset_reliability_score_sets_zero():
         assert miner.challenge_attempts == 0
         assert miner.challenge_successes == 0
 
-    db.update_miners.assert_called_once_with(miners=miners)
+    db.update_miners.assert_called_once_with(miners=miners)
+
+
+@pytest.mark.asyncio
+async def test_sync_miners_updates_visible_outside():
+    db = AsyncMock()
+    
+    # Initial data: one neuron in DB, one existing miner
+    neuron = fake_neuron(uid=1, ip="10.0.0.1", hotkey="hk1")
+    db_neurons = {"hk1": neuron}
+
+    # Existing miner with different IP (will be updated)
+    miner = fake_miner(uid=1, ip="192.168.1.1", hotkey="hk1")
+    miners = [miner]
+
+    validator = fake_neuron(uid=999, country="US")
+    locations = ["US", "CA"]
+
+    result = await sync_miners(db, db_neurons, miners, validator, locations)
+
+    # Assert that the original miner object has been mutated
+    assert result[0].ip == "10.0.0.1"
+    assert result[0].hotkey == "hk1"
+    assert result[0].uid == 1
diff --git a/subvortex/validator/redis/manifest.json b/subvortex/validator/redis/manifest.json
@@ -2,9 +2,9 @@
   "id": "validator-redis",
   "name": "subvortex-validator-redis",
   "description": "SubVortex Validator Redis",
-  "version": "3.1.0",
-  "validator.version": "3.1.0",
-  "validator.redis.version": "3.1.0",
+  "version": "3.1.1",
+  "validator.version": "3.1.1",
+  "validator.redis.version": "3.1.1",
   "type": "package",
   "neuron": "validator",
   "component": "redis",
diff --git a/subvortex/validator/redis/metadata.json b/subvortex/validator/redis/metadata.json
diff --git a/subvortex/validator/redis/version.py b/subvortex/validator/redis/version.py
diff --git a/subvortex/validator/version.py b/subvortex/validator/version.py

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "miner-metagraph",`
`3`	`3`	`"name": "subvortex-miner-metagraph",`
`4`		`- "version": "3.1.0",`
`5`		`- "miner.version": "3.1.0",`
`6`		`- "miner.metagraph.version": "3.1.0",`
	`4`	`+ "version": "3.1.1",`
	`5`	`+ "miner.version": "3.1.1",`
	`6`	`+ "miner.metagraph.version": "3.1.1",`
`7`	`7`	`"depends_on": [`
`8`	`8`	`"miner-redis"`
`9`	`9`	`]`