Merge branch 'release/0.3.1'

Author: xeroc

AUTHORS

@@ -1,7 +1,8 @@
    409	Fabian Schuh <[email protected]>
-   137	Fabian Schuh <[email protected]>
-    85	Fabian Schuh <[email protected]>
+   150	Fabian Schuh <[email protected]>
+    88	Fabian Schuh <[email protected]>
     27	jhtitor <[email protected]>
+    26	pyup-bot <[email protected]>
      6	Vladimir Kamarzin <[email protected]>
      4	Chris Beaven <[email protected]>
      4	Stefan Schiessl <[email protected]>

Makefile

@@ -47,7 +47,7 @@ docs:
 	SPHINX_APIDOC_OPTIONS="members,undoc-members,show-inheritance,inherited-members" sphinx-apidoc -d 6 -e -f -o docs . *.py tests
 	make -C docs clean html
 
-prepare: clean test apidocs authors
+prepare: clean test docs authors
 
 release: clean check dist git
 

bitshares/block.py

@@ -31,11 +31,9 @@ class Block(GrapheneBlock):
 
     """
 
-    def define_classes(self):
-        self.type_id = "-none-"
+    pass
 
 
 @BlockchainInstance.inject
 class BlockHeader(GrapheneBlockHeader):
-    def define_classes(self):
-        self.type_id = "-none-"
+    pass

bitshares/genesisbalance.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+from .account import Account
+from .instance import BlockchainInstance
+from graphenecommon.genesisbalance import (
+    GenesisBalance as GrapheneGenesisBalance,
+    GenesisBalances as GrapheneGenesisBalances,
+)
+
+from bitsharesbase.account import Address, PublicKey
+from bitsharesbase import operations
+
+
+@BlockchainInstance.inject
+class GenesisBalance(GrapheneGenesisBalance):
+    """ Read data about a Genesis Balances from the chain
+
+        :param str identifier: identifier of the balance
+        :param bitshares blockchain_instance: bitshares() instance to use when
+            accesing a RPC
+
+    """
+
+    type_id = 15
+
+    def define_classes(self):
+        self.account_class = Account
+        self.operations = operations
+        self.address_class = Address
+        self.publickey_class = PublicKey
+
+
+@BlockchainInstance.inject
+class GenesisBalances(GrapheneGenesisBalances):
+    """ List genesis balances that can be claimed from the
+        keys in the wallet
+    """
+
+    def define_classes(self):
+        self.genesisbalance_class = GenesisBalance
+        self.publickey_class = PublicKey
+        self.address_class = Address

bitshares/market.py

@@ -149,25 +149,29 @@ def ticker(self):
 
         ticker = self.blockchain.rpc.get_ticker(self["base"]["id"], self["quote"]["id"])
         data["baseVolume"] = Amount(
-            ticker["base_volume"], self["base"], blockchain_instance=self.blockchain
+            ticker["base_volume"] or 0.0,
+            self["base"],
+            blockchain_instance=self.blockchain,
         )
         data["quoteVolume"] = Amount(
-            ticker["quote_volume"], self["quote"], blockchain_instance=self.blockchain
+            ticker["quote_volume"] or 0.0,
+            self["quote"],
+            blockchain_instance=self.blockchain,
         )
         data["lowestAsk"] = Price(
-            ticker["lowest_ask"],
+            ticker["lowest_ask"] or 0.0,
             base=self["base"],
             quote=self["quote"],
             blockchain_instance=self.blockchain,
         )
         data["highestBid"] = Price(
-            ticker["highest_bid"],
+            ticker["highest_bid"] or 0.0,
             base=self["base"],
             quote=self["quote"],
             blockchain_instance=self.blockchain,
         )
         data["latest"] = Price(
-            ticker["latest"],
+            ticker["latest"] or 0.0,
             quote=self["quote"],
             base=self["base"],
             blockchain_instance=self.blockchain,

bitshares/price.py

@@ -237,7 +237,11 @@ def __init__(self, order, **kwargs):
         elif isinstance(order, dict):
             # filled orders from account history
             if "op" in order:
-                order = order["op"][1]
+                if isinstance(order["op"], (list, set)):
+                    order = order["op"][1]
+                elif isinstance(order["op"], dict):
+                    order = order["op"]
+
             base_asset = kwargs.get("base_asset", order["receives"]["asset_id"])
             Price.__init__(self, order, base_asset=base_asset)
 

docs/bitshares.rst

@@ -16,6 +16,7 @@ Submodules
    bitshares.committee
    bitshares.dex
    bitshares.exceptions
+   bitshares.genesisbalance
    bitshares.htlc
    bitshares.instance
    bitshares.market

docs/requirements.txt

@@ -1,5 +1,5 @@
-graphenelib==1.1.11
+graphenelib==1.1.12
 bitshares==0.3.0
 autobahn>=0.14
-pycryptodome==3.7.3
+pycryptodome==3.8.0
 appdirs==1.4.3

requirements-test.txt

@@ -1,11 +1,11 @@
 # Unit testing
-pytest==4.3.0
-pytest-mock==1.10.1
-coverage==4.5.2
+pytest==4.3.1
+pytest-mock==1.10.2
+coverage==4.5.3
 mock==2.0.0
 
 # Code style
 flake8==3.7.7
 # black
-isort==4.3.12
+isort==4.3.16
 pre-commit==1.14.4

requirements.txt

@@ -1,7 +1,3 @@
-graphenelib>=1.1.11
-pycryptodome==3.7.3
+graphenelib>=1.1.16
 websockets==7.0
-appdirs==1.4.3
 Events==0.3
-scrypt==0.8.13
-pyyaml==3.13

setup.py

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

tests/test_block.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import unittest
 from pprint import pprint
 from bitshares import BitShares
@@ -8,16 +9,15 @@
 
 
 class Testcases(unittest.TestCase):
-
     def setUp(self):
         fixture_data()
 
     def test_block(self):
-        block = Block(1)
+        block = Block(1, use_cache=True)
         self.assertEqual(block["previous"], "0000000000000000000000000000000000000000")
-        self.assertEqual(block.time(), parse_time('2015-10-13T14:12:24'))
+        self.assertEqual(block.time(), parse_time("2015-10-13T14:12:24"))
 
     def test_blockheader(self):
-        header = BlockHeader(1)
+        header = BlockHeader(1, use_cache=True)
         self.assertEqual(header["previous"], "0000000000000000000000000000000000000000")
-        self.assertEqual(header.time(), parse_time('2015-10-13T14:12:24'))
+        self.assertEqual(header.time(), parse_time("2015-10-13T14:12:24"))