add setup.py

Author: peiyun@inj21

setup.py

@@ -9,24 +9,25 @@
 import sys
 from shutil import rmtree
 
-from setuptools import setup, Command
+from setuptools import setup, Command, find_packages
 
-NAME = 'injective.sdk'
-DESCRIPTION = 'Injective Python SDK, with Exchange API client'
-URL = 'https://github.com/InjectiveLabs/sdk-python'
-EMAIL = '[email protected]'
-AUTHOR = 'Injective Labs'
-REQUIRES_PYTHON = '>=3.9.0'
-VERSION = '0.2.0'
+NAME = "injective-py"
+DESCRIPTION = "Injective Python SDK, with Exchange API client"
+URL = "https://github.com/InjectiveLabs/sdk-python"
+EMAIL = "[email protected]"
+AUTHOR = "Injective Labs"
+REQUIRES_PYTHON = ">=3.9.0"
+VERSION = "0.2.0"
 
 REQUIRED = [
-    'grpcio',
-    'asyncio',
-    'aiohttp',
-    'ecdsa',
-    'bech32',
-    'mnemonic',
-    'hdwallets',
+    "grpcio",
+    "asyncio",
+    "aiohttp",
+    "ecdsa",
+    "bech32",
+    "mnemonic",
+    "hdwallets",
+    "pysha3",
 ]
 
 # The rest you shouldn't have to touch too much :)
@@ -39,31 +40,31 @@
 # Import the README and use it as the long-description.
 # Note: this will only work if 'README.md' is present in your MANIFEST.in file!
 try:
-    with io.open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
-        long_description = '\n' + f.read()
+    with io.open(os.path.join(here, "README.md"), encoding="utf-8") as f:
+        long_description = "\n" + f.read()
 except FileNotFoundError:
     long_description = DESCRIPTION
 
 # Load the package's __version__.py module as a dictionary.
 about = {}
 if not VERSION:
     project_slug = NAME.lower().replace("-", "_").replace(" ", "_")
-    with open(os.path.join(here, project_slug, '__version__.py')) as f:
+    with open(os.path.join(here, project_slug, "__version__.py")) as f:
         exec(f.read(), about)
 else:
-    about['__version__'] = VERSION
+    about["__version__"] = VERSION
 
 
 class UploadCommand(Command):
     """Support setup.py upload."""
 
-    description = 'Build and publish the package.'
+    description = "Build and publish the package."
     user_options = []
 
     @staticmethod
     def status(s):
         """Prints things in bold."""
-        print('\033[1m{0}\033[0m'.format(s))
+        print("\033[1m{0}\033[0m".format(s))
 
     def initialize_options(self):
         pass
@@ -73,55 +74,52 @@ def finalize_options(self):
 
     def run(self):
         try:
-            self.status('Removing previous builds…')
-            rmtree(os.path.join(here, 'dist'))
+            self.status("Removing previous builds…")
+            rmtree(os.path.join(here, "dist"))
         except OSError:
             pass
 
-        self.status('Building Source and Wheel (universal) distribution…')
-        os.system('{0} setup.py sdist bdist_wheel --universal'.format(sys.executable))
+        self.status("Building Source and Wheel (universal) distribution…")
+        os.system("{0} setup.py sdist bdist_wheel --universal".format(sys.executable))
 
-        self.status('Uploading the package to PyPI via Twine…')
-        os.system('twine upload dist/*')
+        self.status("Uploading the package to PyPI via Twine…")
+        os.system("twine upload dist/*")
 
-        self.status('Pushing git tags…')
-        os.system('git tag v{0}'.format(about['__version__']))
-        os.system('git push --tags')
+        self.status("Pushing git tags…")
+        os.system("git tag v{0}".format(about["__version__"]))
+        os.system("git push --tags")
 
         sys.exit()
 
 
 # Where the magic happens:
 setup(
     name=NAME,
-    version=about['__version__'],
+    version=about["__version__"],
     description=DESCRIPTION,
     long_description=long_description,
-    long_description_content_type='text/markdown',
+    long_description_content_type="text/markdown",
     author=AUTHOR,
     author_email=EMAIL,
     python_requires=REQUIRES_PYTHON,
     url=URL,
-    py_modules=['exchange_api', 'chainclient'],
-
-    # entry_points={
-    #     'console_scripts': ['mycli=mymodule:cli'],
-    # },
+    package_dir={"": "src"},
+    packages=find_packages(where="src"),
     install_requires=REQUIRED,
     include_package_data=True,
-    license='Apache 2.0',
+    license="Apache Software License 2.0",
     classifiers=[
         # Trove classifiers
         # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
-        'License :: OSI Approved :: Apache 2.0 License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy'
+        "License :: OSI Approved :: Apache Software License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
     ],
     # $ setup.py publish support.
     cmdclass={
-        'upload': UploadCommand,
+        "upload": UploadCommand,
     },
-)
+)

