Merge branch 'staging' into feat/roman/add-non-fast-block-tests-each-saturday

Author: Roman

bittensor/core/async_subtensor.py

@@ -616,19 +616,31 @@ async def all_subnets(
         return subnets
 
     async def blocks_since_last_step(
-        self, netuid: int, block: Optional[int] = None
+        self,
+        netuid: int,
+        block: Optional[int] = None,
+        block_hash: Optional[str] = None,
+        reuse_block: bool = False,
     ) -> Optional[int]:
         """Returns number of blocks since the last epoch of the subnet.
 
         Arguments:
             netuid (int): The unique identifier of the subnetwork.
             block: the block number for this query.
+            block_hash: The hash of the blockchain block number for the query. Do not specify if using reuse_block or
+                block.
+            reuse_block: Whether to reuse the last-used blockchain block hash. Do not set if using block_hash or block.
+
 
         Returns:
             block number of the last step in the subnet.
         """
         query = await self.query_subtensor(
-            name="BlocksSinceLastStep", block=block, params=[netuid]
+            name="BlocksSinceLastStep",
+            block=block,
+            block_hash=block_hash,
+            reuse_block=reuse_block,
+            params=[netuid],
         )
         return query.value if query is not None and hasattr(query, "value") else query
 
@@ -1803,11 +1815,16 @@ async def get_next_epoch_start_block(
             int: The block number at which the next epoch will start.
         """
         block_hash = await self.determine_block_hash(block, block_hash, reuse_block)
-        if not block_hash and reuse_block:
-            block_hash = self.substrate.last_block_hash
-        block = await self.substrate.get_block_number(block_hash=block_hash)
-        tempo = await self.tempo(netuid=netuid, block_hash=block_hash)
-        return (((block // tempo) + 1) * tempo) + 1 if tempo else None
+        blocks_since_last_step = await self.blocks_since_last_step(
+            netuid=netuid, block=block, block_hash=block_hash, reuse_block=reuse_block
+        )
+        tempo = await self.tempo(
+            netuid=netuid, block=block, block_hash=block_hash, reuse_block=reuse_block
+        )
+
+        if block and blocks_since_last_step and tempo:
+            return block - blocks_since_last_step + tempo + 1
+        return None
 
     async def get_owned_hotkeys(
         self,

bittensor/core/subtensor.py

@@ -1410,8 +1410,12 @@ def get_next_epoch_start_block(
             int: The block number at which the next epoch will start.
         """
         block = block or self.block
+        blocks_since_last_step = self.blocks_since_last_step(netuid=netuid, block=block)
         tempo = self.tempo(netuid=netuid, block=block)
-        return (((block // tempo) + 1) * tempo) + 1 if tempo else None
+
+        if block and blocks_since_last_step and tempo:
+            return block - blocks_since_last_step + tempo + 1
+        return None
 
     def get_owned_hotkeys(
         self,

contrib/CONTRIBUTING.md

@@ -102,7 +102,7 @@ Patchsets and enhancements should always be focused. A pull request could add a
 Specifically, pull requests must adhere to the following criteria:
 - **Must** branch off from `staging`. Make sure that all your PRs are using `staging` branch as a base or will be closed.
 - Contain fewer than 50 files. PRs with more than 50 files will be closed.
-- Use the specific [template](./.github/pull_request_template.md) appropriate to your contribution.
+- Use the specific [template](../.github/pull_request_template.md) appropriate to your contribution.
 - If a PR introduces a new feature, it *must* include corresponding tests.
 - Other PRs (bug fixes, refactoring, etc.) should ideally also have tests, as they provide proof of concept and prevent regression.
 - Categorize your PR properly by using GitHub labels. This aids in the review process by informing reviewers about the type of change at a glance.
@@ -127,7 +127,7 @@ Please follow these steps to have your contribution considered by the maintainer
 1. Read the [development workflow](./DEVELOPMENT_WORKFLOW.md) defined for this repository to understand our workflow.
 2. Ensure your PR meets the criteria stated in the 'Pull Request Philosophy' section.
 3. Include relevant tests for any fixed bugs or new features as stated in the [testing guide](./TESTING.md).
-4. Follow all instructions in [the template](https://github.com/opentensor/bittensor/blob/master/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md) to create the PR.
+4. Follow all instructions in [the template](../.github/pull_request_template.md) to create the PR.
 5. Ensure your commit messages are clear and concise. Include the issue number if applicable.
 6. If you have multiple commits, rebase them into a single commit using `git rebase -i`.
 7. Explain what your changes do and why you think they should be merged in the PR description consistent with the [style guide](./STYLE.md).

tests/unit_tests/test_async_subtensor.py

@@ -3192,6 +3192,8 @@ async def test_blocks_since_last_step_with_value(subtensor, mocker):
     mocked_query_subtensor.assert_awaited_once_with(
         name="BlocksSinceLastStep",
         block=block,
+        block_hash=None,
+        reuse_block=False,
         params=[netuid],
     )
 
@@ -3214,6 +3216,8 @@ async def test_blocks_since_last_step_is_none(subtensor, mocker):
     mocked_query_subtensor.assert_awaited_once_with(
         name="BlocksSinceLastStep",
         block=block,
+        block_hash=None,
+        reuse_block=False,
         params=[netuid],
     )