Skip to content

Commit

Permalink
Merge pull request #1824 from opentensor/release/6.12.0
Browse files Browse the repository at this point in the history
Release/6.12.0
  • Loading branch information
gus-opentensor committed May 2, 2024
2 parents c74fb15 + 6a20260 commit bfb5de7
Show file tree
Hide file tree
Showing 17 changed files with 572 additions and 139 deletions.
121 changes: 59 additions & 62 deletions .github/PULL_REQUEST_TEMPLATE/bug_fix.md
Original file line number Diff line number Diff line change
@@ -1,62 +1,59 @@
name: Bug Fix Contribution
description: Use this template when contributing a bug fix.
labels: [bug, pull request]

body:
- type: markdown
attributes:
value: |
### Requirements for Contributing a Bug Fix

* Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* The pull request must only fix an existing bug. To contribute other changes, you must use a different template. You can see all templates at <https://github.com/atom/.github/tree/master/.github/PULL_REQUEST_TEMPLATE>.
* The pull request must update the test suite to demonstrate the changed functionality. For guidance, please see <https://flight-manual.atom.io/hacking-atom/sections/writing-specs/>.
* After you create the pull request, all status checks must be pass before a maintainer reviews your contribution. For more details, please see <https://github.com/atom/.github/tree/master/CONTRIBUTING.md#pull-requests>.

- type: input
id: bug
attributes:
label: Identify the Bug
description: Link to the issue describing the bug that you're fixing.
validations:
required: true

- type: textarea
id: change
attributes:
label: Description of the Change
description: We must be able to understand the design of your change from this description.
validations:
required: true

- type: textarea
id: alternate
attributes:
label: Alternate Designs
description: Explain what other alternates were considered and why the proposed version was selected.
validations:
required: false

- type: textarea
id: drawbacks
attributes:
label: Possible Drawbacks
description: What are the possible side-effects or negative impacts of the code change?
validations:
required: false

- type: textarea
id: verification
attributes:
label: Verification Process
description: What process did you follow to verify that the change has not introduced any regressions?
validations:
required: true

- type: input
id: release-notes
attributes:
label: Release Notes
description: Please describe the changes in a single line that explains this improvement in terms that a user can understand.
validations:
required: true
<!--
### Requirements for Contributing a Bug Fix
* Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* The pull request must only fix an existing bug. To contribute other changes, you must use a different template.
* The pull request must update the test suite to demonstrate the changed functionality.
* After you create the pull request, all status checks must be pass before a maintainer reviews your contribution.
-->

### Bug

<!-- Link to the issue describing the bug that you're fixing. -->

### Description of the Change

<!--
We must be able to understand the design of your change from this description.
If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion.
Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts.
-->

### Alternate Designs

<!-- Explain what other alternates were considered and why the proposed version was selected -->

### Possible Drawbacks

<!-- What are the possible side-effects or negative impacts of the code change? -->

### Verification Process

<!--
What process did you follow to verify that the change has not introduced any regressions?
Describe the actions you performed (including buttons you clicked, text you typed, commands you ran, etc.), and describe the results you observed.
-->

### Release Notes

<!--
Please describe the changes in a single line that explains this improvement in
terms that a user can understand. This text will be used in release notes.
If this change is not user-facing or notable enough to be included in release notes
you may use the strings "Not applicable" or "N/A" here.
Examples:
- The GitHub package now allows you to add co-authors to commits.
- Fixed an issue where multiple cursors did not work in a file with a single line.
- Increased the performance of searching and replacing across a whole project.
-->
22 changes: 3 additions & 19 deletions .github/PULL_REQUEST_TEMPLATE/feature_change.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,8 @@

* Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* The pull request must contribute a change that has been endorsed by the maintainer team. See details in the template below.
* The pull request must update the test suite to exercise the updated functionality. For guidance, please see <https://flight-manual.atom.io/hacking-atom/sections/writing-specs/>.
* After you create the pull request, all status checks must be pass before a maintainer reviews your contribution. For more details, please see <https://github.com/atom/.github/tree/master/CONTRIBUTING.md#pull-requests>.

### Issue or RFC Endorsed by Atom's Maintainers

<!--
Link to the issue or RFC that your change relates to. This must be one of the following:
* An open issue with the `help-wanted` label
* An open issue with the `triaged` label
* An RFC with "accepted" status
To contribute an enhancement that isn't covered by one of the items above, please follow our guide for suggesting an enhancement: https://github.com/atom/.github/blob/master/CONTRIBUTING.md#suggesting-enhancements
To contribute other changes, you must use a different template. You can see all templates at https://github.com/atom/.github/tree/master/.github/PULL_REQUEST_TEMPLATE.
-->
* The pull request must update the test suite to exercise the updated functionality.
* After you create the pull request, all status checks must be pass before a maintainer reviews your contribution.

