diff --git a/python/.gitignore b/python/.gitignore index 8c3c14c29..e7f6b1f12 100644 --- a/python/.gitignore +++ b/python/.gitignore @@ -3,7 +3,7 @@ MANIFEST /build /dist -/trezor.egg-info +*.egg-info *.bin *.py.cache /.tox diff --git a/python/MANIFEST.in b/python/MANIFEST.in index 7dd8016a3..4b9c1e7c4 100644 --- a/python/MANIFEST.in +++ b/python/MANIFEST.in @@ -1,6 +1,7 @@ recursive-include bash_completion.d *.sh include tools/* -recursive-include trezorlib * +graft src +graft tests include AUTHORS README.md COPYING CHANGELOG.md include requirements*.txt diff --git a/python/Makefile b/python/Makefile index 2574c5152..4a0b22974 100644 --- a/python/Makefile +++ b/python/Makefile @@ -2,14 +2,14 @@ PYTHON=python3 SETUP=$(PYTHON) setup.py EXCLUDES=.vscode -STYLE_TARGETS=trezorlib trezorctl setup.py +STYLE_TARGETS=src/trezorlib setup.py EXCLUDE_TARGETS=messages all: build clean-gen: ## remove generated files - rm -f trezorlib/messages/*.py - rm -f trezorlib/coins.json + rm -f src/trezorlib/messages/*.py + rm -f src/trezorlib/coins.json coins_json: ./helper-scripts/build-coins-json.sh diff --git a/python/helper-scripts/build-coins-json.sh b/python/helper-scripts/build-coins-json.sh index 1fa89b66b..5379bec26 100755 --- a/python/helper-scripts/build-coins-json.sh +++ b/python/helper-scripts/build-coins-json.sh @@ -1,7 +1,7 @@ #!/bin/bash cd $(dirname $0)/.. -DEST=trezorlib/coins.json +DEST=src/trezorlib/coins.json BUILD_COINS_AT="../common/tools/cointool.py dump \ --list --support \ diff --git a/python/setup.cfg b/python/setup.cfg index aa83c9ca8..d68a18179 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -1,13 +1,11 @@ [flake8] -filename = - *.py, - ./trezorctl +filename = *.py exclude = .tox/, build/, dist/, vendor/, - trezorlib/messages/__init__.py + src/trezorlib/messages/__init__.py ignore = # E203 whitespace before ':' E203, diff --git a/python/setup.py b/python/setup.py index 001811a2a..b6f14cf23 100755 --- a/python/setup.py +++ b/python/setup.py @@ -28,7 +28,7 @@ def read(*path): def find_version(): - version_file = read("trezorlib", "__init__.py") + version_file = read("src", "trezorlib", "__init__.py") version_match = re.search(r"^__version__ = \"(.*)\"$", version_file, re.M) if version_match: return version_match.group(1) @@ -60,9 +60,10 @@ setup( long_description="{}\n\n{}".format(read("README.md"), read("CHANGELOG.md")), long_description_content_type="text/markdown", url="https://github.com/trezor/python-trezor", - packages=find_packages(), + packages=find_packages("src"), + package_dir={"": "src"}, package_data={"trezorlib": ["coins.json"]}, - scripts=["trezorctl"], + entry_points={"console_scripts": ["trezorctl=trezorlib.cli.trezorctl:cli"]}, install_requires=install_requires, extras_require={ "hidapi": ["hidapi>=0.7.99.post20"], diff --git a/python/trezorlib/__init__.py b/python/src/trezorlib/__init__.py similarity index 100% rename from python/trezorlib/__init__.py rename to python/src/trezorlib/__init__.py diff --git a/python/trezorlib/_ed25519.py b/python/src/trezorlib/_ed25519.py similarity index 100% rename from python/trezorlib/_ed25519.py rename to python/src/trezorlib/_ed25519.py diff --git a/python/trezorlib/binance.py b/python/src/trezorlib/binance.py similarity index 100% rename from python/trezorlib/binance.py rename to python/src/trezorlib/binance.py diff --git a/python/trezorlib/btc.py b/python/src/trezorlib/btc.py similarity index 100% rename from python/trezorlib/btc.py rename to python/src/trezorlib/btc.py diff --git a/python/trezorlib/cardano.py b/python/src/trezorlib/cardano.py similarity index 100% rename from python/trezorlib/cardano.py rename to python/src/trezorlib/cardano.py diff --git a/python/trezorlib/tests/support/ckd_public.py b/python/src/trezorlib/ckd_public.py similarity index 97% rename from python/trezorlib/tests/support/ckd_public.py rename to python/src/trezorlib/ckd_public.py index 0579c90ba..aed9d52de 100644 --- a/python/trezorlib/tests/support/ckd_public.py +++ b/python/src/trezorlib/ckd_public.py @@ -17,6 +17,7 @@ import hashlib import hmac import struct +import warnings import ecdsa from ecdsa.curves import SECP256k1 @@ -25,6 +26,8 @@ from ecdsa.util import number_to_string, string_to_number from trezorlib import messages, tools +warnings.warn("ckd_public module is deprecated and will be removed", DeprecationWarning) + def point_to_pubkey(point): order = SECP256k1.order diff --git a/python/trezorlib/qt/__init__.py b/python/src/trezorlib/cli/__init__.py similarity index 100% rename from python/trezorlib/qt/__init__.py rename to python/src/trezorlib/cli/__init__.py diff --git a/python/trezorctl b/python/src/trezorlib/cli/trezorctl.py similarity index 100% rename from python/trezorctl rename to python/src/trezorlib/cli/trezorctl.py diff --git a/python/trezorlib/client.py b/python/src/trezorlib/client.py similarity index 100% rename from python/trezorlib/client.py rename to python/src/trezorlib/client.py diff --git a/python/trezorlib/coins.json b/python/src/trezorlib/coins.json similarity index 100% rename from python/trezorlib/coins.json rename to python/src/trezorlib/coins.json diff --git a/python/trezorlib/coins.py b/python/src/trezorlib/coins.py similarity index 100% rename from python/trezorlib/coins.py rename to python/src/trezorlib/coins.py diff --git a/python/trezorlib/cosi.py b/python/src/trezorlib/cosi.py similarity index 100% rename from python/trezorlib/cosi.py rename to python/src/trezorlib/cosi.py diff --git a/python/trezorlib/debuglink.py b/python/src/trezorlib/debuglink.py similarity index 100% rename from python/trezorlib/debuglink.py rename to python/src/trezorlib/debuglink.py diff --git a/python/trezorlib/device.py b/python/src/trezorlib/device.py similarity index 100% rename from python/trezorlib/device.py rename to python/src/trezorlib/device.py diff --git a/python/trezorlib/eos.py b/python/src/trezorlib/eos.py similarity index 100% rename from python/trezorlib/eos.py rename to python/src/trezorlib/eos.py diff --git a/python/trezorlib/ethereum.py b/python/src/trezorlib/ethereum.py similarity index 100% rename from python/trezorlib/ethereum.py rename to python/src/trezorlib/ethereum.py diff --git a/python/trezorlib/exceptions.py b/python/src/trezorlib/exceptions.py similarity index 100% rename from python/trezorlib/exceptions.py rename to python/src/trezorlib/exceptions.py diff --git a/python/trezorlib/firmware.py b/python/src/trezorlib/firmware.py similarity index 100% rename from python/trezorlib/firmware.py rename to python/src/trezorlib/firmware.py diff --git a/python/trezorlib/lisk.py b/python/src/trezorlib/lisk.py similarity index 100% rename from python/trezorlib/lisk.py rename to python/src/trezorlib/lisk.py diff --git a/python/trezorlib/log.py b/python/src/trezorlib/log.py similarity index 100% rename from python/trezorlib/log.py rename to python/src/trezorlib/log.py diff --git a/python/trezorlib/mapping.py b/python/src/trezorlib/mapping.py similarity index 100% rename from python/trezorlib/mapping.py rename to python/src/trezorlib/mapping.py diff --git a/python/trezorlib/messages/.keep b/python/src/trezorlib/messages/.keep similarity index 100% rename from python/trezorlib/messages/.keep rename to python/src/trezorlib/messages/.keep diff --git a/python/trezorlib/messages/Address.py b/python/src/trezorlib/messages/Address.py similarity index 100% rename from python/trezorlib/messages/Address.py rename to python/src/trezorlib/messages/Address.py diff --git a/python/trezorlib/messages/ApplyFlags.py b/python/src/trezorlib/messages/ApplyFlags.py similarity index 100% rename from python/trezorlib/messages/ApplyFlags.py rename to python/src/trezorlib/messages/ApplyFlags.py diff --git a/python/trezorlib/messages/ApplySettings.py b/python/src/trezorlib/messages/ApplySettings.py similarity index 100% rename from python/trezorlib/messages/ApplySettings.py rename to python/src/trezorlib/messages/ApplySettings.py diff --git a/python/trezorlib/messages/BackupDevice.py b/python/src/trezorlib/messages/BackupDevice.py similarity index 100% rename from python/trezorlib/messages/BackupDevice.py rename to python/src/trezorlib/messages/BackupDevice.py diff --git a/python/trezorlib/messages/BinanceAddress.py b/python/src/trezorlib/messages/BinanceAddress.py similarity index 100% rename from python/trezorlib/messages/BinanceAddress.py rename to python/src/trezorlib/messages/BinanceAddress.py diff --git a/python/trezorlib/messages/BinanceCancelMsg.py b/python/src/trezorlib/messages/BinanceCancelMsg.py similarity index 100% rename from python/trezorlib/messages/BinanceCancelMsg.py rename to python/src/trezorlib/messages/BinanceCancelMsg.py diff --git a/python/trezorlib/messages/BinanceCoin.py b/python/src/trezorlib/messages/BinanceCoin.py similarity index 100% rename from python/trezorlib/messages/BinanceCoin.py rename to python/src/trezorlib/messages/BinanceCoin.py diff --git a/python/trezorlib/messages/BinanceGetAddress.py b/python/src/trezorlib/messages/BinanceGetAddress.py similarity index 100% rename from python/trezorlib/messages/BinanceGetAddress.py rename to python/src/trezorlib/messages/BinanceGetAddress.py diff --git a/python/trezorlib/messages/BinanceGetPublicKey.py b/python/src/trezorlib/messages/BinanceGetPublicKey.py similarity index 100% rename from python/trezorlib/messages/BinanceGetPublicKey.py rename to python/src/trezorlib/messages/BinanceGetPublicKey.py diff --git a/python/trezorlib/messages/BinanceInputOutput.py b/python/src/trezorlib/messages/BinanceInputOutput.py similarity index 100% rename from python/trezorlib/messages/BinanceInputOutput.py rename to python/src/trezorlib/messages/BinanceInputOutput.py diff --git a/python/trezorlib/messages/BinanceOrderMsg.py b/python/src/trezorlib/messages/BinanceOrderMsg.py similarity index 100% rename from python/trezorlib/messages/BinanceOrderMsg.py rename to python/src/trezorlib/messages/BinanceOrderMsg.py diff --git a/python/trezorlib/messages/BinanceOrderSide.py b/python/src/trezorlib/messages/BinanceOrderSide.py similarity index 100% rename from python/trezorlib/messages/BinanceOrderSide.py rename to python/src/trezorlib/messages/BinanceOrderSide.py diff --git a/python/trezorlib/messages/BinanceOrderType.py b/python/src/trezorlib/messages/BinanceOrderType.py similarity index 100% rename from python/trezorlib/messages/BinanceOrderType.py rename to python/src/trezorlib/messages/BinanceOrderType.py diff --git a/python/trezorlib/messages/BinancePublicKey.py b/python/src/trezorlib/messages/BinancePublicKey.py similarity index 100% rename from python/trezorlib/messages/BinancePublicKey.py rename to python/src/trezorlib/messages/BinancePublicKey.py diff --git a/python/trezorlib/messages/BinanceSignTx.py b/python/src/trezorlib/messages/BinanceSignTx.py similarity index 100% rename from python/trezorlib/messages/BinanceSignTx.py rename to python/src/trezorlib/messages/BinanceSignTx.py diff --git a/python/trezorlib/messages/BinanceSignedTx.py b/python/src/trezorlib/messages/BinanceSignedTx.py similarity index 100% rename from python/trezorlib/messages/BinanceSignedTx.py rename to python/src/trezorlib/messages/BinanceSignedTx.py diff --git a/python/trezorlib/messages/BinanceTimeInForce.py b/python/src/trezorlib/messages/BinanceTimeInForce.py similarity index 100% rename from python/trezorlib/messages/BinanceTimeInForce.py rename to python/src/trezorlib/messages/BinanceTimeInForce.py diff --git a/python/trezorlib/messages/BinanceTransferMsg.py b/python/src/trezorlib/messages/BinanceTransferMsg.py similarity index 100% rename from python/trezorlib/messages/BinanceTransferMsg.py rename to python/src/trezorlib/messages/BinanceTransferMsg.py diff --git a/python/trezorlib/messages/BinanceTxRequest.py b/python/src/trezorlib/messages/BinanceTxRequest.py similarity index 100% rename from python/trezorlib/messages/BinanceTxRequest.py rename to python/src/trezorlib/messages/BinanceTxRequest.py diff --git a/python/trezorlib/messages/ButtonAck.py b/python/src/trezorlib/messages/ButtonAck.py similarity index 100% rename from python/trezorlib/messages/ButtonAck.py rename to python/src/trezorlib/messages/ButtonAck.py diff --git a/python/trezorlib/messages/ButtonRequest.py b/python/src/trezorlib/messages/ButtonRequest.py similarity index 100% rename from python/trezorlib/messages/ButtonRequest.py rename to python/src/trezorlib/messages/ButtonRequest.py diff --git a/python/trezorlib/messages/ButtonRequestType.py b/python/src/trezorlib/messages/ButtonRequestType.py similarity index 100% rename from python/trezorlib/messages/ButtonRequestType.py rename to python/src/trezorlib/messages/ButtonRequestType.py diff --git a/python/trezorlib/messages/Cancel.py b/python/src/trezorlib/messages/Cancel.py similarity index 100% rename from python/trezorlib/messages/Cancel.py rename to python/src/trezorlib/messages/Cancel.py diff --git a/python/trezorlib/messages/CardanoAddress.py b/python/src/trezorlib/messages/CardanoAddress.py similarity index 100% rename from python/trezorlib/messages/CardanoAddress.py rename to python/src/trezorlib/messages/CardanoAddress.py diff --git a/python/trezorlib/messages/CardanoGetAddress.py b/python/src/trezorlib/messages/CardanoGetAddress.py similarity index 100% rename from python/trezorlib/messages/CardanoGetAddress.py rename to python/src/trezorlib/messages/CardanoGetAddress.py diff --git a/python/trezorlib/messages/CardanoGetPublicKey.py b/python/src/trezorlib/messages/CardanoGetPublicKey.py similarity index 100% rename from python/trezorlib/messages/CardanoGetPublicKey.py rename to python/src/trezorlib/messages/CardanoGetPublicKey.py diff --git a/python/trezorlib/messages/CardanoPublicKey.py b/python/src/trezorlib/messages/CardanoPublicKey.py similarity index 100% rename from python/trezorlib/messages/CardanoPublicKey.py rename to python/src/trezorlib/messages/CardanoPublicKey.py diff --git a/python/trezorlib/messages/CardanoSignTx.py b/python/src/trezorlib/messages/CardanoSignTx.py similarity index 100% rename from python/trezorlib/messages/CardanoSignTx.py rename to python/src/trezorlib/messages/CardanoSignTx.py diff --git a/python/trezorlib/messages/CardanoSignedTx.py b/python/src/trezorlib/messages/CardanoSignedTx.py similarity index 100% rename from python/trezorlib/messages/CardanoSignedTx.py rename to python/src/trezorlib/messages/CardanoSignedTx.py diff --git a/python/trezorlib/messages/CardanoTxAck.py b/python/src/trezorlib/messages/CardanoTxAck.py similarity index 100% rename from python/trezorlib/messages/CardanoTxAck.py rename to python/src/trezorlib/messages/CardanoTxAck.py diff --git a/python/trezorlib/messages/CardanoTxInputType.py b/python/src/trezorlib/messages/CardanoTxInputType.py similarity index 100% rename from python/trezorlib/messages/CardanoTxInputType.py rename to python/src/trezorlib/messages/CardanoTxInputType.py diff --git a/python/trezorlib/messages/CardanoTxOutputType.py b/python/src/trezorlib/messages/CardanoTxOutputType.py similarity index 100% rename from python/trezorlib/messages/CardanoTxOutputType.py rename to python/src/trezorlib/messages/CardanoTxOutputType.py diff --git a/python/trezorlib/messages/CardanoTxRequest.py b/python/src/trezorlib/messages/CardanoTxRequest.py similarity index 100% rename from python/trezorlib/messages/CardanoTxRequest.py rename to python/src/trezorlib/messages/CardanoTxRequest.py diff --git a/python/trezorlib/messages/ChangePin.py b/python/src/trezorlib/messages/ChangePin.py similarity index 100% rename from python/trezorlib/messages/ChangePin.py rename to python/src/trezorlib/messages/ChangePin.py diff --git a/python/trezorlib/messages/CipherKeyValue.py b/python/src/trezorlib/messages/CipherKeyValue.py similarity index 100% rename from python/trezorlib/messages/CipherKeyValue.py rename to python/src/trezorlib/messages/CipherKeyValue.py diff --git a/python/trezorlib/messages/CipheredKeyValue.py b/python/src/trezorlib/messages/CipheredKeyValue.py similarity index 100% rename from python/trezorlib/messages/CipheredKeyValue.py rename to python/src/trezorlib/messages/CipheredKeyValue.py diff --git a/python/trezorlib/messages/ClearSession.py b/python/src/trezorlib/messages/ClearSession.py similarity index 100% rename from python/trezorlib/messages/ClearSession.py rename to python/src/trezorlib/messages/ClearSession.py diff --git a/python/trezorlib/messages/CosiCommit.py b/python/src/trezorlib/messages/CosiCommit.py similarity index 100% rename from python/trezorlib/messages/CosiCommit.py rename to python/src/trezorlib/messages/CosiCommit.py diff --git a/python/trezorlib/messages/CosiCommitment.py b/python/src/trezorlib/messages/CosiCommitment.py similarity index 100% rename from python/trezorlib/messages/CosiCommitment.py rename to python/src/trezorlib/messages/CosiCommitment.py diff --git a/python/trezorlib/messages/CosiSign.py b/python/src/trezorlib/messages/CosiSign.py similarity index 100% rename from python/trezorlib/messages/CosiSign.py rename to python/src/trezorlib/messages/CosiSign.py diff --git a/python/trezorlib/messages/CosiSignature.py b/python/src/trezorlib/messages/CosiSignature.py similarity index 100% rename from python/trezorlib/messages/CosiSignature.py rename to python/src/trezorlib/messages/CosiSignature.py diff --git a/python/trezorlib/messages/DebugLinkDecision.py b/python/src/trezorlib/messages/DebugLinkDecision.py similarity index 100% rename from python/trezorlib/messages/DebugLinkDecision.py rename to python/src/trezorlib/messages/DebugLinkDecision.py diff --git a/python/trezorlib/messages/DebugLinkFlashErase.py b/python/src/trezorlib/messages/DebugLinkFlashErase.py similarity index 100% rename from python/trezorlib/messages/DebugLinkFlashErase.py rename to python/src/trezorlib/messages/DebugLinkFlashErase.py diff --git a/python/trezorlib/messages/DebugLinkGetState.py b/python/src/trezorlib/messages/DebugLinkGetState.py similarity index 100% rename from python/trezorlib/messages/DebugLinkGetState.py rename to python/src/trezorlib/messages/DebugLinkGetState.py diff --git a/python/trezorlib/messages/DebugLinkLog.py b/python/src/trezorlib/messages/DebugLinkLog.py similarity index 100% rename from python/trezorlib/messages/DebugLinkLog.py rename to python/src/trezorlib/messages/DebugLinkLog.py diff --git a/python/trezorlib/messages/DebugLinkMemory.py b/python/src/trezorlib/messages/DebugLinkMemory.py similarity index 100% rename from python/trezorlib/messages/DebugLinkMemory.py rename to python/src/trezorlib/messages/DebugLinkMemory.py diff --git a/python/trezorlib/messages/DebugLinkMemoryRead.py b/python/src/trezorlib/messages/DebugLinkMemoryRead.py similarity index 100% rename from python/trezorlib/messages/DebugLinkMemoryRead.py rename to python/src/trezorlib/messages/DebugLinkMemoryRead.py diff --git a/python/trezorlib/messages/DebugLinkMemoryWrite.py b/python/src/trezorlib/messages/DebugLinkMemoryWrite.py similarity index 100% rename from python/trezorlib/messages/DebugLinkMemoryWrite.py rename to python/src/trezorlib/messages/DebugLinkMemoryWrite.py diff --git a/python/trezorlib/messages/DebugLinkState.py b/python/src/trezorlib/messages/DebugLinkState.py similarity index 100% rename from python/trezorlib/messages/DebugLinkState.py rename to python/src/trezorlib/messages/DebugLinkState.py diff --git a/python/trezorlib/messages/DebugLinkStop.py b/python/src/trezorlib/messages/DebugLinkStop.py similarity index 100% rename from python/trezorlib/messages/DebugLinkStop.py rename to python/src/trezorlib/messages/DebugLinkStop.py diff --git a/python/trezorlib/messages/DebugMoneroDiagAck.py b/python/src/trezorlib/messages/DebugMoneroDiagAck.py similarity index 100% rename from python/trezorlib/messages/DebugMoneroDiagAck.py rename to python/src/trezorlib/messages/DebugMoneroDiagAck.py diff --git a/python/trezorlib/messages/DebugMoneroDiagRequest.py b/python/src/trezorlib/messages/DebugMoneroDiagRequest.py similarity index 100% rename from python/trezorlib/messages/DebugMoneroDiagRequest.py rename to python/src/trezorlib/messages/DebugMoneroDiagRequest.py diff --git a/python/trezorlib/messages/ECDHSessionKey.py b/python/src/trezorlib/messages/ECDHSessionKey.py similarity index 100% rename from python/trezorlib/messages/ECDHSessionKey.py rename to python/src/trezorlib/messages/ECDHSessionKey.py diff --git a/python/trezorlib/messages/Entropy.py b/python/src/trezorlib/messages/Entropy.py similarity index 100% rename from python/trezorlib/messages/Entropy.py rename to python/src/trezorlib/messages/Entropy.py diff --git a/python/trezorlib/messages/EntropyAck.py b/python/src/trezorlib/messages/EntropyAck.py similarity index 100% rename from python/trezorlib/messages/EntropyAck.py rename to python/src/trezorlib/messages/EntropyAck.py diff --git a/python/trezorlib/messages/EntropyRequest.py b/python/src/trezorlib/messages/EntropyRequest.py similarity index 100% rename from python/trezorlib/messages/EntropyRequest.py rename to python/src/trezorlib/messages/EntropyRequest.py diff --git a/python/trezorlib/messages/EosActionBuyRam.py b/python/src/trezorlib/messages/EosActionBuyRam.py similarity index 100% rename from python/trezorlib/messages/EosActionBuyRam.py rename to python/src/trezorlib/messages/EosActionBuyRam.py diff --git a/python/trezorlib/messages/EosActionBuyRamBytes.py b/python/src/trezorlib/messages/EosActionBuyRamBytes.py similarity index 100% rename from python/trezorlib/messages/EosActionBuyRamBytes.py rename to python/src/trezorlib/messages/EosActionBuyRamBytes.py diff --git a/python/trezorlib/messages/EosActionCommon.py b/python/src/trezorlib/messages/EosActionCommon.py similarity index 100% rename from python/trezorlib/messages/EosActionCommon.py rename to python/src/trezorlib/messages/EosActionCommon.py diff --git a/python/trezorlib/messages/EosActionDelegate.py b/python/src/trezorlib/messages/EosActionDelegate.py similarity index 100% rename from python/trezorlib/messages/EosActionDelegate.py rename to python/src/trezorlib/messages/EosActionDelegate.py diff --git a/python/trezorlib/messages/EosActionDeleteAuth.py b/python/src/trezorlib/messages/EosActionDeleteAuth.py similarity index 100% rename from python/trezorlib/messages/EosActionDeleteAuth.py rename to python/src/trezorlib/messages/EosActionDeleteAuth.py diff --git a/python/trezorlib/messages/EosActionLinkAuth.py b/python/src/trezorlib/messages/EosActionLinkAuth.py similarity index 100% rename from python/trezorlib/messages/EosActionLinkAuth.py rename to python/src/trezorlib/messages/EosActionLinkAuth.py diff --git a/python/trezorlib/messages/EosActionNewAccount.py b/python/src/trezorlib/messages/EosActionNewAccount.py similarity index 100% rename from python/trezorlib/messages/EosActionNewAccount.py rename to python/src/trezorlib/messages/EosActionNewAccount.py diff --git a/python/trezorlib/messages/EosActionRefund.py b/python/src/trezorlib/messages/EosActionRefund.py similarity index 100% rename from python/trezorlib/messages/EosActionRefund.py rename to python/src/trezorlib/messages/EosActionRefund.py diff --git a/python/trezorlib/messages/EosActionSellRam.py b/python/src/trezorlib/messages/EosActionSellRam.py similarity index 100% rename from python/trezorlib/messages/EosActionSellRam.py rename to python/src/trezorlib/messages/EosActionSellRam.py diff --git a/python/trezorlib/messages/EosActionTransfer.py b/python/src/trezorlib/messages/EosActionTransfer.py similarity index 100% rename from python/trezorlib/messages/EosActionTransfer.py rename to python/src/trezorlib/messages/EosActionTransfer.py diff --git a/python/trezorlib/messages/EosActionUndelegate.py b/python/src/trezorlib/messages/EosActionUndelegate.py similarity index 100% rename from python/trezorlib/messages/EosActionUndelegate.py rename to python/src/trezorlib/messages/EosActionUndelegate.py diff --git a/python/trezorlib/messages/EosActionUnknown.py b/python/src/trezorlib/messages/EosActionUnknown.py similarity index 100% rename from python/trezorlib/messages/EosActionUnknown.py rename to python/src/trezorlib/messages/EosActionUnknown.py diff --git a/python/trezorlib/messages/EosActionUnlinkAuth.py b/python/src/trezorlib/messages/EosActionUnlinkAuth.py similarity index 100% rename from python/trezorlib/messages/EosActionUnlinkAuth.py rename to python/src/trezorlib/messages/EosActionUnlinkAuth.py diff --git a/python/trezorlib/messages/EosActionUpdateAuth.py b/python/src/trezorlib/messages/EosActionUpdateAuth.py similarity index 100% rename from python/trezorlib/messages/EosActionUpdateAuth.py rename to python/src/trezorlib/messages/EosActionUpdateAuth.py diff --git a/python/trezorlib/messages/EosActionVoteProducer.py b/python/src/trezorlib/messages/EosActionVoteProducer.py similarity index 100% rename from python/trezorlib/messages/EosActionVoteProducer.py rename to python/src/trezorlib/messages/EosActionVoteProducer.py diff --git a/python/trezorlib/messages/EosAsset.py b/python/src/trezorlib/messages/EosAsset.py similarity index 100% rename from python/trezorlib/messages/EosAsset.py rename to python/src/trezorlib/messages/EosAsset.py diff --git a/python/trezorlib/messages/EosAuthorization.py b/python/src/trezorlib/messages/EosAuthorization.py similarity index 100% rename from python/trezorlib/messages/EosAuthorization.py rename to python/src/trezorlib/messages/EosAuthorization.py diff --git a/python/trezorlib/messages/EosAuthorizationAccount.py b/python/src/trezorlib/messages/EosAuthorizationAccount.py similarity index 100% rename from python/trezorlib/messages/EosAuthorizationAccount.py rename to python/src/trezorlib/messages/EosAuthorizationAccount.py diff --git a/python/trezorlib/messages/EosAuthorizationKey.py b/python/src/trezorlib/messages/EosAuthorizationKey.py similarity index 100% rename from python/trezorlib/messages/EosAuthorizationKey.py rename to python/src/trezorlib/messages/EosAuthorizationKey.py diff --git a/python/trezorlib/messages/EosAuthorizationWait.py b/python/src/trezorlib/messages/EosAuthorizationWait.py similarity index 100% rename from python/trezorlib/messages/EosAuthorizationWait.py rename to python/src/trezorlib/messages/EosAuthorizationWait.py diff --git a/python/trezorlib/messages/EosGetPublicKey.py b/python/src/trezorlib/messages/EosGetPublicKey.py similarity index 100% rename from python/trezorlib/messages/EosGetPublicKey.py rename to python/src/trezorlib/messages/EosGetPublicKey.py diff --git a/python/trezorlib/messages/EosPermissionLevel.py b/python/src/trezorlib/messages/EosPermissionLevel.py similarity index 100% rename from python/trezorlib/messages/EosPermissionLevel.py rename to python/src/trezorlib/messages/EosPermissionLevel.py diff --git a/python/trezorlib/messages/EosPublicKey.py b/python/src/trezorlib/messages/EosPublicKey.py similarity index 100% rename from python/trezorlib/messages/EosPublicKey.py rename to python/src/trezorlib/messages/EosPublicKey.py diff --git a/python/trezorlib/messages/EosSignTx.py b/python/src/trezorlib/messages/EosSignTx.py similarity index 100% rename from python/trezorlib/messages/EosSignTx.py rename to python/src/trezorlib/messages/EosSignTx.py diff --git a/python/trezorlib/messages/EosSignedTx.py b/python/src/trezorlib/messages/EosSignedTx.py similarity index 100% rename from python/trezorlib/messages/EosSignedTx.py rename to python/src/trezorlib/messages/EosSignedTx.py diff --git a/python/trezorlib/messages/EosTxActionAck.py b/python/src/trezorlib/messages/EosTxActionAck.py similarity index 100% rename from python/trezorlib/messages/EosTxActionAck.py rename to python/src/trezorlib/messages/EosTxActionAck.py diff --git a/python/trezorlib/messages/EosTxActionRequest.py b/python/src/trezorlib/messages/EosTxActionRequest.py similarity index 100% rename from python/trezorlib/messages/EosTxActionRequest.py rename to python/src/trezorlib/messages/EosTxActionRequest.py diff --git a/python/trezorlib/messages/EosTxHeader.py b/python/src/trezorlib/messages/EosTxHeader.py similarity index 100% rename from python/trezorlib/messages/EosTxHeader.py rename to python/src/trezorlib/messages/EosTxHeader.py diff --git a/python/trezorlib/messages/EthereumAddress.py b/python/src/trezorlib/messages/EthereumAddress.py similarity index 100% rename from python/trezorlib/messages/EthereumAddress.py rename to python/src/trezorlib/messages/EthereumAddress.py diff --git a/python/trezorlib/messages/EthereumGetAddress.py b/python/src/trezorlib/messages/EthereumGetAddress.py similarity index 100% rename from python/trezorlib/messages/EthereumGetAddress.py rename to python/src/trezorlib/messages/EthereumGetAddress.py diff --git a/python/trezorlib/messages/EthereumGetPublicKey.py b/python/src/trezorlib/messages/EthereumGetPublicKey.py similarity index 100% rename from python/trezorlib/messages/EthereumGetPublicKey.py rename to python/src/trezorlib/messages/EthereumGetPublicKey.py diff --git a/python/trezorlib/messages/EthereumMessageSignature.py b/python/src/trezorlib/messages/EthereumMessageSignature.py similarity index 100% rename from python/trezorlib/messages/EthereumMessageSignature.py rename to python/src/trezorlib/messages/EthereumMessageSignature.py diff --git a/python/trezorlib/messages/EthereumPublicKey.py b/python/src/trezorlib/messages/EthereumPublicKey.py similarity index 100% rename from python/trezorlib/messages/EthereumPublicKey.py rename to python/src/trezorlib/messages/EthereumPublicKey.py diff --git a/python/trezorlib/messages/EthereumSignMessage.py b/python/src/trezorlib/messages/EthereumSignMessage.py similarity index 100% rename from python/trezorlib/messages/EthereumSignMessage.py rename to python/src/trezorlib/messages/EthereumSignMessage.py diff --git a/python/trezorlib/messages/EthereumSignTx.py b/python/src/trezorlib/messages/EthereumSignTx.py similarity index 100% rename from python/trezorlib/messages/EthereumSignTx.py rename to python/src/trezorlib/messages/EthereumSignTx.py diff --git a/python/trezorlib/messages/EthereumTxAck.py b/python/src/trezorlib/messages/EthereumTxAck.py similarity index 100% rename from python/trezorlib/messages/EthereumTxAck.py rename to python/src/trezorlib/messages/EthereumTxAck.py diff --git a/python/trezorlib/messages/EthereumTxRequest.py b/python/src/trezorlib/messages/EthereumTxRequest.py similarity index 100% rename from python/trezorlib/messages/EthereumTxRequest.py rename to python/src/trezorlib/messages/EthereumTxRequest.py diff --git a/python/trezorlib/messages/EthereumVerifyMessage.py b/python/src/trezorlib/messages/EthereumVerifyMessage.py similarity index 100% rename from python/trezorlib/messages/EthereumVerifyMessage.py rename to python/src/trezorlib/messages/EthereumVerifyMessage.py diff --git a/python/trezorlib/messages/Failure.py b/python/src/trezorlib/messages/Failure.py similarity index 100% rename from python/trezorlib/messages/Failure.py rename to python/src/trezorlib/messages/Failure.py diff --git a/python/trezorlib/messages/FailureType.py b/python/src/trezorlib/messages/FailureType.py similarity index 100% rename from python/trezorlib/messages/FailureType.py rename to python/src/trezorlib/messages/FailureType.py diff --git a/python/trezorlib/messages/Features.py b/python/src/trezorlib/messages/Features.py similarity index 100% rename from python/trezorlib/messages/Features.py rename to python/src/trezorlib/messages/Features.py diff --git a/python/trezorlib/messages/FirmwareErase.py b/python/src/trezorlib/messages/FirmwareErase.py similarity index 100% rename from python/trezorlib/messages/FirmwareErase.py rename to python/src/trezorlib/messages/FirmwareErase.py diff --git a/python/trezorlib/messages/FirmwareRequest.py b/python/src/trezorlib/messages/FirmwareRequest.py similarity index 100% rename from python/trezorlib/messages/FirmwareRequest.py rename to python/src/trezorlib/messages/FirmwareRequest.py diff --git a/python/trezorlib/messages/FirmwareUpload.py b/python/src/trezorlib/messages/FirmwareUpload.py similarity index 100% rename from python/trezorlib/messages/FirmwareUpload.py rename to python/src/trezorlib/messages/FirmwareUpload.py diff --git a/python/trezorlib/messages/GetAddress.py b/python/src/trezorlib/messages/GetAddress.py similarity index 100% rename from python/trezorlib/messages/GetAddress.py rename to python/src/trezorlib/messages/GetAddress.py diff --git a/python/trezorlib/messages/GetECDHSessionKey.py b/python/src/trezorlib/messages/GetECDHSessionKey.py similarity index 100% rename from python/trezorlib/messages/GetECDHSessionKey.py rename to python/src/trezorlib/messages/GetECDHSessionKey.py diff --git a/python/trezorlib/messages/GetEntropy.py b/python/src/trezorlib/messages/GetEntropy.py similarity index 100% rename from python/trezorlib/messages/GetEntropy.py rename to python/src/trezorlib/messages/GetEntropy.py diff --git a/python/trezorlib/messages/GetFeatures.py b/python/src/trezorlib/messages/GetFeatures.py similarity index 100% rename from python/trezorlib/messages/GetFeatures.py rename to python/src/trezorlib/messages/GetFeatures.py diff --git a/python/trezorlib/messages/GetPublicKey.py b/python/src/trezorlib/messages/GetPublicKey.py similarity index 100% rename from python/trezorlib/messages/GetPublicKey.py rename to python/src/trezorlib/messages/GetPublicKey.py diff --git a/python/trezorlib/messages/HDNodePathType.py b/python/src/trezorlib/messages/HDNodePathType.py similarity index 100% rename from python/trezorlib/messages/HDNodePathType.py rename to python/src/trezorlib/messages/HDNodePathType.py diff --git a/python/trezorlib/messages/HDNodeType.py b/python/src/trezorlib/messages/HDNodeType.py similarity index 100% rename from python/trezorlib/messages/HDNodeType.py rename to python/src/trezorlib/messages/HDNodeType.py diff --git a/python/trezorlib/messages/IdentityType.py b/python/src/trezorlib/messages/IdentityType.py similarity index 100% rename from python/trezorlib/messages/IdentityType.py rename to python/src/trezorlib/messages/IdentityType.py diff --git a/python/trezorlib/messages/Initialize.py b/python/src/trezorlib/messages/Initialize.py similarity index 100% rename from python/trezorlib/messages/Initialize.py rename to python/src/trezorlib/messages/Initialize.py diff --git a/python/trezorlib/messages/InputScriptType.py b/python/src/trezorlib/messages/InputScriptType.py similarity index 100% rename from python/trezorlib/messages/InputScriptType.py rename to python/src/trezorlib/messages/InputScriptType.py diff --git a/python/trezorlib/messages/LiskAddress.py b/python/src/trezorlib/messages/LiskAddress.py similarity index 100% rename from python/trezorlib/messages/LiskAddress.py rename to python/src/trezorlib/messages/LiskAddress.py diff --git a/python/trezorlib/messages/LiskDelegateType.py b/python/src/trezorlib/messages/LiskDelegateType.py similarity index 100% rename from python/trezorlib/messages/LiskDelegateType.py rename to python/src/trezorlib/messages/LiskDelegateType.py diff --git a/python/trezorlib/messages/LiskGetAddress.py b/python/src/trezorlib/messages/LiskGetAddress.py similarity index 100% rename from python/trezorlib/messages/LiskGetAddress.py rename to python/src/trezorlib/messages/LiskGetAddress.py diff --git a/python/trezorlib/messages/LiskGetPublicKey.py b/python/src/trezorlib/messages/LiskGetPublicKey.py similarity index 100% rename from python/trezorlib/messages/LiskGetPublicKey.py rename to python/src/trezorlib/messages/LiskGetPublicKey.py diff --git a/python/trezorlib/messages/LiskMessageSignature.py b/python/src/trezorlib/messages/LiskMessageSignature.py similarity index 100% rename from python/trezorlib/messages/LiskMessageSignature.py rename to python/src/trezorlib/messages/LiskMessageSignature.py diff --git a/python/trezorlib/messages/LiskMultisignatureType.py b/python/src/trezorlib/messages/LiskMultisignatureType.py similarity index 100% rename from python/trezorlib/messages/LiskMultisignatureType.py rename to python/src/trezorlib/messages/LiskMultisignatureType.py diff --git a/python/trezorlib/messages/LiskPublicKey.py b/python/src/trezorlib/messages/LiskPublicKey.py similarity index 100% rename from python/trezorlib/messages/LiskPublicKey.py rename to python/src/trezorlib/messages/LiskPublicKey.py diff --git a/python/trezorlib/messages/LiskSignMessage.py b/python/src/trezorlib/messages/LiskSignMessage.py similarity index 100% rename from python/trezorlib/messages/LiskSignMessage.py rename to python/src/trezorlib/messages/LiskSignMessage.py diff --git a/python/trezorlib/messages/LiskSignTx.py b/python/src/trezorlib/messages/LiskSignTx.py similarity index 100% rename from python/trezorlib/messages/LiskSignTx.py rename to python/src/trezorlib/messages/LiskSignTx.py diff --git a/python/trezorlib/messages/LiskSignatureType.py b/python/src/trezorlib/messages/LiskSignatureType.py similarity index 100% rename from python/trezorlib/messages/LiskSignatureType.py rename to python/src/trezorlib/messages/LiskSignatureType.py diff --git a/python/trezorlib/messages/LiskSignedTx.py b/python/src/trezorlib/messages/LiskSignedTx.py similarity index 100% rename from python/trezorlib/messages/LiskSignedTx.py rename to python/src/trezorlib/messages/LiskSignedTx.py diff --git a/python/trezorlib/messages/LiskTransactionAsset.py b/python/src/trezorlib/messages/LiskTransactionAsset.py similarity index 100% rename from python/trezorlib/messages/LiskTransactionAsset.py rename to python/src/trezorlib/messages/LiskTransactionAsset.py diff --git a/python/trezorlib/messages/LiskTransactionCommon.py b/python/src/trezorlib/messages/LiskTransactionCommon.py similarity index 100% rename from python/trezorlib/messages/LiskTransactionCommon.py rename to python/src/trezorlib/messages/LiskTransactionCommon.py diff --git a/python/trezorlib/messages/LiskTransactionType.py b/python/src/trezorlib/messages/LiskTransactionType.py similarity index 100% rename from python/trezorlib/messages/LiskTransactionType.py rename to python/src/trezorlib/messages/LiskTransactionType.py diff --git a/python/trezorlib/messages/LiskVerifyMessage.py b/python/src/trezorlib/messages/LiskVerifyMessage.py similarity index 100% rename from python/trezorlib/messages/LiskVerifyMessage.py rename to python/src/trezorlib/messages/LiskVerifyMessage.py diff --git a/python/trezorlib/messages/LoadDevice.py b/python/src/trezorlib/messages/LoadDevice.py similarity index 100% rename from python/trezorlib/messages/LoadDevice.py rename to python/src/trezorlib/messages/LoadDevice.py diff --git a/python/trezorlib/messages/MessageSignature.py b/python/src/trezorlib/messages/MessageSignature.py similarity index 100% rename from python/trezorlib/messages/MessageSignature.py rename to python/src/trezorlib/messages/MessageSignature.py diff --git a/python/trezorlib/messages/MessageType.py b/python/src/trezorlib/messages/MessageType.py similarity index 100% rename from python/trezorlib/messages/MessageType.py rename to python/src/trezorlib/messages/MessageType.py diff --git a/python/trezorlib/messages/MoneroAccountPublicAddress.py b/python/src/trezorlib/messages/MoneroAccountPublicAddress.py similarity index 100% rename from python/trezorlib/messages/MoneroAccountPublicAddress.py rename to python/src/trezorlib/messages/MoneroAccountPublicAddress.py diff --git a/python/trezorlib/messages/MoneroAddress.py b/python/src/trezorlib/messages/MoneroAddress.py similarity index 100% rename from python/trezorlib/messages/MoneroAddress.py rename to python/src/trezorlib/messages/MoneroAddress.py diff --git a/python/trezorlib/messages/MoneroExportedKeyImage.py b/python/src/trezorlib/messages/MoneroExportedKeyImage.py similarity index 100% rename from python/trezorlib/messages/MoneroExportedKeyImage.py rename to python/src/trezorlib/messages/MoneroExportedKeyImage.py diff --git a/python/trezorlib/messages/MoneroGetAddress.py b/python/src/trezorlib/messages/MoneroGetAddress.py similarity index 100% rename from python/trezorlib/messages/MoneroGetAddress.py rename to python/src/trezorlib/messages/MoneroGetAddress.py diff --git a/python/trezorlib/messages/MoneroGetTxKeyAck.py b/python/src/trezorlib/messages/MoneroGetTxKeyAck.py similarity index 100% rename from python/trezorlib/messages/MoneroGetTxKeyAck.py rename to python/src/trezorlib/messages/MoneroGetTxKeyAck.py diff --git a/python/trezorlib/messages/MoneroGetTxKeyRequest.py b/python/src/trezorlib/messages/MoneroGetTxKeyRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroGetTxKeyRequest.py rename to python/src/trezorlib/messages/MoneroGetTxKeyRequest.py diff --git a/python/trezorlib/messages/MoneroGetWatchKey.py b/python/src/trezorlib/messages/MoneroGetWatchKey.py similarity index 100% rename from python/trezorlib/messages/MoneroGetWatchKey.py rename to python/src/trezorlib/messages/MoneroGetWatchKey.py diff --git a/python/trezorlib/messages/MoneroKeyImageExportInitAck.py b/python/src/trezorlib/messages/MoneroKeyImageExportInitAck.py similarity index 100% rename from python/trezorlib/messages/MoneroKeyImageExportInitAck.py rename to python/src/trezorlib/messages/MoneroKeyImageExportInitAck.py diff --git a/python/trezorlib/messages/MoneroKeyImageExportInitRequest.py b/python/src/trezorlib/messages/MoneroKeyImageExportInitRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroKeyImageExportInitRequest.py rename to python/src/trezorlib/messages/MoneroKeyImageExportInitRequest.py diff --git a/python/trezorlib/messages/MoneroKeyImageSyncFinalAck.py b/python/src/trezorlib/messages/MoneroKeyImageSyncFinalAck.py similarity index 100% rename from python/trezorlib/messages/MoneroKeyImageSyncFinalAck.py rename to python/src/trezorlib/messages/MoneroKeyImageSyncFinalAck.py diff --git a/python/trezorlib/messages/MoneroKeyImageSyncFinalRequest.py b/python/src/trezorlib/messages/MoneroKeyImageSyncFinalRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroKeyImageSyncFinalRequest.py rename to python/src/trezorlib/messages/MoneroKeyImageSyncFinalRequest.py diff --git a/python/trezorlib/messages/MoneroKeyImageSyncStepAck.py b/python/src/trezorlib/messages/MoneroKeyImageSyncStepAck.py similarity index 100% rename from python/trezorlib/messages/MoneroKeyImageSyncStepAck.py rename to python/src/trezorlib/messages/MoneroKeyImageSyncStepAck.py diff --git a/python/trezorlib/messages/MoneroKeyImageSyncStepRequest.py b/python/src/trezorlib/messages/MoneroKeyImageSyncStepRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroKeyImageSyncStepRequest.py rename to python/src/trezorlib/messages/MoneroKeyImageSyncStepRequest.py diff --git a/python/trezorlib/messages/MoneroLiveRefreshFinalAck.py b/python/src/trezorlib/messages/MoneroLiveRefreshFinalAck.py similarity index 100% rename from python/trezorlib/messages/MoneroLiveRefreshFinalAck.py rename to python/src/trezorlib/messages/MoneroLiveRefreshFinalAck.py diff --git a/python/trezorlib/messages/MoneroLiveRefreshFinalRequest.py b/python/src/trezorlib/messages/MoneroLiveRefreshFinalRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroLiveRefreshFinalRequest.py rename to python/src/trezorlib/messages/MoneroLiveRefreshFinalRequest.py diff --git a/python/trezorlib/messages/MoneroLiveRefreshStartAck.py b/python/src/trezorlib/messages/MoneroLiveRefreshStartAck.py similarity index 100% rename from python/trezorlib/messages/MoneroLiveRefreshStartAck.py rename to python/src/trezorlib/messages/MoneroLiveRefreshStartAck.py diff --git a/python/trezorlib/messages/MoneroLiveRefreshStartRequest.py b/python/src/trezorlib/messages/MoneroLiveRefreshStartRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroLiveRefreshStartRequest.py rename to python/src/trezorlib/messages/MoneroLiveRefreshStartRequest.py diff --git a/python/trezorlib/messages/MoneroLiveRefreshStepAck.py b/python/src/trezorlib/messages/MoneroLiveRefreshStepAck.py similarity index 100% rename from python/trezorlib/messages/MoneroLiveRefreshStepAck.py rename to python/src/trezorlib/messages/MoneroLiveRefreshStepAck.py diff --git a/python/trezorlib/messages/MoneroLiveRefreshStepRequest.py b/python/src/trezorlib/messages/MoneroLiveRefreshStepRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroLiveRefreshStepRequest.py rename to python/src/trezorlib/messages/MoneroLiveRefreshStepRequest.py diff --git a/python/trezorlib/messages/MoneroMultisigKLRki.py b/python/src/trezorlib/messages/MoneroMultisigKLRki.py similarity index 100% rename from python/trezorlib/messages/MoneroMultisigKLRki.py rename to python/src/trezorlib/messages/MoneroMultisigKLRki.py diff --git a/python/trezorlib/messages/MoneroOutputEntry.py b/python/src/trezorlib/messages/MoneroOutputEntry.py similarity index 100% rename from python/trezorlib/messages/MoneroOutputEntry.py rename to python/src/trezorlib/messages/MoneroOutputEntry.py diff --git a/python/trezorlib/messages/MoneroRctKeyPublic.py b/python/src/trezorlib/messages/MoneroRctKeyPublic.py similarity index 100% rename from python/trezorlib/messages/MoneroRctKeyPublic.py rename to python/src/trezorlib/messages/MoneroRctKeyPublic.py diff --git a/python/trezorlib/messages/MoneroRingCtSig.py b/python/src/trezorlib/messages/MoneroRingCtSig.py similarity index 100% rename from python/trezorlib/messages/MoneroRingCtSig.py rename to python/src/trezorlib/messages/MoneroRingCtSig.py diff --git a/python/trezorlib/messages/MoneroSubAddressIndicesList.py b/python/src/trezorlib/messages/MoneroSubAddressIndicesList.py similarity index 100% rename from python/trezorlib/messages/MoneroSubAddressIndicesList.py rename to python/src/trezorlib/messages/MoneroSubAddressIndicesList.py diff --git a/python/trezorlib/messages/MoneroTransactionAllInputsSetAck.py b/python/src/trezorlib/messages/MoneroTransactionAllInputsSetAck.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionAllInputsSetAck.py rename to python/src/trezorlib/messages/MoneroTransactionAllInputsSetAck.py diff --git a/python/trezorlib/messages/MoneroTransactionAllInputsSetRequest.py b/python/src/trezorlib/messages/MoneroTransactionAllInputsSetRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionAllInputsSetRequest.py rename to python/src/trezorlib/messages/MoneroTransactionAllInputsSetRequest.py diff --git a/python/trezorlib/messages/MoneroTransactionAllOutSetAck.py b/python/src/trezorlib/messages/MoneroTransactionAllOutSetAck.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionAllOutSetAck.py rename to python/src/trezorlib/messages/MoneroTransactionAllOutSetAck.py diff --git a/python/trezorlib/messages/MoneroTransactionAllOutSetRequest.py b/python/src/trezorlib/messages/MoneroTransactionAllOutSetRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionAllOutSetRequest.py rename to python/src/trezorlib/messages/MoneroTransactionAllOutSetRequest.py diff --git a/python/trezorlib/messages/MoneroTransactionData.py b/python/src/trezorlib/messages/MoneroTransactionData.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionData.py rename to python/src/trezorlib/messages/MoneroTransactionData.py diff --git a/python/trezorlib/messages/MoneroTransactionDestinationEntry.py b/python/src/trezorlib/messages/MoneroTransactionDestinationEntry.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionDestinationEntry.py rename to python/src/trezorlib/messages/MoneroTransactionDestinationEntry.py diff --git a/python/trezorlib/messages/MoneroTransactionFinalAck.py b/python/src/trezorlib/messages/MoneroTransactionFinalAck.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionFinalAck.py rename to python/src/trezorlib/messages/MoneroTransactionFinalAck.py diff --git a/python/trezorlib/messages/MoneroTransactionFinalRequest.py b/python/src/trezorlib/messages/MoneroTransactionFinalRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionFinalRequest.py rename to python/src/trezorlib/messages/MoneroTransactionFinalRequest.py diff --git a/python/trezorlib/messages/MoneroTransactionInitAck.py b/python/src/trezorlib/messages/MoneroTransactionInitAck.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionInitAck.py rename to python/src/trezorlib/messages/MoneroTransactionInitAck.py diff --git a/python/trezorlib/messages/MoneroTransactionInitRequest.py b/python/src/trezorlib/messages/MoneroTransactionInitRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionInitRequest.py rename to python/src/trezorlib/messages/MoneroTransactionInitRequest.py diff --git a/python/trezorlib/messages/MoneroTransactionInputViniAck.py b/python/src/trezorlib/messages/MoneroTransactionInputViniAck.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionInputViniAck.py rename to python/src/trezorlib/messages/MoneroTransactionInputViniAck.py diff --git a/python/trezorlib/messages/MoneroTransactionInputViniRequest.py b/python/src/trezorlib/messages/MoneroTransactionInputViniRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionInputViniRequest.py rename to python/src/trezorlib/messages/MoneroTransactionInputViniRequest.py diff --git a/python/trezorlib/messages/MoneroTransactionInputsPermutationAck.py b/python/src/trezorlib/messages/MoneroTransactionInputsPermutationAck.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionInputsPermutationAck.py rename to python/src/trezorlib/messages/MoneroTransactionInputsPermutationAck.py diff --git a/python/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py b/python/src/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py rename to python/src/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py diff --git a/python/trezorlib/messages/MoneroTransactionRsigData.py b/python/src/trezorlib/messages/MoneroTransactionRsigData.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionRsigData.py rename to python/src/trezorlib/messages/MoneroTransactionRsigData.py diff --git a/python/trezorlib/messages/MoneroTransactionSetInputAck.py b/python/src/trezorlib/messages/MoneroTransactionSetInputAck.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionSetInputAck.py rename to python/src/trezorlib/messages/MoneroTransactionSetInputAck.py diff --git a/python/trezorlib/messages/MoneroTransactionSetInputRequest.py b/python/src/trezorlib/messages/MoneroTransactionSetInputRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionSetInputRequest.py rename to python/src/trezorlib/messages/MoneroTransactionSetInputRequest.py diff --git a/python/trezorlib/messages/MoneroTransactionSetOutputAck.py b/python/src/trezorlib/messages/MoneroTransactionSetOutputAck.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionSetOutputAck.py rename to python/src/trezorlib/messages/MoneroTransactionSetOutputAck.py diff --git a/python/trezorlib/messages/MoneroTransactionSetOutputRequest.py b/python/src/trezorlib/messages/MoneroTransactionSetOutputRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionSetOutputRequest.py rename to python/src/trezorlib/messages/MoneroTransactionSetOutputRequest.py diff --git a/python/trezorlib/messages/MoneroTransactionSignInputAck.py b/python/src/trezorlib/messages/MoneroTransactionSignInputAck.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionSignInputAck.py rename to python/src/trezorlib/messages/MoneroTransactionSignInputAck.py diff --git a/python/trezorlib/messages/MoneroTransactionSignInputRequest.py b/python/src/trezorlib/messages/MoneroTransactionSignInputRequest.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionSignInputRequest.py rename to python/src/trezorlib/messages/MoneroTransactionSignInputRequest.py diff --git a/python/trezorlib/messages/MoneroTransactionSourceEntry.py b/python/src/trezorlib/messages/MoneroTransactionSourceEntry.py similarity index 100% rename from python/trezorlib/messages/MoneroTransactionSourceEntry.py rename to python/src/trezorlib/messages/MoneroTransactionSourceEntry.py diff --git a/python/trezorlib/messages/MoneroTransferDetails.py b/python/src/trezorlib/messages/MoneroTransferDetails.py similarity index 100% rename from python/trezorlib/messages/MoneroTransferDetails.py rename to python/src/trezorlib/messages/MoneroTransferDetails.py diff --git a/python/trezorlib/messages/MoneroWatchKey.py b/python/src/trezorlib/messages/MoneroWatchKey.py similarity index 100% rename from python/trezorlib/messages/MoneroWatchKey.py rename to python/src/trezorlib/messages/MoneroWatchKey.py diff --git a/python/trezorlib/messages/MultisigRedeemScriptType.py b/python/src/trezorlib/messages/MultisigRedeemScriptType.py similarity index 100% rename from python/trezorlib/messages/MultisigRedeemScriptType.py rename to python/src/trezorlib/messages/MultisigRedeemScriptType.py diff --git a/python/trezorlib/messages/NEMAddress.py b/python/src/trezorlib/messages/NEMAddress.py similarity index 100% rename from python/trezorlib/messages/NEMAddress.py rename to python/src/trezorlib/messages/NEMAddress.py diff --git a/python/trezorlib/messages/NEMAggregateModification.py b/python/src/trezorlib/messages/NEMAggregateModification.py similarity index 100% rename from python/trezorlib/messages/NEMAggregateModification.py rename to python/src/trezorlib/messages/NEMAggregateModification.py diff --git a/python/trezorlib/messages/NEMCosignatoryModification.py b/python/src/trezorlib/messages/NEMCosignatoryModification.py similarity index 100% rename from python/trezorlib/messages/NEMCosignatoryModification.py rename to python/src/trezorlib/messages/NEMCosignatoryModification.py diff --git a/python/trezorlib/messages/NEMDecryptMessage.py b/python/src/trezorlib/messages/NEMDecryptMessage.py similarity index 100% rename from python/trezorlib/messages/NEMDecryptMessage.py rename to python/src/trezorlib/messages/NEMDecryptMessage.py diff --git a/python/trezorlib/messages/NEMDecryptedMessage.py b/python/src/trezorlib/messages/NEMDecryptedMessage.py similarity index 100% rename from python/trezorlib/messages/NEMDecryptedMessage.py rename to python/src/trezorlib/messages/NEMDecryptedMessage.py diff --git a/python/trezorlib/messages/NEMGetAddress.py b/python/src/trezorlib/messages/NEMGetAddress.py similarity index 100% rename from python/trezorlib/messages/NEMGetAddress.py rename to python/src/trezorlib/messages/NEMGetAddress.py diff --git a/python/trezorlib/messages/NEMImportanceTransfer.py b/python/src/trezorlib/messages/NEMImportanceTransfer.py similarity index 100% rename from python/trezorlib/messages/NEMImportanceTransfer.py rename to python/src/trezorlib/messages/NEMImportanceTransfer.py diff --git a/python/trezorlib/messages/NEMImportanceTransferMode.py b/python/src/trezorlib/messages/NEMImportanceTransferMode.py similarity index 100% rename from python/trezorlib/messages/NEMImportanceTransferMode.py rename to python/src/trezorlib/messages/NEMImportanceTransferMode.py diff --git a/python/trezorlib/messages/NEMModificationType.py b/python/src/trezorlib/messages/NEMModificationType.py similarity index 100% rename from python/trezorlib/messages/NEMModificationType.py rename to python/src/trezorlib/messages/NEMModificationType.py diff --git a/python/trezorlib/messages/NEMMosaic.py b/python/src/trezorlib/messages/NEMMosaic.py similarity index 100% rename from python/trezorlib/messages/NEMMosaic.py rename to python/src/trezorlib/messages/NEMMosaic.py diff --git a/python/trezorlib/messages/NEMMosaicCreation.py b/python/src/trezorlib/messages/NEMMosaicCreation.py similarity index 100% rename from python/trezorlib/messages/NEMMosaicCreation.py rename to python/src/trezorlib/messages/NEMMosaicCreation.py diff --git a/python/trezorlib/messages/NEMMosaicDefinition.py b/python/src/trezorlib/messages/NEMMosaicDefinition.py similarity index 100% rename from python/trezorlib/messages/NEMMosaicDefinition.py rename to python/src/trezorlib/messages/NEMMosaicDefinition.py diff --git a/python/trezorlib/messages/NEMMosaicLevy.py b/python/src/trezorlib/messages/NEMMosaicLevy.py similarity index 100% rename from python/trezorlib/messages/NEMMosaicLevy.py rename to python/src/trezorlib/messages/NEMMosaicLevy.py diff --git a/python/trezorlib/messages/NEMMosaicSupplyChange.py b/python/src/trezorlib/messages/NEMMosaicSupplyChange.py similarity index 100% rename from python/trezorlib/messages/NEMMosaicSupplyChange.py rename to python/src/trezorlib/messages/NEMMosaicSupplyChange.py diff --git a/python/trezorlib/messages/NEMProvisionNamespace.py b/python/src/trezorlib/messages/NEMProvisionNamespace.py similarity index 100% rename from python/trezorlib/messages/NEMProvisionNamespace.py rename to python/src/trezorlib/messages/NEMProvisionNamespace.py diff --git a/python/trezorlib/messages/NEMSignTx.py b/python/src/trezorlib/messages/NEMSignTx.py similarity index 100% rename from python/trezorlib/messages/NEMSignTx.py rename to python/src/trezorlib/messages/NEMSignTx.py diff --git a/python/trezorlib/messages/NEMSignedTx.py b/python/src/trezorlib/messages/NEMSignedTx.py similarity index 100% rename from python/trezorlib/messages/NEMSignedTx.py rename to python/src/trezorlib/messages/NEMSignedTx.py diff --git a/python/trezorlib/messages/NEMSupplyChangeType.py b/python/src/trezorlib/messages/NEMSupplyChangeType.py similarity index 100% rename from python/trezorlib/messages/NEMSupplyChangeType.py rename to python/src/trezorlib/messages/NEMSupplyChangeType.py diff --git a/python/trezorlib/messages/NEMTransactionCommon.py b/python/src/trezorlib/messages/NEMTransactionCommon.py similarity index 100% rename from python/trezorlib/messages/NEMTransactionCommon.py rename to python/src/trezorlib/messages/NEMTransactionCommon.py diff --git a/python/trezorlib/messages/NEMTransfer.py b/python/src/trezorlib/messages/NEMTransfer.py similarity index 100% rename from python/trezorlib/messages/NEMTransfer.py rename to python/src/trezorlib/messages/NEMTransfer.py diff --git a/python/trezorlib/messages/OutputScriptType.py b/python/src/trezorlib/messages/OutputScriptType.py similarity index 100% rename from python/trezorlib/messages/OutputScriptType.py rename to python/src/trezorlib/messages/OutputScriptType.py diff --git a/python/trezorlib/messages/PassphraseAck.py b/python/src/trezorlib/messages/PassphraseAck.py similarity index 100% rename from python/trezorlib/messages/PassphraseAck.py rename to python/src/trezorlib/messages/PassphraseAck.py diff --git a/python/trezorlib/messages/PassphraseRequest.py b/python/src/trezorlib/messages/PassphraseRequest.py similarity index 100% rename from python/trezorlib/messages/PassphraseRequest.py rename to python/src/trezorlib/messages/PassphraseRequest.py diff --git a/python/trezorlib/messages/PassphraseSourceType.py b/python/src/trezorlib/messages/PassphraseSourceType.py similarity index 100% rename from python/trezorlib/messages/PassphraseSourceType.py rename to python/src/trezorlib/messages/PassphraseSourceType.py diff --git a/python/trezorlib/messages/PassphraseStateAck.py b/python/src/trezorlib/messages/PassphraseStateAck.py similarity index 100% rename from python/trezorlib/messages/PassphraseStateAck.py rename to python/src/trezorlib/messages/PassphraseStateAck.py diff --git a/python/trezorlib/messages/PassphraseStateRequest.py b/python/src/trezorlib/messages/PassphraseStateRequest.py similarity index 100% rename from python/trezorlib/messages/PassphraseStateRequest.py rename to python/src/trezorlib/messages/PassphraseStateRequest.py diff --git a/python/trezorlib/messages/PinMatrixAck.py b/python/src/trezorlib/messages/PinMatrixAck.py similarity index 100% rename from python/trezorlib/messages/PinMatrixAck.py rename to python/src/trezorlib/messages/PinMatrixAck.py diff --git a/python/trezorlib/messages/PinMatrixRequest.py b/python/src/trezorlib/messages/PinMatrixRequest.py similarity index 100% rename from python/trezorlib/messages/PinMatrixRequest.py rename to python/src/trezorlib/messages/PinMatrixRequest.py diff --git a/python/trezorlib/messages/PinMatrixRequestType.py b/python/src/trezorlib/messages/PinMatrixRequestType.py similarity index 100% rename from python/trezorlib/messages/PinMatrixRequestType.py rename to python/src/trezorlib/messages/PinMatrixRequestType.py diff --git a/python/trezorlib/messages/Ping.py b/python/src/trezorlib/messages/Ping.py similarity index 100% rename from python/trezorlib/messages/Ping.py rename to python/src/trezorlib/messages/Ping.py diff --git a/python/trezorlib/messages/PublicKey.py b/python/src/trezorlib/messages/PublicKey.py similarity index 100% rename from python/trezorlib/messages/PublicKey.py rename to python/src/trezorlib/messages/PublicKey.py diff --git a/python/trezorlib/messages/RecoveryDevice.py b/python/src/trezorlib/messages/RecoveryDevice.py similarity index 100% rename from python/trezorlib/messages/RecoveryDevice.py rename to python/src/trezorlib/messages/RecoveryDevice.py diff --git a/python/trezorlib/messages/RecoveryDeviceType.py b/python/src/trezorlib/messages/RecoveryDeviceType.py similarity index 100% rename from python/trezorlib/messages/RecoveryDeviceType.py rename to python/src/trezorlib/messages/RecoveryDeviceType.py diff --git a/python/trezorlib/messages/RequestType.py b/python/src/trezorlib/messages/RequestType.py similarity index 100% rename from python/trezorlib/messages/RequestType.py rename to python/src/trezorlib/messages/RequestType.py diff --git a/python/trezorlib/messages/ResetDevice.py b/python/src/trezorlib/messages/ResetDevice.py similarity index 100% rename from python/trezorlib/messages/ResetDevice.py rename to python/src/trezorlib/messages/ResetDevice.py diff --git a/python/trezorlib/messages/ResetDeviceBackupType.py b/python/src/trezorlib/messages/ResetDeviceBackupType.py similarity index 100% rename from python/trezorlib/messages/ResetDeviceBackupType.py rename to python/src/trezorlib/messages/ResetDeviceBackupType.py diff --git a/python/trezorlib/messages/RippleAddress.py b/python/src/trezorlib/messages/RippleAddress.py similarity index 100% rename from python/trezorlib/messages/RippleAddress.py rename to python/src/trezorlib/messages/RippleAddress.py diff --git a/python/trezorlib/messages/RippleGetAddress.py b/python/src/trezorlib/messages/RippleGetAddress.py similarity index 100% rename from python/trezorlib/messages/RippleGetAddress.py rename to python/src/trezorlib/messages/RippleGetAddress.py diff --git a/python/trezorlib/messages/RipplePayment.py b/python/src/trezorlib/messages/RipplePayment.py similarity index 100% rename from python/trezorlib/messages/RipplePayment.py rename to python/src/trezorlib/messages/RipplePayment.py diff --git a/python/trezorlib/messages/RippleSignTx.py b/python/src/trezorlib/messages/RippleSignTx.py similarity index 100% rename from python/trezorlib/messages/RippleSignTx.py rename to python/src/trezorlib/messages/RippleSignTx.py diff --git a/python/trezorlib/messages/RippleSignedTx.py b/python/src/trezorlib/messages/RippleSignedTx.py similarity index 100% rename from python/trezorlib/messages/RippleSignedTx.py rename to python/src/trezorlib/messages/RippleSignedTx.py diff --git a/python/trezorlib/messages/SelfTest.py b/python/src/trezorlib/messages/SelfTest.py similarity index 100% rename from python/trezorlib/messages/SelfTest.py rename to python/src/trezorlib/messages/SelfTest.py diff --git a/python/trezorlib/messages/SetU2FCounter.py b/python/src/trezorlib/messages/SetU2FCounter.py similarity index 100% rename from python/trezorlib/messages/SetU2FCounter.py rename to python/src/trezorlib/messages/SetU2FCounter.py diff --git a/python/trezorlib/messages/SignIdentity.py b/python/src/trezorlib/messages/SignIdentity.py similarity index 100% rename from python/trezorlib/messages/SignIdentity.py rename to python/src/trezorlib/messages/SignIdentity.py diff --git a/python/trezorlib/messages/SignMessage.py b/python/src/trezorlib/messages/SignMessage.py similarity index 100% rename from python/trezorlib/messages/SignMessage.py rename to python/src/trezorlib/messages/SignMessage.py diff --git a/python/trezorlib/messages/SignTx.py b/python/src/trezorlib/messages/SignTx.py similarity index 100% rename from python/trezorlib/messages/SignTx.py rename to python/src/trezorlib/messages/SignTx.py diff --git a/python/trezorlib/messages/SignedIdentity.py b/python/src/trezorlib/messages/SignedIdentity.py similarity index 100% rename from python/trezorlib/messages/SignedIdentity.py rename to python/src/trezorlib/messages/SignedIdentity.py diff --git a/python/trezorlib/messages/StellarAccountMergeOp.py b/python/src/trezorlib/messages/StellarAccountMergeOp.py similarity index 100% rename from python/trezorlib/messages/StellarAccountMergeOp.py rename to python/src/trezorlib/messages/StellarAccountMergeOp.py diff --git a/python/trezorlib/messages/StellarAddress.py b/python/src/trezorlib/messages/StellarAddress.py similarity index 100% rename from python/trezorlib/messages/StellarAddress.py rename to python/src/trezorlib/messages/StellarAddress.py diff --git a/python/trezorlib/messages/StellarAllowTrustOp.py b/python/src/trezorlib/messages/StellarAllowTrustOp.py similarity index 100% rename from python/trezorlib/messages/StellarAllowTrustOp.py rename to python/src/trezorlib/messages/StellarAllowTrustOp.py diff --git a/python/trezorlib/messages/StellarAssetType.py b/python/src/trezorlib/messages/StellarAssetType.py similarity index 100% rename from python/trezorlib/messages/StellarAssetType.py rename to python/src/trezorlib/messages/StellarAssetType.py diff --git a/python/trezorlib/messages/StellarBumpSequenceOp.py b/python/src/trezorlib/messages/StellarBumpSequenceOp.py similarity index 100% rename from python/trezorlib/messages/StellarBumpSequenceOp.py rename to python/src/trezorlib/messages/StellarBumpSequenceOp.py diff --git a/python/trezorlib/messages/StellarChangeTrustOp.py b/python/src/trezorlib/messages/StellarChangeTrustOp.py similarity index 100% rename from python/trezorlib/messages/StellarChangeTrustOp.py rename to python/src/trezorlib/messages/StellarChangeTrustOp.py diff --git a/python/trezorlib/messages/StellarCreateAccountOp.py b/python/src/trezorlib/messages/StellarCreateAccountOp.py similarity index 100% rename from python/trezorlib/messages/StellarCreateAccountOp.py rename to python/src/trezorlib/messages/StellarCreateAccountOp.py diff --git a/python/trezorlib/messages/StellarCreatePassiveOfferOp.py b/python/src/trezorlib/messages/StellarCreatePassiveOfferOp.py similarity index 100% rename from python/trezorlib/messages/StellarCreatePassiveOfferOp.py rename to python/src/trezorlib/messages/StellarCreatePassiveOfferOp.py diff --git a/python/trezorlib/messages/StellarGetAddress.py b/python/src/trezorlib/messages/StellarGetAddress.py similarity index 100% rename from python/trezorlib/messages/StellarGetAddress.py rename to python/src/trezorlib/messages/StellarGetAddress.py diff --git a/python/trezorlib/messages/StellarManageDataOp.py b/python/src/trezorlib/messages/StellarManageDataOp.py similarity index 100% rename from python/trezorlib/messages/StellarManageDataOp.py rename to python/src/trezorlib/messages/StellarManageDataOp.py diff --git a/python/trezorlib/messages/StellarManageOfferOp.py b/python/src/trezorlib/messages/StellarManageOfferOp.py similarity index 100% rename from python/trezorlib/messages/StellarManageOfferOp.py rename to python/src/trezorlib/messages/StellarManageOfferOp.py diff --git a/python/trezorlib/messages/StellarPathPaymentOp.py b/python/src/trezorlib/messages/StellarPathPaymentOp.py similarity index 100% rename from python/trezorlib/messages/StellarPathPaymentOp.py rename to python/src/trezorlib/messages/StellarPathPaymentOp.py diff --git a/python/trezorlib/messages/StellarPaymentOp.py b/python/src/trezorlib/messages/StellarPaymentOp.py similarity index 100% rename from python/trezorlib/messages/StellarPaymentOp.py rename to python/src/trezorlib/messages/StellarPaymentOp.py diff --git a/python/trezorlib/messages/StellarSetOptionsOp.py b/python/src/trezorlib/messages/StellarSetOptionsOp.py similarity index 100% rename from python/trezorlib/messages/StellarSetOptionsOp.py rename to python/src/trezorlib/messages/StellarSetOptionsOp.py diff --git a/python/trezorlib/messages/StellarSignTx.py b/python/src/trezorlib/messages/StellarSignTx.py similarity index 100% rename from python/trezorlib/messages/StellarSignTx.py rename to python/src/trezorlib/messages/StellarSignTx.py diff --git a/python/trezorlib/messages/StellarSignedTx.py b/python/src/trezorlib/messages/StellarSignedTx.py similarity index 100% rename from python/trezorlib/messages/StellarSignedTx.py rename to python/src/trezorlib/messages/StellarSignedTx.py diff --git a/python/trezorlib/messages/StellarTxOpRequest.py b/python/src/trezorlib/messages/StellarTxOpRequest.py similarity index 100% rename from python/trezorlib/messages/StellarTxOpRequest.py rename to python/src/trezorlib/messages/StellarTxOpRequest.py diff --git a/python/trezorlib/messages/Success.py b/python/src/trezorlib/messages/Success.py similarity index 100% rename from python/trezorlib/messages/Success.py rename to python/src/trezorlib/messages/Success.py diff --git a/python/trezorlib/messages/TezosAddress.py b/python/src/trezorlib/messages/TezosAddress.py similarity index 100% rename from python/trezorlib/messages/TezosAddress.py rename to python/src/trezorlib/messages/TezosAddress.py diff --git a/python/trezorlib/messages/TezosBallotOp.py b/python/src/trezorlib/messages/TezosBallotOp.py similarity index 100% rename from python/trezorlib/messages/TezosBallotOp.py rename to python/src/trezorlib/messages/TezosBallotOp.py diff --git a/python/trezorlib/messages/TezosBallotType.py b/python/src/trezorlib/messages/TezosBallotType.py similarity index 100% rename from python/trezorlib/messages/TezosBallotType.py rename to python/src/trezorlib/messages/TezosBallotType.py diff --git a/python/trezorlib/messages/TezosContractID.py b/python/src/trezorlib/messages/TezosContractID.py similarity index 100% rename from python/trezorlib/messages/TezosContractID.py rename to python/src/trezorlib/messages/TezosContractID.py diff --git a/python/trezorlib/messages/TezosContractType.py b/python/src/trezorlib/messages/TezosContractType.py similarity index 100% rename from python/trezorlib/messages/TezosContractType.py rename to python/src/trezorlib/messages/TezosContractType.py diff --git a/python/trezorlib/messages/TezosDelegationOp.py b/python/src/trezorlib/messages/TezosDelegationOp.py similarity index 100% rename from python/trezorlib/messages/TezosDelegationOp.py rename to python/src/trezorlib/messages/TezosDelegationOp.py diff --git a/python/trezorlib/messages/TezosGetAddress.py b/python/src/trezorlib/messages/TezosGetAddress.py similarity index 100% rename from python/trezorlib/messages/TezosGetAddress.py rename to python/src/trezorlib/messages/TezosGetAddress.py diff --git a/python/trezorlib/messages/TezosGetPublicKey.py b/python/src/trezorlib/messages/TezosGetPublicKey.py similarity index 100% rename from python/trezorlib/messages/TezosGetPublicKey.py rename to python/src/trezorlib/messages/TezosGetPublicKey.py diff --git a/python/trezorlib/messages/TezosOriginationOp.py b/python/src/trezorlib/messages/TezosOriginationOp.py similarity index 100% rename from python/trezorlib/messages/TezosOriginationOp.py rename to python/src/trezorlib/messages/TezosOriginationOp.py diff --git a/python/trezorlib/messages/TezosProposalOp.py b/python/src/trezorlib/messages/TezosProposalOp.py similarity index 100% rename from python/trezorlib/messages/TezosProposalOp.py rename to python/src/trezorlib/messages/TezosProposalOp.py diff --git a/python/trezorlib/messages/TezosPublicKey.py b/python/src/trezorlib/messages/TezosPublicKey.py similarity index 100% rename from python/trezorlib/messages/TezosPublicKey.py rename to python/src/trezorlib/messages/TezosPublicKey.py diff --git a/python/trezorlib/messages/TezosRevealOp.py b/python/src/trezorlib/messages/TezosRevealOp.py similarity index 100% rename from python/trezorlib/messages/TezosRevealOp.py rename to python/src/trezorlib/messages/TezosRevealOp.py diff --git a/python/trezorlib/messages/TezosSignTx.py b/python/src/trezorlib/messages/TezosSignTx.py similarity index 100% rename from python/trezorlib/messages/TezosSignTx.py rename to python/src/trezorlib/messages/TezosSignTx.py diff --git a/python/trezorlib/messages/TezosSignedTx.py b/python/src/trezorlib/messages/TezosSignedTx.py similarity index 100% rename from python/trezorlib/messages/TezosSignedTx.py rename to python/src/trezorlib/messages/TezosSignedTx.py diff --git a/python/trezorlib/messages/TezosTransactionOp.py b/python/src/trezorlib/messages/TezosTransactionOp.py similarity index 100% rename from python/trezorlib/messages/TezosTransactionOp.py rename to python/src/trezorlib/messages/TezosTransactionOp.py diff --git a/python/trezorlib/messages/TransactionType.py b/python/src/trezorlib/messages/TransactionType.py similarity index 100% rename from python/trezorlib/messages/TransactionType.py rename to python/src/trezorlib/messages/TransactionType.py diff --git a/python/trezorlib/messages/TxAck.py b/python/src/trezorlib/messages/TxAck.py similarity index 100% rename from python/trezorlib/messages/TxAck.py rename to python/src/trezorlib/messages/TxAck.py diff --git a/python/trezorlib/messages/TxInputType.py b/python/src/trezorlib/messages/TxInputType.py similarity index 100% rename from python/trezorlib/messages/TxInputType.py rename to python/src/trezorlib/messages/TxInputType.py diff --git a/python/trezorlib/messages/TxOutputBinType.py b/python/src/trezorlib/messages/TxOutputBinType.py similarity index 100% rename from python/trezorlib/messages/TxOutputBinType.py rename to python/src/trezorlib/messages/TxOutputBinType.py diff --git a/python/trezorlib/messages/TxOutputType.py b/python/src/trezorlib/messages/TxOutputType.py similarity index 100% rename from python/trezorlib/messages/TxOutputType.py rename to python/src/trezorlib/messages/TxOutputType.py diff --git a/python/trezorlib/messages/TxRequest.py b/python/src/trezorlib/messages/TxRequest.py similarity index 100% rename from python/trezorlib/messages/TxRequest.py rename to python/src/trezorlib/messages/TxRequest.py diff --git a/python/trezorlib/messages/TxRequestDetailsType.py b/python/src/trezorlib/messages/TxRequestDetailsType.py similarity index 100% rename from python/trezorlib/messages/TxRequestDetailsType.py rename to python/src/trezorlib/messages/TxRequestDetailsType.py diff --git a/python/trezorlib/messages/TxRequestSerializedType.py b/python/src/trezorlib/messages/TxRequestSerializedType.py similarity index 100% rename from python/trezorlib/messages/TxRequestSerializedType.py rename to python/src/trezorlib/messages/TxRequestSerializedType.py diff --git a/python/trezorlib/messages/VerifyMessage.py b/python/src/trezorlib/messages/VerifyMessage.py similarity index 100% rename from python/trezorlib/messages/VerifyMessage.py rename to python/src/trezorlib/messages/VerifyMessage.py diff --git a/python/trezorlib/messages/WipeDevice.py b/python/src/trezorlib/messages/WipeDevice.py similarity index 100% rename from python/trezorlib/messages/WipeDevice.py rename to python/src/trezorlib/messages/WipeDevice.py diff --git a/python/trezorlib/messages/WordAck.py b/python/src/trezorlib/messages/WordAck.py similarity index 100% rename from python/trezorlib/messages/WordAck.py rename to python/src/trezorlib/messages/WordAck.py diff --git a/python/trezorlib/messages/WordRequest.py b/python/src/trezorlib/messages/WordRequest.py similarity index 100% rename from python/trezorlib/messages/WordRequest.py rename to python/src/trezorlib/messages/WordRequest.py diff --git a/python/trezorlib/messages/WordRequestType.py b/python/src/trezorlib/messages/WordRequestType.py similarity index 100% rename from python/trezorlib/messages/WordRequestType.py rename to python/src/trezorlib/messages/WordRequestType.py diff --git a/python/trezorlib/messages/__init__.py b/python/src/trezorlib/messages/__init__.py similarity index 100% rename from python/trezorlib/messages/__init__.py rename to python/src/trezorlib/messages/__init__.py diff --git a/python/trezorlib/misc.py b/python/src/trezorlib/misc.py similarity index 100% rename from python/trezorlib/misc.py rename to python/src/trezorlib/misc.py diff --git a/python/trezorlib/monero.py b/python/src/trezorlib/monero.py similarity index 100% rename from python/trezorlib/monero.py rename to python/src/trezorlib/monero.py diff --git a/python/trezorlib/nem.py b/python/src/trezorlib/nem.py similarity index 100% rename from python/trezorlib/nem.py rename to python/src/trezorlib/nem.py diff --git a/python/trezorlib/protobuf.py b/python/src/trezorlib/protobuf.py similarity index 100% rename from python/trezorlib/protobuf.py rename to python/src/trezorlib/protobuf.py diff --git a/python/trezorlib/tests/__init__.py b/python/src/trezorlib/qt/__init__.py similarity index 100% rename from python/trezorlib/tests/__init__.py rename to python/src/trezorlib/qt/__init__.py diff --git a/python/trezorlib/qt/pinmatrix.py b/python/src/trezorlib/qt/pinmatrix.py similarity index 100% rename from python/trezorlib/qt/pinmatrix.py rename to python/src/trezorlib/qt/pinmatrix.py diff --git a/python/trezorlib/ripple.py b/python/src/trezorlib/ripple.py similarity index 100% rename from python/trezorlib/ripple.py rename to python/src/trezorlib/ripple.py diff --git a/python/trezorlib/stellar.py b/python/src/trezorlib/stellar.py similarity index 100% rename from python/trezorlib/stellar.py rename to python/src/trezorlib/stellar.py diff --git a/python/trezorlib/tezos.py b/python/src/trezorlib/tezos.py similarity index 100% rename from python/trezorlib/tezos.py rename to python/src/trezorlib/tezos.py diff --git a/python/trezorlib/tools.py b/python/src/trezorlib/tools.py similarity index 100% rename from python/trezorlib/tools.py rename to python/src/trezorlib/tools.py diff --git a/python/trezorlib/transport/__init__.py b/python/src/trezorlib/transport/__init__.py similarity index 100% rename from python/trezorlib/transport/__init__.py rename to python/src/trezorlib/transport/__init__.py diff --git a/python/trezorlib/transport/bridge.py b/python/src/trezorlib/transport/bridge.py similarity index 100% rename from python/trezorlib/transport/bridge.py rename to python/src/trezorlib/transport/bridge.py diff --git a/python/trezorlib/transport/hid.py b/python/src/trezorlib/transport/hid.py similarity index 100% rename from python/trezorlib/transport/hid.py rename to python/src/trezorlib/transport/hid.py diff --git a/python/trezorlib/transport/protocol.py b/python/src/trezorlib/transport/protocol.py similarity index 100% rename from python/trezorlib/transport/protocol.py rename to python/src/trezorlib/transport/protocol.py diff --git a/python/trezorlib/transport/udp.py b/python/src/trezorlib/transport/udp.py similarity index 100% rename from python/trezorlib/transport/udp.py rename to python/src/trezorlib/transport/udp.py diff --git a/python/trezorlib/transport/webusb.py b/python/src/trezorlib/transport/webusb.py similarity index 100% rename from python/trezorlib/transport/webusb.py rename to python/src/trezorlib/transport/webusb.py diff --git a/python/trezorlib/tx_api.py b/python/src/trezorlib/tx_api.py similarity index 100% rename from python/trezorlib/tx_api.py rename to python/src/trezorlib/tx_api.py diff --git a/python/trezorlib/ui.py b/python/src/trezorlib/ui.py similarity index 100% rename from python/trezorlib/ui.py rename to python/src/trezorlib/ui.py diff --git a/python/trezorlib/tests/unit_tests/test_ckd_public.py b/python/tests/test_ckd_public.py similarity index 97% rename from python/trezorlib/tests/unit_tests/test_ckd_public.py rename to python/tests/test_ckd_public.py index af5782ce8..4da8c80f3 100644 --- a/python/trezorlib/tests/unit_tests/test_ckd_public.py +++ b/python/tests/test_ckd_public.py @@ -14,7 +14,7 @@ # You should have received a copy of the License along with this library. # If not, see . -from ..support import ckd_public +from trezorlib import ckd_public def test_ckd_public(): diff --git a/python/trezorlib/tests/unit_tests/test_cosi.py b/python/tests/test_cosi.py similarity index 100% rename from python/trezorlib/tests/unit_tests/test_cosi.py rename to python/tests/test_cosi.py diff --git a/python/trezorlib/tests/unit_tests/test_nem.py b/python/tests/test_nem.py similarity index 100% rename from python/trezorlib/tests/unit_tests/test_nem.py rename to python/tests/test_nem.py diff --git a/python/trezorlib/tests/unit_tests/test_protobuf.py b/python/tests/test_protobuf.py similarity index 100% rename from python/trezorlib/tests/unit_tests/test_protobuf.py rename to python/tests/test_protobuf.py diff --git a/python/trezorlib/tests/unit_tests/test_stellar.py b/python/tests/test_stellar.py similarity index 100% rename from python/trezorlib/tests/unit_tests/test_stellar.py rename to python/tests/test_stellar.py diff --git a/python/trezorlib/tests/unit_tests/test_transport.py b/python/tests/test_transport.py similarity index 100% rename from python/trezorlib/tests/unit_tests/test_transport.py rename to python/tests/test_transport.py diff --git a/python/trezorlib/tests/unit_tests/test_tx_api.py b/python/tests/test_tx_api.py similarity index 78% rename from python/trezorlib/tests/unit_tests/test_tx_api.py rename to python/tests/test_tx_api.py index eed0f1550..4d9125688 100644 --- a/python/trezorlib/tests/unit_tests/test_tx_api.py +++ b/python/tests/test_tx_api.py @@ -14,23 +14,25 @@ # You should have received a copy of the License along with this library. # If not, see . +import decimal +import json import os from trezorlib import coins, tx_api -from ..support.tx_cache import tx_cache +CACHE_PATH = os.path.join(os.path.dirname(__file__), "../../tests/txcache") TxApiBitcoin = coins.tx_api["Bitcoin"] -TxApiTestnet = tx_cache("Testnet", allow_fetch=False) TxApiZencash = coins.tx_api["Horizen"] -TxApiDash = tx_cache("Dash", allow_fetch=False) -tests_dir = os.path.dirname(os.path.abspath(__file__)) +def load_tx_json(coin_name, txhash): + filename = "insight_{}_tx_{}.json".format(coin_name, txhash) + with open(os.path.join(CACHE_PATH, filename)) as f: + return json.load(f, parse_float=decimal.Decimal) -def test_tx_api_gettx(): - tx_api.cache_dir = os.path.join(tests_dir, "../txcache") +def test_tx_api_gettx(): TxApiBitcoin.get_tx( "39a29e954977662ab3879c66fb251ef753e0912223a83d1dcb009111d28265e5" ) @@ -65,13 +67,6 @@ def test_tx_api_gettx(): "e4bc1ae5e5007a08f2b3926fe11c66612e8f73c6b00c69c7027213b84d259be3" ) - TxApiTestnet.get_tx( - "6f90f3c7cbec2258b0971056ef3fe34128dbde30daa9c0639a898f9977299d54" - ) - TxApiTestnet.get_tx( - "d6da21677d7cca5f42fbc7631d062c9ae918a0254f7c6c22de8e8cb7fd5b8236" - ) - def test_tx_api_current_block(): height = TxApiZencash.current_height() @@ -86,23 +81,23 @@ def test_tx_api_get_block_hash(): def test_tx_api_dash_dip2(): + dash_data = coins.by_name["Dash"] + + def get_tx(txhash): + data = load_tx_json("dash", txhash) + return tx_api.json_to_tx(dash_data, data) + # Test if pre-DIP2 TXs are still working as expected - tx = TxApiDash.get_tx( - "acb3b7f259429989fc9c51ae4a5e3e3eab0723dceb21577533ac7c4b4ba4db5d" - ) + tx = get_tx("acb3b7f259429989fc9c51ae4a5e3e3eab0723dceb21577533ac7c4b4ba4db5d") assert tx.version == 2 # pre-DIP2 assert tx.extra_data is None and tx.extra_data_len is None # Test if version 3 TX with type=0 is treated as normal TX - tx = TxApiDash.get_tx( - "5579eaa64b2a0233e7d8d037f5a5afc957cedf48f1c4067e9e33ca6df22ab04f" - ) + tx = get_tx("5579eaa64b2a0233e7d8d037f5a5afc957cedf48f1c4067e9e33ca6df22ab04f") assert tx.version == 3 assert tx.extra_data is None and tx.extra_data_len is None # Test if DIP2 payloads are initialized correctly - tx = TxApiDash.get_tx( - "15575a1c874bd60a819884e116c42e6791c8283ce1fc3b79f0d18531a61bbb8a" - ) + tx = get_tx("15575a1c874bd60a819884e116c42e6791c8283ce1fc3b79f0d18531a61bbb8a") assert tx.version == (3 | (5 << 16)) # DIP2 type 1 (ProRegTx) assert len(tx.extra_data) == (38 + 1) # real length + varint size diff --git a/python/trezorlib/ckd_public.py b/python/trezorlib/ckd_public.py deleted file mode 100644 index 81ba377df..000000000 --- a/python/trezorlib/ckd_public.py +++ /dev/null @@ -1,21 +0,0 @@ -# This file is part of the Trezor project. -# -# Copyright (C) 2012-2019 SatoshiLabs and contributors -# -# This library is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the License along with this library. -# If not, see . - -import warnings - -from .tests.support.ckd_public import * # noqa - -warnings.warn("ckd_public module is deprecated and will be removed", DeprecationWarning) diff --git a/python/trezorlib/tests/support/__init__.py b/python/trezorlib/tests/support/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/python/trezorlib/tests/unit_tests/__init__.py b/python/trezorlib/tests/unit_tests/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tools/build_protobuf b/tools/build_protobuf index 7935e9aca..731feb5df 100755 --- a/tools/build_protobuf +++ b/tools/build_protobuf @@ -93,6 +93,6 @@ else fi $func core/src/trezor/messages "$CORE_PROTOBUF_SOURCES" "$CORE_MESSAGES_IGNORE" --no-init-py -$func python/trezorlib/messages "$PYTHON_PROTOBUF_SOURCES" "$PYTHON_MESSAGES_IGNORE" -P ..protobuf +$func python/src/trezorlib/messages "$PYTHON_PROTOBUF_SOURCES" "$PYTHON_MESSAGES_IGNORE" -P ..protobuf exit $RETURN