hive-nectar 0.0.5__py3-none-any.whl → 0.0.7__py3-none-any.whl

nectar/hive.py

@@ -6,7 +6,6 @@ from datetime import date, datetime, timezone
 from nectar.blockchaininstance import BlockChainInstance
 from nectar.constants import STEEM_100_PERCENT
 from nectargraphenebase.chains import known_chains
-from nectargraphenebase.py23 import string_types
 
 from .amount import Amount
 from .utils import formatToTimeStamp
@@ -124,7 +123,7 @@ class Hive(BlockChainInstance):
             return known_chains["HIVE"]
         try:
             return self.rpc.get_network(props=config)
-        except:
+        except Exception:
             return known_chains["HIVE"]
 
     def rshares_to_token_backed_dollar(
@@ -362,7 +361,7 @@ class Hive(BlockChainInstance):
         """
         if isinstance(hbd, Amount):
             hbd = Amount(hbd, blockchain_instance=self)
-        elif isinstance(hbd, string_types):
+        elif isinstance(hbd, str):
             hbd = Amount(hbd, blockchain_instance=self)
         else:
             hbd = Amount(hbd, self.hbd_symbol, blockchain_instance=self)
@@ -486,7 +485,7 @@ class Hive(BlockChainInstance):
         """
         if isinstance(hbd, Amount):
             hbd = Amount(hbd, blockchain_instance=self)
-        elif isinstance(hbd, string_types):
+        elif isinstance(hbd, str):
             hbd = Amount(hbd, blockchain_instance=self)
         else:
             hbd = Amount(hbd, self.hbd_symbol, blockchain_instance=self)

nectar/hivesigner.py

@@ -33,7 +33,7 @@ class HiveSigner(object):
         from nectar import Steem
         from nectar.HiveSigner import HiveSigner
         from nectar.comment import Comment
-        hs = HiveSigner(client_id="nectar.app")
+        hs = HiveSigner(client_id="nectarflower")
         steem = Steem(HiveSigner=hs)
         steem.wallet.unlock("supersecret-passphrase")
         post = Comment("author/permlink", blockchain_instance=steem)
@@ -377,7 +377,7 @@ class HiveSigner(object):
                     try:
                         amount = Amount(value, blockchain_instance=self.blockchain)
                         params[key] = str(amount)
-                    except:
+                    except Exception:
                         amount = None
                 elif isinstance(value, bool):
                     if value:

nectar/imageuploader.py

@@ -6,7 +6,6 @@ import requests
 
 from nectar.account import Account
 from nectargraphenebase.ecdsasig import sign_message
-from nectargraphenebase.py23 import py23_bytes, string_types
 
 from .instance import shared_blockchain_instance
 
@@ -55,14 +54,14 @@ class ImageUploader(object):
         for authority in account["posting"]["key_auths"]:
             posting_wif = self.steem.wallet.getPrivateKeyForPublicKey(authority[0])
 
-        if isinstance(image, string_types):
+        if isinstance(image, str):
             image_data = open(image, "rb").read()
         elif isinstance(image, io.BytesIO):
             image_data = image.read()
         else:
             image_data = image
 
-        message = py23_bytes(self.challenge, "ascii") + image_data
+        message = bytes(self.challenge, "ascii") + image_data
         signature = sign_message(message, posting_wif)
         signature_in_hex = hexlify(signature).decode("ascii")
 

nectar/price.py

@@ -3,7 +3,6 @@ from decimal import Decimal
 from fractions import Fraction
 
 from nectar.instance import shared_blockchain_instance
-from nectargraphenebase.py23 import integer_types, string_types
 
 from .amount import Amount
 from .asset import Asset
@@ -97,7 +96,7 @@ class Price(dict):
         self.blockchain = blockchain_instance or shared_blockchain_instance()
         if price == "":
             price = None
-        if price is not None and isinstance(price, string_types) and not base and not quote:
+        if price is not None and isinstance(price, str) and not base and not quote:
             price, assets = price.split(" ")
             base_symbol, quote_symbol = assets_from_string(assets)
             base = Asset(base_symbol, blockchain_instance=self.blockchain)
@@ -131,9 +130,7 @@ class Price(dict):
                 amount=frac.numerator, asset=base, blockchain_instance=self.blockchain
             )
 