src/injective/__init__.py

@@ -1,9 +1,9 @@
 from hdwallets import BIP32DerivationError as BIP32DerivationError
 
-from chainclient._transaction import Transaction as Transaction
-from chainclient._wallet import generate_wallet as generate_wallet
-from chainclient._wallet import privkey_to_address as privkey_to_address
-from chainclient._wallet import privkey_to_pubkey as privkey_to_pubkey
-from chainclient._wallet import privkey_to_uncompressed_pubkey as privkey_to_uncompressed_pubkey
-from chainclient._wallet import pubkey_to_address as pubkey_to_address
-from chainclient._wallet import seed_to_privkey as seed_to_privkey
+from ._transaction import Transaction as Transaction
+from ._wallet import generate_wallet as generate_wallet
+from ._wallet import privkey_to_address as privkey_to_address
+from ._wallet import privkey_to_pubkey as privkey_to_pubkey
+from ._wallet import privkey_to_uncompressed_pubkey as privkey_to_uncompressed_pubkey
+from ._wallet import pubkey_to_address as pubkey_to_address
+from ._wallet import seed_to_privkey as seed_to_privkey

src/injective/chainclient/__init__.py

@@ -1,13 +1,12 @@
 import base64
-import hashlib
 import json
 from typing import Any, Dict, List
 
 import ecdsa
 import sha3
 
-from _wallet import DEFAULT_BECH32_HRP, privkey_to_address, privkey_to_pubkey
-from _typings import SyncMode
+from ._wallet import DEFAULT_BECH32_HRP, privkey_to_address, privkey_to_pubkey
+from ._typings import SyncMode
 
 
 class Transaction:
@@ -47,7 +46,9 @@ def __init__(
 
     # Cosmos SDK • Bank Module
 
-    def add_cosmos_bank_msg_send(self, recipient: str, amount: int, denom: str = "inj") -> None:
+    def add_cosmos_bank_msg_send(
+        self, recipient: str, amount: int, denom: str = "inj"
+    ) -> None:
         msg = {
             "type": "cosmos-sdk/MsgSend",
             "value": {
@@ -60,7 +61,9 @@ def add_cosmos_bank_msg_send(self, recipient: str, amount: int, denom: str = "in
 
     # Injective • Exchange Module
 
-    def add_exchange_msg_deposit(self, subaccount: str, amount: int, denom: str = "inj") -> None:
+    def add_exchange_msg_deposit(
+        self, subaccount: str, amount: int, denom: str = "inj"
+    ) -> None:
         msg = {
             "type": "exchange/MsgDeposit",
             "value": {
@@ -85,7 +88,10 @@ def get_signed(self) -> str:
                 "signatures": [
                     {
                         "signature": self._sign(),
-                        "pub_key": {"type": "injective/PubKeyEthSecp256k1", "value": base64_pubkey},
+                        "pub_key": {
+                            "type": "injective/PubKeyEthSecp256k1",
+                            "value": base64_pubkey,
+                        },
                         "account_number": str(self._account_num),
                         "sequence": str(self._sequence),
                     }
@@ -96,14 +102,20 @@ def get_signed(self) -> str:
         return json.dumps(signed_tx, separators=(",", ":"))
 
     def _sign(self) -> str:
-        message_str = json.dumps(self._get_sign_message(), separators=(",", ":"), sort_keys=True)
+        message_str = json.dumps(
+            self._get_sign_message(), separators=(",", ":"), sort_keys=True
+        )
         message_bytes = message_str.encode("utf-8")
 
         privkey = ecdsa.SigningKey.from_string(self._privkey, curve=ecdsa.SECP256k1)
         signature_compact_keccak = privkey.sign_deterministic(
-            message_bytes, hashfunc=sha3.keccak_256, sigencode=ecdsa.util.sigencode_string_canonize
+            message_bytes,
+            hashfunc=sha3.keccak_256,
+            sigencode=ecdsa.util.sigencode_string_canonize,
+        )
+        signature_base64_str = base64.b64encode(signature_compact_keccak).decode(
+            "utf-8"
         )
-        signature_base64_str = base64.b64encode(signature_compact_keccak).decode("utf-8")
         return signature_base64_str
 
     def _get_sign_message(self) -> Dict[str, Any]:

src/injective/chainclient/_transaction.py

@@ -1,13 +1,11 @@
-import hashlib
-
 import bech32
 import ecdsa
 import hdwallets
 import mnemonic
 import sha3
 
 from hdwallets import BIP32DerivationError as BIP32DerivationError
-from _typings import Wallet
+from ._typings import Wallet
 
 
 DEFAULT_DERIVATION_PATH = "m/44'/60'/0'/0/0"