u-transnet · Jan 27, 2018 · May 7, 2017 · Jul 4, 2017 · Jul 26, 2017 · Aug 1, 2017
diff --git a/.gitignore b/.gitignore
@@ -61,3 +61,5 @@ target/
 
 # Vim temp files
 *.swp
+.ropeproject/
+*/.ropeproject/
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 language: python
-python: "3.5"
+python:
+  - 3.5
 install:
  - pip install tox codecov
 script:
  - tox
-env:
-  - TOXENV=py35
 after_success:
   - codecov
diff --git a/Makefile b/Makefile
@@ -1,9 +1,5 @@
 .PHONY: clean-pyc clean-build docs
 
-TAG := $(shell git describe master --abbrev=0)
-TAGSTEEM := $(shell git describe master --abbrev=0 | tr "." "-")
-
-# 
 clean: clean-build clean-pyc
 
 clean-build:
@@ -43,7 +39,4 @@ dist:
 	python3 setup.py sdist upload -r pypi
 	python3 setup.py bdist_wheel upload
 
-release: clean check dist bitshares-changelog git
-
-bitshares-changelog:
-	git show -s --pretty=format: $(TAG) | tail -n +4 | piston post --file "-" --author chainsquad --permlink "python-bitshares-changelog-$(TAGSTEEM)" --category bitshares --title "[Changelog] python-bitshares $(TAG)" --tags python-bitshares changelog
+release: clean check dist git
diff --git a/README.md b/README.md
@@ -1,4 +1,27 @@
-Python Library for BitShares
-========================
+# Python Library for BitShares
 
-*placeholder*
+---
+
+## Documentation
+
+Visit the [pybitshares website](http://docs.pybitshares.com/en/latest/) for in depth documentation on this Python library.
+
+## Installation
+
+### Install with pip:
+```
+$ sudo apt-get install libffi-dev libssl-dev python-dev python3-dev python3-pip
+$ pip3 install bitshares
+```
+
+### Manual installation:
+```
+$ git clone https://github.com/xeroc/python-bitshares/
+$ cd python-bitshares
+$ python3 setup.py install --user
+```
+
+### Upgrade
+```
+$ pip3 install --user --upgrade
+```
diff --git a/bitshares/__init__.py b/bitshares/__init__.py
@@ -16,5 +16,6 @@
     "wallet",
     "committee",
     "vesting",
-    "proposal"
+    "proposal",
+    "message"
 ]
diff --git a/bitshares/account.py b/bitshares/account.py
@@ -38,16 +38,16 @@ class Account(BlockchainObject):
     def __init__(
         self,
         account,
-        lazy=False,
         full=False,
+        lazy=False,
         bitshares_instance=None
     ):
         self.full = full
         super().__init__(
             account,
-            lazy=False,
-            full=False,
-            bitshares_instance=None
+            lazy=lazy,
+            full=full,
+            bitshares_instance=bitshares_instance
         )
 
     def refresh(self):
@@ -59,9 +59,9 @@ def refresh(self):
         else:
             account = self.bitshares.rpc.lookup_account_names(
                 [self.identifier])[0]
-            self.identifier = account["id"]
         if not account:
             raise AccountDoesNotExistsException(self.identifier)