-        elif (
-            price is not None and isinstance(base, string_types) and isinstance(quote, string_types)
-        ):
+        elif price is not None and isinstance(base, str) and isinstance(quote, str):
             base = Asset(base, blockchain_instance=self.blockchain)
             quote = Asset(quote, blockchain_instance=self.blockchain)
             frac = Fraction(float(price)).limit_denominator(10 ** base["precision"])
@@ -144,12 +141,10 @@ class Price(dict):
                 amount=frac.numerator, asset=base, blockchain_instance=self.blockchain
             )
 
-        elif price is None and isinstance(base, string_types) and isinstance(quote, string_types):
+        elif price is None and isinstance(base, str) and isinstance(quote, str):
             self["quote"] = Amount(quote, blockchain_instance=self.blockchain)
             self["base"] = Amount(base, blockchain_instance=self.blockchain)
-        elif (
-            price is not None and isinstance(price, string_types) and isinstance(base, string_types)
-        ):
+        elif price is not None and isinstance(price, str) and isinstance(base, str):
             self["quote"] = Amount(price, blockchain_instance=self.blockchain)
             self["base"] = Amount(base, blockchain_instance=self.blockchain)
         # len(args) > 1
@@ -163,10 +158,8 @@ class Price(dict):
             self["base"] = base
 
         elif (
-            isinstance(price, float)
-            or isinstance(price, integer_types)
-            or isinstance(price, Decimal)
-        ) and isinstance(base, string_types):
+            isinstance(price, float) or isinstance(price, int) or isinstance(price, Decimal)
+        ) and isinstance(base, str):
             base_symbol, quote_symbol = assets_from_string(base)
             base = Asset(base_symbol, blockchain_instance=self.blockchain)
             quote = Asset(quote_symbol, blockchain_instance=self.blockchain)

nectar/rc.py

@@ -9,7 +9,6 @@ from nectar.constants import (
 from nectarbase import operations
 from nectarbase.objects import Operation
 from nectarbase.signedtransactions import Signed_Transaction
-from nectargraphenebase.py23 import py23_bytes
 
 from .instance import shared_blockchain_instance
 
@@ -38,7 +37,7 @@ class RC(object):
             operations=ops,
         )
         tx = tx.sign([wif], chain=prefix)
-        txWire = hexlify(py23_bytes(tx)).decode("ascii")
+        txWire = hexlify(bytes(tx)).decode("ascii")
         tx_size = len(txWire)
         return tx_size
 

nectar/steem.py

@@ -6,7 +6,6 @@ from datetime import date, datetime, timezone
 from nectar.blockchaininstance import BlockChainInstance
 from nectar.constants import STEEM_100_PERCENT, STEEM_VOTE_REGENERATION_SECONDS
 from nectargraphenebase.chains import known_chains
-from nectargraphenebase.py23 import string_types
 
 from .amount import Amount
 from .utils import formatToTimeStamp
@@ -124,7 +123,7 @@ class Steem(BlockChainInstance):
             return known_chains["STEEM"]
         try:
             return self.rpc.get_network(props=config)
