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

nectar/blockchain.py

@@ -5,13 +5,13 @@ import logging
 import math
 import time
 from datetime import timedelta
+from queue import Queue
 from threading import Event, Thread
 from time import sleep
 
 import nectar as stm
 from nectar.instance import shared_blockchain_instance
 from nectarapi.exceptions import UnknownTransaction
-from nectargraphenebase.py23 import py23_bytes
 
 from .block import Block, BlockHeader
 from .exceptions import (
@@ -23,12 +23,11 @@ from .exceptions import (
 from .utils import addTzInfo
 
 log = logging.getLogger(__name__)
-from queue import Queue
 
 FUTURES_MODULE = None
 if not FUTURES_MODULE:
     try:
-        from concurrent.futures import ThreadPoolExecutor, as_completed, wait
+        from concurrent.futures import ThreadPoolExecutor, as_completed
 
         FUTURES_MODULE = "futures"
         # FUTURES_MODULE = None
@@ -339,7 +338,7 @@ class Blockchain(object):
             >>> from datetime import datetime
             >>> blockchain = Blockchain()
             >>> block_num = blockchain.get_estimated_block_num(datetime(2019, 6, 18, 5 ,8, 27))
-            >>> block_num == 33898184
+            >>> block_num == 33898182
             True
 
         """
@@ -961,7 +960,7 @@ class Blockchain(object):
             op = event["value"]
             event = [op_type, op]
         data = json.dumps(event, sort_keys=True)
-        return hashlib.sha1(py23_bytes(data, "utf-8")).hexdigest()
+        return hashlib.sha1(bytes(data, "utf-8")).hexdigest()
 
     def get_all_accounts(self, start="", stop="", steps=1e3, limit=-1, **kwargs):
         """Yields account names between start and stop.

nectar/blockchaininstance.py

@@ -328,7 +328,7 @@ class BlockChainInstance(object):
                 self.data["last_node"] = self.rpc.url
             try:
                 self.data["feed_history"] = self.get_feed_history(False)
-            except:
+            except Exception:
                 self.data["feed_history"] = None
             self.data["get_feed_history"] = self.data["feed_history"]
         elif chain_property == "hardfork_properties":
@@ -348,7 +348,7 @@ class BlockChainInstance(object):
                 self.data["last_node"] = self.rpc.url
             try:
                 self.data["hardfork_properties"] = self.get_hardfork_properties(False)
-            except:
+            except Exception:
                 self.data["hardfork_properties"] = None
         elif chain_property == "witness_schedule":
             if not self.offline:
@@ -430,7 +430,7 @@ class BlockChainInstance(object):
                 "current_reserve_ratio": props["current_reserve_ratio"],
                 "max_virtual_bandwidth": props["max_virtual_bandwidth"],
             }
-        except:
+        except Exception:
             reserve_ratio = {
                 "id": 0,
                 "average_block_size": None,
@@ -541,7 +541,7 @@ class BlockChainInstance(object):
             return None
         try:
             return self.rpc.get_network(props=config)
-        except:
+        except Exception:
             return known_chains["HIVE"]
 
     def get_median_price(self, use_stored_data=True):

nectar/blockchainobject.py

@@ -4,7 +4,6 @@ import threading
 from datetime import datetime, timedelta, timezone
 
 from nectar.instance import shared_blockchain_instance
-from nectargraphenebase.py23 import integer_types, string_types
 
 
 class ObjectCache(dict):
@@ -115,7 +114,7 @@ class BlockchainObject(dict):
         if isinstance(data, (list, set, tuple)):
             raise ValueError("Cannot interpret lists! Please load elements individually!")
 
-        if id_item and isinstance(id_item, string_types):
+        if id_item and isinstance(id_item, str):
             self.id_item = id_item
         else:
             self.id_item = "id"
@@ -125,7 +124,7 @@ class BlockchainObject(dict):
         elif isinstance(data, dict):
             self.identifier = data.get(self.id_item)
             super(BlockchainObject, self).__init__(data)
-        elif isinstance(data, integer_types):
+        elif isinstance(data, int):
             # This is only for block number basically
             self.identifier = data
             if not lazy and not self.cached:
@@ -134,7 +133,7 @@ class BlockchainObject(dict):
             self[self.id_item] = data
             # Set identifier again as it is overwritten in super() in refresh()
             self.identifier = data
-        elif isinstance(data, string_types):
+        elif isinstance(data, str):
             self.identifier = data
             if not lazy and not self.cached:
                 self.refresh()
@@ -159,9 +158,9 @@ class BlockchainObject(dict):
         BlockchainObject._cache = ObjectCache()
 
     def test_valid_objectid(self, i):
-        if isinstance(i, string_types):
+        if isinstance(i, str):
             return True
-        elif isinstance(i, integer_types):
+        elif isinstance(i, int):
             return True
         else:
             return False

nectar/blurt.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 Blurt(BlockChainInstance):
             return known_chains["BLURT"]
         try:
             return self.rpc.get_network(props=config)
-        except:
+        except Exception:
             return known_chains["BLURT"]
 
     def rshares_to_token_backed_dollar(
@@ -378,7 +377,7 @@ class Blurt(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.token_symbol, blockchain_instance=self)
@@ -502,7 +501,7 @@ class Blurt(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.token_symbol, blockchain_instance=self)

nectar/cli.py

@@ -151,7 +151,7 @@ def unlock_wallet(stm, password=None, allow_wif=True):
         if stm.wallet.is_encrypted():
             try:
                 stm.wallet.unlock(password)
-            except:
+            except Exception:
                 try:
                     from nectarstorage import InRamPlainKeyStore
 
@@ -159,7 +159,7 @@ def unlock_wallet(stm, password=None, allow_wif=True):
                     stm.wallet.setKeys([password])
                     print("Wif accepted!")
                     return True
-                except:
+                except Exception:
                     if allow_wif:
                         raise exceptions.WrongMasterPasswordException(
                             "entered password is not a valid password/wif"
@@ -173,13 +173,13 @@ def unlock_wallet(stm, password=None, allow_wif=True):
                 stm.wallet.setKeys([password])
                 print("Wif accepted!")
                 return True
-            except:
+            except Exception:
                 try:
                     from nectarstorage import SqliteEncryptedKeyStore
 
                     stm.wallet.store = SqliteEncryptedKeyStore(config=stm.config)
                     stm.wallet.unlock(password)
-                except:
+                except Exception:
                     if allow_wif:
                         raise exceptions.WrongMasterPasswordException(
                             "entered password is not a valid password/wif"
@@ -231,7 +231,7 @@ def unlock_token_wallet(stm, sc2, password=None):
         )
         try:
             sc2.unlock(password)
-        except:
+        except Exception:
             raise exceptions.WrongMasterPasswordException(
                 "entered password is not a valid password"
             )
@@ -1539,7 +1539,7 @@ def powerup(amount, account, to, export):
     acc = Account(account, blockchain_instance=stm)
     try:
         amount = float(amount)
-    except:
+    except Exception:
         amount = str(amount)
     tx = acc.transfer_to_vesting(amount, to=to)
     if stm.unsigned and stm.nobroadcast and stm.steemconnect is not None:
@@ -1570,7 +1570,7 @@ def powerdown(amount, account, export):
     acc = Account(account, blockchain_instance=stm)
     try:
         amount = float(amount)
-    except:
+    except Exception:
         amount = str(amount)
     tx = acc.withdraw_vesting(amount)
     if stm.unsigned and stm.nobroadcast and stm.steemconnect is not None:
@@ -1602,7 +1602,7 @@ def delegate(amount, to_account, account, export):
     acc = Account(account, blockchain_instance=stm)
     try:
         amount = float(amount)
-    except:
+    except Exception:
         amount = Amount(str(amount), blockchain_instance=stm)
         if amount.symbol == stm.token_symbol and isinstance(stm, Steem):
             amount = stm.sp_to_vests(float(amount))
@@ -1747,7 +1747,7 @@ def convert(amount, account, export):
     acc = Account(account, blockchain_instance=stm)
     try:
         amount = float(amount)
-    except:
+    except Exception:
         amount = str(amount)
     tx = acc.convert(amount)
     if stm.unsigned and stm.nobroadcast and stm.steemconnect is not None:
@@ -2760,7 +2760,7 @@ def decrypt(memo, account, output, info, text, binary):
                 else:
                     print("to: %s" % str(to_key))
                 print("nonce: %s" % nonce)
-            except:
+            except Exception:
                 print("from: %s" % str(from_key))
                 print("to: %s" % str(to_key))
                 print("nonce: %s" % nonce)
@@ -3031,7 +3031,7 @@ def createpost(
             community = input("community account (name or title): ")
             try:
                 community = Community(community)
-            except:
+            except Exception:
                 c = Communities(limit=1000)
                 comm_cand = c.search_title(community)
                 if len(comm_cand) == 0:
@@ -3264,7 +3264,7 @@ def post(
     if permlink is not None:
         try:
             comment = Comment(construct_authorperm(author, permlink), blockchain_instance=stm)
-        except:
+        except Exception:
             comment = None
     else:
         comment = None
@@ -3291,7 +3291,7 @@ def post(
         permlink = derive_permlink(title, with_suffix=False)
         try:
             comment = Comment(construct_authorperm(author, permlink), blockchain_instance=stm)
-        except:
+        except Exception:
             comment = None
     if comment is None:
         json_metadata = {}
@@ -5768,7 +5768,7 @@ def info(objects):
                 Amount(median_price["base"], blockchain_instance=stm).amount
                 / Amount(median_price["quote"], blockchain_instance=stm).amount
             )
-        except:
+        except Exception:
             price = None
         for key in info:
             if isinstance(info[key], dict) and "amount" in info[key]:

nectar/comment.py

@@ -10,7 +10,6 @@ from nectar.constants import (
     STEEM_REVERSE_AUCTION_WINDOW_SECONDS_HF21,
 )
 from nectarbase import operations
-from nectargraphenebase.py23 import bytes_types, integer_types, string_types
 
 from .account import Account
 from .amount import Amount
@@ -74,7 +73,7 @@ class Comment(BlockchainObject):
             elif kwargs.get("hive_instance"):
                 blockchain_instance = kwargs["hive_instance"]
         self.blockchain = blockchain_instance or shared_blockchain_instance()
-        if isinstance(authorperm, string_types) and authorperm != "":
+        if isinstance(authorperm, str) and authorperm != "":
             [author, permlink] = resolve_authorperm(authorperm)
             self["id"] = 0
             self["author"] = author
@@ -104,7 +103,7 @@ class Comment(BlockchainObject):
             "max_cashout_time",
         ]
         for p in parse_times:
-            if p in comment and isinstance(comment.get(p), string_types):
+            if p in comment and isinstance(comment.get(p), str):
                 comment[p] = formatTimeString(comment.get(p, "1970-01-01T00:00:00"))
         # Parse Amounts
         sbd_amounts = [
@@ -116,7 +115,7 @@ class Comment(BlockchainObject):
             "promoted",
         ]
         for p in sbd_amounts:
-            if p in comment and isinstance(comment.get(p), (string_types, list, dict)):
+            if p in comment and isinstance(comment.get(p), (str, list, dict)):
                 value = comment.get(p, "0.000 %s" % (self.blockchain.backed_token_symbol))
                 if (
                     isinstance(value, str)
@@ -129,7 +128,7 @@ class Comment(BlockchainObject):
         meta_str = comment.get("json_metadata", "{}")
         if meta_str == "{}":
             comment["json_metadata"] = meta_str
-        if isinstance(meta_str, (string_types, bytes_types, bytearray)):
+        if isinstance(meta_str, (str, bytes, bytearray)):
             try:
                 comment["json_metadata"] = json.loads(meta_str)
             except Exception:
@@ -147,20 +146,20 @@ class Comment(BlockchainObject):
             "net_rshares",
         ]
         for p in parse_int:
-            if p in comment and isinstance(comment.get(p), string_types):
+            if p in comment and isinstance(comment.get(p), str):
                 comment[p] = int(comment.get(p, "0"))
 
         if "active_votes" in comment:
             new_active_votes = []
             for vote in comment["active_votes"]:
-                if "time" in vote and isinstance(vote.get("time"), string_types):
+                if "time" in vote and isinstance(vote.get("time"), str):
                     vote["time"] = formatTimeString(vote.get("time", "1970-01-01T00:00:00"))
                 parse_int = [
                     "rshares",
                     "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):
                         try:
                             vote[p] = int(vote.get(p, "0"))
                         except ValueError:
@@ -263,7 +262,7 @@ class Comment(BlockchainObject):
             "net_rshares",
         ]
         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])
         if "active_votes" in output:
             new_active_votes = []
@@ -279,7 +278,7 @@ class Comment(BlockchainObject):
                     "reputation",
                 ]
                 for p in parse_int:
-                    if p in vote and isinstance(vote[p], integer_types):
+                    if p in vote and isinstance(vote[p], int):
                         vote[p] = str(vote[p])
                 new_active_votes.append(vote)
             output["active_votes"] = new_active_votes
@@ -685,7 +684,7 @@ class Comment(BlockchainObject):
                 )
             elif pending_payout_value is None:
                 pending_payout_value = 0
-            elif isinstance(pending_payout_value, (float, integer_types)):
+            elif isinstance(pending_payout_value, (float, int)):
                 pending_payout_value = Amount(
                     pending_payout_value,
                     self.blockchain.backed_token_symbol,

nectar/community.py

@@ -6,7 +6,6 @@ from datetime import date, datetime, time
 from prettytable import PrettyTable
 
 from nectar.instance import shared_blockchain_instance
-from nectargraphenebase.py23 import integer_types, string_types
 
 from .blockchainobject import BlockchainObject
 from .exceptions import AccountDoesNotExistsException, OfflineHasNoRPCException
@@ -118,11 +117,11 @@ class Community(BlockchainObject):
             "num_authors",
         ]
         for p in parse_int:
-            if p in community and isinstance(community.get(p), string_types):
+            if p in community and isinstance(community.get(p), str):
                 community[p] = int(community.get(p, 0))
         parse_times = ["created_at"]
         for p in parse_times:
-            if p in community and isinstance(community.get(p), string_types):
+            if p in community and isinstance(community.get(p), str):
                 community[p] = addTzInfo(
                     datetime.strptime(community.get(p, "1970-01-01 00:00:00"), "%Y-%m-%d %H:%M:%S")
                 )
@@ -138,10 +137,10 @@ class Community(BlockchainObject):
         ]
         parse_int_without_zero = []
         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])
         for p in parse_int_without_zero:
-            if p in output and isinstance(output[p], integer_types) and output[p] != 0:
+            if p in output and isinstance(output[p], int) and output[p] != 0:
                 output[p] = str(output[p])
 
         parse_times = [

nectar/conveyor.py

@@ -10,7 +10,6 @@ from datetime import datetime, timezone
 import requests
 
 from nectargraphenebase.ecdsasig import sign_message
-from nectargraphenebase.py23 import py23_bytes
 
 from .account import Account
 from .instance import shared_blockchain_instance
@@ -64,7 +63,7 @@ class Conveyor(object):
         self.id = 0
         self.ENCODING = "utf-8"
         self.TIMEFORMAT = "%Y-%m-%dT%H:%M:%S.%f"
-        self.K = hashlib.sha256(py23_bytes("steem_jsonrpc_auth", self.ENCODING)).digest()
+        self.K = hashlib.sha256(bytes("steem_jsonrpc_auth", self.ENCODING)).digest()
 
     def prehash_message(self, timestamp, account, method, params, nonce):
         """Prepare a hash for the Conveyor API request with SHA256 according
@@ -78,7 +77,7 @@ class Conveyor(object):
         :param bytes nonce: random 8 bytes
 
         """
-        first = hashlib.sha256(py23_bytes(timestamp + account + method + params, self.ENCODING))
+        first = hashlib.sha256(bytes(timestamp + account + method + params, self.ENCODING))
         return self.K + first.digest() + nonce
 
     def _request(self, account, method, params, key):
@@ -91,7 +90,7 @@ class Conveyor(object):
         :param str key: Steem posting key for signing
 
         """
-        params_bytes = py23_bytes(json.dumps(params), self.ENCODING)
+        params_bytes = bytes(json.dumps(params), self.ENCODING)
         params_enc = base64.b64encode(params_bytes).decode(self.ENCODING)
         timestamp = datetime.now(timezone.utc).strftime(self.TIMEFORMAT)[:-3] + "Z"
         nonce_int = random.getrandbits(64)

nectar/exceptions.py

@@ -1,7 +1,13 @@
 # -*- coding: utf-8 -*-
 
 
-class WalletExists(Exception):
+class NectarException(Exception):
+    """Base exception for all Nectar-related errors"""
+
+    pass
+
+
+class WalletExists(NectarException):
     """A wallet has already been created and requires a password to be
     unlocked by means of :func:`nectar.wallet.Wallet.unlock`.
     """
@@ -9,85 +15,85 @@ class WalletExists(Exception):
     pass
 
 
-class RPCConnectionRequired(Exception):
+class RPCConnectionRequired(NectarException):
     """An RPC connection is required"""
 
     pass
 
 
-class InvalidMemoKeyException(Exception):
+class InvalidMemoKeyException(NectarException):
     """Memo key in message is invalid"""
 
     pass
 
 
-class WrongMemoKey(Exception):
+class WrongMemoKey(NectarException):
     """The memo provided is not equal the one on the blockchain"""
 
     pass
 
 
-class OfflineHasNoRPCException(Exception):
+class OfflineHasNoRPCException(NectarException):
     """When in offline mode, we don't have RPC"""
 
     pass
 
 
-class AccountExistsException(Exception):
+class AccountExistsException(NectarException):
     """The requested account already exists"""
 
     pass
 
 
-class AccountDoesNotExistsException(Exception):
+class AccountDoesNotExistsException(NectarException):
     """The account does not exist"""
 
     pass
 
 
-class AssetDoesNotExistsException(Exception):
+class AssetDoesNotExistsException(NectarException):
     """The asset does not exist"""
 
     pass
 
 
-class InvalidAssetException(Exception):
+class InvalidAssetException(NectarException):
     """An invalid asset has been provided"""
 
     pass
 
 
-class InsufficientAuthorityError(Exception):
+class InsufficientAuthorityError(NectarException):
     """The transaction requires signature of a higher authority"""
 
     pass
 
 
-class VotingInvalidOnArchivedPost(Exception):
+class VotingInvalidOnArchivedPost(NectarException):
     """The transaction requires signature of a higher authority"""
 
     pass
 
 
-class MissingKeyError(Exception):
+class MissingKeyError(NectarException):
     """A required key couldn't be found in the wallet"""
 
     pass
 
 
-class InvalidWifError(Exception):
+class InvalidWifError(NectarException):
     """The provided private Key has an invalid format"""
 
     pass
 
 
-class BlockDoesNotExistsException(Exception):
+class BlockDoesNotExistsException(NectarException):
     """The block does not exist"""
 
     pass
 
 
-class NoWalletException(Exception):
+class NoWalletException(NectarException):
     """No Wallet could be found, please use :func:`nectar.wallet.Wallet.create` to
     create a new wallet
     """
@@ -95,55 +101,55 @@ class NoWalletException(Exception):
     pass
 
 
-class WitnessDoesNotExistsException(Exception):
+class WitnessDoesNotExistsException(NectarException):
     """The witness does not exist"""
 
     pass
 
 
-class ContentDoesNotExistsException(Exception):
+class ContentDoesNotExistsException(NectarException):
     """The content does not exist"""
 
     pass
 
 
-class VoteDoesNotExistsException(Exception):
+class VoteDoesNotExistsException(NectarException):
     """The vote does not exist"""
 
     pass
 
 
-class WrongMasterPasswordException(Exception):
+class WrongMasterPasswordException(NectarException):
     """The password provided could not properly unlock the wallet"""
 
     pass
 
 
-class VestingBalanceDoesNotExistsException(Exception):
+class VestingBalanceDoesNotExistsException(NectarException):
     """Vesting Balance does not exist"""
 
     pass
 
 
-class InvalidMessageSignature(Exception):
+class InvalidMessageSignature(NectarException):
     """The message signature does not fit the message"""
 
     pass
 
 
-class NoWriteAccess(Exception):
+class NoWriteAccess(NectarException):
     """Cannot store to sqlite3 database due to missing write access"""
 
     pass
 
 
-class BatchedCallsNotSupported(Exception):
+class BatchedCallsNotSupported(NectarException):
     """Batch calls do not work"""
 
     pass
 
 
-class BlockWaitTimeExceeded(Exception):
+class BlockWaitTimeExceeded(NectarException):
     """Wait time for new block exceeded"""
 
     pass

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: