From 70ad20ea1ad1f024175f5a74f74a32a4a22ac617 Mon Sep 17 00:00:00 2001 From: ReevesAk Date: Tue, 2 Mar 2021 15:20:51 +0100 Subject: [PATCH 1/7] modify import & update README.md --- README.md | 14 ++++++++++++++ tinywallet/tinywallet/app.py | 7 ++++--- tinywallet/tinywallet/screens.py | 6 +++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 48e4a031..51726622 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,16 @@ The [`tinywallet`](./tinywallet) package contains a wallet based on the Each package may be installed from the [Python Package Index](https://pypi.org/) using the [`pip`](https://pip.pypa.io/) command as usual. +## Required packages + +Using `pip` to install as stated above: + +- pip install websocket_client +- pip install blake256 +- pip install base58 +- pip install PyNaCl +- pip install appdirs + ## Status [![Check and test both packages](https://github.com/decred/tinydecred/workflows/Check%20and%20test%20both%20packages/badge.svg)](https://github.com/decred/tinydecred/actions) @@ -28,6 +38,10 @@ using the [`pip`](https://pip.pypa.io/) command as usual. [![GitHub contributors](https://img.shields.io/github/contributors/decred/tinydecred)](https://github.com/decred/tinydecred/graphs/contributors) [![GitHub](https://img.shields.io/github/license/decred/tinydecred)](./LICENSE) +## Run + +Execute script from the relevant root directory using: `python3 -m myfile.py` + ## Roadmap In no particular order: diff --git a/tinywallet/tinywallet/app.py b/tinywallet/tinywallet/app.py index 710d9dd3..2f588311 100644 --- a/tinywallet/tinywallet/app.py +++ b/tinywallet/tinywallet/app.py @@ -10,6 +10,7 @@ from pathlib import Path import sys +sys.path.insert(0, '/home/akwa/projects/tinydecred/decred') from PyQt5 import QtCore, QtGui, QtWidgets from decred.dcr import constants as DCR @@ -18,9 +19,9 @@ from decred.util.helpers import formatTraceback from decred.wallet.wallet import Wallet -from . import config, qutilities as Q, screens, ui -from .config import DB -from .ui import LARGE, MEDIUM, SMALL, TINY +import config, qutilities as Q, screens, ui +from config import DB +from ui import LARGE, MEDIUM, SMALL, TINY # The directory of the tinywallet package. diff --git a/tinywallet/tinywallet/screens.py b/tinywallet/tinywallet/screens.py index 2ff81441..4a4508e6 100644 --- a/tinywallet/tinywallet/screens.py +++ b/tinywallet/tinywallet/screens.py @@ -24,9 +24,9 @@ from decred.util.helpers import formatTraceback from decred.wallet.wallet import Wallet -from . import config, qutilities as Q, ui -from .config import DB -from .ui import SMALL, TINY +import config, qutilities as Q, ui +from config import DB +from ui import SMALL, TINY UI_DIR = os.path.dirname(os.path.realpath(__file__)) From 22fa4ede8793234d779a9998ac280f7a8b072afe Mon Sep 17 00:00:00 2001 From: ReevesAk Date: Tue, 9 Mar 2021 22:31:10 +0100 Subject: [PATCH 2/7] update README.md --- .gitignore | 3 +++ README.md | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a9999b81..3b057baf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,9 @@ prof/ .venv/ .mypy_cache/ __pycache__/ +.idea/ +.vscode/ +decred/setup.py .pytest_cache .coverage *.c diff --git a/README.md b/README.md index 51726622..7f5ed3d6 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,11 @@ The [`tinywallet`](./tinywallet) package contains a wallet based on the Each package may be installed from the [Python Package Index](https://pypi.org/) using the [`pip`](https://pip.pypa.io/) command as usual. -## Required packages +## Requirements -Using `pip` to install as stated above: +To run tinywallet on your machine you will need to setup the following. + +Use `pip` to install as stated above: - pip install websocket_client - pip install blake256 @@ -22,6 +24,9 @@ Using `pip` to install as stated above: - pip install PyNaCl - pip install appdirs +Setup and run dcrd. Set your rpcusername and rpcpassword from config file +Installation guide can be found [`here`](https://docs.decred.org/wallets/cli/dcrd-setup/). + ## Status [![Check and test both packages](https://github.com/decred/tinydecred/workflows/Check%20and%20test%20both%20packages/badge.svg)](https://github.com/decred/tinydecred/actions) From b2e150c0e6c9521986a7d336cad0ac572a237504 Mon Sep 17 00:00:00 2001 From: ReevesAk Date: Sat, 20 Mar 2021 07:26:09 +0100 Subject: [PATCH 3/7] modified README.md --- tinywallet/tinywallet/app.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tinywallet/tinywallet/app.py b/tinywallet/tinywallet/app.py index 2f588311..08839ec2 100644 --- a/tinywallet/tinywallet/app.py +++ b/tinywallet/tinywallet/app.py @@ -10,7 +10,10 @@ from pathlib import Path import sys -sys.path.insert(0, '/home/akwa/projects/tinydecred/decred') +""" +update your path to the decred folder accordingly +""" +sys.path.insert(0, '/home/silverback/PycharmProjects/tinydecred/decred') from PyQt5 import QtCore, QtGui, QtWidgets from decred.dcr import constants as DCR From c3a7448b6d041534db15b5a8b70411dd96eabd1b Mon Sep 17 00:00:00 2001 From: ReevesAk Date: Sat, 20 Mar 2021 07:29:25 +0100 Subject: [PATCH 4/7] updated README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f5ed3d6..f648d57a 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,8 @@ Installation guide can be found [`here`](https://docs.decred.org/wallets/cli/dcr ## Run -Execute script from the relevant root directory using: `python3 -m myfile.py` +Execute script from the relevant root directory using: `python3 -m myfile.py` for python3.8. +But if you are using python3.9, use this: `python myfile.py` ## Roadmap From 4a1a2ecfce068481fd248e644d6e6fc608126df1 Mon Sep 17 00:00:00 2001 From: ReevesAk Date: Thu, 10 Jun 2021 12:39:36 +0100 Subject: [PATCH 5/7] update README.md file and import statements --- decred/decred/dcr/nets/mainnet.py | 6 +++--- decred/decred/dcr/nets/testnet.py | 6 +++--- decred/decred/dcr/rpc.py | 2 +- decred/decred/dcr/wire/msgblock.py | 2 +- tinywallet/tinywallet/app.py | 18 +++++++++--------- tinywallet/tinywallet/config.py | 4 ++-- tinywallet/tinywallet/qutilities.py | 2 +- tinywallet/tinywallet/screens.py | 18 +++++++++--------- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/decred/decred/dcr/nets/mainnet.py b/decred/decred/dcr/nets/mainnet.py index e1278597..f4f5bc52 100644 --- a/decred/decred/dcr/nets/mainnet.py +++ b/decred/decred/dcr/nets/mainnet.py @@ -13,9 +13,9 @@ Name = "mainnet" DefaultPort = "9108" DNSSeeds = [ - ("mainnet-seed.decred.mindcry.org", True), - ("mainnet-seed.decred.netpurgatory.com", True), - ("mainnet-seed.decred.org", True), + ("mainnet-seed.dec.mindcry.org", True), + ("mainnet-seed.dec.netpurgatory.com", True), + ("mainnet-seed.dec.org", True), ] GenesisHash = "298e5cc3d985bfe7f81dc135f360abe089edd4396b86d2de66b0cef42b21d980" PowLimit = 2 ^ 224 - 1 diff --git a/decred/decred/dcr/nets/testnet.py b/decred/decred/dcr/nets/testnet.py index edac2ada..a0b78a0e 100644 --- a/decred/decred/dcr/nets/testnet.py +++ b/decred/decred/dcr/nets/testnet.py @@ -10,9 +10,9 @@ Name = "testnet3" DefaultPort = "19108" DNSSeeds = [ - ("testnet-seed.decred.mindcry.org", True), - ("testnet-seed.decred.netpurgatory.com", True), - ("testnet-seed.decred.org", True), + ("testnet-seed.dec.mindcry.org", True), + ("testnet-seed.dec.netpurgatory.com", True), + ("testnet-seed.dec.org", True), ] GenesisHash = "a649dce53918caf422e9c711c858837e08d626ecfcd198969b24f7b634a49bac" diff --git a/decred/decred/dcr/rpc.py b/decred/decred/dcr/rpc.py index f387df9b..6d13d39c 100644 --- a/decred/decred/dcr/rpc.py +++ b/decred/decred/dcr/rpc.py @@ -1863,7 +1863,7 @@ def __init__( """ Args: size (int): Transaction size in bytes. - fee (float): Transaction fee in decred. + fee (float): Transaction fee in dec. time (int): Local time transaction entered pool in seconds since 1 Jan 1970 GMT. height (int): Block height when transaction entered the pool. diff --git a/decred/decred/dcr/wire/msgblock.py b/decred/decred/dcr/wire/msgblock.py index 0fa47515..eafc9e63 100644 --- a/decred/decred/dcr/wire/msgblock.py +++ b/decred/decred/dcr/wire/msgblock.py @@ -18,7 +18,7 @@ class BlockHeader: """ - BlockHeader defines information about a block and is used in the decred + BlockHeader defines information about a block and is used in the dec block (MsgBlock) and headers (MsgHeaders) messages. """ diff --git a/tinywallet/tinywallet/app.py b/tinywallet/tinywallet/app.py index 08839ec2..253646f8 100644 --- a/tinywallet/tinywallet/app.py +++ b/tinywallet/tinywallet/app.py @@ -10,17 +10,17 @@ from pathlib import Path import sys -""" -update your path to the decred folder accordingly -""" -sys.path.insert(0, '/home/silverback/PycharmProjects/tinydecred/decred') +# """ +# update your path to the decred folder accordingly +# """ +# sys.path.insert(0, '/home/silverback/PycharmProjects/tinydecred/decred') from PyQt5 import QtCore, QtGui, QtWidgets -from decred.dcr import constants as DCR -from decred.dcr.dcrdata import DcrdataBlockchain -from decred.util import chains, database, helpers -from decred.util.helpers import formatTraceback -from decred.wallet.wallet import Wallet +from decred.decred.dcr import constants as DCR +from decred.decred.dcr.dcrdata import DcrdataBlockchain +from decred.decred.util import chains, database, helpers +from decred.decred.util.helpers import formatTraceback +from decred.decred.wallet.wallet import Wallet import config, qutilities as Q, screens, ui from config import DB diff --git a/tinywallet/tinywallet/config.py b/tinywallet/tinywallet/config.py index b2c60def..4b4b63f6 100644 --- a/tinywallet/tinywallet/config.py +++ b/tinywallet/tinywallet/config.py @@ -14,8 +14,8 @@ from appdirs import AppDirs -from decred.dcr import nets -from decred.util import helpers +from decred.decred.dcr import nets +from decred.decred.util import helpers # Set the data directory in a OS-appropriate location. diff --git a/tinywallet/tinywallet/qutilities.py b/tinywallet/tinywallet/qutilities.py index 5bb9856b..a6760dbe 100644 --- a/tinywallet/tinywallet/qutilities.py +++ b/tinywallet/tinywallet/qutilities.py @@ -10,7 +10,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets -from decred.util import helpers +from decred.decred.util import helpers log = helpers.getLogger("QUTIL") diff --git a/tinywallet/tinywallet/screens.py b/tinywallet/tinywallet/screens.py index 4a4508e6..050406d3 100644 --- a/tinywallet/tinywallet/screens.py +++ b/tinywallet/tinywallet/screens.py @@ -14,15 +14,15 @@ from PyQt5 import QtCore, QtGui, QtSvg, QtWidgets -from decred import DecredError -from decred.crypto import crypto -from decred.dcr import constants as DCR, nets -from decred.dcr.blockchain import LocalNode -from decred.dcr.txscript import DefaultRelayFeePerKb -from decred.dcr.vsp import VotingServiceProvider -from decred.util import chains, database, helpers -from decred.util.helpers import formatTraceback -from decred.wallet.wallet import Wallet +from decred.decred import DecredError +from decred.decred.crypto import crypto +from decred.decred.dcr import constants as DCR, nets +from decred.decred.dcr.blockchain import LocalNode +from decred.decred.dcr.txscript import DefaultRelayFeePerKb +from decred.decred.dcr.vsp import VotingServiceProvider +from decred.decred.util import chains, database, helpers +from decred.decred.util.helpers import formatTraceback +from decred.decred.wallet.wallet import Wallet import config, qutilities as Q, ui from config import DB From 9243080ad2fe897aaf118bcfcf963b8f1bc00eae Mon Sep 17 00:00:00 2001 From: ReevesAk Date: Thu, 10 Jun 2021 13:00:22 +0100 Subject: [PATCH 6/7] updated import statements --- decred/decred/crypto/crypto.py | 6 +++--- decred/decred/crypto/mnemonic.py | 4 ++-- decred/decred/crypto/rando.py | 4 ++-- decred/decred/crypto/secp256k1/curve.py | 6 +++--- decred/decred/crypto/secp256k1/field.py | 2 +- decred/decred/dcr/account.py | 12 ++++++------ decred/decred/dcr/addrlib.py | 10 +++++----- decred/decred/dcr/blockchain.py | 8 ++++---- decred/decred/dcr/dcrdata.py | 12 ++++++------ decred/decred/dcr/nets/__init__.py | 2 +- decred/decred/dcr/nets/mainnet.py | 8 ++++---- decred/decred/dcr/nets/testnet.py | 6 +++--- decred/decred/dcr/rpc.py | 12 ++++++------ decred/decred/dcr/txscript.py | 12 ++++++------ decred/decred/dcr/vsp.py | 8 ++++---- decred/decred/dcr/wire/msgblock.py | 6 +++--- decred/decred/dcr/wire/msgping.py | 2 +- decred/decred/dcr/wire/msgpong.py | 2 +- decred/decred/dcr/wire/msgtx.py | 8 ++++---- decred/decred/dcr/wire/msgverack.py | 2 +- decred/decred/dcr/wire/msgversion.py | 6 +++--- decred/decred/dcr/wire/netaddress.py | 4 ++-- decred/decred/dcr/wire/wire.py | 4 ++-- decred/decred/util/chains.py | 4 ++-- decred/decred/util/database.py | 2 +- decred/decred/util/encode.py | 2 +- decred/decred/util/tinyhttp.py | 2 +- decred/decred/wallet/accounts.py | 6 +++--- decred/decred/wallet/wallet.py | 12 ++++++------ decred/examples/create_testnet_wallet.py | 2 +- decred/examples/plot_ticket_price.py | 4 ++-- decred/examples/send_testnet.py | 2 +- .../benchmark/util/test_database_benchmark.py | 2 +- decred/tests/conftest.py | 2 +- .../integration/dcr/test_blockchain_live.py | 8 ++++---- .../tests/integration/dcr/test_dcrdata_live.py | 12 ++++++------ decred/tests/integration/dcr/test_rpc_live.py | 16 ++++++++-------- decred/tests/integration/dcr/test_vsp_live.py | 4 ++-- decred/tests/integration/util/test_ws.py | 2 +- decred/tests/integration/wallet/test_wallet.py | 4 ++-- 40 files changed, 116 insertions(+), 116 deletions(-) diff --git a/decred/decred/crypto/crypto.py b/decred/decred/crypto/crypto.py index 13bdbca8..b90b007f 100644 --- a/decred/decred/crypto/crypto.py +++ b/decred/decred/crypto/crypto.py @@ -13,9 +13,9 @@ from blake256.blake256 import blake_hash import nacl.secret -from decred import DecredError -from decred.util import encode -from decred.util.encode import ByteArray, unblobCheck +from decred.decred import DecredError +from decred.decred.util import encode +from decred.decred.util.encode import ByteArray, unblobCheck from . import rando from .secp256k1.curve import PrivateKey, PublicKey, curve as Curve diff --git a/decred/decred/crypto/mnemonic.py b/decred/decred/crypto/mnemonic.py index 5f957b2b..6c8c97ce 100644 --- a/decred/decred/crypto/mnemonic.py +++ b/decred/decred/crypto/mnemonic.py @@ -6,8 +6,8 @@ PGP-based mnemonic seed generation. """ -from decred import DecredError -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.util.encode import ByteArray from .crypto import sha256ChecksumByte diff --git a/decred/decred/crypto/rando.py b/decred/decred/crypto/rando.py index e27397f8..21a27fa2 100644 --- a/decred/decred/crypto/rando.py +++ b/decred/decred/crypto/rando.py @@ -6,8 +6,8 @@ import os -from decred import DecredError -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.util.encode import ByteArray KEY_SIZE = 32 diff --git a/decred/decred/crypto/secp256k1/curve.py b/decred/decred/crypto/secp256k1/curve.py index cba88c7d..8e6b72cb 100644 --- a/decred/decred/crypto/secp256k1/curve.py +++ b/decred/decred/crypto/secp256k1/curve.py @@ -26,9 +26,9 @@ where x = x1/z1^2 and y = y1/z1^3. """ -from decred import DecredError -from decred.crypto.rando import generateSeed -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.crypto.rando import generateSeed +from decred.decred.util.encode import ByteArray from .field import BytePoints, FieldVal diff --git a/decred/decred/crypto/secp256k1/field.py b/decred/decred/crypto/secp256k1/field.py index d813f572..b9ee20af 100644 --- a/decred/decred/crypto/secp256k1/field.py +++ b/decred/decred/crypto/secp256k1/field.py @@ -7,7 +7,7 @@ from base64 import b64decode from zlib import decompress as zdecompress -from decred.util.encode import ByteArray +from decred.decred.util.encode import ByteArray from .bytepoints import secp256k1BytePoints diff --git a/decred/decred/dcr/account.py b/decred/decred/dcr/account.py index 58756251..08216c61 100644 --- a/decred/decred/dcr/account.py +++ b/decred/decred/dcr/account.py @@ -4,12 +4,12 @@ See LICENSE for details """ -from decred import DecredError -from decred.crypto import crypto, opcode -from decred.dcr import addrlib -from decred.dcr.txscript import DefaultRelayFeePerKb -from decred.util import encode, helpers -from decred.util.encode import BuildyBytes, ByteArray, unblobCheck +from decred.decred import DecredError +from decred.decred.crypto import crypto, opcode +from decred.decred.dcr import addrlib +from decred.decred.dcr.txscript import DefaultRelayFeePerKb +from decred.decred.util import encode, helpers +from decred.decred.util.encode import BuildyBytes, ByteArray, unblobCheck from . import nets, txscript from .vsp import VotingServiceProvider diff --git a/decred/decred/dcr/addrlib.py b/decred/decred/dcr/addrlib.py index e0fec3bc..d7b2981a 100644 --- a/decred/decred/dcr/addrlib.py +++ b/decred/decred/dcr/addrlib.py @@ -9,8 +9,8 @@ from base58 import b58encode -from decred import DecredError -from decred.crypto.crypto import ( +from decred.decred import DecredError +from decred.decred.crypto.crypto import ( RIPEMD160_SIZE, PKFCompressed, PKFUncompressed, @@ -21,9 +21,9 @@ checksum, hash160, ) -from decred.crypto.secp256k1.curve import curve as Secp256k1 -from decred.dcr import nets -from decred.util.encode import BuildyBytes, ByteArray, decodeBlob, unblobCheck +from decred.decred.crypto.secp256k1.curve import curve as Secp256k1 +from decred.decred.dcr import nets +from decred.decred.util.encode import BuildyBytes, ByteArray, decodeBlob, unblobCheck class Address: diff --git a/decred/decred/dcr/blockchain.py b/decred/decred/dcr/blockchain.py index bf1e9410..2bf52a7d 100644 --- a/decred/decred/dcr/blockchain.py +++ b/decred/decred/dcr/blockchain.py @@ -4,10 +4,10 @@ import time -from decred.dcr import addrlib, rpc -from decred.dcr.wire.msgblock import BlockHeader -from decred.util import database, helpers -from decred.util.encode import ByteArray +from decred.decred.dcr import addrlib, rpc +from decred.decred.dcr.wire.msgblock import BlockHeader +from decred.decred.util import database, helpers +from decred.decred.util.encode import ByteArray log = helpers.getLogger("blockchain") diff --git a/decred/decred/dcr/dcrdata.py b/decred/decred/dcr/dcrdata.py index a8cf41e0..dba9c22c 100644 --- a/decred/decred/dcr/dcrdata.py +++ b/decred/decred/dcr/dcrdata.py @@ -12,12 +12,12 @@ import time from urllib.parse import urlencode, urljoin, urlsplit, urlunsplit -from decred import DecredError -from decred.crypto import crypto -from decred.dcr import addrlib -from decred.util import database, tinyhttp, ws -from decred.util.encode import ByteArray -from decred.util.helpers import formatTraceback, getLogger, makeWebsocketURL +from decred.decred import DecredError +from decred.decred.crypto import crypto +from decred.decred.dcr import addrlib +from decred.decred.util import database, tinyhttp, ws +from decred.decred.util.encode import ByteArray +from decred.decred.util.helpers import formatTraceback, getLogger, makeWebsocketURL from . import account, agenda, txscript from .wire import msgblock, msgtx, wire diff --git a/decred/decred/dcr/nets/__init__.py b/decred/decred/dcr/nets/__init__.py index 6f28745a..d6934037 100644 --- a/decred/decred/dcr/nets/__init__.py +++ b/decred/decred/dcr/nets/__init__.py @@ -3,7 +3,7 @@ See LICENSE for details """ -from decred import DecredError +from decred.decred import DecredError from . import mainnet, simnet, testnet diff --git a/decred/decred/dcr/nets/mainnet.py b/decred/decred/dcr/nets/mainnet.py index f4f5bc52..62586a62 100644 --- a/decred/decred/dcr/nets/mainnet.py +++ b/decred/decred/dcr/nets/mainnet.py @@ -7,15 +7,15 @@ https://github.com/decred/dcrd/blob/master/chaincfg/mainnetparams.go """ -from decred.dcr import constants as C +from decred.decred.dcr import constants as C Name = "mainnet" DefaultPort = "9108" DNSSeeds = [ - ("mainnet-seed.dec.mindcry.org", True), - ("mainnet-seed.dec.netpurgatory.com", True), - ("mainnet-seed.dec.org", True), + ("mainnet-seed.decred.mindcry.org", True), + ("mainnet-seed.decred.netpurgatory.com", True), + ("mainnet-seed.decred.org", True), ] GenesisHash = "298e5cc3d985bfe7f81dc135f360abe089edd4396b86d2de66b0cef42b21d980" PowLimit = 2 ^ 224 - 1 diff --git a/decred/decred/dcr/nets/testnet.py b/decred/decred/dcr/nets/testnet.py index a0b78a0e..edac2ada 100644 --- a/decred/decred/dcr/nets/testnet.py +++ b/decred/decred/dcr/nets/testnet.py @@ -10,9 +10,9 @@ Name = "testnet3" DefaultPort = "19108" DNSSeeds = [ - ("testnet-seed.dec.mindcry.org", True), - ("testnet-seed.dec.netpurgatory.com", True), - ("testnet-seed.dec.org", True), + ("testnet-seed.decred.mindcry.org", True), + ("testnet-seed.decred.netpurgatory.com", True), + ("testnet-seed.decred.org", True), ] GenesisHash = "a649dce53918caf422e9c711c858837e08d626ecfcd198969b24f7b634a49bac" diff --git a/decred/decred/dcr/rpc.py b/decred/decred/dcr/rpc.py index 6d13d39c..c87dcc8e 100644 --- a/decred/decred/dcr/rpc.py +++ b/decred/decred/dcr/rpc.py @@ -9,11 +9,11 @@ import ssl import types -from decred import DecredError -from decred.crypto.opcode import OP_SSRTX -from decred.util import tinyhttp, ws -from decred.util.encode import ByteArray -from decred.util.helpers import getLogger, makeWebsocketURL +from decred.decred import DecredError +from decred.decred.crypto.opcode import OP_SSRTX +from decred.decred.util import tinyhttp, ws +from decred.decred.util.encode import ByteArray +from decred.decred.util.helpers import getLogger, makeWebsocketURL from . import agenda, txscript from .wire.msgblock import BlockHeader @@ -1863,7 +1863,7 @@ def __init__( """ Args: size (int): Transaction size in bytes. - fee (float): Transaction fee in dec. + fee (float): Transaction fee in decred. time (int): Local time transaction entered pool in seconds since 1 Jan 1970 GMT. height (int): Block height when transaction entered the pool. diff --git a/decred/decred/dcr/txscript.py b/decred/decred/dcr/txscript.py index 9c80bbbe..dbc719af 100644 --- a/decred/decred/dcr/txscript.py +++ b/decred/decred/dcr/txscript.py @@ -9,12 +9,12 @@ import bisect import math -from decred import DecredError -from decred.crypto import crypto, opcode -from decred.crypto.secp256k1.curve import curve as Curve -from decred.dcr import addrlib -from decred.util import helpers -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.crypto import crypto, opcode +from decred.decred.crypto.secp256k1.curve import curve as Curve +from decred.decred.dcr import addrlib +from decred.decred.util import helpers +from decred.decred.util.encode import ByteArray from .wire import msgtx, wire diff --git a/decred/decred/dcr/vsp.py b/decred/decred/dcr/vsp.py index fbb06586..fc58971a 100644 --- a/decred/decred/dcr/vsp.py +++ b/decred/decred/dcr/vsp.py @@ -9,10 +9,10 @@ import time from urllib.parse import urlsplit, urlunsplit -from decred import DecredError -from decred.dcr import addrlib -from decred.util import encode, tinyhttp -from decred.util.encode import ByteArray, unblobCheck +from decred.decred import DecredError +from decred.decred.dcr import addrlib +from decred.decred.util import encode, tinyhttp +from decred.decred.util.encode import ByteArray, unblobCheck from . import constants, nets, txscript diff --git a/decred/decred/dcr/wire/msgblock.py b/decred/decred/dcr/wire/msgblock.py index eafc9e63..4904339f 100644 --- a/decred/decred/dcr/wire/msgblock.py +++ b/decred/decred/dcr/wire/msgblock.py @@ -6,8 +6,8 @@ Based on dcrd MsgBlock. """ -from decred.crypto import crypto -from decred.util.encode import ByteArray +from decred.decred.crypto import crypto +from decred.decred.util.encode import ByteArray # chainhash.HashSize in Go @@ -18,7 +18,7 @@ class BlockHeader: """ - BlockHeader defines information about a block and is used in the dec + BlockHeader defines information about a block and is used in the decred block (MsgBlock) and headers (MsgHeaders) messages. """ diff --git a/decred/decred/dcr/wire/msgping.py b/decred/decred/dcr/wire/msgping.py index fe35e669..d11d4f4a 100644 --- a/decred/decred/dcr/wire/msgping.py +++ b/decred/decred/dcr/wire/msgping.py @@ -5,7 +5,7 @@ Based on dcrd MsgPing. """ -from decred.util.encode import ByteArray +from decred.decred.util.encode import ByteArray CmdPing = "ping" diff --git a/decred/decred/dcr/wire/msgpong.py b/decred/decred/dcr/wire/msgpong.py index db0f37ed..b6002961 100644 --- a/decred/decred/dcr/wire/msgpong.py +++ b/decred/decred/dcr/wire/msgpong.py @@ -5,7 +5,7 @@ Based on dcrd MsgPing. """ -from decred.util.encode import ByteArray +from decred.decred.util.encode import ByteArray CmdPong = "pong" diff --git a/decred/decred/dcr/wire/msgtx.py b/decred/decred/dcr/wire/msgtx.py index 11edb9d2..6de6e176 100644 --- a/decred/decred/dcr/wire/msgtx.py +++ b/decred/decred/dcr/wire/msgtx.py @@ -6,10 +6,10 @@ Based on dcrd MsgTx. """ -from decred import DecredError -from decred.crypto.crypto import hashH -from decred.dcr import txscript -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.crypto.crypto import hashH +from decred.decred.dcr import txscript +from decred.decred.util.encode import ByteArray from . import wire diff --git a/decred/decred/dcr/wire/msgverack.py b/decred/decred/dcr/wire/msgverack.py index 9b039159..4dd8ca85 100644 --- a/decred/decred/dcr/wire/msgverack.py +++ b/decred/decred/dcr/wire/msgverack.py @@ -5,7 +5,7 @@ Based on dcrd MsgVerAck. """ -from decred.util.encode import ByteArray +from decred.decred.util.encode import ByteArray CmdVerAck = "verack" diff --git a/decred/decred/dcr/wire/msgversion.py b/decred/decred/dcr/wire/msgversion.py index ceee1903..174569de 100644 --- a/decred/decred/dcr/wire/msgversion.py +++ b/decred/decred/dcr/wire/msgversion.py @@ -5,9 +5,9 @@ import time -from decred import DecredError -from decred.dcr.wire import netaddress, wire -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.dcr.wire import netaddress, wire +from decred.decred.util.encode import ByteArray # MaxUserAgentLen is the maximum allowed length for the user agent field in a diff --git a/decred/decred/dcr/wire/netaddress.py b/decred/decred/dcr/wire/netaddress.py index e8ef9065..6bce9bbc 100644 --- a/decred/decred/dcr/wire/netaddress.py +++ b/decred/decred/dcr/wire/netaddress.py @@ -6,8 +6,8 @@ import socket import time -from decred import DecredError -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.util.encode import ByteArray MaxNetAddressPayload = 30 diff --git a/decred/decred/dcr/wire/wire.py b/decred/decred/dcr/wire/wire.py index c30de349..c321ad2f 100644 --- a/decred/decred/dcr/wire/wire.py +++ b/decred/decred/dcr/wire/wire.py @@ -6,8 +6,8 @@ Constants and common routines from the dcrd wire package. """ -from decred import DecredError -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.util.encode import ByteArray # fmt: off diff --git a/decred/decred/util/chains.py b/decred/decred/util/chains.py index 05a99716..b4f2e33a 100644 --- a/decred/decred/util/chains.py +++ b/decred/decred/util/chains.py @@ -3,8 +3,8 @@ See LICENSE for details """ -from decred import DecredError -from decred.dcr import account as dcracct, nets as dcrnets +from decred.decred import DecredError +from decred.decred.dcr import account as dcracct, nets as dcrnets class BipIDs: diff --git a/decred/decred/util/database.py b/decred/decred/util/database.py index 83a6e54e..539bde7f 100644 --- a/decred/decred/util/database.py +++ b/decred/decred/util/database.py @@ -16,7 +16,7 @@ import sqlite3 import threading -from decred import DecredError +from decred.decred import DecredError TRUE = bytearray([1]) diff --git a/decred/decred/util/encode.py b/decred/decred/util/encode.py index 485e4f0d..93f2b227 100644 --- a/decred/decred/util/encode.py +++ b/decred/decred/util/encode.py @@ -8,7 +8,7 @@ import struct -from decred import DecredError +from decred.decred import DecredError NONE = "None".encode() diff --git a/decred/decred/util/tinyhttp.py b/decred/decred/util/tinyhttp.py index 8b420d76..f071121d 100644 --- a/decred/decred/util/tinyhttp.py +++ b/decred/decred/util/tinyhttp.py @@ -9,7 +9,7 @@ from urllib.parse import urlencode import urllib.request as urlrequest -from decred import DecredError +from decred.decred import DecredError from .helpers import formatTraceback diff --git a/decred/decred/wallet/accounts.py b/decred/decred/wallet/accounts.py index b5868ea8..d19191b8 100644 --- a/decred/decred/wallet/accounts.py +++ b/decred/decred/wallet/accounts.py @@ -8,9 +8,9 @@ mostly be through the AccountManager. """ -from decred import DecredError -from decred.crypto import crypto -from decred.util import chains, encode, helpers +from decred.decred import DecredError +from decred.decred.crypto import crypto +from decred.decred.util import chains, encode, helpers EXTERNAL_BRANCH = 0 diff --git a/decred/decred/wallet/wallet.py b/decred/decred/wallet/wallet.py index fc493d94..8c4df1d3 100644 --- a/decred/decred/wallet/wallet.py +++ b/decred/decred/wallet/wallet.py @@ -6,12 +6,12 @@ from pathlib import Path -from decred import DecredError -from decred.crypto import crypto, mnemonic, rando -from decred.dcr import nets -from decred.dcr.dcrdata import DcrdataBlockchain -from decred.util import chains, database, encode, helpers -from decred.util.helpers import mkdir +from decred.decred import DecredError +from decred.decred.crypto import crypto, mnemonic, rando +from decred.decred.dcr import nets +from decred.decred.dcr.dcrdata import DcrdataBlockchain +from decred.decred.util import chains, database, encode, helpers +from decred.decred.util.helpers import mkdir from . import accounts diff --git a/decred/examples/create_testnet_wallet.py b/decred/examples/create_testnet_wallet.py index 91aaa040..31fc76fe 100644 --- a/decred/examples/create_testnet_wallet.py +++ b/decred/examples/create_testnet_wallet.py @@ -7,7 +7,7 @@ from getpass import getpass -from decred.wallet.wallet import SimpleWallet +from decred.decred.wallet.wallet import SimpleWallet def main(): diff --git a/decred/examples/plot_ticket_price.py b/decred/examples/plot_ticket_price.py index ce167847..d0d5de36 100644 --- a/decred/examples/plot_ticket_price.py +++ b/decred/examples/plot_ticket_price.py @@ -6,8 +6,8 @@ be installed separately with `pip3 install matplotlib`. """ -from decred.dcr.dcrdata import DcrdataClient -from decred.util.helpers import mktime +from decred.decred.dcr.dcrdata import DcrdataClient +from decred.decred.util.helpers import mktime try: diff --git a/decred/examples/send_testnet.py b/decred/examples/send_testnet.py index c0e76624..697ac76c 100644 --- a/decred/examples/send_testnet.py +++ b/decred/examples/send_testnet.py @@ -9,7 +9,7 @@ from getpass import getpass -from decred.wallet.wallet import SimpleWallet +from decred.decred.wallet.wallet import SimpleWallet # Testnet return address for faucet.decred.org. TESTNET_ADDRESS = "TsfDLrRkk9ciUuwfp2b8PawwnukYD7yAjGd" diff --git a/decred/tests/benchmark/util/test_database_benchmark.py b/decred/tests/benchmark/util/test_database_benchmark.py index d32623ff..169673d1 100644 --- a/decred/tests/benchmark/util/test_database_benchmark.py +++ b/decred/tests/benchmark/util/test_database_benchmark.py @@ -5,7 +5,7 @@ import pytest -from decred.util import database +from decred.decred.util import database @pytest.fixture diff --git a/decred/tests/conftest.py b/decred/tests/conftest.py index 37713be0..24573898 100644 --- a/decred/tests/conftest.py +++ b/decred/tests/conftest.py @@ -8,7 +8,7 @@ import pytest -from decred.util import chains, helpers +from decred.decred.util import chains, helpers @pytest.fixture diff --git a/decred/tests/integration/dcr/test_blockchain_live.py b/decred/tests/integration/dcr/test_blockchain_live.py index e7d977d6..9719861d 100644 --- a/decred/tests/integration/dcr/test_blockchain_live.py +++ b/decred/tests/integration/dcr/test_blockchain_live.py @@ -5,10 +5,10 @@ import pytest -from decred.dcr.blockchain import LocalNode -from decred.dcr.nets import mainnet -from decred.dcr.wire.msgtx import OutPoint -from decred.util.encode import ByteArray, rba +from decred.decred.dcr.blockchain import LocalNode +from decred.decred.dcr.nets import mainnet +from decred.decred.dcr.wire.msgtx import OutPoint +from decred.decred.util.encode import ByteArray, rba @pytest.fixture diff --git a/decred/tests/integration/dcr/test_dcrdata_live.py b/decred/tests/integration/dcr/test_dcrdata_live.py index e051184a..23c8bec1 100644 --- a/decred/tests/integration/dcr/test_dcrdata_live.py +++ b/decred/tests/integration/dcr/test_dcrdata_live.py @@ -5,12 +5,12 @@ import time -from decred.crypto import crypto, rando -from decred.crypto.secp256k1 import curve as Curve -from decred.dcr import account, addrlib, dcrdata, txscript -from decred.dcr.nets import mainnet, testnet -from decred.dcr.wire import msgtx -from decred.util.encode import ByteArray +from decred.decred.crypto import crypto, rando +from decred.decred.crypto.secp256k1 import curve as Curve +from decred.decred.dcr import account, addrlib, dcrdata, txscript +from decred.decred.dcr.nets import mainnet, testnet +from decred.decred.dcr.wire import msgtx +from decred.decred.util.encode import ByteArray class TestDcrdata: diff --git a/decred/tests/integration/dcr/test_rpc_live.py b/decred/tests/integration/dcr/test_rpc_live.py index 572527ee..2be4d2d5 100644 --- a/decred/tests/integration/dcr/test_rpc_live.py +++ b/decred/tests/integration/dcr/test_rpc_live.py @@ -8,14 +8,14 @@ from base58 import b58decode import pytest -from decred import DecredError -from decred.crypto import crypto, opcode -from decred.dcr import account, addrlib, rpc, txscript -from decred.dcr.nets import mainnet -from decred.dcr.wire import wire -from decred.dcr.wire.msgblock import BlockHeader -from decred.dcr.wire.msgtx import MsgTx, OutPoint, TxIn, TxOut -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.crypto import crypto, opcode +from decred.decred.dcr import account, addrlib, rpc, txscript +from decred.decred.dcr.nets import mainnet +from decred.decred.dcr.wire import wire +from decred.decred.dcr.wire.msgblock import BlockHeader +from decred.decred.dcr.wire.msgtx import MsgTx, OutPoint, TxIn, TxOut +from decred.decred.util.encode import ByteArray mainnetAddress = "Dcur2mcGjmENx4DhNqDctW5wJCVyT3Qeqkx" diff --git a/decred/tests/integration/dcr/test_vsp_live.py b/decred/tests/integration/dcr/test_vsp_live.py index 78d9b6bd..f1169890 100644 --- a/decred/tests/integration/dcr/test_vsp_live.py +++ b/decred/tests/integration/dcr/test_vsp_live.py @@ -3,8 +3,8 @@ See LICENSE for details """ -from decred.dcr import vsp -from decred.dcr.nets import testnet +from decred.decred.dcr import vsp +from decred.decred.dcr.nets import testnet VSP_URL = "https://dcrstakedinner.com" diff --git a/decred/tests/integration/util/test_ws.py b/decred/tests/integration/util/test_ws.py index 4b7caa0d..a5f15ed0 100644 --- a/decred/tests/integration/util/test_ws.py +++ b/decred/tests/integration/util/test_ws.py @@ -12,7 +12,7 @@ import websocket from websocket_server import WebsocketServer -from decred.util import ws +from decred.decred.util import ws HOST = "localhost" diff --git a/decred/tests/integration/wallet/test_wallet.py b/decred/tests/integration/wallet/test_wallet.py index afe17085..5790f015 100644 --- a/decred/tests/integration/wallet/test_wallet.py +++ b/decred/tests/integration/wallet/test_wallet.py @@ -2,8 +2,8 @@ Copyright (c) 2020, The Decred developers """ -from decred.dcr import nets -from decred.wallet.wallet import SimpleWallet, Wallet +from decred.decred.dcr import nets +from decred.decred.wallet.wallet import SimpleWallet, Wallet PASSWORD = "test_password" From aaa39c3f101e5c6e13b0ca055702c97eb07e8fc1 Mon Sep 17 00:00:00 2001 From: ReevesAk Date: Tue, 2 Mar 2021 15:20:51 +0100 Subject: [PATCH 7/7] modify import & update README.md update README.md modified README.md updated README.md update README.md file and import statements updated import statements --- .gitignore | 3 +++ README.md | 20 ++++++++++++++ decred/decred/crypto/crypto.py | 6 ++--- decred/decred/crypto/mnemonic.py | 4 +-- decred/decred/crypto/rando.py | 4 +-- decred/decred/crypto/secp256k1/curve.py | 6 ++--- decred/decred/crypto/secp256k1/field.py | 2 +- decred/decred/dcr/account.py | 12 ++++----- decred/decred/dcr/addrlib.py | 10 +++---- decred/decred/dcr/blockchain.py | 8 +++--- decred/decred/dcr/dcrdata.py | 12 ++++----- decred/decred/dcr/nets/__init__.py | 2 +- decred/decred/dcr/nets/mainnet.py | 2 +- decred/decred/dcr/rpc.py | 10 +++---- decred/decred/dcr/txscript.py | 12 ++++----- decred/decred/dcr/vsp.py | 8 +++--- decred/decred/dcr/wire/msgblock.py | 4 +-- decred/decred/dcr/wire/msgping.py | 2 +- decred/decred/dcr/wire/msgpong.py | 2 +- decred/decred/dcr/wire/msgtx.py | 8 +++--- decred/decred/dcr/wire/msgverack.py | 2 +- decred/decred/dcr/wire/msgversion.py | 6 ++--- decred/decred/dcr/wire/netaddress.py | 4 +-- decred/decred/dcr/wire/wire.py | 4 +-- decred/decred/util/chains.py | 4 +-- decred/decred/util/database.py | 2 +- decred/decred/util/encode.py | 2 +- decred/decred/util/tinyhttp.py | 2 +- decred/decred/wallet/accounts.py | 6 ++--- decred/decred/wallet/wallet.py | 12 ++++----- decred/examples/create_testnet_wallet.py | 2 +- decred/examples/plot_ticket_price.py | 4 +-- decred/examples/send_testnet.py | 2 +- .../benchmark/util/test_database_benchmark.py | 2 +- decred/tests/conftest.py | 2 +- .../integration/dcr/test_blockchain_live.py | 8 +++--- .../integration/dcr/test_dcrdata_live.py | 12 ++++----- decred/tests/integration/dcr/test_rpc_live.py | 16 ++++++------ decred/tests/integration/dcr/test_vsp_live.py | 4 +-- decred/tests/integration/util/test_ws.py | 2 +- .../tests/integration/wallet/test_wallet.py | 4 +-- tinywallet/tinywallet/app.py | 20 ++++++++------ tinywallet/tinywallet/config.py | 4 +-- tinywallet/tinywallet/qutilities.py | 2 +- tinywallet/tinywallet/screens.py | 26 +++++++++---------- 45 files changed, 159 insertions(+), 132 deletions(-) diff --git a/.gitignore b/.gitignore index a9999b81..3b057baf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,9 @@ prof/ .venv/ .mypy_cache/ __pycache__/ +.idea/ +.vscode/ +decred/setup.py .pytest_cache .coverage *.c diff --git a/README.md b/README.md index 48e4a031..f648d57a 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,21 @@ The [`tinywallet`](./tinywallet) package contains a wallet based on the Each package may be installed from the [Python Package Index](https://pypi.org/) using the [`pip`](https://pip.pypa.io/) command as usual. +## Requirements + +To run tinywallet on your machine you will need to setup the following. + +Use `pip` to install as stated above: + +- pip install websocket_client +- pip install blake256 +- pip install base58 +- pip install PyNaCl +- pip install appdirs + +Setup and run dcrd. Set your rpcusername and rpcpassword from config file +Installation guide can be found [`here`](https://docs.decred.org/wallets/cli/dcrd-setup/). + ## Status [![Check and test both packages](https://github.com/decred/tinydecred/workflows/Check%20and%20test%20both%20packages/badge.svg)](https://github.com/decred/tinydecred/actions) @@ -28,6 +43,11 @@ using the [`pip`](https://pip.pypa.io/) command as usual. [![GitHub contributors](https://img.shields.io/github/contributors/decred/tinydecred)](https://github.com/decred/tinydecred/graphs/contributors) [![GitHub](https://img.shields.io/github/license/decred/tinydecred)](./LICENSE) +## Run + +Execute script from the relevant root directory using: `python3 -m myfile.py` for python3.8. +But if you are using python3.9, use this: `python myfile.py` + ## Roadmap In no particular order: diff --git a/decred/decred/crypto/crypto.py b/decred/decred/crypto/crypto.py index 13bdbca8..b90b007f 100644 --- a/decred/decred/crypto/crypto.py +++ b/decred/decred/crypto/crypto.py @@ -13,9 +13,9 @@ from blake256.blake256 import blake_hash import nacl.secret -from decred import DecredError -from decred.util import encode -from decred.util.encode import ByteArray, unblobCheck +from decred.decred import DecredError +from decred.decred.util import encode +from decred.decred.util.encode import ByteArray, unblobCheck from . import rando from .secp256k1.curve import PrivateKey, PublicKey, curve as Curve diff --git a/decred/decred/crypto/mnemonic.py b/decred/decred/crypto/mnemonic.py index 5f957b2b..6c8c97ce 100644 --- a/decred/decred/crypto/mnemonic.py +++ b/decred/decred/crypto/mnemonic.py @@ -6,8 +6,8 @@ PGP-based mnemonic seed generation. """ -from decred import DecredError -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.util.encode import ByteArray from .crypto import sha256ChecksumByte diff --git a/decred/decred/crypto/rando.py b/decred/decred/crypto/rando.py index e27397f8..21a27fa2 100644 --- a/decred/decred/crypto/rando.py +++ b/decred/decred/crypto/rando.py @@ -6,8 +6,8 @@ import os -from decred import DecredError -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.util.encode import ByteArray KEY_SIZE = 32 diff --git a/decred/decred/crypto/secp256k1/curve.py b/decred/decred/crypto/secp256k1/curve.py index cba88c7d..8e6b72cb 100644 --- a/decred/decred/crypto/secp256k1/curve.py +++ b/decred/decred/crypto/secp256k1/curve.py @@ -26,9 +26,9 @@ where x = x1/z1^2 and y = y1/z1^3. """ -from decred import DecredError -from decred.crypto.rando import generateSeed -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.crypto.rando import generateSeed +from decred.decred.util.encode import ByteArray from .field import BytePoints, FieldVal diff --git a/decred/decred/crypto/secp256k1/field.py b/decred/decred/crypto/secp256k1/field.py index d813f572..b9ee20af 100644 --- a/decred/decred/crypto/secp256k1/field.py +++ b/decred/decred/crypto/secp256k1/field.py @@ -7,7 +7,7 @@ from base64 import b64decode from zlib import decompress as zdecompress -from decred.util.encode import ByteArray +from decred.decred.util.encode import ByteArray from .bytepoints import secp256k1BytePoints diff --git a/decred/decred/dcr/account.py b/decred/decred/dcr/account.py index 58756251..08216c61 100644 --- a/decred/decred/dcr/account.py +++ b/decred/decred/dcr/account.py @@ -4,12 +4,12 @@ See LICENSE for details """ -from decred import DecredError -from decred.crypto import crypto, opcode -from decred.dcr import addrlib -from decred.dcr.txscript import DefaultRelayFeePerKb -from decred.util import encode, helpers -from decred.util.encode import BuildyBytes, ByteArray, unblobCheck +from decred.decred import DecredError +from decred.decred.crypto import crypto, opcode +from decred.decred.dcr import addrlib +from decred.decred.dcr.txscript import DefaultRelayFeePerKb +from decred.decred.util import encode, helpers +from decred.decred.util.encode import BuildyBytes, ByteArray, unblobCheck from . import nets, txscript from .vsp import VotingServiceProvider diff --git a/decred/decred/dcr/addrlib.py b/decred/decred/dcr/addrlib.py index e0fec3bc..d7b2981a 100644 --- a/decred/decred/dcr/addrlib.py +++ b/decred/decred/dcr/addrlib.py @@ -9,8 +9,8 @@ from base58 import b58encode -from decred import DecredError -from decred.crypto.crypto import ( +from decred.decred import DecredError +from decred.decred.crypto.crypto import ( RIPEMD160_SIZE, PKFCompressed, PKFUncompressed, @@ -21,9 +21,9 @@ checksum, hash160, ) -from decred.crypto.secp256k1.curve import curve as Secp256k1 -from decred.dcr import nets -from decred.util.encode import BuildyBytes, ByteArray, decodeBlob, unblobCheck +from decred.decred.crypto.secp256k1.curve import curve as Secp256k1 +from decred.decred.dcr import nets +from decred.decred.util.encode import BuildyBytes, ByteArray, decodeBlob, unblobCheck class Address: diff --git a/decred/decred/dcr/blockchain.py b/decred/decred/dcr/blockchain.py index bf1e9410..2bf52a7d 100644 --- a/decred/decred/dcr/blockchain.py +++ b/decred/decred/dcr/blockchain.py @@ -4,10 +4,10 @@ import time -from decred.dcr import addrlib, rpc -from decred.dcr.wire.msgblock import BlockHeader -from decred.util import database, helpers -from decred.util.encode import ByteArray +from decred.decred.dcr import addrlib, rpc +from decred.decred.dcr.wire.msgblock import BlockHeader +from decred.decred.util import database, helpers +from decred.decred.util.encode import ByteArray log = helpers.getLogger("blockchain") diff --git a/decred/decred/dcr/dcrdata.py b/decred/decred/dcr/dcrdata.py index a8cf41e0..dba9c22c 100644 --- a/decred/decred/dcr/dcrdata.py +++ b/decred/decred/dcr/dcrdata.py @@ -12,12 +12,12 @@ import time from urllib.parse import urlencode, urljoin, urlsplit, urlunsplit -from decred import DecredError -from decred.crypto import crypto -from decred.dcr import addrlib -from decred.util import database, tinyhttp, ws -from decred.util.encode import ByteArray -from decred.util.helpers import formatTraceback, getLogger, makeWebsocketURL +from decred.decred import DecredError +from decred.decred.crypto import crypto +from decred.decred.dcr import addrlib +from decred.decred.util import database, tinyhttp, ws +from decred.decred.util.encode import ByteArray +from decred.decred.util.helpers import formatTraceback, getLogger, makeWebsocketURL from . import account, agenda, txscript from .wire import msgblock, msgtx, wire diff --git a/decred/decred/dcr/nets/__init__.py b/decred/decred/dcr/nets/__init__.py index 6f28745a..d6934037 100644 --- a/decred/decred/dcr/nets/__init__.py +++ b/decred/decred/dcr/nets/__init__.py @@ -3,7 +3,7 @@ See LICENSE for details """ -from decred import DecredError +from decred.decred import DecredError from . import mainnet, simnet, testnet diff --git a/decred/decred/dcr/nets/mainnet.py b/decred/decred/dcr/nets/mainnet.py index e1278597..62586a62 100644 --- a/decred/decred/dcr/nets/mainnet.py +++ b/decred/decred/dcr/nets/mainnet.py @@ -7,7 +7,7 @@ https://github.com/decred/dcrd/blob/master/chaincfg/mainnetparams.go """ -from decred.dcr import constants as C +from decred.decred.dcr import constants as C Name = "mainnet" diff --git a/decred/decred/dcr/rpc.py b/decred/decred/dcr/rpc.py index f387df9b..c87dcc8e 100644 --- a/decred/decred/dcr/rpc.py +++ b/decred/decred/dcr/rpc.py @@ -9,11 +9,11 @@ import ssl import types -from decred import DecredError -from decred.crypto.opcode import OP_SSRTX -from decred.util import tinyhttp, ws -from decred.util.encode import ByteArray -from decred.util.helpers import getLogger, makeWebsocketURL +from decred.decred import DecredError +from decred.decred.crypto.opcode import OP_SSRTX +from decred.decred.util import tinyhttp, ws +from decred.decred.util.encode import ByteArray +from decred.decred.util.helpers import getLogger, makeWebsocketURL from . import agenda, txscript from .wire.msgblock import BlockHeader diff --git a/decred/decred/dcr/txscript.py b/decred/decred/dcr/txscript.py index 9c80bbbe..dbc719af 100644 --- a/decred/decred/dcr/txscript.py +++ b/decred/decred/dcr/txscript.py @@ -9,12 +9,12 @@ import bisect import math -from decred import DecredError -from decred.crypto import crypto, opcode -from decred.crypto.secp256k1.curve import curve as Curve -from decred.dcr import addrlib -from decred.util import helpers -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.crypto import crypto, opcode +from decred.decred.crypto.secp256k1.curve import curve as Curve +from decred.decred.dcr import addrlib +from decred.decred.util import helpers +from decred.decred.util.encode import ByteArray from .wire import msgtx, wire diff --git a/decred/decred/dcr/vsp.py b/decred/decred/dcr/vsp.py index fbb06586..fc58971a 100644 --- a/decred/decred/dcr/vsp.py +++ b/decred/decred/dcr/vsp.py @@ -9,10 +9,10 @@ import time from urllib.parse import urlsplit, urlunsplit -from decred import DecredError -from decred.dcr import addrlib -from decred.util import encode, tinyhttp -from decred.util.encode import ByteArray, unblobCheck +from decred.decred import DecredError +from decred.decred.dcr import addrlib +from decred.decred.util import encode, tinyhttp +from decred.decred.util.encode import ByteArray, unblobCheck from . import constants, nets, txscript diff --git a/decred/decred/dcr/wire/msgblock.py b/decred/decred/dcr/wire/msgblock.py index 0fa47515..4904339f 100644 --- a/decred/decred/dcr/wire/msgblock.py +++ b/decred/decred/dcr/wire/msgblock.py @@ -6,8 +6,8 @@ Based on dcrd MsgBlock. """ -from decred.crypto import crypto -from decred.util.encode import ByteArray +from decred.decred.crypto import crypto +from decred.decred.util.encode import ByteArray # chainhash.HashSize in Go diff --git a/decred/decred/dcr/wire/msgping.py b/decred/decred/dcr/wire/msgping.py index fe35e669..d11d4f4a 100644 --- a/decred/decred/dcr/wire/msgping.py +++ b/decred/decred/dcr/wire/msgping.py @@ -5,7 +5,7 @@ Based on dcrd MsgPing. """ -from decred.util.encode import ByteArray +from decred.decred.util.encode import ByteArray CmdPing = "ping" diff --git a/decred/decred/dcr/wire/msgpong.py b/decred/decred/dcr/wire/msgpong.py index db0f37ed..b6002961 100644 --- a/decred/decred/dcr/wire/msgpong.py +++ b/decred/decred/dcr/wire/msgpong.py @@ -5,7 +5,7 @@ Based on dcrd MsgPing. """ -from decred.util.encode import ByteArray +from decred.decred.util.encode import ByteArray CmdPong = "pong" diff --git a/decred/decred/dcr/wire/msgtx.py b/decred/decred/dcr/wire/msgtx.py index 11edb9d2..6de6e176 100644 --- a/decred/decred/dcr/wire/msgtx.py +++ b/decred/decred/dcr/wire/msgtx.py @@ -6,10 +6,10 @@ Based on dcrd MsgTx. """ -from decred import DecredError -from decred.crypto.crypto import hashH -from decred.dcr import txscript -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.crypto.crypto import hashH +from decred.decred.dcr import txscript +from decred.decred.util.encode import ByteArray from . import wire diff --git a/decred/decred/dcr/wire/msgverack.py b/decred/decred/dcr/wire/msgverack.py index 9b039159..4dd8ca85 100644 --- a/decred/decred/dcr/wire/msgverack.py +++ b/decred/decred/dcr/wire/msgverack.py @@ -5,7 +5,7 @@ Based on dcrd MsgVerAck. """ -from decred.util.encode import ByteArray +from decred.decred.util.encode import ByteArray CmdVerAck = "verack" diff --git a/decred/decred/dcr/wire/msgversion.py b/decred/decred/dcr/wire/msgversion.py index ceee1903..174569de 100644 --- a/decred/decred/dcr/wire/msgversion.py +++ b/decred/decred/dcr/wire/msgversion.py @@ -5,9 +5,9 @@ import time -from decred import DecredError -from decred.dcr.wire import netaddress, wire -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.dcr.wire import netaddress, wire +from decred.decred.util.encode import ByteArray # MaxUserAgentLen is the maximum allowed length for the user agent field in a diff --git a/decred/decred/dcr/wire/netaddress.py b/decred/decred/dcr/wire/netaddress.py index e8ef9065..6bce9bbc 100644 --- a/decred/decred/dcr/wire/netaddress.py +++ b/decred/decred/dcr/wire/netaddress.py @@ -6,8 +6,8 @@ import socket import time -from decred import DecredError -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.util.encode import ByteArray MaxNetAddressPayload = 30 diff --git a/decred/decred/dcr/wire/wire.py b/decred/decred/dcr/wire/wire.py index c30de349..c321ad2f 100644 --- a/decred/decred/dcr/wire/wire.py +++ b/decred/decred/dcr/wire/wire.py @@ -6,8 +6,8 @@ Constants and common routines from the dcrd wire package. """ -from decred import DecredError -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.util.encode import ByteArray # fmt: off diff --git a/decred/decred/util/chains.py b/decred/decred/util/chains.py index 05a99716..b4f2e33a 100644 --- a/decred/decred/util/chains.py +++ b/decred/decred/util/chains.py @@ -3,8 +3,8 @@ See LICENSE for details """ -from decred import DecredError -from decred.dcr import account as dcracct, nets as dcrnets +from decred.decred import DecredError +from decred.decred.dcr import account as dcracct, nets as dcrnets class BipIDs: diff --git a/decred/decred/util/database.py b/decred/decred/util/database.py index 83a6e54e..539bde7f 100644 --- a/decred/decred/util/database.py +++ b/decred/decred/util/database.py @@ -16,7 +16,7 @@ import sqlite3 import threading -from decred import DecredError +from decred.decred import DecredError TRUE = bytearray([1]) diff --git a/decred/decred/util/encode.py b/decred/decred/util/encode.py index 485e4f0d..93f2b227 100644 --- a/decred/decred/util/encode.py +++ b/decred/decred/util/encode.py @@ -8,7 +8,7 @@ import struct -from decred import DecredError +from decred.decred import DecredError NONE = "None".encode() diff --git a/decred/decred/util/tinyhttp.py b/decred/decred/util/tinyhttp.py index 8b420d76..f071121d 100644 --- a/decred/decred/util/tinyhttp.py +++ b/decred/decred/util/tinyhttp.py @@ -9,7 +9,7 @@ from urllib.parse import urlencode import urllib.request as urlrequest -from decred import DecredError +from decred.decred import DecredError from .helpers import formatTraceback diff --git a/decred/decred/wallet/accounts.py b/decred/decred/wallet/accounts.py index b5868ea8..d19191b8 100644 --- a/decred/decred/wallet/accounts.py +++ b/decred/decred/wallet/accounts.py @@ -8,9 +8,9 @@ mostly be through the AccountManager. """ -from decred import DecredError -from decred.crypto import crypto -from decred.util import chains, encode, helpers +from decred.decred import DecredError +from decred.decred.crypto import crypto +from decred.decred.util import chains, encode, helpers EXTERNAL_BRANCH = 0 diff --git a/decred/decred/wallet/wallet.py b/decred/decred/wallet/wallet.py index fc493d94..8c4df1d3 100644 --- a/decred/decred/wallet/wallet.py +++ b/decred/decred/wallet/wallet.py @@ -6,12 +6,12 @@ from pathlib import Path -from decred import DecredError -from decred.crypto import crypto, mnemonic, rando -from decred.dcr import nets -from decred.dcr.dcrdata import DcrdataBlockchain -from decred.util import chains, database, encode, helpers -from decred.util.helpers import mkdir +from decred.decred import DecredError +from decred.decred.crypto import crypto, mnemonic, rando +from decred.decred.dcr import nets +from decred.decred.dcr.dcrdata import DcrdataBlockchain +from decred.decred.util import chains, database, encode, helpers +from decred.decred.util.helpers import mkdir from . import accounts diff --git a/decred/examples/create_testnet_wallet.py b/decred/examples/create_testnet_wallet.py index 91aaa040..31fc76fe 100644 --- a/decred/examples/create_testnet_wallet.py +++ b/decred/examples/create_testnet_wallet.py @@ -7,7 +7,7 @@ from getpass import getpass -from decred.wallet.wallet import SimpleWallet +from decred.decred.wallet.wallet import SimpleWallet def main(): diff --git a/decred/examples/plot_ticket_price.py b/decred/examples/plot_ticket_price.py index ce167847..d0d5de36 100644 --- a/decred/examples/plot_ticket_price.py +++ b/decred/examples/plot_ticket_price.py @@ -6,8 +6,8 @@ be installed separately with `pip3 install matplotlib`. """ -from decred.dcr.dcrdata import DcrdataClient -from decred.util.helpers import mktime +from decred.decred.dcr.dcrdata import DcrdataClient +from decred.decred.util.helpers import mktime try: diff --git a/decred/examples/send_testnet.py b/decred/examples/send_testnet.py index c0e76624..697ac76c 100644 --- a/decred/examples/send_testnet.py +++ b/decred/examples/send_testnet.py @@ -9,7 +9,7 @@ from getpass import getpass -from decred.wallet.wallet import SimpleWallet +from decred.decred.wallet.wallet import SimpleWallet # Testnet return address for faucet.decred.org. TESTNET_ADDRESS = "TsfDLrRkk9ciUuwfp2b8PawwnukYD7yAjGd" diff --git a/decred/tests/benchmark/util/test_database_benchmark.py b/decred/tests/benchmark/util/test_database_benchmark.py index d32623ff..169673d1 100644 --- a/decred/tests/benchmark/util/test_database_benchmark.py +++ b/decred/tests/benchmark/util/test_database_benchmark.py @@ -5,7 +5,7 @@ import pytest -from decred.util import database +from decred.decred.util import database @pytest.fixture diff --git a/decred/tests/conftest.py b/decred/tests/conftest.py index 37713be0..24573898 100644 --- a/decred/tests/conftest.py +++ b/decred/tests/conftest.py @@ -8,7 +8,7 @@ import pytest -from decred.util import chains, helpers +from decred.decred.util import chains, helpers @pytest.fixture diff --git a/decred/tests/integration/dcr/test_blockchain_live.py b/decred/tests/integration/dcr/test_blockchain_live.py index e7d977d6..9719861d 100644 --- a/decred/tests/integration/dcr/test_blockchain_live.py +++ b/decred/tests/integration/dcr/test_blockchain_live.py @@ -5,10 +5,10 @@ import pytest -from decred.dcr.blockchain import LocalNode -from decred.dcr.nets import mainnet -from decred.dcr.wire.msgtx import OutPoint -from decred.util.encode import ByteArray, rba +from decred.decred.dcr.blockchain import LocalNode +from decred.decred.dcr.nets import mainnet +from decred.decred.dcr.wire.msgtx import OutPoint +from decred.decred.util.encode import ByteArray, rba @pytest.fixture diff --git a/decred/tests/integration/dcr/test_dcrdata_live.py b/decred/tests/integration/dcr/test_dcrdata_live.py index e051184a..23c8bec1 100644 --- a/decred/tests/integration/dcr/test_dcrdata_live.py +++ b/decred/tests/integration/dcr/test_dcrdata_live.py @@ -5,12 +5,12 @@ import time -from decred.crypto import crypto, rando -from decred.crypto.secp256k1 import curve as Curve -from decred.dcr import account, addrlib, dcrdata, txscript -from decred.dcr.nets import mainnet, testnet -from decred.dcr.wire import msgtx -from decred.util.encode import ByteArray +from decred.decred.crypto import crypto, rando +from decred.decred.crypto.secp256k1 import curve as Curve +from decred.decred.dcr import account, addrlib, dcrdata, txscript +from decred.decred.dcr.nets import mainnet, testnet +from decred.decred.dcr.wire import msgtx +from decred.decred.util.encode import ByteArray class TestDcrdata: diff --git a/decred/tests/integration/dcr/test_rpc_live.py b/decred/tests/integration/dcr/test_rpc_live.py index 572527ee..2be4d2d5 100644 --- a/decred/tests/integration/dcr/test_rpc_live.py +++ b/decred/tests/integration/dcr/test_rpc_live.py @@ -8,14 +8,14 @@ from base58 import b58decode import pytest -from decred import DecredError -from decred.crypto import crypto, opcode -from decred.dcr import account, addrlib, rpc, txscript -from decred.dcr.nets import mainnet -from decred.dcr.wire import wire -from decred.dcr.wire.msgblock import BlockHeader -from decred.dcr.wire.msgtx import MsgTx, OutPoint, TxIn, TxOut -from decred.util.encode import ByteArray +from decred.decred import DecredError +from decred.decred.crypto import crypto, opcode +from decred.decred.dcr import account, addrlib, rpc, txscript +from decred.decred.dcr.nets import mainnet +from decred.decred.dcr.wire import wire +from decred.decred.dcr.wire.msgblock import BlockHeader +from decred.decred.dcr.wire.msgtx import MsgTx, OutPoint, TxIn, TxOut +from decred.decred.util.encode import ByteArray mainnetAddress = "Dcur2mcGjmENx4DhNqDctW5wJCVyT3Qeqkx" diff --git a/decred/tests/integration/dcr/test_vsp_live.py b/decred/tests/integration/dcr/test_vsp_live.py index 78d9b6bd..f1169890 100644 --- a/decred/tests/integration/dcr/test_vsp_live.py +++ b/decred/tests/integration/dcr/test_vsp_live.py @@ -3,8 +3,8 @@ See LICENSE for details """ -from decred.dcr import vsp -from decred.dcr.nets import testnet +from decred.decred.dcr import vsp +from decred.decred.dcr.nets import testnet VSP_URL = "https://dcrstakedinner.com" diff --git a/decred/tests/integration/util/test_ws.py b/decred/tests/integration/util/test_ws.py index 4b7caa0d..a5f15ed0 100644 --- a/decred/tests/integration/util/test_ws.py +++ b/decred/tests/integration/util/test_ws.py @@ -12,7 +12,7 @@ import websocket from websocket_server import WebsocketServer -from decred.util import ws +from decred.decred.util import ws HOST = "localhost" diff --git a/decred/tests/integration/wallet/test_wallet.py b/decred/tests/integration/wallet/test_wallet.py index afe17085..5790f015 100644 --- a/decred/tests/integration/wallet/test_wallet.py +++ b/decred/tests/integration/wallet/test_wallet.py @@ -2,8 +2,8 @@ Copyright (c) 2020, The Decred developers """ -from decred.dcr import nets -from decred.wallet.wallet import SimpleWallet, Wallet +from decred.decred.dcr import nets +from decred.decred.wallet.wallet import SimpleWallet, Wallet PASSWORD = "test_password" diff --git a/tinywallet/tinywallet/app.py b/tinywallet/tinywallet/app.py index 710d9dd3..253646f8 100644 --- a/tinywallet/tinywallet/app.py +++ b/tinywallet/tinywallet/app.py @@ -10,17 +10,21 @@ from pathlib import Path import sys +# """ +# update your path to the decred folder accordingly +# """ +# sys.path.insert(0, '/home/silverback/PycharmProjects/tinydecred/decred') from PyQt5 import QtCore, QtGui, QtWidgets -from decred.dcr import constants as DCR -from decred.dcr.dcrdata import DcrdataBlockchain -from decred.util import chains, database, helpers -from decred.util.helpers import formatTraceback -from decred.wallet.wallet import Wallet +from decred.decred.dcr import constants as DCR +from decred.decred.dcr.dcrdata import DcrdataBlockchain +from decred.decred.util import chains, database, helpers +from decred.decred.util.helpers import formatTraceback +from decred.decred.wallet.wallet import Wallet -from . import config, qutilities as Q, screens, ui -from .config import DB -from .ui import LARGE, MEDIUM, SMALL, TINY +import config, qutilities as Q, screens, ui +from config import DB +from ui import LARGE, MEDIUM, SMALL, TINY # The directory of the tinywallet package. diff --git a/tinywallet/tinywallet/config.py b/tinywallet/tinywallet/config.py index b2c60def..4b4b63f6 100644 --- a/tinywallet/tinywallet/config.py +++ b/tinywallet/tinywallet/config.py @@ -14,8 +14,8 @@ from appdirs import AppDirs -from decred.dcr import nets -from decred.util import helpers +from decred.decred.dcr import nets +from decred.decred.util import helpers # Set the data directory in a OS-appropriate location. diff --git a/tinywallet/tinywallet/qutilities.py b/tinywallet/tinywallet/qutilities.py index 5bb9856b..a6760dbe 100644 --- a/tinywallet/tinywallet/qutilities.py +++ b/tinywallet/tinywallet/qutilities.py @@ -10,7 +10,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets -from decred.util import helpers +from decred.decred.util import helpers log = helpers.getLogger("QUTIL") diff --git a/tinywallet/tinywallet/screens.py b/tinywallet/tinywallet/screens.py index 2ff81441..050406d3 100644 --- a/tinywallet/tinywallet/screens.py +++ b/tinywallet/tinywallet/screens.py @@ -14,19 +14,19 @@ from PyQt5 import QtCore, QtGui, QtSvg, QtWidgets -from decred import DecredError -from decred.crypto import crypto -from decred.dcr import constants as DCR, nets -from decred.dcr.blockchain import LocalNode -from decred.dcr.txscript import DefaultRelayFeePerKb -from decred.dcr.vsp import VotingServiceProvider -from decred.util import chains, database, helpers -from decred.util.helpers import formatTraceback -from decred.wallet.wallet import Wallet - -from . import config, qutilities as Q, ui -from .config import DB -from .ui import SMALL, TINY +from decred.decred import DecredError +from decred.decred.crypto import crypto +from decred.decred.dcr import constants as DCR, nets +from decred.decred.dcr.blockchain import LocalNode +from decred.decred.dcr.txscript import DefaultRelayFeePerKb +from decred.decred.dcr.vsp import VotingServiceProvider +from decred.decred.util import chains, database, helpers +from decred.decred.util.helpers import formatTraceback +from decred.decred.wallet.wallet import Wallet + +import config, qutilities as Q, ui +from config import DB +from ui import SMALL, TINY UI_DIR = os.path.dirname(os.path.realpath(__file__))