Merge branch 'release/0.1.20'

Author: xeroc

.travis.yml

@@ -1,3 +1,4 @@
+dist: trusty
 language: python
 sudo: false
 python:
@@ -14,5 +15,13 @@ install:
   - pip install tox-travis codecov
 script:
   - tox
+  - sed -i 's/filename="/filename=".\//g' coverage.xml
+  - sonar-scanner
 after_success:
   - codecov
+
+addons:
+  sonarcloud:
+    organization: bitshares
+    token:
+     secure: "dSFPBeC5Gr9oiU0weJY3rJXfc68uo2zvfRMcYRSQdqruAtrNqqmJCew0rANDtJPLkKxfIzbJSkokKCvt3f1SXbIOnbuAv/MN2TKDZkqZyve3AdMgYifepHwzK14KWO79ga7gaBKa6CxayZbOkX0BWciOO+5QFlBtmYdov3JpxboymZH9jJKdRs2C3mrIfGQG48u1qaFNaFFRKCvlCY0pXM7MbxFf1C+EADJC1CeR5yHQ2Zd3K6dIh+JpiZ9b1DbxjwWeRC7fOQ9KFV6I8I+GPPjKsS50/96m7SPlnriogYKx4DXRD85by2HfRUUv2bsDXzz4kLo2KR3c358lyhhh3qZBmJS/fJEq+s9Tmqcxb4ssMmht6tpQKnc6NWN4Z/wK0+nyBqFZryZnzO863HRu6GM1d6Mp7q976z1u5UWgPi2D5Y2ulZNfan4T+NVZViTM/XD8Mj9tOpml1A1LbDt3lgHulV9vUD1Hd/TzWh546ydN3hCnGbeuSDY2N5GKNptOAG48sXWPgGc8y8X0yBY+0c3oo0JaMIP1e7IIXEcmq2LI/gF8C0feTKMbBFQSG8kAHHJhOLrV5o9aUFyWK1YT4AADRZrUKXlRaL6rnA0tXDxuGpwYkaB6zbA/c2l2pxsysO5REpbIgn1o6emo5XJ9flXMszwmDqvoio0XaB4JcJY="

CONTRIBUTING.md

@@ -105,9 +105,9 @@ everyone is a beginner at first
 
 Your patch should follow the same conventions & pass the same code
 quality checks as the rest of the project.