+        self.identifier = account["id"]
 
         if self.full:
             account = self.bitshares.rpc.get_full_accounts(
@@ -118,9 +118,7 @@ def call_positions(self):
     def callpositions(self):
         """ List call positions (collateralized positions :doc:`mpa`)
         """
-        if not self.full:
-            self.full = True
-            self.refresh()
+        self.ensure_full()
         from .dex import Dex
         dex = Dex(bitshares_instance=self.bitshares)
         return dex.list_debt_positions(self)
@@ -130,10 +128,22 @@ def openorders(self):
         """ Returns open Orders
         """
         from .price import Order
-        if not self.full:
+        self.ensure_full()
+        return [
+            Order(o, bitshares_instance=self.bitshares)
+            for o in self["limit_orders"]
+        ]
+
+    @property
+    def is_fully_loaded(self):
+        """ Is this instance fully loaded / e.g. all data available?
+        """
+        return (self.full and "votes" in self)
+
+    def ensure_full(self):
+        if not self.is_fully_loaded:
             self.full = True
             self.refresh()
-        return [Order(o) for o in self["limit_orders"]]
 
     def history(
         self, first=None,
@@ -165,7 +175,7 @@ def history(
             api="history"
         )
         if not mostrecent:
-            raise StopIteration
+            return
 
         if not first:
             # first = int(mostrecent[0].get("id").split(".")[2]) + 1
@@ -191,7 +201,7 @@ def history(
                     cnt += 1
                     yield i
                     if limit >= 0 and cnt >= limit:
-                        raise StopIteration
+                        return
 
             if not txs:
                 break

diff --git a/bitshares/amount.py b/bitshares/amount.py
@@ -91,7 +91,7 @@ def __init__(self, *args, amount=None, asset=None, bitshares_instance=None):
 
         elif isinstance(amount, (int, float)) and asset and isinstance(asset, str):
             self["amount"] = amount
-            self["asset"] = Asset(asset)
+            self["asset"] = Asset(asset, bitshares_instance=self.bitshares)
             self["symbol"] = asset
 
         else:
@@ -145,7 +145,7 @@ def __str__(self):
         )
 
     def __float__(self):
-        return self["amount"]
+        return float(self["amount"])
 
     def __int__(self):
         return int(self["amount"] * 10 ** self["asset"]["precision"])
@@ -171,6 +171,7 @@ def __sub__(self, other):
     def __mul__(self, other):
         a = self.copy()
         if isinstance(other, Amount):
+            assert other["asset"] == self["asset"]
             a["amount"] *= other["amount"]
         else:
             a["amount"] *= other
@@ -228,6 +229,7 @@ def __isub__(self, other):
 
     def __imul__(self, other):
         if isinstance(other, Amount):
+            assert other["asset"] == self["asset"]
             self["amount"] *= other["amount"]
         else:
             self["amount"] *= other

diff --git a/bitshares/asset.py b/bitshares/asset.py
@@ -38,18 +38,18 @@ def __init__(
         self.full = full
         super().__init__(
             asset,
-            lazy=False,
-            full=False,
-            bitshares_instance=None
+            lazy=lazy,
+            full=full,
+            bitshares_instance=bitshares_instance
         )
 
     def refresh(self):
         """ Refresh the data from the API server
         """
         asset = self.bitshares.rpc.get_asset(self.identifier)
         if not asset:
-            raise AssetDoesNotExistsException
-        super(Asset, self).__init__(asset)
+            raise AssetDoesNotExistsException(self.identifier)
+        super(Asset, self).__init__(asset, bitshares_instance=self.bitshares)
         if self.full:
             if "bitasset_data_id" in asset:
                 self["bitasset_data"] = self.bitshares.rpc.get_object(
@@ -66,6 +66,24 @@ def refresh(self):
         except:
             self["description"] = asset["options"]["description"]
 
+    @property
+    def is_fully_loaded(self):
+        """ Is this instance fully loaded / e.g. all data available?
+        """
+        return (
+            self.full and
+            "bitasset_data_id" in self and
+            "bitasset_data" in self
+        )
+
+    @property
+    def symbol(self):
+        return self["symbol"]
+
+    @property
+    def precision(self):
+        return self["precision"]
+
     @property
     def is_bitasset(self):
         """ Is the asset a :doc:`mpa`?
@@ -85,7 +103,7 @@ def flags(self):
         return self["flags"]
 
     def ensure_full(self):
-        if not self.full:
+        if not self.is_fully_loaded:
             self.full = True
             self.refresh()
 
@@ -97,19 +115,25 @@ def feeds(self):
             return
         r = []
         for feed in self["bitasset_data"]["feeds"]:
-            r.append(PriceFeed(feed))
+            r.append(PriceFeed(
+                feed,
+                bitshares_instance=self.bitshares
+            ))
         return r
 
     @property
     def feed(self):
         from .price import PriceFeed
         assert self.is_bitasset
         self.ensure_full()
-        return PriceFeed(self["bitasset_data"]["current_feed"])
+        return PriceFeed(
+            self["bitasset_data"]["current_feed"],
+            bitshares_instance=self.bitshares
+        )
 
     @property
     def calls(self):
-        return self.get_call_positions(10)
+        return self.get_call_orders(10)
 
     def get_call_orders(self, limit=100):
         from .price import Price
@@ -119,10 +143,16 @@ def get_call_orders(self, limit=100):
         self.ensure_full()
         r = list()
         bitasset = self["bitasset_data"]
-        settlement_price = Price(bitasset["current_feed"]["settlement_price"])
+        settlement_price = Price(
+            bitasset["current_feed"]["settlement_price"],
+            bitshares_instance=self.bitshares
+        )
         ret = self.bitshares.rpc.get_call_orders(self["id"], limit)
         for call in ret[:limit]:
-            call_price = Price(call["call_price"])
+            call_price = Price(
+                call["call_price"],
+                bitshares_instance=self.bitshares
+            )
             collateral_amount = Amount(
                 {
                     "amount": call["collateral"],
@@ -184,7 +214,10 @@ def get_settle_orders(self, limit=100):
     def halt(self):
         """ Halt this asset from being moved or traded
         """
-        nullaccount = Account("null-account")  # We set the null-account
+        nullaccount = Account(
+            "null-account",  # We set the null-account
+            bitshares_instance=self.bitshares
+        )
         flags = {"white_list": True,
                  "transfer_restricted": True,
                  }
@@ -464,6 +497,7 @@ def set_market_fee(self, percentage_fee, max_market_fee):
 
             :param float percentage_fee: Percentage of fee
             :param bitshares.amount.Amount max_market_fee: Max Fee
+
         """
         assert percentage_fee <= 100 and percentage_fee > 0
         flags = {"charge_market_fee": percentage_fee > 0}
@@ -487,8 +521,8 @@ def set_market_fee(self, percentage_fee, max_market_fee):
     def update_feed_producers(self, producers):
         """ Update bitasset feed producers
 
-            :param list producers: List of accounts that are
-            allowed to produce a feed
+            :param list producers: List of accounts that are allowed to produce
+                 a feed
         """
         assert self.is_bitasset, \
             "Asset needs to be a bitasset/market pegged asset"