-        except:
+        except Exception:
             return known_chains["STEEM"]
 
     def rshares_to_token_backed_dollar(
@@ -393,7 +392,7 @@ class Steem(BlockChainInstance):
         """
         if isinstance(sbd, Amount):
             sbd = Amount(sbd, blockchain_instance=self)
-        elif isinstance(sbd, string_types):
+        elif isinstance(sbd, str):
             sbd = Amount(sbd, blockchain_instance=self)
         else:
             sbd = Amount(sbd, self.sbd_symbol, blockchain_instance=self)
@@ -517,7 +516,7 @@ class Steem(BlockChainInstance):
         """
         if isinstance(sbd, Amount):
             sbd = Amount(sbd, blockchain_instance=self)
-        elif isinstance(sbd, string_types):
+        elif isinstance(sbd, str):
             sbd = Amount(sbd, blockchain_instance=self)
         else:
             sbd = Amount(sbd, self.sbd_symbol, blockchain_instance=self)

nectar/transactionbuilder.py

@@ -279,7 +279,7 @@ class TransactionBuilder(dict):
             try:
                 PrivateKey(wif, prefix=self.blockchain.prefix)
                 self.wifs.add(wif)
-            except:
+            except Exception:
                 raise InvalidWifError
 
     def clearWifs(self):
@@ -427,7 +427,7 @@ class TransactionBuilder(dict):
             # try:
             #    ledgertx = Ledger_Transaction(**self.json(with_prefix=True))
             #    ledgertx.add_custom_chains(self.blockchain.custom_chains)
-            # except:
+            # except Exception:
             #    raise ValueError("Invalid TransactionBuilder Format")
             # ledgertx.sign(self.path, chain=self.blockchain.chain_params)
             self.ledgertx.sign(self.path, chain=self.blockchain.chain_params)
@@ -438,7 +438,16 @@ class TransactionBuilder(dict):
                 raise MissingKeyError
 
             self.tx.sign(self.wifs, chain=self.blockchain.chain_params)
-            self["signatures"].extend(self.tx.json().get("signatures"))
+            # Defensive: ensure self["signatures"] is a list before extend
+            if isinstance(self["signatures"], str):
+                log.warning(
+                    "self['signatures'] was a string, converting to list to avoid AttributeError."
+                )
+                self["signatures"] = [self["signatures"]]
+            sigs = self.tx.json().get("signatures")
+            if isinstance(sigs, str):
+                sigs = [sigs]
+            self["signatures"].extend(sigs)
             return self.tx
 
     def verify_authority(self):

nectar/version.py

@@ -1,3 +1,3 @@
 """THIS FILE IS GENERATED FROM nectar PYPROJECT.TOML."""
 
-version = "0.0.5"
+version = "0.0.7"

nectar/vote.py

@@ -5,7 +5,6 @@ from datetime import date, datetime, timezone
 from prettytable import PrettyTable
 
 from nectarapi.exceptions import InvalidParameters, UnknownKey
-from nectargraphenebase.py23 import integer_types, string_types
 
 from .account import Account
 from .blockchainobject import BlockchainObject
@@ -42,7 +41,7 @@ class Vote(BlockchainObject):
             elif kwargs.get("hive_instance"):
                 blockchain_instance = kwargs["hive_instance"]
         self.blockchain = blockchain_instance or shared_blockchain_instance()
-        if isinstance(voter, string_types) and authorperm is not None:
+        if isinstance(voter, str) and authorperm is not None:
             [author, permlink] = resolve_authorperm(authorperm)
             self["voter"] = voter
             self["author"] = author
@@ -138,20 +137,20 @@ class Vote(BlockchainObject):
             "reputation",
         ]
         for p in parse_int:
-            if p in vote and isinstance(vote.get(p), string_types):
+            if p in vote and isinstance(vote.get(p), str):
                 vote[p] = int(vote.get(p, "0"))
 
-        if "time" in vote and isinstance(vote.get("time"), string_types) and vote.get("time") != "":
+        if "time" in vote and isinstance(vote.get("time"), str) and vote.get("time") != "":
             vote["time"] = formatTimeString(vote.get("time", "1970-01-01T00:00:00"))
         elif (
             "timestamp" in vote
-            and isinstance(vote.get("timestamp"), string_types)
+            and isinstance(vote.get("timestamp"), str)
             and vote.get("timestamp") != ""
         ):
             vote["time"] = formatTimeString(vote.get("timestamp", "1970-01-01T00:00:00"))
         elif (
             "last_update" in vote
-            and isinstance(vote.get("last_update"), string_types)
+            and isinstance(vote.get("last_update"), str)
             and vote.get("last_update") != ""
         ):
             vote["last_update"] = formatTimeString(vote.get("last_update", "1970-01-01T00:00:00"))
@@ -178,7 +177,7 @@ class Vote(BlockchainObject):
             "reputation",
         ]
         for p in parse_int:
-            if p in output and isinstance(output[p], integer_types):
+            if p in output and isinstance(output[p], int):
                 output[p] = str(output[p])
         return json.loads(str(json.dumps(output)))
 
@@ -456,7 +455,7 @@ class ActiveVotes(VotesObject):
                     authorperm["author"], authorperm["permlink"], api="condenser"
                 )
             authorperm = authorperm["authorperm"]
