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

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.6"
+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/version.py

@@ -1,3 +1,3 @@
 """THIS FILE IS GENERATED FROM nectar PYPROJECT.TOML."""
 
-version = "0.0.6"
+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]]

nectarbase/memo.py

@@ -3,7 +3,6 @@ import hashlib
 from binascii import hexlify, unhexlify
 
 from nectargraphenebase.base58 import base58decode, base58encode
-from nectargraphenebase.py23 import py23_bytes
 from nectargraphenebase.types import varintdecode
 
 try:
@@ -50,7 +49,7 @@ def init_aes(shared_secret, nonce):
     " Shared Secret "
     ss = hashlib.sha512(unhexlify(shared_secret)).digest()
     " Seed "
-    seed = py23_bytes(str(nonce), "ascii") + hexlify(ss)
+    seed = bytes(str(nonce), "ascii") + hexlify(ss)
     seed_digest = hexlify(hashlib.sha512(seed).digest()).decode("ascii")
     " AES "
     key = unhexlify(seed_digest[0:64])
@@ -76,7 +75,7 @@ def init_aes_bts(shared_secret, nonce):
     return AES.new(key, AES.MODE_CBC, iv)
 
 
-def init_aes(shared_secret, nonce):
+def init_aes2(shared_secret, nonce):
     """Initialize AES instance
     :param hex shared_secret: Shared Secret to use as encryption key
     :param int nonce: Random nonce
@@ -121,7 +120,7 @@ def encode_memo_bts(priv, pub, nonce, message):
     shared_secret = get_shared_secret(priv, pub)
     aes = init_aes_bts(shared_secret, nonce)
     " Checksum "
-    raw = py23_bytes(message, "utf8")
+    raw = bytes(message, "utf8")
     checksum = hashlib.sha256(raw).digest()
     raw = checksum[0:4] + raw
     " Padding "
@@ -146,7 +145,7 @@ def decode_memo_bts(priv, pub, nonce, message):
     shared_secret = get_shared_secret(priv, pub)
     aes = init_aes_bts(shared_secret, nonce)
     " Encryption "
-    raw = py23_bytes(message, "ascii")
+    raw = bytes(message, "ascii")
     cleartext = aes.decrypt(unhexlify(raw))
     " Checksum "
     checksum = cleartext[0:4]
@@ -170,9 +169,9 @@ def encode_memo(priv, pub, nonce, message, **kwargs):
     :rtype: hex
     """
     shared_secret = get_shared_secret(priv, pub)
-    aes, check = init_aes(shared_secret, nonce)
+    aes, check = init_aes2(shared_secret, nonce)
     " Padding "
-    raw = py23_bytes(message, "utf8")
+    raw = bytes(message, "utf8")
     raw = _pad(raw, 16)
     " Encryption "
     cipher = hexlify(aes.encrypt(raw)).decode("ascii")
@@ -186,7 +185,7 @@ def encode_memo(priv, pub, nonce, message, **kwargs):
         "prefix": prefix,
     }
     tx = Memo(**s)
-    return "#" + base58encode(hexlify(py23_bytes(tx)).decode("ascii"))
+    return "#" + base58encode(hexlify(bytes(tx)).decode("ascii"))
 
 
 def extract_memo_data(message):
@@ -225,7 +224,7 @@ def decode_memo(priv, message):
         raise ValueError("Incorrect PrivateKey")
 
     # Init encryption
-    aes, checksum = init_aes(shared_secret, nonce)
+    aes, checksum = init_aes2(shared_secret, nonce)
     # Check
     if not check == checksum:
         raise AssertionError("Checksum failure")
@@ -234,7 +233,7 @@ def decode_memo(priv, message):
     numBytes = 16 - len(cipher) % 16
     n = 16 - numBytes
     message = cipher[n:]
-    message = aes.decrypt(unhexlify(py23_bytes(message, "ascii")))
+    message = aes.decrypt(unhexlify(bytes(message, "ascii")))
     message = _unpad(message, 16)
     n = varintdecode(message)
     if (len(message) - n) > 0 and (len(message) - n) < 8:

nectarbase/objects.py