### Description of the Change

Expand Down Expand Up @@ -56,7 +40,7 @@ Describe the actions you performed (including buttons you clicked, text you type
<!--
Please describe the changes in a single line that explains this improvement in
terms that a user can understand. This text will be used in Atom's release notes.
terms that a user can understand. This text will be used in release notes.
If this change is not user-facing or notable enough to be included in release notes
you may use the strings "Not applicable" or "N/A" here.
Expand Down
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE/performance_improvement.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### Requirements for Contributing a Performance Improvement

* Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* The pull request must only affect performance of existing functionality. To contribute other changes, you must use a different template. You can see all templates at <https://github.com/atom/.github/tree/master/.github/PULL_REQUEST_TEMPLATE>.
* After you create the pull request, all status checks must be pass before a maintainer reviews your contribution. For more details, please see <https://github.com/atom/.github/tree/master/CONTRIBUTING.md#pull-requests>.
* The pull request must only affect performance of existing functionality
* After you create the pull request, all status checks must be pass before a maintainer reviews your contribution.

### Description of the Change

Expand Down Expand Up @@ -41,7 +41,7 @@ What process did you follow to verify that the change has not introduced any reg
<!--
Please describe the changes in a single line that explains this improvement in
terms that a user can understand. This text will be used in Atom's release notes.
terms that a user can understand. This text will be used in release notes.
If this change is not user-facing or notable enough to be included in release notes
you may use the strings "Not applicable" or "N/A" here.
Expand Down
9 changes: 0 additions & 9 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md

This file was deleted.

10 changes: 10 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Welcome!

Due to [GitHub limitations](https://github.com/orgs/community/discussions/4620),
please switch to **Preview** for links to render properly.

Please choose the right template for your pull request:

- 🐛 Are you fixing a bug? [Bug fix](?template=bug_fix.md)
- 📈 Are you improving performance? [Performance improvement](?template=performance_improvement.md)
- 💻 Are you changing functionality? [Feature change](?template=feature_change.md)
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog


## 6.12.0 / 2024-04-29

## What's Changed
* Tests: Axon to_string patch import by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/1785
* Tests: Extends coverage on Serving extrinsics methods by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/1783
* Fix: CVE-2024-24762 FastAPI by @gus-opentensor in https://github.com/opentensor/bittensor/pull/1800
* Fix: CVE-2024-26130 | vulnerability cryptography by @gus-opentensor in https://github.com/opentensor/bittensor/pull/1801
* fix PR templates by @mjurbanski-reef in https://github.com/opentensor/bittensor/pull/1778
* Fix: SNYK-PYTHON-CERTIFI-5805047 | Vulnerability Certifi by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/1816
* Tests: Extends test coverage on Registration methods by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/1814
* Fix: Wallet overwrite functionality by @ibraheem-opentensor in https://github.com/opentensor/bittensor/pull/1802


**Full Changelog**: https://github.com/opentensor/bittensor/compare/v6.11.0...v6.12.0

## 6.11.0 / 2024-04-11

## What's Changed
Expand Down Expand Up @@ -37,6 +53,7 @@
**Full Changelog**: https://github.com/opentensor/bittensor/compare/v6.9.3...v6.10.0



## 6.9.3 / 2024-03-12

## What's Changed
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.11.0
6.12.0
3 changes: 2 additions & 1 deletion bittensor/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
nest_asyncio.apply()

# Bittensor code and protocol version.
__version__ = "6.11.0"

__version__ = "6.12.0"

version_split = __version__.split(".")
__version_as_int__: int = (
Expand Down
12 changes: 5 additions & 7 deletions bittensor/commands/wallets.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,8 @@ def run(cli):
raise ValueError("File {} does not exist".format(file_name))
with open(cli.config.get("json"), "r") as f:
json_str = f.read()

# Password can be "", assume if None
json_password = cli.config.get("json_password", "")

wallet.regenerate_coldkey(
mnemonic=cli.config.mnemonic,
seed=cli.config.seed,
Expand Down Expand Up @@ -146,7 +144,7 @@ def add_args(parser: argparse.ArgumentParser):
regen_coldkey_parser.add_argument(
"--overwrite_coldkey",
default=False,
action="store_false",
action="store_true",
help="""Overwrite the old coldkey with the newly generated coldkey""",
)
bittensor.wallet.add_args(regen_coldkey_parser)
Expand Down Expand Up @@ -443,7 +441,7 @@ def add_args(parser: argparse.ArgumentParser):
)
new_hotkey_parser.add_argument(
"--overwrite_hotkey",
action="store_false",
action="store_true",
default=False,
help="""Overwrite the old hotkey with the newly generated hotkey""",
)
Expand Down Expand Up @@ -518,7 +516,7 @@ def add_args(parser: argparse.ArgumentParser):
)
new_coldkey_parser.add_argument(
"--overwrite_coldkey",
action="store_false",
action="store_true",
default=False,
help="""Overwrite the old coldkey with the newly generated coldkey""",
)
Expand Down Expand Up @@ -602,13 +600,13 @@ def add_args(parser: argparse.ArgumentParser):
)
new_coldkey_parser.add_argument(
"--overwrite_coldkey",
action="store_false",
action="store_true",
default=False,
help="""Overwrite the old coldkey with the newly generated coldkey""",
)
new_coldkey_parser.add_argument(
"--overwrite_hotkey",
action="store_false",
action="store_true",
default=False,
help="""Overwrite the old hotkey with the newly generated hotkey""",
)
Expand Down
5 changes: 4 additions & 1 deletion bittensor/extrinsics/registration.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def burned_register_extrinsic(
":cross_mark: [red]Failed[/red]: error:{}".format(err_msg)
)
time.sleep(0.5)

return False
# Successful registration, final check for neuron and pubkey
else:
bittensor.__console__.print(":satellite: Checking Balance...")
Expand All @@ -315,6 +315,7 @@ def burned_register_extrinsic(
bittensor.__console__.print(
":cross_mark: [red]Unknown error. Neuron not found.[/red]"
)
return False


class MaxSuccessException(Exception):
Expand Down Expand Up @@ -499,8 +500,10 @@ def swap_hotkey_extrinsic(
":cross_mark: [red]Failed[/red]: error:{}".format(err_msg)
)
time.sleep(0.5)
return False

else:
bittensor.__console__.print(
f"Hotkey {wallet.hotkey} swapped for new hotkey: {new_wallet.hotkey}"
)
return True
6 changes: 3 additions & 3 deletions contrib/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ For a more detailed description of the review process, see the [Code Review Guid

This section guides you through submitting a bug report for Bittensor. Following these guidelines helps maintainers and the community understand your report :pencil:, reproduce the behavior :computer: :computer:, and find related reports :mag_right:.

When you are creating a bug report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](https://bit.ly/atom-bugfix-pr), the information it asks for helps us resolve issues faster.
When you are creating a bug report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report).

> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
Expand All @@ -242,7 +242,7 @@ When you are creating a bug report, please [include as many details as possible]

#### How Do I Submit A (Good) Bug Report?

Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). You can find Bittensor's issues [here](https://github.com/opentensor/bittensor/issues). After you've determined which repository ([Bittensor](https://github.com/opentensor/bittensor) or [subtensor](https://github.com/opentensor/subtensor)) your bug is related to, create an issue on that repository and provide the following information by filling in [the template](https://bit.ly/atom-bugfix-pr).
Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). You can find Bittensor's issues [here](https://github.com/opentensor/bittensor/issues). After you've determined which repository ([Bittensor](https://github.com/opentensor/bittensor) or [subtensor](https://github.com/opentensor/subtensor)) your bug is related to, create an issue on that repository.

Explain the problem and include additional details to help maintainers reproduce the problem:

Expand Down Expand Up @@ -275,7 +275,7 @@ Include details about your configuration and environment:

This section guides you through submitting an enhancement suggestion for Bittensor, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion :pencil: and find related suggestions :mag_right:.

When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion). Fill in [the template](https://bit.ly/atom-behavior-pr), including the steps that you imagine you would take if the feature you're requesting existed.
When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion).

#### Before Submitting An Enhancement Suggestion

Expand Down
7 changes: 4 additions & 3 deletions requirements/prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ ansible==6.7.0
ansible_vault==2.1.0
backoff
black==23.7.0
certifi==2024.2.2
colorama==0.4.6
cryptography==42.0.0
cryptography==42.0.5
ddt==1.6.0
fuzzywuzzy>=0.18.0
fastapi==0.99.1
fastapi==0.110.1
munch==2.5.0
netaddr
numpy
Expand All @@ -32,4 +33,4 @@ termcolor
torch>=1.13.1
tqdm
uvicorn==0.22.0
wheel
wheel
Loading

0 comments on commit bfb5de7

Please sign in to comment.