diff --git a/.gitignore b/.gitignore index 5435c5f..061a698 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ __pycache__/ *.py[cod] *$py.class +**/__pycache__ +**/*.pyc # pyblock stuff pyblocksettings.conf diff --git a/README.md b/README.md index cabf662..6e1442c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + ---------------------- @@ -78,7 +78,7 @@
- +
@@ -86,7 +86,7 @@
- +
@@ -94,7 +94,7 @@
- +
@@ -102,7 +102,7 @@
- +
@@ -110,7 +110,7 @@
- +
@@ -118,7 +118,7 @@
- +
@@ -143,7 +143,7 @@
- +
@@ -151,7 +151,7 @@
- +
@@ -159,7 +159,7 @@
- +
@@ -167,7 +167,7 @@
- +
@@ -175,7 +175,7 @@
- +
@@ -183,7 +183,7 @@
- +
@@ -201,6 +201,8 @@ ### Tools by [@Curly60e](https://twitter.com/royalfield370) ⚡️ curly60e@bitrefill.com +[@__B__T__C__](https://twitter.com/__B__T__C__) ⚡️ satoshinakamoto@bitrefill.me +[@Danvergara](https://twitter.com/__danvergara__) [@SamouraiDev,](https://twitter.com/SamouraiDev) [@Korynewton,](https://twitter.com/kn3wt) @@ -225,20 +227,17 @@ [@BenTheCarman,](https://twitter.com/benthecarman) [@Whale_Alert...](https://twitter.com/whale_alert) -### Revised by - -[@__B__T__C__](https://twitter.com/__B__T__C__) ⚡️ satoshinakamoto@bitrefill.me SUPPORT PyBLØCK. Bitcoin Address: bc1qjzaz34nv2ev55vfdu9m5qh0zq0fwcn6c7pkcrv - + Samourai Wallet Paynym: PM8TJhNTTq3YVocXuPtLjKx7pKkdUxqwTerWJ2j2a7dNitgyMmBPN6gK61yE17N2vgvQvKYokXktt6D6GZFTmocvDJhaUJfHt7ehEMmthjsT3NQHseFM - + Monero: 42jtb4dAfm6BQ8h6x56qGyAMMHVXGRwRMTSb2LwsBg1jVqD4TxfpD1pTK56tkrTMGhEKipZdDHfJrB1g8iQfvSyC7gZ9M8M - + diff --git a/downloads/Welcome.txt b/downloads/Welcome.txt deleted file mode 100644 index 047e3d8..0000000 --- a/downloads/Welcome.txt +++ /dev/null @@ -1 +0,0 @@ -Welcome to SatNode on PyBLOCK! Congratulations! diff --git a/poetry.lock b/poetry.lock index 3207474..5a82fb4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -27,7 +27,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "charset-normalizer" -version = "2.0.7" +version = "2.0.8" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -36,6 +36,18 @@ python-versions = ">=3.5.0" [package.extras] unicode_backport = ["unicodedata2"] +[[package]] +name = "click" +version = "8.0.3" +description = "Composable command line interface toolkit" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} + [[package]] name = "colorama" version = "0.4.4" @@ -80,6 +92,22 @@ category = "main" optional = false python-versions = ">=3.5" +[[package]] +name = "importlib-metadata" +version = "4.2.0" +description = "Read metadata from Python packages" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} +zipp = ">=0.5" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] + [[package]] name = "lnpay-py" version = "0.1.0" @@ -184,7 +212,7 @@ colorama = "*" [[package]] name = "python-gnupg" -version = "0.4.7" +version = "0.4.8" description = "A wrapper for the Gnu Privacy Guard (GPG or GnuPG)" category = "main" optional = false @@ -273,6 +301,31 @@ category = "main" optional = false python-versions = "*" +[[package]] +name = "typer" +version = "0.4.0" +description = "Typer, build great CLIs. Easy to code. Based on Python type hints." +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +click = ">=7.1.1,<9.0.0" + +[package.extras] +all = ["colorama (>=0.4.3,<0.5.0)", "shellingham (>=1.3.0,<2.0.0)"] +dev = ["autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)"] +doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=5.4.0,<6.0.0)", "markdown-include (>=0.5.1,<0.6.0)"] +test = ["shellingham (>=1.3.0,<2.0.0)", "pytest (>=4.4.0,<5.4.0)", "pytest-cov (>=2.10.0,<3.0.0)", "coverage (>=5.2,<6.0)", "pytest-xdist (>=1.32.0,<2.0.0)", "pytest-sugar (>=0.9.4,<0.10.0)", "mypy (==0.910)", "black (>=19.10b0,<20.0b0)", "isort (>=5.0.6,<6.0.0)"] + +[[package]] +name = "typing-extensions" +version = "4.0.0" +description = "Backported and Experimental Type Hints for Python 3.6+" +category = "main" +optional = false +python-versions = ">=3.6" + [[package]] name = "urllib3" version = "1.26.7" @@ -294,10 +347,22 @@ category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +[[package]] +name = "zipp" +version = "3.6.0" +description = "Backport of pathlib-compatible object wrapper for zip files" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] + [metadata] lock-version = "1.1" python-versions = ">=3.7,<3.11" -content-hash = "4077b2945bbbaf5bca16ac335c2b917d9c3eeda193cdb33391a1ac77345a7306" +content-hash = "c840a27a4d49ac38be5017113cd5aabe0eebf144042aba75b294d83eacd70201" [metadata.files] art = [ @@ -313,8 +378,12 @@ chardet = [ {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, - {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, + {file = "charset-normalizer-2.0.8.tar.gz", hash = "sha256:735e240d9a8506778cd7a453d97e817e536bb1fc29f4f6961ce297b9c7a917b0"}, + {file = "charset_normalizer-2.0.8-py3-none-any.whl", hash = "sha256:83fcdeb225499d6344c8f7f34684c2981270beacc32ede2e669e94f7fa544405"}, +] +click = [ + {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"}, + {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, @@ -374,6 +443,10 @@ idna = [ {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] +importlib-metadata = [ + {file = "importlib_metadata-4.2.0-py3-none-any.whl", hash = "sha256:057e92c15bc8d9e8109738a48db0ccb31b4d9d5cfbee5a8670879a30be66304b"}, + {file = "importlib_metadata-4.2.0.tar.gz", hash = "sha256:b7e52a1f8dec14a75ea73e0891f3060099ca1d8e6a462a4dff11c3e119ea1b31"}, +] lnpay-py = [ {file = "lnpay-py-0.1.0.tar.gz", hash = "sha256:844751741efe8192e13c647fe16e2e657a89b79e5f6733db0a1bff217c6314f0"}, {file = "lnpay_py-0.1.0-py3.6.egg", hash = "sha256:f0aabe392f6cea90bb07630ca60a470625b7ec2815dc09bf20a16b48b485e237"}, @@ -551,8 +624,8 @@ python-cfonts = [ {file = "python_cfonts-1.5.2-py3-none-any.whl", hash = "sha256:88ddfffae675a2bc4e796baf057c5b989541a710bef4ac3e739edfbb388027ed"}, ] python-gnupg = [ - {file = "python-gnupg-0.4.7.tar.gz", hash = "sha256:2061f56b1942c29b92727bf9aecbd3cea3893acc9cccbdc7eb4604285efe4ac7"}, - {file = "python_gnupg-0.4.7-py2.py3-none-any.whl", hash = "sha256:3ff5b1bf5e397de6e1fe41a7c0f403dad4e242ac92b345f440eaecfb72a7ebae"}, + {file = "python-gnupg-0.4.8.tar.gz", hash = "sha256:b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7"}, + {file = "python_gnupg-0.4.8-py2.py3-none-any.whl", hash = "sha256:93a521501d6c2785d96b190aec7125ba89c1c2fe708b0c98af3fb32b59026ab8"}, ] qrcode = [ {file = "qrcode-7.3.1.tar.gz", hash = "sha256:375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578"}, @@ -639,6 +712,14 @@ sseclient-py = [ termcolor = [ {file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"}, ] +typer = [ + {file = "typer-0.4.0-py3-none-any.whl", hash = "sha256:d81169725140423d072df464cad1ff25ee154ef381aaf5b8225352ea187ca338"}, + {file = "typer-0.4.0.tar.gz", hash = "sha256:63c3aeab0549750ffe40da79a1b524f60e08a2cbc3126c520ebf2eeaf507f5dd"}, +] +typing-extensions = [ + {file = "typing_extensions-4.0.0-py3-none-any.whl", hash = "sha256:829704698b22e13ec9eaf959122315eabb370b0884400e9818334d8b677023d9"}, + {file = "typing_extensions-4.0.0.tar.gz", hash = "sha256:2cdf80e4e04866a9b3689a51869016d36db0814d84b8d8a568d22781d45d27ed"}, +] urllib3 = [ {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"}, {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"}, @@ -647,3 +728,7 @@ xmltodict = [ {file = "xmltodict-0.12.0-py2.py3-none-any.whl", hash = "sha256:8bbcb45cc982f48b2ca8fe7e7827c5d792f217ecf1792626f808bf41c3b86051"}, {file = "xmltodict-0.12.0.tar.gz", hash = "sha256:50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21"}, ] +zipp = [ + {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"}, + {file = "zipp-3.6.0.tar.gz", hash = "sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"}, +] diff --git a/PyBlock.py b/pybitblock/PyBlock.py similarity index 100% rename from PyBlock.py rename to pybitblock/PyBlock.py diff --git a/pybitblock/__init__.py b/pybitblock/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/apisnd.py b/pybitblock/apisnd.py similarity index 100% rename from apisnd.py rename to pybitblock/apisnd.py diff --git a/clockscript.py b/pybitblock/clockscript.py similarity index 100% rename from clockscript.py rename to pybitblock/clockscript.py diff --git a/clockscriptREMOTE.py b/pybitblock/clockscriptREMOTE.py similarity index 100% rename from clockscriptREMOTE.py rename to pybitblock/clockscriptREMOTE.py diff --git a/clone.py b/pybitblock/clone.py similarity index 100% rename from clone.py rename to pybitblock/clone.py diff --git a/pybitblock/console.py b/pybitblock/console.py new file mode 100644 index 0000000..b7990f4 --- /dev/null +++ b/pybitblock/console.py @@ -0,0 +1,11 @@ +import os +import typer + + +def main(): + scriptpath = os.path.join(os.path.dirname(__file__), 'PyBlock.py') + os.system(f"python3 {scriptpath}") + + +if __name__ == "__main__": + typer.run(main) diff --git a/donation.py b/pybitblock/donation.py similarity index 100% rename from donation.py rename to pybitblock/donation.py diff --git a/feed.py b/pybitblock/feed.py similarity index 100% rename from feed.py rename to pybitblock/feed.py diff --git a/grpc_generated/router_pb2.py b/pybitblock/grpc_generated/router_pb2.py similarity index 100% rename from grpc_generated/router_pb2.py rename to pybitblock/grpc_generated/router_pb2.py diff --git a/grpc_generated/router_pb2_grpc.py b/pybitblock/grpc_generated/router_pb2_grpc.py similarity index 100% rename from grpc_generated/router_pb2_grpc.py rename to pybitblock/grpc_generated/router_pb2_grpc.py diff --git a/grpc_generated/rpc_pb2.py b/pybitblock/grpc_generated/rpc_pb2.py similarity index 100% rename from grpc_generated/rpc_pb2.py rename to pybitblock/grpc_generated/rpc_pb2.py diff --git a/grpc_generated/rpc_pb2_grpc.py b/pybitblock/grpc_generated/rpc_pb2_grpc.py similarity index 100% rename from grpc_generated/rpc_pb2_grpc.py rename to pybitblock/grpc_generated/rpc_pb2_grpc.py diff --git a/images/bitcoin-donation.png b/pybitblock/images/bitcoin-donation.png similarity index 100% rename from images/bitcoin-donation.png rename to pybitblock/images/bitcoin-donation.png diff --git a/images/codeimage.png b/pybitblock/images/codeimage.png similarity index 100% rename from images/codeimage.png rename to pybitblock/images/codeimage.png diff --git a/images/keysend.png b/pybitblock/images/keysend.png similarity index 100% rename from images/keysend.png rename to pybitblock/images/keysend.png diff --git a/images/qrcode.png b/pybitblock/images/qrcode.png similarity index 100% rename from images/qrcode.png rename to pybitblock/images/qrcode.png diff --git a/lnd.py b/pybitblock/lnd.py similarity index 100% rename from lnd.py rename to pybitblock/lnd.py diff --git a/logic.py b/pybitblock/logic.py similarity index 100% rename from logic.py rename to pybitblock/logic.py diff --git a/logos.py b/pybitblock/logos.py similarity index 100% rename from logos.py rename to pybitblock/logos.py diff --git a/nodeconnection.py b/pybitblock/nodeconnection.py similarity index 100% rename from nodeconnection.py rename to pybitblock/nodeconnection.py diff --git a/pblogo.py b/pybitblock/pblogo.py similarity index 100% rename from pblogo.py rename to pybitblock/pblogo.py diff --git a/ppi.py b/pybitblock/ppi.py similarity index 100% rename from ppi.py rename to pybitblock/ppi.py diff --git a/rebalance.py b/pybitblock/rebalance.py similarity index 100% rename from rebalance.py rename to pybitblock/rebalance.py diff --git a/resources/images/EYDhHM1X0AAd8UP.PNG b/pybitblock/resources/images/EYDhHM1X0AAd8UP.PNG similarity index 100% rename from resources/images/EYDhHM1X0AAd8UP.PNG rename to pybitblock/resources/images/EYDhHM1X0AAd8UP.PNG diff --git a/resources/images/Logo.PNG b/pybitblock/resources/images/Logo.PNG similarity index 100% rename from resources/images/Logo.PNG rename to pybitblock/resources/images/Logo.PNG diff --git a/resources/images/REST1.PNG b/pybitblock/resources/images/REST1.PNG similarity index 100% rename from resources/images/REST1.PNG rename to pybitblock/resources/images/REST1.PNG diff --git a/resources/images/REST1REMOTE.PNG b/pybitblock/resources/images/REST1REMOTE.PNG similarity index 100% rename from resources/images/REST1REMOTE.PNG rename to pybitblock/resources/images/REST1REMOTE.PNG diff --git a/resources/images/REST2.PNG b/pybitblock/resources/images/REST2.PNG similarity index 100% rename from resources/images/REST2.PNG rename to pybitblock/resources/images/REST2.PNG diff --git a/resources/images/REST2REMOTE.PNG b/pybitblock/resources/images/REST2REMOTE.PNG similarity index 100% rename from resources/images/REST2REMOTE.PNG rename to pybitblock/resources/images/REST2REMOTE.PNG diff --git a/resources/images/REST3.PNG b/pybitblock/resources/images/REST3.PNG similarity index 100% rename from resources/images/REST3.PNG rename to pybitblock/resources/images/REST3.PNG diff --git a/resources/images/REST3REMOTE.PNG b/pybitblock/resources/images/REST3REMOTE.PNG similarity index 100% rename from resources/images/REST3REMOTE.PNG rename to pybitblock/resources/images/REST3REMOTE.PNG diff --git a/resources/images/REST4.PNG b/pybitblock/resources/images/REST4.PNG similarity index 100% rename from resources/images/REST4.PNG rename to pybitblock/resources/images/REST4.PNG diff --git a/resources/images/bitcoin-cli.PNG b/pybitblock/resources/images/bitcoin-cli.PNG similarity index 100% rename from resources/images/bitcoin-cli.PNG rename to pybitblock/resources/images/bitcoin-cli.PNG diff --git a/resources/images/conf.PNG b/pybitblock/resources/images/conf.PNG similarity index 100% rename from resources/images/conf.PNG rename to pybitblock/resources/images/conf.PNG diff --git a/resources/images/console.PNG b/pybitblock/resources/images/console.PNG similarity index 100% rename from resources/images/console.PNG rename to pybitblock/resources/images/console.PNG diff --git a/resources/images/design1.PNG b/pybitblock/resources/images/design1.PNG similarity index 100% rename from resources/images/design1.PNG rename to pybitblock/resources/images/design1.PNG diff --git a/resources/images/design2.PNG b/pybitblock/resources/images/design2.PNG similarity index 100% rename from resources/images/design2.PNG rename to pybitblock/resources/images/design2.PNG diff --git a/resources/images/funb.PNG b/pybitblock/resources/images/funb.PNG similarity index 100% rename from resources/images/funb.PNG rename to pybitblock/resources/images/funb.PNG diff --git a/resources/images/image.png b/pybitblock/resources/images/image.png similarity index 100% rename from resources/images/image.png rename to pybitblock/resources/images/image.png diff --git a/resources/images/main.PNG b/pybitblock/resources/images/main.PNG similarity index 100% rename from resources/images/main.PNG rename to pybitblock/resources/images/main.PNG diff --git a/resources/images/satnode.PNG b/pybitblock/resources/images/satnode.PNG similarity index 100% rename from resources/images/satnode.PNG rename to pybitblock/resources/images/satnode.PNG diff --git a/resources/images/start.png b/pybitblock/resources/images/start.png similarity index 100% rename from resources/images/start.png rename to pybitblock/resources/images/start.png diff --git a/resources/images/sysinfo.PNG b/pybitblock/resources/images/sysinfo.PNG similarity index 100% rename from resources/images/sysinfo.PNG rename to pybitblock/resources/images/sysinfo.PNG diff --git a/routes.py b/pybitblock/routes.py similarity index 100% rename from routes.py rename to pybitblock/routes.py diff --git a/sysinf.py b/pybitblock/sysinf.py similarity index 100% rename from sysinf.py rename to pybitblock/sysinf.py diff --git a/terminal_matrix/LICENSE.GPL b/pybitblock/terminal_matrix/LICENSE.GPL similarity index 100% rename from terminal_matrix/LICENSE.GPL rename to pybitblock/terminal_matrix/LICENSE.GPL diff --git a/terminal_matrix/README.md b/pybitblock/terminal_matrix/README.md similarity index 100% rename from terminal_matrix/README.md rename to pybitblock/terminal_matrix/README.md diff --git a/terminal_matrix/matrix.py b/pybitblock/terminal_matrix/matrix.py similarity index 100% rename from terminal_matrix/matrix.py rename to pybitblock/terminal_matrix/matrix.py diff --git a/pyproject.toml b/pyproject.toml index ceb8664..3877984 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,12 @@ [tool.poetry] -name = "pyblock" +name = "pybitblock" version = "0.9.8.9" description = "Python Bitcoin block dashboard, transactions, send message to Space and more" +license="MIT" authors = ["curly60e ", "SatoshiNakamotoBitcoin"] +readme="README.md" +repository="https://github.com/curly60e/pyblock" +homepage="https://github.com/curly60e/pyblock" [tool.poetry.dependencies] python = ">=3.7,<3.11" @@ -30,9 +34,13 @@ numpy = "^1.21.4" googleapis-common-protos = "1.52.0" grpcio = "^1.42.0" pdfminer = "^20191125" +typer = "^0.4.0" [tool.poetry.dev-dependencies] [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" + +[tool.poetry.scripts] +pyblock = "pybitblock.console:main" diff --git a/terminal_matrix/__pycache__/matrix.cpython-37.pyc b/terminal_matrix/__pycache__/matrix.cpython-37.pyc deleted file mode 100644 index 6b3e057..0000000 Binary files a/terminal_matrix/__pycache__/matrix.cpython-37.pyc and /dev/null differ