-[Codeclimate](https://codeclimate.com/github/xeroc/python-bitshares)
+[Codeclimate](https://codeclimate.com/github/bitshares/python-bitshares)
 will give you feedback in this regard. You can check & fix codeclimate's
-feedback by running it locally using [Codeclimate's CLI](https://codeclimate.com/github/xeroc/python-bitshares), via
+feedback by running it locally using [Codeclimate's CLI](https://codeclimate.com/github/bitshares/python-bitshares), via
 `codeclimate analyze`.
 
 ### 7. Make a Pull Request

Makefile

@@ -14,7 +14,7 @@ clean-pyc:
 	find . -name '*~' -exec rm -f {} +
 
 lint:
-	flake8 --ignore=E501,F401 bitsharesapi bitsharesbase examples
+	flake8 bitsharesapi bitsharesbase examples
 
 test:
 	python3 setup.py test

README.md

@@ -1,23 +1,23 @@
 # Python Library for BitShares
 
 ![](https://img.shields.io/pypi/v/bitshares.svg?style=for-the-badge)
-![](https://img.shields.io/github/release/xeroc/python-bitshares.svg?style=for-the-badge)
-![](https://img.shields.io/github/downloads/xeroc/python-bitshares/total.svg?style=for-the-badge)
+![](https://img.shields.io/github/release/bitshares/python-bitshares.svg?style=for-the-badge)
+![](https://img.shields.io/github/downloads/bitshares/python-bitshares/total.svg?style=for-the-badge)
 ![](https://img.shields.io/pypi/pyversions/bitshares.svg?style=for-the-badge)
 ![](https://img.shields.io/pypi/l/bitshares.svg?style=for-the-badge)
 ![](https://cla-assistant.io/readme/badge/bitshares/python-bitshares)
 
 **Stable**
 
 [![docs master](https://readthedocs.org/projects/python-bitshares/badge/?version=latest)](http://python-bitshares.readthedocs.io/en/latest/)
-[![Travis master](https://travis-ci.org/xeroc/python-bitshares.png?branch=master)](https://travis-ci.org/xeroc/python-bitshares)
-[![codecov](https://codecov.io/gh/xeroc/python-bitshares/branch/master/graph/badge.svg)](https://codecov.io/gh/xeroc/python-bitshares)
+[![Travis master](https://travis-ci.org/bitshares/python-bitshares.png?branch=master)](https://travis-ci.org/bitshares/python-bitshares)
+[![codecov](https://codecov.io/gh/bitshares/python-bitshares/branch/master/graph/badge.svg)](https://codecov.io/gh/bitshares/python-bitshares)
 
 **Develop**
 
 [![docs develop](https://readthedocs.org/projects/python-bitshares/badge/?version=develop)](http://python-bitshares.readthedocs.io/en/develop/)
-[![Travis develop](https://travis-ci.org/xeroc/python-bitshares.png?branch=develop)](https://travis-ci.org/xeroc/python-bitshares)
-[![codecov develop](https://codecov.io/gh/xeroc/python-bitshares/branch/develop/graph/badge.svg)](https://codecov.io/gh/xeroc/python-bitshares)
+[![Travis develop](https://travis-ci.org/bitshares/python-bitshares.png?branch=develop)](https://travis-ci.org/bitshares/python-bitshares)
+[![codecov develop](https://codecov.io/gh/bitshares/python-bitshares/branch/develop/graph/badge.svg)](https://codecov.io/gh/bitshares/python-bitshares)
 
 ---
 
@@ -28,22 +28,19 @@ Visit the [pybitshares website](http://docs.pybitshares.com/en/latest/) for in d
 ## Installation
 
 ### Install with pip3:
-```
-$ sudo apt-get install libffi-dev libssl-dev python-dev python3-dev python3-pip
-$ pip3 install bitshares
-```
+
+    $ 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
-```
+
+    $ git clone https://github.com/bitshares/python-bitshares/
+    $ cd python-bitshares
+    $ python3 setup.py install --user
 
 ### Upgrade
-```
-$ pip3 install --user --upgrade
-```
+
+    $ pip3 install --user --upgrade bitshares
 
 ## Contributing
 

bitshares/bitshares.py

@@ -4,6 +4,7 @@
 from bitsharesapi.bitsharesnoderpc import BitSharesNodeRPC
 from bitsharesbase.account import PublicKey
 from bitsharesbase import operations
+from .instance import set_shared_blockchain_instance, shared_blockchain_instance
 from .asset import Asset
 from .account import Account
 from .amount import Amount
@@ -327,6 +328,20 @@ def unlock(self, *args, **kwargs):
         """
         return self.wallet.unlock(*args, **kwargs)
 
+    # -------------------------------------------------------------------------
+    # Shared instance interface
+    # -------------------------------------------------------------------------
+    def set_shared_instance(self):
+        """ This method allows to set the current instance as default
+        """
+        set_shared_blockchain_instance(self)
+
+    @classmethod
+    def get_shared_instance(cls, self):
+        """ This interface allows to obtain the default instance
+        """
+        return shared_blockchain_instance()
+
     # -------------------------------------------------------------------------
     # Transaction Buffers
     # -------------------------------------------------------------------------

bitshares/blockchainobject.py

@@ -68,8 +68,6 @@ def __init__(
         self,
         data,
         klass=None,
-        space_id=1,
-        object_id=None,
         lazy=False,
         use_cache=True,
         *args,
@@ -182,3 +180,13 @@ def __contains__(self, key):
     def __repr__(self):
         return "<%s %s>" % (
             self.__class__.__name__, str(self.identifier))
+
+
+class Object(BlockchainObject):
+
+    def refresh(self):
+        dict.__init__(
+            self,
+            self.blockchain.rpc.get_object(self.identifier),
+            blockchain_instance=self.blockchain
+        )

bitshares/storage.py

@@ -357,6 +357,14 @@ def delete(self, key):
         cursor.execute(*query)
         connection.commit()
 
+    def wipe(self):
+        """ Delete all configuration from the configuration store
+        """
+        query = ("DELETE FROM %s " % (self.__tablename__) +
+                 "WHERE key<>?",
+                 (MasterPassword.config_key,))
+        self.sql_execute(query)
+
     def __iter__(self):
         return iter(self.items())
 

bitshares/transactionbuilder.py

@@ -1,4 +1,5 @@
 from .account import Account
+from .asset import Asset
 from bitsharesbase.objects import Operation
 from bitsharesbase.account import PrivateKey, PublicKey
 from bitsharesbase.signedtransactions import Signed_Transaction
@@ -216,24 +217,46 @@ def appendSigner(self, account, permission):
 
         # Let's define a helper function for recursion
         def fetchkeys(account, perm, level=0, required_treshold=1):
+
+            # Do not travel recursion more than 2 levels
             if level > 2:
                 return []
+
             r = []
+            # Let's go through all *keys* of the account
             for authority in account[perm]["key_auths"]:
                 try:
+                    # Try obtain the private key from wallet
                     wif = self.blockchain.wallet.getPrivateKeyForPublicKey(
                         authority[0])
-                    r.append([wif, authority[1]])
+                    if wif:
+                        r.append([wif, authority[1]])
+                        # If we found a key for account, we add it
+                        # to signing_accounts to be sure we do not resign
+                        # another operation with the same account/wif
+                        self.signing_accounts.append(account)
                 except Exception:
                     pass
 
+                # Test if we reached threshold already
+                if sum([x[1] for x in r]) >= required_treshold:
+                    break
+
+            # Let's see if we still need to go through accounts
             if sum([x[1] for x in r]) < required_treshold:
                 # go one level deeper
                 for authority in account[perm]["account_auths"]:
+                    # Let's see if we can find keys for an account in
+                    # account_auths
+                    # This is recursive with a limit at level 2 (see above)
                     auth_account = Account(
                         authority[0], blockchain_instance=self.blockchain)
                     r.extend(fetchkeys(auth_account, perm, level + 1, required_treshold))
 
+                    # Test if we reached threshold already and break
+                    if sum([x[1] for x in r]) >= required_treshold:
+                        break
+
             return r
 
         # Now let's actually deal with the accounts
@@ -247,13 +270,13 @@ def fetchkeys(account, perm, level=0, required_treshold=1):
                 )
             # ... or should we rather obtain the keys from an account name
             else:
-                account = Account(account, blockchain_instance=self.blockchain)
-                required_treshold = account[permission]["weight_threshold"]
-                keys = fetchkeys(account, permission, required_treshold=required_treshold)
+                accountObj = Account(account, blockchain_instance=self.blockchain)
+                required_treshold = accountObj[permission]["weight_threshold"]
+                keys = fetchkeys(accountObj, 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", required_treshold=required_treshold))
+                    keys.extend(fetchkeys(accountObj, "owner", required_treshold=required_treshold))
                 for x in keys:
                     self.wifs.add(x[0])
 
@@ -275,6 +298,8 @@ def set_fee_asset(self, fee_asset):
         from .amount import Amount
         if isinstance(fee_asset, Amount):
             self.fee_asset_id = fee_asset["id"]
+        elif isinstance(fee_asset, Asset):
+            self.fee_asset_id = fee_asset["id"]
         elif fee_asset:
             self.fee_asset_id = fee_asset
         else:

bitshares/worker.py

@@ -23,6 +23,7 @@ def post_format(self):
         if isinstance(self["work_end_date"], str):
             self["work_end_date"] = formatTimeString(self["work_end_date"])
             self["work_begin_date"] = formatTimeString(self["work_begin_date"])
+        self["daily_pay"] = int(self["daily_pay"])
 
     def refresh(self):
         worker = self.blockchain.rpc.get_object(self.identifier)

bitsharesapi/exceptions.py

@@ -1,5 +1,5 @@
 import re
-from grapheneapi.graphenewsrpc import RPCError
+from grapheneapi.exceptions import RPCError
 
 
 def decodeRPCErrorMsg(e):

setup.cfg

@@ -5,7 +5,8 @@ description-file = README.md
 test=pytest
 
 [coverage:run]
-#source=bitshares*
+source=bitsharesbase,bitsharesapi,bitshares
+branch=True
 omit=
    tests/*
    .tox/*
@@ -15,6 +16,16 @@ omit=
 include=bitshares*
 ignore_errors=True
 show_missing=True
+exclude_lines =
+    pragma: no cover
+    def __repr__
+    if self.debug:
+    if settings.DEBUG
+    raise AssertionError
+    raise NotImplementedError
+    if 0:
+    if __name__ == .__main__.:
+    if sys.version > '3': 
 
 [flake8]
 ignore = E501,F401
@@ -26,3 +37,12 @@ exclude =
     # The conf file is mostly autogenerated, ignore it
     docs/conf.py,
 max-complexity = 15
+
+# [nosetests]
+# with-coverage=1
+# with-xunit=1
+# #cover-branches=1
+# cover-xml=1
+# cover-inclusive=1
+# detailed-errors=1
+# cover-package=graphenebase,grapheneapi,graphenestorage,graphene

setup.py

@@ -11,19 +11,19 @@
     ascii = codecs.lookup('ascii')
     codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
 
-VERSION = '0.1.19'
+VERSION = '0.1.20'
 
 setup(
     name='bitshares',
     version=VERSION,
     description='Python library for bitshares',
     long_description=open('README.md').read(),
-    download_url='https://github.com/xeroc/python-bitshares/tarball/' + VERSION,
+    download_url='https://github.com/bitshares/python-bitshares/tarball/' + VERSION,
     author='Fabian Schuh',
     author_email='[email protected]',
     maintainer='Fabian Schuh',
     maintainer_email='[email protected]',
-    url='http://www.github.com/xeroc/python-bitshares',
+    url='http://www.github.com/bitshares/python-bitshares',
     keywords=['bitshares', 'library', 'api', 'rpc'],
     packages=[
         "bitshares",

sonar-project.properties

@@ -0,0 +1,37 @@
+# Metadata
+sonar.projectKey=python-bitshares
+sonar.projectName=Python BitShares Library
+sonar.projectVersion=1.0
+sonar.organization=bitshares
+
+# Upload to sonar cloud
+sonar.host.url=https://sonarcloud.io
+ 
+# Language
+sonar.language=py
+
+# Sources
+sonar.sources=bitshares,bitsharesapi,bitsharesbase
+
+# Unit tests
+sonar.tests=./tests/
+
+# Linter
+#sonar.python.pylint=/usr/local/bin/pylint
+#sonar.python.pylint_config=.pylintrc
+#sonar.python.pylint.reportPath=pylint-report.txt 
+
+sonar.links.homepage=https://bitshares.org
+sonar.links.ci=https://travis-ci.org/bitshares/python-bitshares/
+sonar.links.issue=https://github.com/bitshares/python-bitshares/issues
+sonar.links.scm=https://github.com/bitshares/python-bitshares/tree/master
+
+sonar.exclusions=htmlcov/*,docs/*,build/*,dist/*,*.py,tests/*,graphene*/*
+
+# coverage
+# sonar.python.xunit.reportPath=test-reports/*.xml
+#sonar.python.coverage.reportPath=coverage.xml
+
+sonar.python.xunit.reportPath=nosetests.xml
+sonar.python.coverage.reportPath=coverage.xml
+#sonar.python.coveragePlugin=cobertura

tox.ini

@@ -5,9 +5,10 @@ skip_missing_interpreters = true
 [testenv]
 deps=-rrequirements-test.txt
 commands=
-    coverage run -a setup.py test
+    coverage run setup.py test
     coverage report
     coverage html
+    coverage xml -i
 
 [testenv:lint]
 deps=