diff --git a/beem/account.py b/beem/account.py
index 817dd803ce40230e11900189e69755eb5de21ac9..7f54632757ba1b3bcb24bc4646ad248a1679b52e 100644
--- a/beem/account.py
+++ b/beem/account.py
@@ -232,14 +232,18 @@ class Account(BlockchainObject):
remaining = 100 - bandwidth["used"] / bandwidth["allocated"] * 100
used_kb = bandwidth["used"] / 1024
allocated_mb = bandwidth["allocated"] / 1024 / 1024
+ utc = pytz.timezone('UTC')
+ last_vote_time_str = formatTimedelta(utc.localize(datetime.utcnow()) - self["last_vote_time"])
if use_table:
t = PrettyTable(["Key", "Value"])
t.align = "l"
t.add_row(["Name (rep)", self.name + " (%.2f)" % (self.rep)])
t.add_row(["Voting Power", "%.2f %%, " % (self.get_voting_power())])
t.add_row(["Vote Value", "%.2f $" % (self.get_voting_value_SBD())])
+ t.add_row(["Last vote", "%s ago" % last_vote_time_str])
t.add_row(["Full in ", "%s" % (self.get_recharge_time_str())])
- t.add_row(["Balance", "%.2f SP, %s, %s" % (self.get_steem_power(), str(self.balances["available"][0]), str(self.balances["available"][1]))])
+ t.add_row(["Steem Power", "%.2f STEEM" % (self.get_steem_power())])
+ t.add_row(["Balance", "%s, %s" % (str(self.balances["available"][0]), str(self.balances["available"][1]))])
if bandwidth["allocated"] > 0:
t.add_row(["Remaining Bandwidth", "%.2f %%" % (remaining)])
t.add_row(["used/allocated Bandwidth", "(%.0f kb of %.0f mb)" % (used_kb, allocated_mb)])
@@ -314,12 +318,18 @@ class Account(BlockchainObject):
def get_recharge_time_str(self, voting_power_goal=100):
""" Returns the account recharge time
+
+ :param float voting_power_goal: voting power goal in percentage (default is 100)
+
"""
remainingTime = self.get_recharge_timedelta(voting_power_goal=voting_power_goal)
return formatTimedelta(remainingTime)
def get_recharge_timedelta(self, voting_power_goal=100):
""" Returns the account voting power recharge time as timedelta object
+
+ :param float voting_power_goal: voting power goal in percentage (default is 100)
+
"""
missing_vp = voting_power_goal - self.get_voting_power()
if missing_vp < 0:
@@ -329,74 +339,84 @@ class Account(BlockchainObject):
def get_recharge_time(self, voting_power_goal=100):
""" Returns the account voting power recharge time in minutes
+
+ :param float voting_power_goal: voting power goal in percentage (default is 100)
+
"""
utc = pytz.timezone('UTC')
return utc.localize(datetime.utcnow()) + self.get_recharge_timedelta(voting_power_goal)
- def get_feed(self, entryId=0, limit=100, raw_data=False, account=None):
+ def get_feed(self, start_entry_id=0, limit=100, raw_data=False, account=None):
+ """ Returns the user feed
+
+ :param int start_entry_id: default is 0
+ :param int limit: default is 100
+ :param bool raw_data: default is False
+ :param beem.account.Account account: default is None
+ """
if account is None:
account = self["name"]
if raw_data and self.steem.rpc.get_use_appbase():
return [
- c for c in self.steem.rpc.get_feed({'account': account, 'start_entry_id': entryId, 'limit': limit}, api='follow')["feed"]
+ c for c in self.steem.rpc.get_feed({'account': account, 'start_entry_id': start_entry_id, 'limit': limit}, api='follow')["feed"]
]
elif raw_data and not self.steem.rpc.get_use_appbase():
return [
- c for c in self.steem.rpc.get_feed(account, entryId, limit, api='follow')
+ c for c in self.steem.rpc.get_feed(account, start_entry_id, limit, api='follow')
]
elif not raw_data and self.steem.rpc.get_use_appbase():
from .comment import Comment
return [
- Comment(c['comment'], steem_instance=self.steem) for c in self.steem.rpc.get_feed({'account': account, 'start_entry_id': entryId, 'limit': limit}, api='follow')["feed"]
+ Comment(c['comment'], steem_instance=self.steem) for c in self.steem.rpc.get_feed({'account': account, 'start_entry_id': start_entry_id, 'limit': limit}, api='follow')["feed"]
]
else:
from .comment import Comment
return [
- Comment(c['comment'], steem_instance=self.steem) for c in self.steem.rpc.get_feed(account, entryId, limit, api='follow')
+ Comment(c['comment'], steem_instance=self.steem) for c in self.steem.rpc.get_feed(account, start_entry_id, limit, api='follow')
]
- def get_blog_entries(self, entryId=0, limit=100, raw_data=False, account=None):
+ def get_blog_entries(self, start_entry_id=0, limit=100, raw_data=False, account=None):
if account is None:
account = self["name"]
if raw_data and self.steem.rpc.get_use_appbase():
return [
- c for c in self.steem.rpc.get_blog_entries({'account': account, 'start_entry_id': entryId, 'limit': limit}, api='follow')["blog"]
+ c for c in self.steem.rpc.get_blog_entries({'account': account, 'start_entry_id': start_entry_id, 'limit': limit}, api='follow')["blog"]
]
elif raw_data and not self.steem.rpc.get_use_appbase():
return [
- c for c in self.steem.rpc.get_blog_entries(account, entryId, limit, api='follow')
+ c for c in self.steem.rpc.get_blog_entries(account, start_entry_id, limit, api='follow')
]
elif not raw_data and self.steem.rpc.get_use_appbase():
from .comment import Comment
return [
- Comment(c, steem_instance=self.steem) for c in self.steem.rpc.get_blog_entries({'account': account, 'start_entry_id': entryId, 'limit': limit}, api='follow')["blog"]
+ Comment(c, steem_instance=self.steem) for c in self.steem.rpc.get_blog_entries({'account': account, 'start_entry_id': start_entry_id, 'limit': limit}, api='follow')["blog"]
]
else:
from .comment import Comment
return [
- Comment(c, steem_instance=self.steem) for c in self.steem.rpc.get_blog_entries(account, entryId, limit, api='follow')
+ Comment(c, steem_instance=self.steem) for c in self.steem.rpc.get_blog_entries(account, start_entry_id, limit, api='follow')
]
- def get_blog(self, entryId=0, limit=100, raw_data=False, account=None):
+ def get_blog(self, start_entry_id=0, limit=100, raw_data=False, account=None):
if account is None:
account = self["name"]
if raw_data and self.steem.rpc.get_use_appbase():
return [
- c for c in self.steem.rpc.get_blog({'account': account, 'start_entry_id': entryId, 'limit': limit}, api='follow')["blog"]
+ c for c in self.steem.rpc.get_blog({'account': account, 'start_entry_id': start_entry_id, 'limit': limit}, api='follow')["blog"]
]
elif raw_data and not self.steem.rpc.get_use_appbase():
return [
- c for c in self.steem.rpc.get_blog(account, entryId, limit, api='follow')
+ c for c in self.steem.rpc.get_blog(account, start_entry_id, limit, api='follow')
]
elif not raw_data and self.steem.rpc.get_use_appbase():
from .comment import Comment
return [
- Comment(c["comment"], steem_instance=self.steem) for c in self.steem.rpc.get_blog({'account': account, 'start_entry_id': entryId, 'limit': limit}, api='follow')["blog"]
+ Comment(c["comment"], steem_instance=self.steem) for c in self.steem.rpc.get_blog({'account': account, 'start_entry_id': start_entry_id, 'limit': limit}, api='follow')["blog"]
]
else:
from .comment import Comment
return [
- Comment(c["comment"], steem_instance=self.steem) for c in self.steem.rpc.get_blog(account, entryId, limit, api='follow')
+ Comment(c["comment"], steem_instance=self.steem) for c in self.steem.rpc.get_blog(account, start_entry_id, limit, api='follow')
]
def get_blog_account(self, account=None):
@@ -790,24 +810,12 @@ class Account(BlockchainObject):
:rtype: list
"""
- if until is not None and isinstance(until, datetime):
- limit = until
- last_gen = self.history_reverse(limit=limit)
- last_item = 0
- for item in last_gen:
- last_item = item[0]
- return last_item
+ if until is not None:
+ return self.estimate_account_op(until, op_accuracy=1)
else:
try:
op_count = 0
- # self.steem.rpc.set_next_node_on_empty_reply(True)
- if self.steem.rpc.get_use_appbase():
- try:
- op_count = self.steem.rpc.get_account_history({'account': self["name"], 'start': -1, 'limit': 0}, api="account_history")['history']
- except ApiNotSupported:
- op_count = self.steem.rpc.get_account_history(self["name"], -1, 0)
- else:
- op_count = self.steem.rpc.get_account_history(self["name"], -1, 0, api="database")
+ op_count = self._get_account_history(start=-1, limit=0)
if isinstance(op_count, list) and len(op_count) > 0 and len(op_count[0]) > 0:
return op_count[0][0]
else:
@@ -815,6 +823,109 @@ class Account(BlockchainObject):
except IndexError:
return 0
+ def _get_account_history(self, account=None, start=-1, limit=0):
+ if account is None:
+ account = self
+ account = Account(account, steem_instance=self.steem)
+ # self.steem.rpc.set_next_node_on_empty_reply(True)
+ if self.steem.rpc.get_use_appbase():
+ try:
+ ret = self.steem.rpc.get_account_history({'account': account["name"], 'start': start, 'limit': limit}, api="account_history")['history']
+ except ApiNotSupported:
+ ret = self.steem.rpc.get_account_history(account["name"], start, limit)
+ else:
+ ret = self.steem.rpc.get_account_history(account["name"], start, limit, api="database")
+ return ret
+
+ def estimate_account_op(self, start, op_accuracy=10, max_count=10, reverse=False):
+ """ Returns a estiamtion of account operation index for a given time or blockindex
+
+ :param int/datetime start: start time or start block index from which account
+ operation should be fetched
+ :param int op_accuracy: defines the estimation accuracy (default 10)
+
+ Example:::
+
+ import pytz
+ from beem.account import Account
+ from beem.blockchain import Blockchain
+ from datetime import datetime, timedelta
+ utc = pytz.timezone('UTC')
+ start_time = utc.localize(datetime.utcnow()) - timedelta(days=7)
+ acc = Account("gtg")
+ start_op = acc.estimate_account_op(start_time)
+
+ b = Blockchain()
+ start_block_num = b.get_estimated_block_num(start_time)
+ start_op2 = acc.estimate_account_op(start_block_num)
+ """
+ max_index = self.virtual_op_count()
+ created = self["created"]
+ if not isinstance(start, datetime):
+ b = Blockchain(steem_instance=self.steem)
+ current_block_num = b.get_current_block_num()
+ created_blocknum = b.get_estimated_block_num(created, accurate=True)
+ if start < created_blocknum and not reverse:
+ return 0
+ elif start < created_blocknum:
+ return max_index
+ else:
+ if start < created and not reverse:
+ return 0
+ elif start < created:
+ return max_index
+ if max_index < op_accuracy and not reverse:
+ return 0
+ elif max_index < op_accuracy:
+ return max_index
+ if isinstance(start, datetime):
+ utc = pytz.timezone('UTC')
+ now = utc.localize(datetime.utcnow())
+ account_lifespan_sec = (now - created).total_seconds()
+ start = addTzInfo(start)
+ estimated_op_num = int((start - created).total_seconds() / account_lifespan_sec * max_index)
+ else:
+ account_lifespan_block = (current_block_num - created_blocknum)
+ estimated_op_num = int((start - created_blocknum) / account_lifespan_block * max_index)
+ op_diff = op_accuracy + 1
+ cnt = 0
+ while op_diff > op_accuracy and cnt < max_count:
+ op_start = self._get_account_history(start=estimated_op_num)
+ if isinstance(op_start, list) and len(op_start) > 0 and len(op_start[0]) > 0:
+ trx = op_start[0][1]
+ estimated_op_num = op_start[0][0]
+ elif not reverse:
+ return 0
+ else:
+ return max_index
+ if isinstance(start, datetime):
+ diff_time = (now - formatTimeString(trx["timestamp"])).total_seconds()
+ op_diff = ((start - formatTimeString(trx["timestamp"])).total_seconds() / diff_time * (max_index - estimated_op_num))
+ else:
+ diff_block = (current_block_num - trx["block"])
+ op_diff = ((start - trx["block"]) / diff_block * (max_index - estimated_op_num))
+ if reverse:
+ estimated_op_num += math.ceil(op_diff)
+ else:
+ estimated_op_num += int(op_diff)
+ cnt += 1
+ if estimated_op_num < 0:
+ return 0
+ elif estimated_op_num > max_index:
+ return max_index
+ elif math.ceil(op_diff) == 0 and reverse:
+ return estimated_op_num
+ elif int(op_diff) == 0 and not reverse:
+ return estimated_op_num
+ elif estimated_op_num > op_accuracy and not reverse:
+ return estimated_op_num - op_accuracy
+ elif estimated_op_num + op_accuracy < max_index:
+ return estimated_op_num + op_accuracy
+ elif reverse:
+ return max_index
+ else:
+ return 0
+
def get_curation_reward(self, days=7):
"""Returns the curation reward of the last `days` days
@@ -879,13 +990,7 @@ class Account(BlockchainObject):
if order != -1 and order != 1:
raise ValueError("order must be -1 or 1!")
# self.steem.rpc.set_next_node_on_empty_reply(True)
- if self.steem.rpc.get_use_appbase():
- try:
- txs = self.steem.rpc.get_account_history({'account': self["name"], 'start': index, 'limit': limit}, api="account_history")['history']
- except ApiNotSupported:
- txs = self.steem.rpc.get_account_history(self["name"], index, limit)
- else:
- txs = self.steem.rpc.get_account_history(self["name"], index, limit, api="database")
+ txs = self._get_account_history(start=index, limit=limit)
start = addTzInfo(start)
stop = addTzInfo(stop)
@@ -1031,12 +1136,14 @@ class Account(BlockchainObject):
max_index = self.virtual_op_count()
if not max_index:
return
+ start = addTzInfo(start)
+ stop = addTzInfo(stop)
if start is not None and not use_block_num and not isinstance(start, datetime):
start_index = start
+ elif start is not None:
+ start_index = self.estimate_account_op(start, op_accuracy=10)
else:
start_index = 0
- start = addTzInfo(start)
- stop = addTzInfo(stop)
first = start_index + _limit
if first > max_index:
@@ -1175,6 +1282,8 @@ class Account(BlockchainObject):
start += first
elif start is not None and isinstance(start, int) and not use_block_num:
first = start
+ elif start is not None:
+ first = self.estimate_account_op(start, op_accuracy=10, reverse=True)
if stop is not None and isinstance(stop, int) and stop < 0 and not use_block_num:
stop += first
start = addTzInfo(start)
diff --git a/beem/exceptions.py b/beem/exceptions.py
index fb532e15ceaa3f179eb2dde341f238e80b9f7e81..2a50d768f6e88d57797b12d1a362ebad3bbf9462 100644
--- a/beem/exceptions.py
+++ b/beem/exceptions.py
@@ -24,6 +24,18 @@ class RPCConnectionRequired(Exception):
pass
+class InvalidMemoKeyException(Exception):
+ """ Memo key in message is invalid
+ """
+ pass
+
+
+class WrongMemoKey(Exception):
+ """ The memo provided is not equal the one on the blockchain
+ """
+ pass
+
+
class OfflineHasNoRPCException(Exception):
""" When in offline mode, we don't have RPC
"""
@@ -133,12 +145,6 @@ class InvalidMessageSignature(Exception):
pass
-class KeyNotFound(Exception):
- """ Key not found
- """
- pass
-
-
class NoWriteAccess(Exception):
""" Cannot store to sqlite3 database due to missing write access
"""
diff --git a/beem/instance.py b/beem/instance.py
index ec89ca247532e3f5db3d095cac7b371c943b81d1..48f1902e337a1dbcaca7496fbe855530a44cb425 100644
--- a/beem/instance.py
+++ b/beem/instance.py
@@ -58,7 +58,7 @@ def set_shared_config(config):
"""
if not isinstance(config, dict):
raise AssertionError()
- SharedInstance.config = config
+ SharedInstance.config.update(config)
# if one is already set, delete
if SharedInstance.instance:
clear_cache()
diff --git a/beem/memo.py b/beem/memo.py
index 6fa53708b8b3e4324739ddc8e0511f4ff7078e49..bfb926a807825b959746de8a247f99c67ea26b17 100644
--- a/beem/memo.py
+++ b/beem/memo.py
@@ -10,7 +10,7 @@ import random
from beembase import memo as BtsMemo
from beemgraphenebase.account import PrivateKey, PublicKey
from .account import Account
-from .exceptions import MissingKeyError, KeyNotFound
+from .exceptions import MissingKeyError
class Memo(object):
@@ -237,14 +237,14 @@ class Memo(object):
memo_to["memo_key"]
)
pubkey = memo_from["memo_key"]
- except KeyNotFound:
+ except MissingKeyError:
try:
# if that failed, we assume that we have sent the memo
memo_wif = self.steem.wallet.getPrivateKeyForPublicKey(
memo_from["memo_key"]
)
pubkey = memo_to["memo_key"]
- except KeyNotFound:
+ except MissingKeyError:
# if all fails, raise exception
raise MissingKeyError(
"Non of the required memo keys are installed!"
diff --git a/beem/price.py b/beem/price.py
index f2d0bc3a9aba4b615d176e4dffdf70f7436f3259..5e28b5b962248dfd34ad3c85e42042e7b580f827 100644
--- a/beem/price.py
+++ b/beem/price.py
@@ -100,13 +100,13 @@ class Price(dict):
if "price" in price:
raise AssertionError("You cannot provide a 'price' this way")
# Regular 'price' objects according to steem-core
- base_id = price["base"]["asset_id"]
- if price["base"]["asset_id"] == base_id:
- self["base"] = Amount(price["base"], steem_instance=self.steem)
- self["quote"] = Amount(price["quote"], steem_instance=self.steem)
- else:
- self["quote"] = Amount(price["base"], steem_instance=self.steem)
- self["base"] = Amount(price["quote"], steem_instance=self.steem)
+ # base_id = price["base"]["asset_id"]
+ # if price["base"]["asset_id"] == base_id:
+ self["base"] = Amount(price["base"], steem_instance=self.steem)
+ self["quote"] = Amount(price["quote"], steem_instance=self.steem)
+ # else:
+ # self["quote"] = Amount(price["base"], steem_instance=self.steem)
+ # self["base"] = Amount(price["quote"], steem_instance=self.steem)
elif (price is not None and isinstance(base, Asset) and isinstance(quote, Asset)):
frac = Fraction(float(price)).limit_denominator(10 ** base["precision"])
diff --git a/beem/steem.py b/beem/steem.py
index c01778002aafa8dbc3aa096047642469e4ab31fd..38d73cd77abc8863ba66f5b3320cffc209d5fdfb 100644
--- a/beem/steem.py
+++ b/beem/steem.py
@@ -97,8 +97,7 @@ class Steem(object):
>>> from beem import Steem
>>> steem = Steem()
- >>> print(steem.get_blockchain_version())
- 0.19.2
+ >>> print(steem.get_blockchain_version()) # doctest: +SKIP
This class also deals with edits, votes and reading content.
"""
@@ -197,13 +196,24 @@ class Steem(object):
"""Returns if rpc is connected"""
return self.rpc is not None
+ def __repr__(self):
+ if self.offline:
+ return "<%s offline=True>" % (
+ self.__class__.__name__)
+ elif self.rpc and self.rpc.url:
+ return "<%s node=%s, nobroadcast=%s>" % (
+ self.__class__.__name__, str(self.rpc.url), str(self.nobroadcast))
+ else:
+ return "<%s, nobroadcast=%s>" % (
+ self.__class__.__name__, str(self.nobroadcast))
+
def refresh_data(self, force_refresh=False, data_refresh_time_seconds=None):
- """
- Read and stores steem blockchain parameters
- If the last data refresh is older than data_refresh_time_seconds, data will be refreshed
+ """ Read and stores steem blockchain parameters
+ If the last data refresh is older than data_refresh_time_seconds, data will be refreshed
:param bool force_refresh: if True, data are forced to refreshed
:param float data_refresh_time_seconds: set a new minimal refresh time in seconds
+
"""
if self.offline:
return
@@ -225,8 +235,10 @@ class Steem(object):
def get_dynamic_global_properties(self, use_stored_data=True):
""" This call returns the *dynamic global properties*
+
:param bool use_stored_data: if True, stored data will be returned. If stored data are
- empty or old, refresh_data() is used.
+ empty or old, refresh_data() is used.
+
"""
if use_stored_data:
self.refresh_data()
@@ -238,8 +250,10 @@ class Steem(object):
def get_reserve_ratio(self, use_stored_data=True):
""" This call returns the *dynamic global properties*
+
:param bool use_stored_data: if True, stored data will be returned. If stored data are
- empty or old, refresh_data() is used.
+ empty or old, refresh_data() is used.
+
"""
if use_stored_data:
self.refresh_data()
@@ -260,8 +274,10 @@ class Steem(object):
def get_feed_history(self, use_stored_data=True):
""" Returns the feed_history
+
:param bool use_stored_data: if True, stored data will be returned. If stored data are
- empty or old, refresh_data() is used.
+ empty or old, refresh_data() is used.
+
"""
if use_stored_data:
self.refresh_data()
@@ -273,8 +289,10 @@ class Steem(object):
def get_reward_funds(self, use_stored_data=True):
""" Get details for a reward fund.
+
:param bool use_stored_data: if True, stored data will be returned. If stored data are
- empty or old, refresh_data() is used.
+ empty or old, refresh_data() is used.
+
"""
if use_stored_data:
self.refresh_data()
@@ -471,9 +489,11 @@ class Steem(object):
def sp_to_rshares(self, steem_power, voting_power=10000, vote_pct=10000):
""" Obtain the r-shares from Steem power
+
:param number steem_power: Steem Power
:param int voting_power: voting power (100% = 10000)
:param int vote_pct: voting participation (100% = 10000)
+
"""
# calculate our account voting shares (from vests)
vesting_shares = int(self.sp_to_vests(steem_power) * 1e6)
@@ -481,9 +501,11 @@ class Steem(object):
def vests_to_rshares(self, vests, voting_power=10000, vote_pct=10000):
""" Obtain the r-shares from vests
+
:param number vests: vesting shares
:param int voting_power: voting power (100% = 10000)
:param int vote_pct: voting participation (100% = 10000)
+
"""
used_power = self._calc_resulting_vote(voting_power=voting_power, vote_pct=vote_pct)
# calculate vote rshares
@@ -503,6 +525,7 @@ class Steem(object):
:param number steem_power: Steem Power
:param number vests: vesting shares
:param int voting_power: voting power (100% = 10000)
+
"""
if steem_power is None and vests is None:
raise ValueError("Either steem_power or vests has to be set!")
@@ -522,10 +545,13 @@ class Steem(object):
def get_chain_properties(self, use_stored_data=True):
""" Return witness elected chain properties
- ::
- {'account_creation_fee': '30.000 STEEM',
- 'maximum_block_size': 65536,
- 'sbd_interest_rate': 250}
+ Properties:::
+ {
+ 'account_creation_fee': '30.000 STEEM',
+ 'maximum_block_size': 65536,
+ 'sbd_interest_rate': 250
+ }
+
"""
if use_stored_data:
self.refresh_data()
@@ -718,6 +744,7 @@ class Steem(object):
""" Broadcast a transaction to the Steem network
:param tx tx: Signed transaction to broadcast
+
"""
if tx:
# If tx is provided, we broadcast the tx
@@ -738,8 +765,10 @@ class Steem(object):
:func:`beem.wallet.create`.
:param str pwd: Password to use for the new wallet
+
:raises beem.exceptions.WalletExists: if there is already a
wallet created
+
"""
return self.wallet.create(pwd)
@@ -1152,9 +1181,9 @@ class Steem(object):
If left empty, it will be derived from title automatically.
:param str reply_identifier: Identifier of the parent post/comment (only
if this post is a reply/comment).
- :param (str, dict) json_metadata: JSON meta object that can be attached to
+ :param str/dict json_metadata: JSON meta object that can be attached to
the post.
- :param (str, dict) comment_options: JSON options object that can be
+ :param dict comment_options: JSON options object that can be
attached to the post.
Example::
@@ -1177,11 +1206,11 @@ class Steem(object):
`json_metadata`.
:param str app: (Optional) Name of the app which are used for posting
when not set, beem/<version> is used
- :param (str, list) tags: (Optional) A list of tags (5 max) to go with the
+ :param str/list tags: (Optional) A list of tags (5 max) to go with the
post. This will also override the tags specified in
`json_metadata`. The first tag will be used as a 'category'. If
provided as a string, it should be space separated.
- :param (list of dicts) beneficiaries: (Optional) A list of beneficiaries
+ :param list beneficiaries: (Optional) A list of beneficiaries
for posting reward distribution. This argument overrides
beneficiaries as specified in `comment_options`.
diff --git a/beem/transactionbuilder.py b/beem/transactionbuilder.py
index a58f5d522ed8c3707593d07144a19ce89422d821..a354830d1e73b616f0fc0f6647ec8a9ce60bc172 100644
--- a/beem/transactionbuilder.py
+++ b/beem/transactionbuilder.py
@@ -16,8 +16,7 @@ from .exceptions import (
InsufficientAuthorityError,
MissingKeyError,
InvalidWifError,
- WalletLocked,
- KeyNotFound
+ WalletLocked
)
from beem.instance import shared_steem_instance
import logging
@@ -163,7 +162,7 @@ class TransactionBuilder(dict):
r.append([wif, authority[1]])
except ValueError:
pass
- except KeyNotFound:
+ except MissingKeyError:
pass
if sum([x[1] for x in r]) < required_treshold:
@@ -294,6 +293,41 @@ class TransactionBuilder(dict):
except Exception as e:
raise e
+ def get_potential_signatures(self):
+ """ Returns public key from signature
+ """
+ if self.steem.rpc.get_use_appbase():
+ args = {'trx': self.json()}
+ else:
+ args = self.json()
+ ret = self.steem.rpc.get_potential_signatures(args, api="database")
+ if 'keys' in ret:
+ ret = ret["keys"]
+ return ret
+
+ def get_transaction_hex(self):
+ """ Returns a hex value of the transaction
+ """
+ if self.steem.rpc.get_use_appbase():
+ args = {'trx': self.json()}
+ else:
+ args = self.json()
+ ret = self.steem.rpc.get_transaction_hex(args, api="database")
+ if 'hex' in ret:
+ ret = ret["hex"]
+ return ret
+
+ def get_required_signatures(self, available_keys=list()):
+ """ Returns public key from signature
+ """
+ if self.steem.rpc.get_use_appbase():
+ args = {'trx': self.json(), 'available_keys': available_keys}
+ ret = self.steem.rpc.get_required_signatures(args, api="database")
+ else:
+ ret = self.steem.rpc.get_required_signatures(self.json(), available_keys, api="database")
+
+ return ret
+
def broadcast(self, max_block_age=-1):
""" Broadcast a transaction to the steem network
Returns the signed transaction and clears itself
@@ -407,5 +441,5 @@ class TransactionBuilder(dict):
wif = self.steem.wallet.getPrivateKeyForPublicKey(pub)
if wif:
self.appendWif(wif)
- except KeyNotFound:
+ except MissingKeyError:
wif = None
diff --git a/beem/version.py b/beem/version.py
index 3e50a9ecd15ea83e0528bbeb64b94426ce67b27f..f72aa5bb52436efa7fe650a87a70786157922ebe 100644
--- a/beem/version.py
+++ b/beem/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.26'
+version = '0.19.27'
diff --git a/beem/vote.py b/beem/vote.py
index 75f08b85435886b50f8e1c74fa8347c6df185cf0..1c1911a0e1cba6959f983b47ab60c2e9eb4f67b8 100644
--- a/beem/vote.py
+++ b/beem/vote.py
@@ -272,6 +272,30 @@ class VotesObject(list):
t = PrettyTable(table_header)
t.align = "l"
+ def __contains__(self, item):
+ if isinstance(item, Account):
+ name = item["name"]
+ authorperm = ""
+ elif isinstance(item, Comment):
+ authorperm = item.authorperm
+ name = ""
+ else:
+ name = item
+ authorperm = item
+
+ return (
+ any([name == x["voter"] for x in self]) or
+ any([name == x.votee for x in self]) or
+ any([authorperm == x["authorperm"] for x in self])
+ )
+
+ def __str__(self):
+ return self.printAsTable(return_str=True)
+
+ def __repr__(self):
+ return "<%s %s>" % (
+ self.__class__.__name__, str(self.identifier))
+
class ActiveVotes(VotesObject):
""" Obtain a list of votes for a post
@@ -312,7 +336,7 @@ class ActiveVotes(VotesObject):
authorperm = authorperm["authorperm"]
if votes is None:
return
-
+ self.identifier = authorperm
super(ActiveVotes, self).__init__(
[
Vote(x, authorperm=authorperm, lazy=True, steem_instance=self.steem)
@@ -334,6 +358,7 @@ class AccountVotes(VotesObject):
stop = addTzInfo(stop)
account = Account(account, steem_instance=self.steem)
votes = account.get_account_votes()
+ self.identifier = account["name"]
vote_list = []
for x in votes:
time = x.get("time", "")
diff --git a/beem/wallet.py b/beem/wallet.py
index cf7bb6a72b8700c291a8b8e1e3065d1ed9c6f383..42f9ed6d175e1de999530cdc649d2ea295432303 100644
--- a/beem/wallet.py
+++ b/beem/wallet.py
@@ -11,7 +11,7 @@ from beemgraphenebase.account import PrivateKey
from beem.instance import shared_steem_instance
from .account import Account
from .exceptions import (
- KeyNotFound,
+ MissingKeyError,
InvalidWifError,
WalletExists,
WalletLocked,
@@ -332,7 +332,7 @@ class Wallet(object):
encwif = self.keyStorage.getPrivateKeyForPublicKey(pub)
if not encwif:
- raise KeyNotFound("No private key for {} found".format(pub))
+ raise MissingKeyError("No private key for {} found".format(pub))
return self.decrypt_wif(encwif)
def removePrivateKeyFromPublicKey(self, pub):
@@ -380,10 +380,10 @@ class Wallet(object):
key = self.getPrivateKeyForPublicKey(authority[0])
if key:
return key
- except KeyNotFound:
+ except MissingKeyError:
key = None
if key is None:
- raise KeyNotFound("No private key for {} found".format(name))
+ raise MissingKeyError("No private key for {} found".format(name))
return
def getOwnerKeyForAccount(self, name):
diff --git a/beem/witness.py b/beem/witness.py
index bb03040e3d80c85cb19964c1ba909f8f1ea25315..84c1e064dc0e1e94dc649c8b4da3dba5f7608bf2 100644
--- a/beem/witness.py
+++ b/beem/witness.py
@@ -186,6 +186,25 @@ class WitnessesObject(list):
else:
print(t.get_string(**kwargs))
+ def __contains__(self, item):
+ from .account import Account
+ if isinstance(item, Account):
+ name = item["name"]
+ elif self.steem:
+ account = Account(item, steem_instance=self.steem)
+ name = account["name"]
+
+ return (
+ any([name == x["owner"] for x in self])
+ )
+
+ def __str__(self):
+ return self.printAsTable(return_str=True)
+
+ def __repr__(self):
+ return "<%s %s>" % (
+ self.__class__.__name__, str(self.identifier))
+
class Witnesses(WitnessesObject):
""" Obtain a list of **active** witnesses and the current schedule
@@ -202,7 +221,7 @@ class Witnesses(WitnessesObject):
self.active_witnessess = self.steem.rpc.get_active_witnesses()
self.schedule = self.steem.rpc.get_witness_schedule()
self.witness_count = self.steem.rpc.get_witness_count()
-
+ self.identifier = ""
super(Witnesses, self).__init__(
[
Witness(x, lazy=True, steem_instance=self.steem)
@@ -221,7 +240,7 @@ class WitnessesVotedByAccount(WitnessesObject):
def __init__(self, account, steem_instance=None):
self.steem = steem_instance or shared_steem_instance()
self.account = Account(account, full=True, steem_instance=self.steem)
-
+ self.identifier = self.account["name"]
if self.steem.rpc.get_use_appbase():
if "witnesses_voted_for" not in self.account:
return
@@ -254,6 +273,7 @@ class WitnessesRankedByVote(WitnessesObject):
self.steem = steem_instance or shared_steem_instance()
witnessList = []
last_limit = limit
+ self.identifier = ""
if self.steem.rpc.get_use_appbase() and not from_account:
last_account = "0"
else:
@@ -297,6 +317,7 @@ class ListWitnesses(WitnessesObject):
"""
def __init__(self, from_account, limit, steem_instance=None):
self.steem = steem_instance or shared_steem_instance()
+ self.identifier = from_account
if self.steem.rpc.get_use_appbase():
witnessess = self.steem.rpc.list_witnesses({'start': from_account, 'limit': limit, 'order': 'by_name'}, api="database")['witnesses']
else:
diff --git a/beemapi/exceptions.py b/beemapi/exceptions.py
index 0ab9981a62c78affefcf10cd3d5197f682c14d27..6d66385f865665b05d9dd9f523121ad0cbd7606f 100644
--- a/beemapi/exceptions.py
+++ b/beemapi/exceptions.py
@@ -4,7 +4,7 @@ from __future__ import print_function
from __future__ import unicode_literals
from builtins import str
import re
-from beemgrapheneapi.graphenerpc import RPCError, RPCErrorDoRetry
+from beemgrapheneapi.graphenerpc import RPCError, RPCErrorDoRetry, NumRetriesReached
def decodeRPCErrorMsg(e):
@@ -53,10 +53,6 @@ class NoAccessApi(RPCError):
pass
-class NumRetriesReached(Exception):
- pass
-
-
class InvalidEndpointUrl(Exception):
pass
diff --git a/beemapi/steemnoderpc.py b/beemapi/steemnoderpc.py
index 018c557cfffa4bf5bf95c5e7c31f54202f2f000d..9c3ffab503b1c25749070ba83cab5c630f2f6520 100644
--- a/beemapi/steemnoderpc.py
+++ b/beemapi/steemnoderpc.py
@@ -15,19 +15,29 @@ log = logging.getLogger(__name__)
class SteemNodeRPC(GrapheneRPC):
- """This class allows to call API methods exposed by the witness node via
- websockets / rpc-json.
+ """ This class allows to call API methods exposed by the witness node via
+ websockets / rpc-json.
- :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
- :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 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
+ :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)
"""
def __init__(self, *args, **kwargs):
+ """ Init SteemNodeRPC
+
+ :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
+ :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)
+
+ """
super(SteemNodeRPC, self).__init__(*args, **kwargs)
self.next_node_on_empty_reply = False
@@ -45,16 +55,14 @@ class SteemNodeRPC(GrapheneRPC):
:raises RPCError: if the server returns an error
"""
doRetry = True
- cnt = 0
- while doRetry and cnt < self.num_retries_call:
+ maxRetryCountReached = False
+ while doRetry and not maxRetryCountReached:
doRetry = False
try:
# Forward call to GrapheneWebsocketRPC and catch+evaluate errors
- self.error_cnt_call = cnt
reply = super(SteemNodeRPC, self).rpcexec(payload)
if self.next_node_on_empty_reply and not bool(reply) and self.n_urls > 1:
self._retry_on_next_node("Empty Reply")
- cnt = 0
doRetry = True
self.next_node_on_empty_reply = True
else:
@@ -63,39 +71,33 @@ class SteemNodeRPC(GrapheneRPC):
except exceptions.RPCErrorDoRetry as e:
msg = exceptions.decodeRPCErrorMsg(e).strip()
try:
- sleep_and_check_retries(self.num_retries_call, cnt, self.url, str(msg), call_retry=True)
+ sleep_and_check_retries(self.num_retries_call, self.error_cnt_call, self.url, str(msg), call_retry=True)
doRetry = True
except CallRetriesReached:
if self.n_urls > 1:
self._retry_on_next_node(msg)
- cnt = 0
doRetry = True
else:
raise CallRetriesReached
except exceptions.RPCError as e:
try:
- doRetry = self._check_error_message(e, cnt)
+ doRetry = self._check_error_message(e, self.error_cnt_call)
except CallRetriesReached:
msg = exceptions.decodeRPCErrorMsg(e).strip()
if self.n_urls > 1:
self._retry_on_next_node(msg)
- cnt = 0
doRetry = True
else:
raise CallRetriesReached
except Exception as e:
raise e
- if doRetry:
- if self.error_cnt_call == 0:
- cnt += 1
- else:
- cnt = self.error_cnt_call + 1
+ if self.error_cnt_call >= self.num_retries_call:
+ maxRetryCountReached = True
def _retry_on_next_node(self, error_msg):
self.error_cnt[self.url] += 1
sleep_and_check_retries(self.num_retries, self.error_cnt[self.url], self.url, error_msg, sleep=False, call_retry=False)
self.next()
- self.error_cnt_call = 0
def _check_error_message(self, e, cnt):
"""Check error message and decide what to do"""
diff --git a/beemapi/version.py b/beemapi/version.py
index 3e50a9ecd15ea83e0528bbeb64b94426ce67b27f..f72aa5bb52436efa7fe650a87a70786157922ebe 100644
--- a/beemapi/version.py
+++ b/beemapi/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.26'
+version = '0.19.27'
diff --git a/beembase/operationids.py b/beembase/operationids.py
index 254bbb46b9256a4d3562cf8a71c4f2bc0c201dbc..96f3b5cf91d27f2156f43ce2052482465dc599b6 100644
--- a/beembase/operationids.py
+++ b/beembase/operationids.py
@@ -51,6 +51,7 @@ ops = [
'curation_reward',
'comment_reward',
'liquidity_reward',
+ 'producer_reward',
'interest',
'fill_vesting_withdraw',
'fill_order',
diff --git a/beembase/signedtransactions.py b/beembase/signedtransactions.py
index 299c1cc6e8acfd981765eef3e299f8a6d8d993c5..49416bc1cea6171c536eb3d6c9f9db0e3e9d6dac 100644
--- a/beembase/signedtransactions.py
+++ b/beembase/signedtransactions.py
@@ -22,10 +22,10 @@ class Signed_Transaction(GrapheneSigned_Transaction):
def __init__(self, *args, **kwargs):
super(Signed_Transaction, self).__init__(*args, **kwargs)
- def sign(self, wifkeys, chain=u"STM"):
+ def sign(self, wifkeys, chain=u"STEEM"):
return super(Signed_Transaction, self).sign(wifkeys, chain)
- def verify(self, pubkeys=[], chain=u"STM"):
+ def verify(self, pubkeys=[], chain=u"STEEM"):
return super(Signed_Transaction, self).verify(pubkeys, chain)
def getOperationKlass(self):
diff --git a/beembase/version.py b/beembase/version.py
index 3e50a9ecd15ea83e0528bbeb64b94426ce67b27f..f72aa5bb52436efa7fe650a87a70786157922ebe 100644
--- a/beembase/version.py
+++ b/beembase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.26'
+version = '0.19.27'
diff --git a/beemgrapheneapi/exceptions.py b/beemgrapheneapi/exceptions.py
index 2b1f4b69310706f70eb8e5cfe1e76ee703efa7bc..460d6c2e0c18436cc2c2a7b3518ece3131abf99c 100644
--- a/beemgrapheneapi/exceptions.py
+++ b/beemgrapheneapi/exceptions.py
@@ -35,6 +35,6 @@ class NumRetriesReached(Exception):
class CallRetriesReached(Exception):
- """CallRetriesReached Exception."""
+ """CallRetriesReached Exception. Only for internal use"""
pass
diff --git a/beemgrapheneapi/graphenerpc.py b/beemgrapheneapi/graphenerpc.py
index b98a1e41be8aed632ea15792996e533d68710c45..a80dab4c932911f6572847b245275c3666480f9a 100644
--- a/beemgrapheneapi/graphenerpc.py
+++ b/beemgrapheneapi/graphenerpc.py
@@ -91,6 +91,7 @@ class GrapheneRPC(object):
:param int num_retries: Try x times to num_retries to a node on disconnect, -1 for indefinitely
: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)
Available APIs:
@@ -140,6 +141,7 @@ class GrapheneRPC(object):
self.user = user
self.password = password
self.ws = None
+ self.url = None
self.session = None
self.rpc_queue = []
self.timeout = kwargs.get('timeout', 60)
diff --git a/beemgrapheneapi/rpcutils.py b/beemgrapheneapi/rpcutils.py
index c0a36889c3a129f10353643e1e7e00e3556853ad..65575cab9c5b8fc6b491f73e562665ef01f32c1a 100644
--- a/beemgrapheneapi/rpcutils.py
+++ b/beemgrapheneapi/rpcutils.py
@@ -38,7 +38,7 @@ def get_query(appbase, request_id, api_name, name, args):
"params": args[0],
"jsonrpc": "2.0",
"id": request_id}
- elif len(args) > 0 and isinstance(args, list) and len(args[0]) > 0 and isinstance(args[0], list) and isinstance(args[0][0], dict):
+ elif len(args) > 0 and isinstance(args, list) and isinstance(args[0], list) and len(args[0]) > 0 and isinstance(args[0][0], dict):
for a in args[0]:
query.append({"method": api_name + "." + name,
"params": a,
diff --git a/beemgrapheneapi/version.py b/beemgrapheneapi/version.py
index 3e50a9ecd15ea83e0528bbeb64b94426ce67b27f..f72aa5bb52436efa7fe650a87a70786157922ebe 100644
--- a/beemgrapheneapi/version.py
+++ b/beemgrapheneapi/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.26'
+version = '0.19.27'
diff --git a/beemgraphenebase/version.py b/beemgraphenebase/version.py
index 3e50a9ecd15ea83e0528bbeb64b94426ce67b27f..f72aa5bb52436efa7fe650a87a70786157922ebe 100644
--- a/beemgraphenebase/version.py
+++ b/beemgraphenebase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.26'
+version = '0.19.27'
diff --git a/docs/beemapi.exceptions.rst b/docs/beemapi.exceptions.rst
index 07c320d990fadf435155d6e893240426dd97ed71..536a015b96bb209669675f3f7dd4fedff6830b5f 100644
--- a/docs/beemapi.exceptions.rst
+++ b/docs/beemapi.exceptions.rst
@@ -1,7 +1,7 @@
-beemapi\.exceptions module
-==========================
+beemapi\.exceptions
+===================
.. automodule:: beemapi.exceptions
:members:
:undoc-members:
- :show-inheritance:
\ No newline at end of file
+ :show-inheritance:
diff --git a/requirements.txt b/requirements.txt
index 82847f4d8da3bb130253b98c669463a89437a0d6..2ccb0e9b5998c4a1b34b34e2cadb52412ff95123 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ requests
websocket-client
pytz
pycryptodomex>=3.4.6
-scrypt>=0.7.1
+scrypt>=0.8.0
Events>=0.2.2
pyyaml
pytest
diff --git a/setup.py b/setup.py
index 6ca1f8fcefe041a96d0a624bccfa1f115d7cae61..d8ee4d617a3d145f68ed3e25e6a4c7d9af5a36b2 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ except LookupError:
ascii = codecs.lookup('ascii')
codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
-VERSION = '0.19.26'
+VERSION = '0.19.27'
tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized']
diff --git a/tests/beem/test_wallet.py b/tests/beem/test_wallet.py
index 52b3984d54f5fa78772834b44f9ccdbf3a5d0ac0..cb1dcd4406869fc18b07aa4f53e38e34d1519132 100644
--- a/tests/beem/test_wallet.py
+++ b/tests/beem/test_wallet.py
@@ -124,19 +124,19 @@ class Testcases(unittest.TestCase):
self.wallet.steem = stm
self.wallet.unlock(pwd="TestingOneTwoThree")
with self.assertRaises(
- exceptions.KeyNotFound
+ exceptions.MissingKeyError
):
self.wallet.getOwnerKeyForAccount("test")
with self.assertRaises(
- exceptions.KeyNotFound
+ exceptions.MissingKeyError
):
self.wallet.getMemoKeyForAccount("test")
with self.assertRaises(
- exceptions.KeyNotFound
+ exceptions.MissingKeyError
):
self.wallet.getActiveKeyForAccount("test")
with self.assertRaises(
- exceptions.KeyNotFound
+ exceptions.MissingKeyError
):
self.wallet.getPostingKeyForAccount("test")
diff --git a/tests/beemapi/test_steemnoderpc.py b/tests/beemapi/test_steemnoderpc.py
index 763dba86136509b840a431183fea15622e81614c..f7ce56241ed93e4ca0b78db542564f8f1532d76f 100644
--- a/tests/beemapi/test_steemnoderpc.py
+++ b/tests/beemapi/test_steemnoderpc.py
@@ -15,6 +15,7 @@ from beem import Steem
from beemapi.steemnoderpc import SteemNodeRPC
from beemapi.websocket import SteemWebsocket
from beemapi import exceptions
+from beemgrapheneapi.exceptions import NumRetriesReached, CallRetriesReached
from beem.instance import set_shared_steem_instance
# Py3 compatibility
import sys
@@ -169,3 +170,46 @@ class Testcases(unittest.TestCase):
exceptions.RPCError
):
rpc._check_for_server_error(self.get_reply("511 Network Authentication Required"))
+
+ def test_num_retries(self):
+ with self.assertRaises(
+ NumRetriesReached
+ ):
+ SteemNodeRPC(urls="https://wrong.link.com", num_retries=2, timeout=1)
+ with self.assertRaises(
+ NumRetriesReached
+ ):
+ SteemNodeRPC(urls="https://wrong.link.com", num_retries=3, num_retries_call=3, timeout=1)
+ nodes = ["https://httpstat.us/500", "https://httpstat.us/501", "https://httpstat.us/502", "https://httpstat.us/503",
+ "https://httpstat.us/505", "https://httpstat.us/511", "https://httpstat.us/520", "https://httpstat.us/522",
+ "https://httpstat.us/524"]
+ with self.assertRaises(
+ NumRetriesReached
+ ):
+ SteemNodeRPC(urls=nodes, num_retries=0, num_retries_call=0, timeout=1)
+
+ def test_error_handling(self):
+ rpc = SteemNodeRPC(urls=nodes, num_retries=2, num_retries_call=3)
+ with self.assertRaises(
+ exceptions.NoMethodWithName
+ ):
+ rpc.get_wrong_command()
+ with self.assertRaises(
+ exceptions.UnhandledRPCError
+ ):
+ rpc.get_accounts("test")
+
+ def test_error_handling_appbase(self):
+ rpc = SteemNodeRPC(urls=nodes_appbase, num_retries=2, num_retries_call=3)
+ with self.assertRaises(
+ exceptions.NoMethodWithName
+ ):
+ rpc.get_wrong_command()
+ with self.assertRaises(
+ exceptions.NoApiWithName
+ ):
+ rpc.get_config(api="wrong_api")
+ with self.assertRaises(
+ exceptions.UnhandledRPCError
+ ):
+ rpc.get_config("test")
diff --git a/util/package-osx.sh b/util/package-osx.sh
index 68281b4b5ca15c7ee85df8ecec2508530012cd75..588c081080152a20536695d52f041f55a8e116a4 100644
--- a/util/package-osx.sh
+++ b/util/package-osx.sh
@@ -9,7 +9,7 @@ rm -rf dist build locale
pip install
python setup.py clean
python setup.py build_ext
-python setup.py build_locales
+# python setup.py build_locales
pip install pyinstaller
pyinstaller beempy-onedir.spec
@@ -17,13 +17,13 @@ cd dist
ditto -rsrc --arch x86_64 'beempy.app' 'beempy.tmp'
rm -r 'beempy.app'
mv 'beempy.tmp' 'beempy.app'
-hdiutil create -volname "beempy $VERSION" -srcfolder 'beempy.app' -ov -format UDBZ "beempy $VERSION.dmg"
+hdiutil create -volname "beempy $VERSION" -srcfolder 'beempy.app' -ov -format UDBZ "beempy_$VERSION.dmg"
if [ -n "$UPLOAD_OSX" ]
then
- curl --upload-file "beempy $VERSION.dmg" https://transfer.sh/
+ curl --upload-file "beempy_$VERSION.dmg" https://transfer.sh/
# Required for a newline between the outputs
echo -e "\n"
- md5 -r "beempy $VERSION.dmg"
+ md5 -r "beempy_$VERSION.dmg"
echo -e "\n"
- shasum -a 256 "beempy $VERSION.dmg"
+ shasum -a 256 "beempy_$VERSION.dmg"
fi