@@ -8,7 +8,6 @@ from nectargraphenebase.account import PublicKey
 from nectargraphenebase.chains import known_chains
 from nectargraphenebase.objects import GrapheneObject, isArgsThisClass
 from nectargraphenebase.objects import Operation as GPHOperation
-from nectargraphenebase.py23 import py23_bytes, string_types
 from nectargraphenebase.types import (
     Array,
     Bytes,
@@ -38,7 +37,7 @@ def value_to_decimal(value, decimal_places):
 class Amount(object):
     def __init__(self, d, prefix=default_prefix, json_str=False):
         self.json_str = json_str
-        if isinstance(d, string_types):
+        if isinstance(d, str):
             self.amount, self.symbol = d.strip().split(" ")
             self.precision = None
             for c in known_chains:
@@ -113,7 +112,7 @@ class Amount(object):
         return (
             struct.pack("<q", int(self.amount))
             + struct.pack("<b", self.precision)
-            + py23_bytes(symbol, "ascii")
+            + bytes(symbol, "ascii")
         )
 
     def __str__(self):
@@ -150,7 +149,7 @@ class Operation(GPHOperation):
         # return json.loads(str(json.dumps([self.name, self.op.toJson()])))
 
     def __bytes__(self):
-        return py23_bytes(Id(self.opId)) + py23_bytes(self.op)
+        return bytes(Id(self.opId)) + bytes(self.op)
 
     def __str__(self):
         if self.appbase:
@@ -364,7 +363,7 @@ class CommentOptionExtensions(Static_variant):
     """
 
     def __init__(self, o):
-        if type(o) == dict and "type" in o and "value" in o:
+        if isinstance(o, dict) and "type" in o and "value" in o:
             if o["type"] == "comment_payout_beneficiaries":
                 type_id = 0
             else:

nectarbase/operations.py

@@ -5,7 +5,6 @@ from binascii import hexlify
 from collections import OrderedDict
 
 from nectargraphenebase.account import PublicKey
-from nectargraphenebase.py23 import PY2, PY3, string_types
 from nectargraphenebase.types import (
     Array,
     Bool,
@@ -58,7 +57,7 @@ class Transfer(GrapheneObject):
         if isinstance(kwargs["memo"], dict):
             kwargs["memo"]["prefix"] = prefix
             memo = Optional(Memo(**kwargs["memo"]))
-        elif isinstance(kwargs["memo"], string_types):
+        elif isinstance(kwargs["memo"], str):
             memo = String(kwargs["memo"])
         else:
             memo = Optional(Memo(kwargs["memo"]))
@@ -90,7 +89,7 @@ class Recurring_transfer(GrapheneObject):
         if isinstance(kwargs["memo"], dict):
             kwargs["memo"]["prefix"] = prefix
             memo = Optional(Memo(**kwargs["memo"]))
-        elif isinstance(kwargs["memo"], string_types):
+        elif isinstance(kwargs["memo"], str):
             memo = String(kwargs["memo"])
         else:
             memo = Optional(Memo(kwargs["memo"]))
@@ -539,10 +538,8 @@ class Witness_set_properties(GrapheneObject):
         for k in kwargs["props"]:
             if k[0] in ["key", "new_signing_key"]:
                 continue
-            if isinstance(k[1], str) and PY3:
+            if isinstance(k[1], str):
                 is_hex = re.fullmatch(r"[0-9a-fA-F]+", k[1] or "") is not None
-            elif isinstance(k[1], str) and PY2:
-                is_hex = re.match(r"[0-9a-fA-F]+", k[1] or "") is not None
             else:
                 is_hex = False
             if isinstance(k[1], int) and k[0] in [
@@ -991,7 +988,6 @@ class Transfer_from_savings(GrapheneObject):
         json_str = kwargs.get("json_str", False)
         if "memo" not in kwargs:
             kwargs["memo"] = ""
-
         super(Transfer_from_savings, self).__init__(
             OrderedDict(
                 [

nectarbase/version.py

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

nectargraphenebase/__init__.py

@@ -23,5 +23,4 @@ __all__ = [
     "signedtransactions",
     "unsignedtransactions",
     "objecttypes",
-    "py23",
 ]