Merge branch 'release/0.1.32'

peerplays/cli/bos.py

@@ -0,0 +1,54 @@
+import click
+from pprint import pprint
+from prettytable import PrettyTable
+from .decorators import onlineChain, unlockWallet, customchain
+from .main import main
+from .ui import pretty_print
+
+from peerplays.account import Account
+from peerplays.asset import Asset
+from peerplays.sport import Sport, Sports
+from peerplays.eventgroup import EventGroup, EventGroups
+from peerplays.event import Event, Events
+from peerplays.bettingmarketgroup import BettingMarketGroup, BettingMarketGroups
+from peerplays.rule import Rule, Rules
+from peerplays.proposal import Proposals
+from peerplays.storage import configStorage as config
+
+
+@main.group()
+def bos():
+    """ BOS related calls
+    """
+    pass
+
+
+@bos.command()
+@click.pass_context
+@click.argument(
+    "eventids",
+    nargs=-1)
+@customchain(bundle=True)
+@unlockWallet
+def cancel_event(ctx, eventids):
+    for eventid in eventids:
+        Event(eventid)
+        ctx.blockchain.event_update_status(
+            eventid,
+            "canceled",
+        )
+    click.echo(ctx.broadcast())
+
+
+@bos.command()
+@click.pass_context
+@click.argument("account")
+@onlineChain
+@unlockWallet
+def approve_all(ctx, account):
+    proposals = Proposals(account)
+    proposal_ids = {x["id"] for x in proposals}
+    click.echo(ctx.peerplays.approveproposal(
+        proposal_ids,
+        account=account
+    ))

peerplays/cli/cli.py

@@ -34,7 +34,8 @@
     bookie,
     message,
     rpc,
-    asset
+    asset,
+    bos
 )
 
 log = logging.getLogger(__name__)

peerplaysapi/exceptions.py

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

setup.py

@@ -11,7 +11,7 @@
     ascii = codecs.lookup('ascii')
     codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
 
-VERSION = '0.1.31'
+VERSION = '0.1.32'
 
 setup(
     name='peerplays',
@@ -46,7 +46,7 @@
         ],
     },
     install_requires=[
-        "graphenelib==0.6.6",
+        "graphenelib<1.0.0",
         "appdirs",
         "prettytable",
         "events==0.3",