Skip to content

Commit

Permalink
Revolution master prep (#1526)
Browse files Browse the repository at this point in the history
* merge master into revolution

* remove depreicated content
  • Loading branch information
Eugene-hu authored Sep 29, 2023
1 parent 697e611 commit 557cadc
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 40 deletions.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ version: 2.1

orbs:
python: circleci/python@2.1.1
python-lib: dialogue/python-lib@0.1.55
# coveralls: coveralls/coveralls@1.0.6

jobs:
Expand Down Expand Up @@ -242,7 +243,7 @@ workflows:
pr-requirements:
jobs:
- black:
python-version: "3.9.13"
python-version: "3.8.12"
- build-and-test:
matrix:
parameters:
Expand Down
33 changes: 22 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Changelog

## 5.3.4 / 2023-08-16

# What's Changed
* Removes miniupnpc by @ifrit98 (completely unused and requires a sudo install)
* Fixes blacklist vpermit_required by @inquinim e80d3d5
* Add try/except and timeout to version checking with exception handles by @ifrit98 a6a89fd
* Further updates CONTRIBUTING.md and DEVELOPMENT_WORKFLOW.md by @gitphantomman 3fefdbb
* Adds automatic compatibility checks to circleci for all major python3 supported versions. add checks by @ifrit98 #1484

**Full Changelog**: https://github.com/opentensor/bittensor/compare/v5.3.3...v5.3.4


## 5.3.3 / 2023-07-26

## What's Changed
* Remove datasets requirement by @camfairchild in 2eabf0002b01
* Relax bittensor-* requirements by @camfairchild in da9300ba5b2


**Full Changelog**: https://github.com/opentensor/bittensor/compare/v5.3.2...v5.3.3


## 5.3.2 / 2023-07-25

## What's Changed
Expand All @@ -15,24 +37,13 @@

## 5.3.1 / 2023-07-06

<<<<<<< HEAD
## What's Changed
* bump bittensor-wallet req, update cryptography security req by @@ifrit98 in [91d13b0](https://github.com/opentensor/bittensor/commit/91d13b0fa711621cbf823708d4368b1b387e42c4)
* Fixes Discord Link Issue #1442 by @camfairchild in [54d6248](https://github.com/opentensor/bittensor/commit/54d62487d4cb59e0b5edcd53acdca013108d155b)
* move mocks to bittensor_wallet package by @camfairchild in https://github.com/opentensor/bittensor/pull/1441
* Bump bittensor-wallet version to 0.0.4

**Full Changelog**: https://github.com/opentensor/bittensor/compare/v5.3.0...v5.3.1

=======
## What's Changed
* bump bittensor-wallet req, update cryptography security req by @@ifrit98 in [91d13b0](https://github.com/opentensor/bittensor/commit/91d13b0fa711621cbf823708d4368b1b387e42c4)
* Fixes Discord Link Issue #1442 by @camfairchild in [54d6248](https://github.com/opentensor/bittensor/commit/54d62487d4cb59e0b5edcd53acdca013108d155b)
* move mocks to bittensor_wallet package by @camfairchild in https://github.com/opentensor/bittensor/pull/1441
* Bump bittensor-wallet version to 0.0.4

**Full Changelog**: https://github.com/opentensor/bittensor/compare/v5.3.0...v5.3.1
>>>>>>> 18b8a7cdc5c00cf88dc2600c0e448a640df99caa

## 5.3.0 / 2023-07-04

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<div align="center">

# **Bittensor** <!-- omit in toc -->
[![Discord Chat](https://img.shields.io/discord/308323056592486420.svg)](https://discord.gg/realbittensor)
[![Discord Chat](https://img.shields.io/discord/308323056592486420.svg)](https://discord.gg/bittensor)
[![PyPI version](https://badge.fury.io/py/bittensor.svg)](https://badge.fury.io/py/bittensor)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)

---

### Internet-scale Neural Networks <!-- omit in toc -->

[Discord](https://discord.gg/bittensor)[Network](https://taostats.io/)[Research](https://drive.google.com/file/d/1VnsobL6lIAAqcA1_Tbm8AYIQscfJV4KU)
[Discord](https://discord.gg/bittensor)[Network](https://taostats.io/)[Research](https://bittensor.com/whitepaper)

</div>

Bittensor is a mining network, similar to Bitcoin, that includes built-in incentives designed to encourage computers to provide access to machine learning models in an efficient and censorship-resistant manner. These models can be queried by users seeking outputs from the network, for instance; generating text, audio, and images, or for extracting numerical representations of these input types. Under the hood, Bittensor’s *economic market*, is facilitated by a blockchain token mechanism, through which producers (***miners***) and the verification of the work done by those miners (***validators***) are rewarded. Miners host, train or otherwise procure machine learning systems into the network as a means of fulfilling the verification problems defined by the validators, like the ability to generate responses from prompts i.e. “What is the capital of Texas?.

The token based mechanism under which the miners are incentivized ensures that they are constantly driven to make their knowledge output more useful, in terms of speed, intelligence and diversity. The value generated by the network is distributed directly to the individuals producing that value, without intermediarias. Anyone can participate in this endeavour, extract value from the network, and govern Bittensor. The network is open to all participants, and no individual or group has full control over what is learned, who can profit from it, or who can access it.

To learn more about Bittensor, please read our [paper](https://drive.google.com/file/d/1VnsobL6lIAAqcA1_Tbm8AYIQscfJV4KU/view).
To learn more about Bittensor, please read our [paper](https://bittensor.com/whitepaper).

# Install
There are three ways to install Bittensor
Expand Down
1 change: 0 additions & 1 deletion bittensor/commands/list.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,5 @@ def check_config(config: "bittensor.config"):
@staticmethod
def add_args(parser: argparse.ArgumentParser):
list_parser = parser.add_parser("list", help="""List wallets""")

bittensor.wallet.add_args(list_parser)
bittensor.subtensor.add_args(list_parser)
1 change: 1 addition & 0 deletions bittensor/extrinsics/prometheus.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import bittensor.utils.networking as net



def prometheus_extrinsic(
subtensor: "bittensor.subtensor",
wallet: "bittensor.wallet",
Expand Down
1 change: 1 addition & 0 deletions bittensor/extrinsics/staking.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from bittensor.utils.balance import Balance



def add_stake_extrinsic(
subtensor: "bittensor.subtensor",
wallet: "bittensor.wallet",
Expand Down
1 change: 1 addition & 0 deletions bittensor/extrinsics/transfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from ..utils import is_valid_bittensor_address_or_public_key



def transfer_extrinsic(
subtensor: "bittensor.subtensor",
wallet: "bittensor.wallet",
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ def read_requirements(path):
license="MIT",
python_requires=">=3.8",
install_requires=requirements,
extras_require={"dev": extra_requirements_dev},
extras_require={
"dev": extra_requirements_dev,
},
scripts=["bin/btcli"],
classifiers=[
"Development Status :: 3 - Alpha",
Expand All @@ -89,7 +91,6 @@ def read_requirements(path):
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Mathematics",
"Topic :: Scientific/Engineering :: Artificial Intelligence",
Expand Down
32 changes: 10 additions & 22 deletions tests/integration_tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -803,8 +803,7 @@ def test_stake_with_specific_hotkeys(self, _):
)

success, err = _subtensor_mock.force_set_balance(
ss58_address=mock_coldkey_kp.ss58_address,
balance=mock_balance.rao,
ss58_address=mock_coldkey_kp.ss58_address, balance=mock_balance.rao
)

cli = bittensor.cli(config)
Expand Down Expand Up @@ -879,8 +878,7 @@ def test_stake_with_all_hotkeys(self, _):

# Set the coldkey balance
success, err = _subtensor_mock.force_set_balance(
ss58_address=mock_coldkey_kp.ss58_address,
balance=mock_balance.rao,
ss58_address=mock_coldkey_kp.ss58_address, balance=mock_balance.rao
)

cli = bittensor.cli(config)
Expand Down Expand Up @@ -978,8 +976,7 @@ def test_stake_with_exclude_hotkeys_from_all(self, _):

# Set the coldkey balance
_subtensor_mock.force_set_balance(
ss58_address=mock_coldkey_kp.ss58_address,
balance=mock_balance.rao,
ss58_address=mock_coldkey_kp.ss58_address, balance=mock_balance.rao
)

cli = bittensor.cli(config)
Expand Down Expand Up @@ -1093,8 +1090,7 @@ def test_stake_with_multiple_hotkeys_max_stake(self, _):
)

_subtensor_mock.force_set_balance(
ss58_address=mock_coldkey_kp.ss58_address,
balance=mock_balance.rao,
ss58_address=mock_coldkey_kp.ss58_address, balance=mock_balance.rao
)

cli = bittensor.cli(config)
Expand Down Expand Up @@ -1192,8 +1188,7 @@ def test_stake_with_multiple_hotkeys_max_stake_not_enough_balance(self, _):
)

_subtensor_mock.force_set_balance(
ss58_address=mock_coldkey_kp.ss58_address,
balance=mock_balance.rao,
ss58_address=mock_coldkey_kp.ss58_address, balance=mock_balance.rao
)

cli = bittensor.cli(config)
Expand Down Expand Up @@ -1286,8 +1281,7 @@ def test_stake_with_single_hotkey_max_stake(self, _):
)

_subtensor_mock.force_set_balance(
ss58_address=mock_coldkey_kp.ss58_address,
balance=mock_balance.rao,
ss58_address=mock_coldkey_kp.ss58_address, balance=mock_balance.rao
)

cli = bittensor.cli(config)
Expand Down Expand Up @@ -1374,8 +1368,7 @@ def test_stake_with_single_hotkey_max_stake_not_enough_balance(self, _):
)

_subtensor_mock.force_set_balance(
ss58_address=mock_coldkey_kp.ss58_address,
balance=mock_balance.rao,
ss58_address=mock_coldkey_kp.ss58_address, balance=mock_balance.rao
)

cli = bittensor.cli(config)
Expand Down Expand Up @@ -1469,8 +1462,7 @@ def test_stake_with_single_hotkey_max_stake_enough_stake(self, _):
)

success, err = _subtensor_mock.force_set_balance(
ss58_address=mock_coldkey_kp.ss58_address,
balance=mock_balance.rao,
ss58_address=mock_coldkey_kp.ss58_address, balance=mock_balance.rao
)

cli = bittensor.cli(config)
Expand Down Expand Up @@ -1630,9 +1622,7 @@ def test_delegate_stake(self, _):
)

# Make the first wallet a delegate
success = _subtensor_mock.nominate(
wallet=mock_wallets[0],
)
success = _subtensor_mock.nominate(wallet=mock_wallets[0])
self.assertTrue(success)

cli = bittensor.cli(config)
Expand Down Expand Up @@ -1718,9 +1708,7 @@ def test_undelegate_stake(self, _):
)

# Make the first wallet a delegate
success = _subtensor_mock.nominate(
wallet=mock_wallets[0],
)
success = _subtensor_mock.nominate(wallet=mock_wallets[0])
self.assertTrue(success)

# Stake to the delegate
Expand Down

0 comments on commit 557cadc

Please sign in to comment.