Skip to content

Commit

Permalink
Merge #563: Fix typos
Browse files Browse the repository at this point in the history
7ff8596 Fix typos (Dimitris Apostolou)

Pull request description:

ACKs for top commit:
  achow101:
    ACK 7ff8596

Tree-SHA512: eb9d63bfa675c06d7d66daa692d4a44a1af12470ad45cfc8a58bafb66aac586620b2016f1e81560f6133b40380fc86c35e67150a220927e56f789160338e8fda
  • Loading branch information
achow101 committed Feb 9, 2022
2 parents 0d846a6 + 7ff8596 commit 4572620
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ python3 setup.py install

## Dependencies

See `pyproject.toml` for all dependencies. Dependencies under `[tool.poetry.dependecies]` are user dependencies, and `[tool.poetry.dev-dependencies]` for development based dependencies. These dependencies will be installed with any of the three above installation methods.
See `pyproject.toml` for all dependencies. Dependencies under `[tool.poetry.dependencies]` are user dependencies, and `[tool.poetry.dev-dependencies]` for development based dependencies. These dependencies will be installed with any of the three above installation methods.

## Usage

Expand Down
4 changes: 2 additions & 2 deletions docs/examples/walkthrough/walkthrough.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Send funds with Bitcoin Core and Trezor using HWI
* Now let us **send funds**.

* CORE: To send funds, open the "Send" tab in Bitcoin Core Wallet,
then select input, amount, fees, etc. Once satisifed, click "Create Unsigned",
then select input, amount, fees, etc. Once satisfied, click "Create Unsigned",
verify any displayed information, then click "Create Unsigned" again.
The PSBT (Partially Signed Bitcoin Transaction) is now on the clipboard.

Expand Down Expand Up @@ -183,6 +183,6 @@ Send funds with Bitcoin Core and Trezor using HWI
Versions Used
=============

* This walk-trough was done in Janary 2021
* This walk-trough was done in January 2021
* HWI version 2.0.0-dev
* Bitcoin 0.21.0
2 changes: 1 addition & 1 deletion docs/usage/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ HWI is distributed in 2 different ways:
Binaries
========

The self-contained binaries are availabe for download from the `releases page <https://github.com/bitcoin-core/HWI/releases>`_.
The self-contained binaries are available for download from the `releases page <https://github.com/bitcoin-core/HWI/releases>`_.

Download and extract the package for your operating system and architecture.
The ``hwi`` binary (``hwi.exe`` for Windows) is a command line tool and executed from the terminal (command prompt in Windows).
Expand Down
2 changes: 1 addition & 1 deletion hwilib/_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ def get_device_info(self):
# If it isn't initialized, show an error but don't do anything
if 'code' in self.device_info and self.device_info['code'] == DEVICE_NOT_INITIALIZED:
self.clear_info()
QMessageBox.information(None, "Not initialized yet", 'Device is not initalized yet')
QMessageBox.information(None, "Not initialized yet", 'Device is not initialized yet')
return

# do getkeypool and getdescriptors
Expand Down
4 changes: 2 additions & 2 deletions hwilib/descriptor.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ def to_string_no_checksum(self) -> str:

def to_string(self) -> str:
"""
Serializes the descriptor as a string wtih the checksum
Serializes the descriptor as a string with the checksum
:return: The descriptor with a checksum
"""
Expand Down Expand Up @@ -591,7 +591,7 @@ def _parse_descriptor(desc: str, ctx: '_ParseDescriptorContext') -> 'Descriptor'
except ValueError:
break
if len(branches) > MAX_TAPROOT_NODES:
raise ValueError("tr() suports at most {MAX_TAPROOT_NODES} nesting levels")
raise ValueError("tr() supports at most {MAX_TAPROOT_NODES} nesting levels")
# Process script expression
sarg, expr = _get_expr(expr)
subscripts.append(_parse_descriptor(sarg, _ParseDescriptorContext.P2TR))
Expand Down
2 changes: 1 addition & 1 deletion hwilib/devices/jade.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def _split_at_last_hardened_element(path: Sequence[int]) -> Tuple[Sequence[int],

# Change output details
# This is optional, in that if we send it Jade validates the change output script
# and the user need not confirm that ouptut. If not passed the change output must
# and the user need not confirm that output. If not passed the change output must
# be confirmed by the user on the hwwallet screen, like any other spend output.
change: List[Optional[Dict[str, Any]]] = [None] * len(tx.outputs)

Expand Down
2 changes: 1 addition & 1 deletion hwilib/devices/trezor.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def func(*args: Any, **kwargs: Any) -> Any:


def interactive_get_pin(self: object, code: Optional[int] = None) -> str:
if code == messages.PinMatrixRequestType.Currrent:
if code == messages.PinMatrixRequestType.Current:
desc = "current PIN"
elif code == messages.PinMatrixRequestType.NewFirst:
desc = "new PIN"
Expand Down
4 changes: 2 additions & 2 deletions hwilib/psbt.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def deserialize(self, f: Readable) -> None:
raise PSBTSerializationError("Input Taproot leaf script key's control block is not valid")
script = deser_string(f)
if len(script) == 0:
raise PSBTSerializationError("Intput Taproot leaf script cannot be empty")
raise PSBTSerializationError("Input Taproot leaf script cannot be empty")
leaf_script = (script[:-1], int(script[-1]))
if leaf_script not in self.tap_scripts:
self.tap_scripts[leaf_script] = set()
Expand Down Expand Up @@ -814,7 +814,7 @@ def deserialize(self, psbt: str) -> None:
if self.version == 0:
# make sure that we got an unsigned tx
if self.tx.is_null():
raise PSBTSerializationError("No unsigned trasaction was provided")
raise PSBTSerializationError("No unsigned transaction was provided")
# Make sure no v2 fields are present
if self.tx_version is not None:
raise PSBTSerializationError("PSBT_GLOBAL_TX_VERSION is not allowed in PSBTv0")
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
'name': 'hwi',
'version': '2.0.2',
'description': 'A library for working with Bitcoin hardware wallets',
'long_description': "# Bitcoin Hardware Wallet Interface\n\n[![Build Status](https://api.cirrus-ci.com/github/bitcoin-core/HWI.svg)](https://cirrus-ci.com/github/bitcoin-core/HWI)\n[![Documentation Status](https://readthedocs.org/projects/hwi/badge/?version=latest)](https://hwi.readthedocs.io/en/latest/?badge=latest)\n\nThe Bitcoin Hardware Wallet Interface is a Python library and command line tool for interacting with hardware wallets.\nIt provides a standard way for software to work with hardware wallets without needing to implement device specific drivers.\nPython software can use the provided library (`hwilib`). Software in other languages can execute the `hwi` tool.\n\nCaveat emptor: Inclusion of a specific hardware wallet vendor does not imply any endorsement of quality or security.\n\n## Prerequisites\n\nPython 3 is required. The libraries and [udev rules](hwilib/udev/README.md) for each device must also be installed. Some libraries will need to be installed\n\nFor Ubuntu/Debian:\n```\nsudo apt install libusb-1.0-0-dev libudev-dev python3-dev\n```\n\nFor Centos:\n```\nsudo yum -y install python3-devel libusbx-devel systemd-devel\n```\n\nFor macOS:\n```\nbrew install libusb\n```\n\n## Install\n\n```\ngit clone https://github.com/bitcoin-core/HWI.git\ncd HWI\npoetry install # or 'pip3 install .' or 'python3 setup.py install'\n```\n\nThis project uses the [Poetry](https://github.com/sdispater/poetry) dependency manager. HWI and its dependencies can be installed via poetry by executing the following in the root source directory:\n\n```\npoetry install\n```\n\nPip can also be used to automatically install HWI and its dependencies using the `setup.py` file (which is usually in sync with `pyproject.toml`):\n\n```\npip3 install .\n```\n\nThe `setup.py` file can be used to install HWI and its dependencies so long as `setuptools` is also installed:\n\n```\npip3 install -U setuptools\npython3 setup.py install\n```\n\n## Dependencies\n\nSee `pyproject.toml` for all dependencies. Dependencies under `[tool.poetry.dependecies]` are user dependencies, and `[tool.poetry.dev-dependencies]` for development based dependencies. These dependencies will be installed with any of the three above installation methods.\n\n## Usage\n\nTo use, first enumerate all devices and find the one that you want to use with\n\n```\n./hwi.py enumerate\n```\n\nOnce the device type and device path is known, issue commands to it like so:\n\n```\n./hwi.py -t <type> -d <path> <command> <command args>\n```\n\nAll output will be in JSON form and sent to `stdout`.\nAdditional information or prompts will be sent to `stderr` and will not necessarily be in JSON.\nThis additional information is for debugging purposes.\n\nTo see a complete list of available commands and global parameters, run\n`./hwi.py --help`. To see options specific to a particular command,\npass the `--help` parameter after the command name; for example:\n\n```\n./hwi.py getdescriptors --help\n```\n\n## Documentation\n\nDocumentation for HWI can be found on [readthedocs.io](https://hwi.readthedocs.io/).\n\n### Device Support\n\nFor documentation on devices supported and how they are supported, please check the [device support page](https://hwi.readthedocs.io/en/latest/devices/index.html#support-matrix)\n\n### Using with Bitcoin Core\n\nSee [Using Bitcoin Core with Hardware Wallets](https://hwi.readthedocs.io/en/latest/examples/bitcoin-core-usage.html).\n\n## License\n\nThis project is available under the MIT License, Copyright Andrew Chow.\n",
'long_description': "# Bitcoin Hardware Wallet Interface\n\n[![Build Status](https://api.cirrus-ci.com/github/bitcoin-core/HWI.svg)](https://cirrus-ci.com/github/bitcoin-core/HWI)\n[![Documentation Status](https://readthedocs.org/projects/hwi/badge/?version=latest)](https://hwi.readthedocs.io/en/latest/?badge=latest)\n\nThe Bitcoin Hardware Wallet Interface is a Python library and command line tool for interacting with hardware wallets.\nIt provides a standard way for software to work with hardware wallets without needing to implement device specific drivers.\nPython software can use the provided library (`hwilib`). Software in other languages can execute the `hwi` tool.\n\nCaveat emptor: Inclusion of a specific hardware wallet vendor does not imply any endorsement of quality or security.\n\n## Prerequisites\n\nPython 3 is required. The libraries and [udev rules](hwilib/udev/README.md) for each device must also be installed. Some libraries will need to be installed\n\nFor Ubuntu/Debian:\n```\nsudo apt install libusb-1.0-0-dev libudev-dev python3-dev\n```\n\nFor Centos:\n```\nsudo yum -y install python3-devel libusbx-devel systemd-devel\n```\n\nFor macOS:\n```\nbrew install libusb\n```\n\n## Install\n\n```\ngit clone https://github.com/bitcoin-core/HWI.git\ncd HWI\npoetry install # or 'pip3 install .' or 'python3 setup.py install'\n```\n\nThis project uses the [Poetry](https://github.com/sdispater/poetry) dependency manager. HWI and its dependencies can be installed via poetry by executing the following in the root source directory:\n\n```\npoetry install\n```\n\nPip can also be used to automatically install HWI and its dependencies using the `setup.py` file (which is usually in sync with `pyproject.toml`):\n\n```\npip3 install .\n```\n\nThe `setup.py` file can be used to install HWI and its dependencies so long as `setuptools` is also installed:\n\n```\npip3 install -U setuptools\npython3 setup.py install\n```\n\n## Dependencies\n\nSee `pyproject.toml` for all dependencies. Dependencies under `[tool.poetry.dependencies]` are user dependencies, and `[tool.poetry.dev-dependencies]` for development based dependencies. These dependencies will be installed with any of the three above installation methods.\n\n## Usage\n\nTo use, first enumerate all devices and find the one that you want to use with\n\n```\n./hwi.py enumerate\n```\n\nOnce the device type and device path is known, issue commands to it like so:\n\n```\n./hwi.py -t <type> -d <path> <command> <command args>\n```\n\nAll output will be in JSON form and sent to `stdout`.\nAdditional information or prompts will be sent to `stderr` and will not necessarily be in JSON.\nThis additional information is for debugging purposes.\n\nTo see a complete list of available commands and global parameters, run\n`./hwi.py --help`. To see options specific to a particular command,\npass the `--help` parameter after the command name; for example:\n\n```\n./hwi.py getdescriptors --help\n```\n\n## Documentation\n\nDocumentation for HWI can be found on [readthedocs.io](https://hwi.readthedocs.io/).\n\n### Device Support\n\nFor documentation on devices supported and how they are supported, please check the [device support page](https://hwi.readthedocs.io/en/latest/devices/index.html#support-matrix)\n\n### Using with Bitcoin Core\n\nSee [Using Bitcoin Core with Hardware Wallets](https://hwi.readthedocs.io/en/latest/examples/bitcoin-core-usage.html).\n\n## License\n\nThis project is available under the MIT License, Copyright Andrew Chow.\n",
'author': 'Andrew Chow',
'author_email': 'andrew@achow101.com',
'maintainer': None,
Expand Down
2 changes: 1 addition & 1 deletion test/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ if [[ -n ${build_jade} ]]; then
cd ..

# Build the esp-idf toolchain
# We will install the esp-idf tools in a given location (otherwise defauts to user home dir)
# We will install the esp-idf tools in a given location (otherwise defaults to user home dir)
export IDF_TOOLS_PATH="$(pwd)/esp-idf-tools"
if [ ! -d "esp-idf" ]; then
git clone --depth=1 --branch ${ESP_IDF_BRANCH} --single-branch --recursive https://github.com/espressif/esp-idf.git ./esp-idf
Expand Down
4 changes: 2 additions & 2 deletions test/test_bech32.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# THE SOFTWARE.


"""Reference tests for segwit adresses"""
"""Reference tests for segwit addresses"""

import binascii
import unittest
Expand Down Expand Up @@ -143,7 +143,7 @@ def segwit_scriptpubkey(witver, witprog):
]

class TestSegwitAddress(unittest.TestCase):
"""Unit test class for segwit addressess."""
"""Unit test class for segwit addresses."""

def test_valid_checksum(self):
"""Test checksum creation and validation."""
Expand Down

0 comments on commit 4572620

Please sign in to comment.