Merge pull request #2950 from opentensor/update/safe-staking-limits

Safe staking: Updates safe staking limits

Author: ibraheem-abe

bittensor/core/extrinsics/asyncex/staking.py

@@ -120,28 +120,31 @@ async def add_stake_extrinsic(
 
         if safe_staking:
             pool = await subtensor.subnet(netuid=netuid)
-            base_price = pool.price.rao
-            price_with_tolerance = base_price * (1 + rate_tolerance)
-            call_params.update(
-                {
-                    "limit_price": price_with_tolerance,
-                    "allow_partial": allow_partial_stake,
-                }
-            )
-            call_function = "add_stake_limit"
+            base_price = pool.price.tao
+
+            if pool.netuid == 0:
+                price_with_tolerance = base_price
+            else:
+                price_with_tolerance = base_price * (1 + rate_tolerance)
 
-            # For logging
-            base_rate = pool.price.tao
-            rate_with_tolerance = base_rate * (1 + rate_tolerance)
             logging.info(
                 f":satellite: [magenta]Safe Staking to:[/magenta] "
                 f"[blue]netuid: [green]{netuid}[/green], amount: [green]{staking_balance}[/green], "
                 f"tolerance percentage: [green]{rate_tolerance * 100}%[/green], "
-                f"price limit: [green]{rate_with_tolerance}[/green], "
-                f"original price: [green]{base_rate}[/green], "
+                f"price limit: [green]{price_with_tolerance}[/green], "
+                f"original price: [green]{base_price}[/green], "
                 f"with partial stake: [green]{allow_partial_stake}[/green] "
                 f"on [blue]{subtensor.network}[/blue][/magenta]...[/magenta]"
             )
+
+            limit_price = Balance.from_tao(price_with_tolerance).rao
+            call_params.update(
+                {
+                    "limit_price": limit_price,
+                    "allow_partial": allow_partial_stake,
+                }
+            )
+            call_function = "add_stake_limit"
         else:
             logging.info(
                 f":satellite: [magenta]Staking to:[/magenta] "

bittensor/core/extrinsics/asyncex/unstaking.py

@@ -107,26 +107,27 @@ async def unstake_extrinsic(
         }
         if safe_staking:
             pool = await subtensor.subnet(netuid=netuid)
-            base_price = pool.price.rao
-            price_with_tolerance = base_price * (1 - rate_tolerance)
+            base_price = pool.price.tao
 
-            # For logging
-            base_rate = pool.price.tao
-            rate_with_tolerance = base_rate * (1 - rate_tolerance)
+            if pool.netuid == 0:
+                price_with_tolerance = base_price
+            else:
+                price_with_tolerance = base_price * (1 - rate_tolerance)
 
             logging.info(
                 f":satellite: [magenta]Safe Unstaking from:[/magenta] "
                 f"netuid: [green]{netuid}[/green], amount: [green]{unstaking_balance}[/green], "
                 f"tolerance percentage: [green]{rate_tolerance * 100}%[/green], "
-                f"price limit: [green]{rate_with_tolerance}[/green], "
-                f"original price: [green]{base_rate}[/green], "
+                f"price limit: [green]{price_with_tolerance}[/green], "
+                f"original price: [green]{base_price}[/green], "
                 f"with partial unstake: [green]{allow_partial_stake}[/green] "
                 f"on [blue]{subtensor.network}[/blue][magenta]...[/magenta]"
             )
 
+            limit_price = Balance.from_tao(price_with_tolerance).rao
             call_params.update(
                 {
-                    "limit_price": price_with_tolerance,
+                    "limit_price": limit_price,
                     "allow_partial": allow_partial_stake,
                 }
             )

bittensor/core/extrinsics/staking.py

@@ -112,26 +112,27 @@ def add_stake_extrinsic(
 
         if safe_staking:
             pool = subtensor.subnet(netuid=netuid)
-            base_price = pool.price.rao
-            price_with_tolerance = base_price * (1 + rate_tolerance)
+            base_price = pool.price.tao
 
-            # For logging
-            base_rate = pool.price.tao
-            rate_with_tolerance = base_rate * (1 + rate_tolerance)
+            if pool.netuid == 0:
+                price_with_tolerance = base_price
+            else:
+                price_with_tolerance = base_price * (1 + rate_tolerance)
 
             logging.info(
                 f":satellite: [magenta]Safe Staking to:[/magenta] "
                 f"[blue]netuid: [green]{netuid}[/green], amount: [green]{staking_balance}[/green], "
                 f"tolerance percentage: [green]{rate_tolerance * 100}%[/green], "
-                f"price limit: [green]{rate_with_tolerance}[/green], "
-                f"original price: [green]{base_rate}[/green], "
+                f"price limit: [green]{price_with_tolerance}[/green], "
+                f"original price: [green]{base_price}[/green], "
                 f"with partial stake: [green]{allow_partial_stake}[/green] "
                 f"on [blue]{subtensor.network}[/blue][/magenta]...[/magenta]"
             )
 
+            limit_price = Balance.from_tao(price_with_tolerance).rao
             call_params.update(
                 {
-                    "limit_price": price_with_tolerance,
+                    "limit_price": limit_price,
                     "allow_partial": allow_partial_stake,
                 }
             )

bittensor/core/extrinsics/unstaking.py

@@ -105,26 +105,27 @@ def unstake_extrinsic(
 
         if safe_staking:
             pool = subtensor.subnet(netuid=netuid)
-            base_price = pool.price.rao
-            price_with_tolerance = base_price * (1 - rate_tolerance)
+            base_price = pool.price.tao
 
-            # For logging
-            base_rate = pool.price.tao
-            rate_with_tolerance = base_rate * (1 - rate_tolerance)
+            if pool.netuid == 0:
+                price_with_tolerance = base_price
+            else:
+                price_with_tolerance = base_price * (1 - rate_tolerance)
 
             logging.info(
                 f":satellite: [magenta]Safe Unstaking from:[/magenta] "
                 f"netuid: [green]{netuid}[/green], amount: [green]{unstaking_balance}[/green], "
                 f"tolerance percentage: [green]{rate_tolerance * 100}%[/green], "
-                f"price limit: [green]{rate_with_tolerance}[/green], "
-                f"original price: [green]{base_rate}[/green], "
+                f"price limit: [green]{price_with_tolerance}[/green], "
+                f"original price: [green]{base_price}[/green], "
                 f"with partial unstake: [green]{allow_partial_stake}[/green] "
                 f"on [blue]{subtensor.network}[/blue][magenta]...[/magenta]"
             )
 
+            limit_price = Balance.from_tao(price_with_tolerance).rao
             call_params.update(
                 {
-                    "limit_price": price_with_tolerance,
+                    "limit_price": limit_price,
                     "allow_partial": allow_partial_stake,
                 }
             )