-        elif isinstance(authorperm, string_types):
+        elif isinstance(authorperm, str):
             [author, permlink] = resolve_authorperm(authorperm)
             if self.blockchain.rpc.get_use_appbase():
                 self.blockchain.rpc.set_next_node_on_empty_reply(False)
@@ -534,7 +533,7 @@ class AccountVotes(VotesObject):
                 time = x.get("last_update", "")
                 if time != "":
                     x["time"] = time
-            if time != "" and isinstance(time, string_types):
+            if time != "" and isinstance(time, str):
                 d_time = formatTimeString(time)
             elif isinstance(time, datetime):
                 d_time = time

nectar/wallet.py

@@ -409,7 +409,7 @@ class Wallet(object):
         else:
             try:
                 account = Account(name, blockchain_instance=self.blockchain)
-            except:
+            except Exception:
                 return
             return {
                 "name": account["name"],

nectarapi/exceptions.py

@@ -19,37 +19,43 @@ def decodeRPCErrorMsg(e):
         return str(e)
 
 
-class UnauthorizedError(Exception):
+class NectarApiException(Exception):
+    """NectarApiException base Exception."""
+
+    pass
+
+
+class UnauthorizedError(NectarApiException):
     """UnauthorizedError Exception."""
 
     pass
 
 
-class RPCConnection(Exception):
+class RPCConnection(NectarApiException):
     """RPCConnection Exception."""
 
     pass
 
 
-class RPCError(Exception):
+class RPCError(NectarApiException):
     """RPCError Exception."""
 
     pass
 
 
-class RPCErrorDoRetry(Exception):
+class RPCErrorDoRetry(NectarApiException):
     """RPCErrorDoRetry Exception."""
 
     pass
 
 
-class NumRetriesReached(Exception):
+class NumRetriesReached(NectarApiException):
     """NumRetriesReached Exception."""
 
     pass
 
 
-class CallRetriesReached(Exception):
+class CallRetriesReached(NectarApiException):
     """CallRetriesReached Exception. Only for internal use"""
 
     pass
@@ -91,33 +97,33 @@ class FilteredItemNotFound(RPCError):
     pass
 
 
-class InvalidEndpointUrl(Exception):
+class InvalidEndpointUrl(NectarApiException):
     pass
 
 
-class InvalidParameters(Exception):
+class InvalidParameters(NectarApiException):
     pass
 
 
-class SupportedByHivemind(Exception):
+class SupportedByHivemind(NectarApiException):
     pass
 
 
-class UnnecessarySignatureDetected(Exception):
+class UnnecessarySignatureDetected(NectarApiException):
     pass
 
 
-class WorkingNodeMissing(Exception):
+class WorkingNodeMissing(NectarApiException):
     pass
 
 
-class TimeoutException(Exception):
+class TimeoutException(NectarApiException):
     pass
 
 
-class VotedBeforeWaitTimeReached(Exception):
+class VotedBeforeWaitTimeReached(NectarApiException):
     pass
 
 
-class UnknownTransaction(Exception):
+class UnknownTransaction(NectarApiException):
     pass

nectarapi/graphenerpc.py

@@ -46,7 +46,7 @@ log = logging.getLogger(__name__)
 
 
 class SessionInstance(object):
-    """Singelton for the Session Instance"""
+    """Singleton for the Session Instance"""
 
     instance = None
 
@@ -59,7 +59,7 @@ def set_session_instance(instance):
 def shared_session_instance():
     """Get session instance"""
     if REQUEST_MODULE is None:
-        raise Exception()
+        raise Exception("Requests module is not available.")
     if not SessionInstance.instance:
         SessionInstance.instance = requests.Session()
     return SessionInstance.instance
@@ -68,7 +68,7 @@ def shared_session_instance():
 def create_ws_instance(use_ssl=True, enable_multithread=True):
     """Get websocket instance"""
     if WEBSOCKET_MODULE is None:
-        raise Exception()
+        raise Exception("WebSocket module is not available.")
     if use_ssl:
         ssl_defaults = ssl.get_default_verify_paths()
         sslopt_ca_certs = {"ca_certs": ssl_defaults.cafile}
@@ -79,47 +79,24 @@ def create_ws_instance(use_ssl=True, enable_multithread=True):
 
 class GrapheneRPC(object):
     """
-    This class allows to call API methods synchronously, without callbacks.
+    This class allows calling API methods synchronously, without callbacks.
 
     It logs warnings and errors.
 
     :param str urls: Either a single Websocket/Http URL, or a list of URLs
     :param str user: Username for Authentication
     :param str password: Password for Authentication
-    :param int num_retries: Try x times to num_retries to a node on disconnect, -1 for indefinitely (default is 100)
-    :param int num_retries_call: Repeat num_retries_call times a rpc call on node error (default is 5)
-    :param int timeout: Timeout setting for https nodes (default is 60)
-    :param bool autoconnect: When set to false, connection is performed on the first rpc call (default is True)
-    :param bool use_condenser: Use the old condenser_api rpc protocol on nodes with version
-        0.19.4 or higher. The settings has no effect on nodes with version of 0.19.3 or lower.
-    :param bool use_tor: When set to true, 'socks5h://localhost:9050' is set as proxy
-    :param dict custom_chains: custom chain which should be added to the known chains
-
-    Available APIs:
-
-          * database
-          * network_node
-          * network_broadcast
-
-    Usage:
-
-        .. code-block:: python
-
-            from nectarapi.graphenerpc import GrapheneRPC
-            ws = GrapheneRPC("wss://steemd.pevo.science","","")
-            print(ws.get_account_count())
-
-            ws = GrapheneRPC("https://api.steemit.com","","")
-            print(ws.get_account_count())
-
-    .. note:: This class allows to call methods available via
-              websocket. If you want to use the notification
-              subsystem, please use ``GrapheneWebsocket`` instead.
-
+    :param int num_retries: Number of retries for node connection (default is 100)
+    :param int num_retries_call: Number of retries for RPC calls on node error (default is 5)
+    :param int timeout: Timeout setting for HTTP nodes (default is 60)
+    :param bool autoconnect: Automatically connect on initialization (default is True)
+    :param bool use_condenser: Use the old condenser_api RPC protocol
+    :param bool use_tor: Use Tor proxy for connections
+    :param dict custom_chains: Custom chains to add to known chains
     """
 
     def __init__(self, urls, user=None, password=None, **kwargs):
-        """Init."""
+        """Initialize the RPC client."""
         self.rpc_methods = {"offline": -1, "ws": 0, "jsonrpc": 1, "wsappbase": 2, "appbase": 3}
         self.current_rpc = self.rpc_methods["ws"]
         self._request_id = 0
@@ -454,11 +431,12 @@ class GrapheneRPC(object):
         :raises ValueError: if the server does not respond in proper JSON format
         :raises RPCError: if the server returns an error
         """
-        log.debug(json.dumps(payload))
+        log.debug(f"Payload: {json.dumps(payload)}")
         if self.nodes.working_nodes_count == 0:
-            raise WorkingNodeMissing
+            raise WorkingNodeMissing("No working nodes available.")
         if self.url is None:
             raise RPCConnection("RPC is not connected!")
+
         reply = {}
         response = None
         while True:
@@ -488,13 +466,9 @@ class GrapheneRPC(object):
             except KeyboardInterrupt:
                 raise
             except WebSocketConnectionClosedException as e:
-                if self.nodes.num_retries_call_reached:
-                    self.nodes.increase_error_cnt()
-                    self.nodes.sleep_and_check_retries(str(e), sleep=False, call_retry=False)
-                    self.rpcconnect()
-                else:
-                    # self.nodes.sleep_and_check_retries(str(e), sleep=True, call_retry=True)
-                    self.rpcconnect(next_url=False)
+                self.nodes.increase_error_cnt()
+                self.nodes.sleep_and_check_retries(str(e), sleep=False, call_retry=False)
+                self.rpcconnect()
             except ConnectionError as e:
                 self.nodes.increase_error_cnt()
                 self.nodes.sleep_and_check_retries(str(e), sleep=False, call_retry=False)
@@ -508,48 +482,47 @@ class GrapheneRPC(object):
                 self.nodes.sleep_and_check_retries(str(e), sleep=False, call_retry=False)
                 self.rpcconnect()
 
-        ret = {}
         try:
             if response is None:
-                ret = json.loads(reply, strict=False, encoding="utf-8")
+                try:
+                    ret = json.loads(reply, strict=False)
+                except ValueError:
+                    log.error(f"Non-JSON response: {reply} Node: {self.url}")
+                    self._check_for_server_error(reply)
+                    raise RPCError("Invalid response format")
             else:
                 ret = response.json()
         except ValueError:
             self._check_for_server_error(reply)
 
-        log.debug(json.dumps(reply))
+        log.debug(f"Reply: {json.dumps(reply)}")
 
         if isinstance(ret, dict) and "error" in ret:
-            if "detail" in ret["error"]:
-                raise RPCError(ret["error"]["detail"])
-            else:
-                raise RPCError(ret["error"]["message"])
-        else:
-            if isinstance(ret, list):
-                ret_list = []
-                for r in ret:
-                    if isinstance(r, dict) and "error" in r:
-                        if "detail" in r["error"]:
-                            raise RPCError(r["error"]["detail"])
-                        else:
-                            raise RPCError(r["error"]["message"])
-                    elif isinstance(r, dict) and "result" in r:
-                        ret_list.append(r["result"])
-                    else:
-                        ret_list.append(r)
-                self.nodes.reset_error_cnt_call()
-                return ret_list
-            elif isinstance(ret, dict) and "result" in ret:
-                self.nodes.reset_error_cnt_call()
-                return ret["result"]
-            elif isinstance(ret, int):
-                raise RPCError(
-                    "Client returned invalid format. Expected JSON! Output: %s" % (str(ret))
+            if isinstance(ret["error"], dict):
+                error_message = ret["error"].get(
+                    "detail", ret["error"].get("message", "Unknown error")
                 )
-            else:
-                self.nodes.reset_error_cnt_call()
-                return ret
-        return ret
+                raise RPCError(error_message)
+        elif isinstance(ret, list):
+            ret_list = []
+            for r in ret:
+                if isinstance(r, dict) and "error" in r:
+                    error_message = r["error"].get(
+                        "detail", r["error"].get("message", "Unknown error")
+                    )
+                    raise RPCError(error_message)
+                elif isinstance(r, dict) and "result" in r:
+                    ret_list.append(r["result"])
+                else:
+                    ret_list.append(r)
+            self.nodes.reset_error_cnt_call()
+            return ret_list
+        elif isinstance(ret, dict) and "result" in ret:
+            self.nodes.reset_error_cnt_call()
+            return ret["result"]
+        else:
+            log.error(f"Unexpected response format: {ret} Node: {self.url}")
+            raise RPCError(f"Unexpected response format: {ret}")
 
     # End of Deprecated methods
     ####################################################################

nectarapi/version.py

@@ -1,3 +1,3 @@
 """THIS FILE IS GENERATED FROM nectar PYPROJECT.TOML."""
 
-version = "0.0.5"
+version = "0.0.7"

nectarbase/ledgertransactions.py

@@ -3,7 +3,6 @@ import logging
 
 from nectargraphenebase.account import PublicKey
 from nectargraphenebase.chains import known_chains
-from nectargraphenebase.py23 import py23_bytes
 from nectargraphenebase.types import (
     Array,
     Signature,
@@ -54,7 +53,7 @@ class Ledger_Transaction(GrapheneUnsigned_Transaction):
         dongle = getDongle(True)
         apdu_list = self.build_apdu(path, chain)
         for apdu in apdu_list:
-            result = dongle.exchange(py23_bytes(apdu))
+            result = dongle.exchange(bytes(apdu))
         dongle.close()
         sigs = []
         signature = result
@@ -67,7 +66,7 @@ class Ledger_Transaction(GrapheneUnsigned_Transaction):
 
         dongle = getDongle(True)
         apdu = self.build_apdu_pubkey(path, request_screen_approval)
-        result = dongle.exchange(py23_bytes(apdu))
+        result = dongle.exchange(bytes(apdu))
         dongle.close()
         offset = 1 + result[0]
         address = result[offset + 1 : offset + 1 + result[offset]]