Merge branch 'release/0.1.19'

Author: xeroc

bitshares/bitshares.py

@@ -1017,6 +1017,8 @@ def approveproposal(
         """ Approve Proposal
 
             :param list proposal_id: Ids of the proposals
+            :param str appprover: The account or key to use for approval
+                (defaults to ``account``)
             :param str account: (optional) the account to allow access
                 to (defaults to ``default_account``)
         """
@@ -1045,7 +1047,6 @@ def approveproposal(
                 "fee": {"amount": 0, "asset_id": "1.3.0"},
                 'fee_paying_account': account["id"],
                 'proposal': proposal["id"],
-                'active_approvals_to_add': [approver["id"]],
                 "prefix": self.prefix
             }
             if is_key:
@@ -1058,8 +1059,9 @@ def approveproposal(
                 })
             op.append(operations.Proposal_update(**update_dict))
         if is_key:
-            self.txbuffer.appendSigner(account["name"], "active")
-        return self.finalizeOp(op, approver["name"], "active", **kwargs)
+            self.txbuffer.appendSigner(approver, "active")
+            return self.finalizeOp(op, account["name"], "active", **kwargs)
+        return self.finalizeOp(op, approver, "active", **kwargs)
 
     def disapproveproposal(
         self, proposal_ids, account=None, approver=None, **kwargs

bitshares/exceptions.py

@@ -143,8 +143,3 @@ class WrongMemoKey(Exception):
     """
     pass
 
-
-class KeyNotFound(Exception):
-    """ Key not found
-    """
-    pass

bitshares/memo.py

@@ -3,7 +3,7 @@
 from bitsharesbase import memo as BtsMemo
 from bitsharesbase.account import PrivateKey, PublicKey
 from .account import Account
-from .exceptions import MissingKeyError
+from .exceptions import MissingKeyError, KeyNotFound
 
 
 class Memo(object):

bitshares/price.py

@@ -507,7 +507,7 @@ def __repr__(self):
                     )),
                     str(self["for_sale"]),
                 )
-            else:
+            elif "amount_to_sell" in self:
                 t += "{} for {} ".format(
                     str(Amount(
                         self["amount_to_sell"],
@@ -518,6 +518,19 @@ def __repr__(self):
                         blockchain_instance=self.blockchain
                     )),
                 )
+            elif "quote" in self and "base" in self:
+                t += "{} for {} ".format(
+                    str(Amount({
+                        "amount": self["quote"],
+                        "asset_id": self["quote"]["asset"]["id"]},
+                        blockchain_instance=self.blockchain
+                    )),
+                    str(Amount({
+                        "amount": self["base"],
+                        "asset_id": self["base"]["asset"]["id"]},
+                        blockchain_instance=self.blockchain
+                    )),
+                )
             return t + "@ " + Price.__repr__(self)
 
     __str__ = __repr__

bitshares/transactionbuilder.py

@@ -210,14 +210,12 @@ def appendSigner(self, account, permission):
             and permission is supposed to sign the transaction
         """
         assert permission in ["active", "owner"], "Invalid permission"
-        account = Account(account, blockchain_instance=self.blockchain)
-        required_treshold = account[permission]["weight_threshold"]
 
         if self.blockchain.wallet.locked():
             raise WalletLocked()
 
         # Let's define a helper function for recursion
-        def fetchkeys(account, perm, level=0):
+        def fetchkeys(account, perm, level=0, required_treshold=1):
             if level > 2:
                 return []
             r = []
@@ -234,7 +232,7 @@ def fetchkeys(account, perm, level=0):
                 for authority in account[perm]["account_auths"]:
                     auth_account = Account(
                         authority[0], blockchain_instance=self.blockchain)
-                    r.extend(fetchkeys(auth_account, perm, level + 1))
+                    r.extend(fetchkeys(auth_account, perm, level + 1, required_treshold))
 
             return r
 
@@ -251,11 +249,11 @@ def fetchkeys(account, perm, level=0):
             else:
                 account = Account(account, blockchain_instance=self.blockchain)
                 required_treshold = account[permission]["weight_threshold"]
-                keys = fetchkeys(account, permission)
+                keys = fetchkeys(account, permission, required_treshold=required_treshold)
                 # If we couldn't find an active key, let's try overwrite it
                 # with an owner key
                 if not keys and permission != "owner":
-                    keys.extend(fetchkeys(account, "owner"))
+                    keys.extend(fetchkeys(account, "owner", required_treshold=required_treshold))
                 for x in keys:
                     self.wifs.add(x[0])
 

setup.cfg

@@ -25,4 +25,4 @@ exclude =
     __pycache__,
     # The conf file is mostly autogenerated, ignore it
     docs/conf.py,
-max-complexity = 10
+max-complexity = 15

setup.py

@@ -11,7 +11,7 @@
     ascii = codecs.lookup('ascii')
     codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
 
-VERSION = '0.1.18'
+VERSION = '0.1.19'
 
 setup(
     name='bitshares',