Merge branch 'release/0.3.2'

Author: xeroc

bitshares/asset.py

@@ -55,7 +55,8 @@ def max_market_fee(self):
         from .amount import Amount
 
         return Amount(
-            {"amount": self["options"]["max_market_fee"], "asset_id": self["id"]}
+            {"amount": self["options"]["max_market_fee"], "asset_id": self["id"]},
+            blockchain_instance=self.blockchain,
         )
 
     @property
@@ -222,10 +223,12 @@ def release(
             {
                 "flags": flags_int,
                 "whitelist_authorities": [
-                    Account(a)["id"] for a in whitelist_authorities
+                    Account(a, blockchain_instance=self.blockchain)["id"]
+                    for a in whitelist_authorities
                 ],
                 "blacklist_authorities": [
-                    Account(a)["id"] for a in blacklist_authorities
+                    Account(a, blockchain_instance=self.blockchain)["id"]
+                    for a in blacklist_authorities
                 ],
                 "whitelist_markets": [Asset(a)["id"] for a in whitelist_markets],
                 "blacklist_markets": [Asset(a)["id"] for a in blacklist_markets],
@@ -330,11 +333,17 @@ def add_authorities(self, type, authorities=[]):
         options = self["options"]
         if type == "whitelist":
             options["whitelist_authorities"].extend(
-                [Account(a)["id"] for a in authorities]
+                [
+                    Account(a, blockchain_instance=self.blockchain)["id"]
+                    for a in authorities
+                ]
             )
         if type == "blacklist":
             options["blacklist_authorities"].extend(
-                [Account(a)["id"] for a in authorities]
+                [
+                    Account(a, blockchain_instance=self.blockchain)["id"]
+                    for a in authorities
+                ]
             )
         op = operations.Asset_update(
             **{
@@ -360,10 +369,14 @@ def remove_authorities(self, type, authorities=[]):
         options = self["options"]
         if type == "whitelist":
             for a in authorities:
-                options["whitelist_authorities"].remove(Account(a)["id"])
+                options["whitelist_authorities"].remove(
+                    Account(a, blockchain_instance=self.blockchain)["id"]
+                )
         if type == "blacklist":
             for a in authorities:
-                options["blacklist_authorities"].remove(Account(a)["id"])
+                options["blacklist_authorities"].remove(
+                    Account(a, blockchain_instance=self.blockchain)["id"]
+                )
         op = operations.Asset_update(
             **{
                 "fee": {"amount": 0, "asset_id": "1.3.0"},
@@ -396,9 +409,19 @@ def add_markets(self, type, authorities=[], force_enable=True):
             ), "whitelist feature not enabled"
 
         if type == "whitelist":
-            options["whitelist_markets"].extend([Asset(a)["id"] for a in authorities])
+            options["whitelist_markets"].extend(
+                [
+                    Asset(a, blockchain_instance=self.blockchain)["id"]
+                    for a in authorities
+                ]
+            )
         if type == "blacklist":
-            options["blacklist_markets"].extend([Asset(a)["id"] for a in authorities])
+            options["blacklist_markets"].extend(
+                [
+                    Asset(a, blockchain_instance=self.blockchain)["id"]
+                    for a in authorities
+                ]
+            )
         op = operations.Asset_update(
             **{
                 "fee": {"amount": 0, "asset_id": "1.3.0"},
@@ -422,10 +445,14 @@ def remove_markets(self, type, authorities=[]):
         options = self["options"]
         if type == "whitelist":
             for a in authorities:
-                options["whitelist_markets"].remove(Asset(a)["id"])
+                options["whitelist_markets"].remove(
+                    Asset(a, blockchain_instance=self.blockchain)["id"]
+                )
         if type == "blacklist":
             for a in authorities:
-                options["blacklist_markets"].remove(Asset(a)["id"])
+                options["blacklist_markets"].remove(
+                    Asset(a, blockchain_instance=self.blockchain)["id"]
+                )
         op = operations.Asset_update(
             **{
                 "fee": {"amount": 0, "asset_id": "1.3.0"},
@@ -481,7 +508,10 @@ def update_feed_producers(self, producers):
                 "fee": {"amount": 0, "asset_id": "1.3.0"},
                 "issuer": self["issuer"],
                 "asset_to_update": self["id"],
-                "new_feed_producers": [Account(a)["id"] for a in producers],
+                "new_feed_producers": [
+                    Account(a, blockchain_instance=self.blockchain)["id"]
+                    for a in producers
+                ],
                 "extensions": [],
             }
         )
@@ -495,7 +525,7 @@ def change_issuer(self, new_issuer, **kwargs):
         """
         from .account import Account
 
-        new_issuer = Account(new_issuer)
+        new_issuer = Account(new_issuer, blockchain_instance=self.blockchain)
         op = operations.Asset_update_issuer(
             **{
                 "fee": {"amount": 0, "asset_id": "1.3.0"},
@@ -517,9 +547,11 @@ def issue(self, amount, to, memo=None, **kwargs):
         from .memo import Memo
         from .account import Account
 
-        to = Account(to)
+        to = Account(to, blockchain_instance=self.blockchain)
         account = Account(self["issuer"])
-        memoObj = Memo(from_account=account, to_account=to, blockchain_instance=self)
+        memoObj = Memo(
+            from_account=account, to_account=to, blockchain_instance=self.blockchain
+        )
 
         # append operation
         op = operations.Asset_issue(
@@ -538,4 +570,4 @@ def issue(self, amount, to, memo=None, **kwargs):
                 "extensions": [],
             }
         )
-        return self.exbet.finalizeOp(op, self["issuer"], "active", **kwargs)
+        return self.blockchain.finalizeOp(op, self["issuer"], "active", **kwargs)

bitshares/instance.py

@@ -1,12 +1,22 @@
 # -*- coding: utf-8 -*-
-from graphenecommon.instance import AbstractBlockchainInstanceProvider, SharedInstance
+from graphenecommon.instance import AbstractBlockchainInstanceProvider
+
+
+class SharedInstance:
+    """ This class merely offers a singelton for the Blockchain Instance
+    """
+
+    instance = None
+    config = {}
 
 
 class BlockchainInstance(AbstractBlockchainInstanceProvider):
     """ This is a class that allows compatibility with previous
         naming conventions
     """
 
+    _sharedInstance = SharedInstance
+
     def __init__(self, *args, **kwargs):
         # Also allow 'bitshares_instance'
         if kwargs.get("bitshares_instance"):
@@ -33,11 +43,12 @@ def shared_blockchain_instance():
 
 def set_shared_blockchain_instance(instance):
     instance.clear_cache()
-    instance.set_shared_instance()
+    # instance.set_shared_instance()
+    BlockchainInstance.set_shared_blockchain_instance(instance)
 
 
 def set_shared_config(config):
-    shared_blockchain_instance().set_shared_config(config)
+    BlockchainInstance.set_shared_config(config)
 
 
 shared_bitshares_instance = shared_blockchain_instance

bitshares/market.py

@@ -505,7 +505,7 @@ def buy(
 
         tx = self.blockchain.finalizeOp(order, account["name"], "active", **kwargs)
 
-        if returnOrderId:
+        if returnOrderId and tx.get("operation_results"):
             tx["orderid"] = tx["operation_results"][0][1]
             self.blockchain.blocking = prevblocking
 

bitsharesapi/bitsharesnoderpc.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import re
 
 from bitsharesbase.chains import known_chains
@@ -35,7 +36,9 @@ def get_network(self):
         for k, v in known_chains.items():
             if v["chain_id"] == chain_id:
                 return v
-        raise Exception("Connecting to unknown network!")
+        raise exceptions.UnknownNetworkException(
+            "Connecting to unknown network (chain_id: {})!".format(props["chain_id"])
+        )
 
     def get_account(self, name, **kwargs):
         """ Get full account details from account name or id

bitsharesapi/exceptions.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import re
 
 from grapheneapi.exceptions import RPCError
@@ -48,3 +49,10 @@ class AccountCouldntBeFoundException(Exception):
 
 class InvalidAccountNameException(Exception):
     pass
+
+
+class UnknownNetworkException(Exception):
+    """ Thrown when we don't recognize the chain id
+    """
+
+    pass

bitsharesbase/operationids.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #: Operation ids
 ops = [
     "transfer",
@@ -65,3 +66,18 @@ def getOperationNameForId(i):
         if int(operations[key]) is int(i):
             return key
     return "Unknown Operation ID %d" % i
+
+
+def getOperationName(id: str):
+    """ This method returns the name representation of an operation given
+        its value as used in the API
+    """
+    if isinstance(id, str):
+        # Some graphene chains (e.g. steem) do not encode the
+        # operation_type as id but in its string form
+        assert id in operations.keys(), "Unknown operation {}".format(id)
+        return id
+    elif isinstance(id, int):
+        return getOperationNameForId(id)
+    else:
+        raise ValueError

bitsharesbase/operations.py

@@ -911,6 +911,21 @@ def detail(self, *args, **kwargs):
         )
 
 
+class Balance_claim(GrapheneObject):
+    def detail(self, *args, **kwargs):
+        # New pygraphene interface!
+        prefix = kwargs.pop("prefix", default_prefix)
+        return OrderedDict(
+            [
+                ("fee", Asset(kwargs["fee"])),
+                ("deposit_to_account", ObjectId(kwargs["deposit_to_account"], "account")),
+                ("balance_to_claim", ObjectId(kwargs["balance_to_claim"], "balance")),
+                ("balance_owner_key", PublicKey(kwargs["balance_owner_key"], prefix=prefix)),
+                ("total_claimed", Asset(kwargs["total_claimed"])),
+            ]
+        )
+
+
 class Asset_settle(GrapheneObject):
     def detail(self, *args, **kwargs):
         # New pygraphene interface!

docs/requirements.txt

@@ -1,4 +1,4 @@
-graphenelib==1.1.12
+graphenelib==1.1.14
 bitshares==0.3.0
 autobahn>=0.14
 pycryptodome==3.8.0

requirements-test.txt

@@ -1,11 +1,11 @@
 # Unit testing
-pytest==4.3.1
-pytest-mock==1.10.2
+pytest==4.4.0
+pytest-mock==1.10.3
 coverage==4.5.3
 mock==2.0.0
 
 # Code style
 flake8==3.7.7
 # black
 isort==4.3.16
-pre-commit==1.14.4
+pre-commit==1.15.0

setup.py

@@ -13,7 +13,7 @@
     ascii = codecs.lookup("ascii")
     codecs.register(lambda name, enc=ascii: {True: enc}.get(name == "mbcs"))
 
-VERSION = "0.3.1"
+VERSION = "0.3.2"
 URL = "https://github.com/bitshares/python-bitshares"
 
 setup(

tests/test_transactions.py

@@ -515,6 +515,27 @@ def test_bid_collateral(self):
         )
         self.doit()
 
+    def test_balance_claim(self):
+        self.op = operations.Balance_claim(
+            **{
+                "fee": {"amount": 0, "asset_id": "1.3.0"},
+                "deposit_to_account": "1.2.121",
+                "balance_to_claim": "1.15.0",
+                "balance_owner_key": "BTS7YFfmNBLpcrhe7hf39NLQfgBjGvtYBtAAc4nDvZKWxVQjF4CeL",
+                "total_claimed": {"amount": 229174, "asset_id": "1.3.0"},
+                "prefix": prefix,
+            }
+        )
+        self.cm = (
+            "f68585abf4dce7c8045701250000000000000000007900035d2"
+            "3de4ecd631e7aae2ec37ace7da12ffceea9fae1722ff4c8fa04"
+            "2ba9ecd3c2367f03000000000000000120056c75aa663a9bc3f"
+            "8d8806c0c32b820d539ee938684b581657a8179769f9f604c3d"
+            "1b4d7dcdc04be31ea28722da45aace8f5b983cc1a5c5a42ca79"
+            "751d4d0fa"
+        )
+        self.doit()
+
     def test_asset_create(self):
         self.op = operations.Asset_create(
             **{