Skip to content
Snippets Groups Projects
Commit 4a375a3f authored by Fabian Schuh's avatar Fabian Schuh
Browse files

Consistent naming with python-steem

parent b3041956
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
bitshares/bitshares.py
+ 1
− 1
View file @ 4a375a3f
......@@ -4,7 +4,7 @@ import random
import re
from datetime import datetime, timedelta
from bitsharesapi.noderpc import BitSharesNodeRPC
from bitsharesapi.bitsharesnoderpc import BitSharesNodeRPC
from bitsharesbase.account import PrivateKey, PublicKey
from bitsharesbase import transactions, operations
from .asset import Asset
......
bitsharesapi/__init__.py
+ 2
− 2
View file @ 4a375a3f
__all__ = [
"api",
"noderpc",
"bitsharesnoderpc",
"exceptions"
]
bitsharesapi/api.py deleted 100644 → 0
+ 0
− 6
View file @ b3041956
from grapheneapi.grapheneapi import GrapheneAPI
class BitSharesAPI(GrapheneAPI):
def __init__(self, *args, **kwargs):
super(BitSharesAPI, self).__init__(*args, **kwargs)
bitsharesapi/noderpc.py deleted 100644 → 0
+ 0
− 276
View file @ b3041956
import re
import sys
import threading
import websocket
import ssl
import json
import time
from itertools import cycle
from grapheneapi.graphenewsrpc import GrapheneWebsocketRPC
from . import exceptions
import logging
log = logging.getLogger(__name__)
class NumRetriesReached(Exception):
pass
class BitSharesNodeRPC(GrapheneWebsocketRPC):
def __init__(self, *args, **kwargs):
super(BitSharesNodeRPC, self).__init__(*args, **kwargs)
def register_apis(self):
self.api_id["database"] = self.database(api_id=1)
self.api_id["history"] = self.history(api_id=1)
self.api_id["network_broadcast"] = self.network_broadcast(api_id=1)
def get_account(self, name, **kwargs):
""" Get full account details from account name or id
:param str name: Account name or account id
"""
if len(name.split(".")) == 3:
return self.get_objects([name])[0]
else:
return self.get_account_by_name(name, **kwargs)
def get_asset(self, name, **kwargs):
""" Get full asset from name of id
:param str name: Symbol name or asset id (e.g. 1.3.0)
"""
if len(name.split(".")) == 3:
return self.get_objects([name], **kwargs)[0]
else:
return self.lookup_asset_symbols([name], **kwargs)[0]
def loop_account_history(self, account, start=0, only_ops=[]):
""" Returns a generator for individual account transactions
:param str account: account name to get history for
:param int start: sequence number of the first transaction to return
:param array only_ops: Limit generator by these operations (ids)
"""
account = self.get_account(account)
cnt = 0
while True:
ret = self.get_relative_account_history(
account["id"],
start,
100,
start + 101,
api="history",
)[::-1]
for i in ret:
if not only_ops or i["op"][0] in only_ops:
cnt += 1
yield i
if len(ret) < 100:
break
start += 100
def getFullAccountHistory(self, account, begin=1, limit=100, sort="block", **kwargs):
""" Get History of an account
:param string account: account name or account id
:param number begin: sequence number of first element
:param number limit: limit number of entries
:param string sort: Either "block" or "reversed"
**Example:**
The following code will give you you the first 110
operations for the account ``faucet`` starting at the first
operation:
.. code-block:: python
client = GrapheneClient(config)
client.ws.getAccountHistory(
"faucet",
begin=1,
limit=110,
)
"""
if account[0:4] == "1.2.":
account_id = account
else:
account_id = self.get_account_by_name(account, **kwargs)["id"]
if begin < 1:
raise ValueError("begin cannot be smaller than 1")
if sort != "block":
raise Exception("'sort' can currently only be 'block' " +
"due to backend API issues")
r = []
if limit <= 100:
if sort == "block":
ret = self.get_relative_account_history(
account_id,
begin,
limit,
begin + limit,
api="history", **kwargs
)
[r.append(a) for a in ret[::-1]]
else:
ret = self.get_relative_account_history(
account_id,
begin,
limit,
0,
api="history"
)
[r.append(a) for a in ret]
else:
while True:
if len(r) + 100 > limit:
thislimit = limit - len(r)
else:
thislimit = 100
if sort == "block":
ret = self.get_relative_account_history(
account_id,
begin,
thislimit,
begin + thislimit,
api="history", **kwargs
)
[r.append(a) for a in ret[::-1]]
begin += thislimit
else:
ret = self.get_relative_account_history(
account_id,
begin,
thislimit,
0,
api="history", **kwargs
)
[r.append(a) for a in ret]
if len(ret) < 100:
break
return r
def block_stream(self, start=None, mode="irreversible", **kwargs):
""" Yields blocks starting from ``start``.
:param int start: Starting block
:param str mode: We here have the choice between
* "head": the last block
* "irreversible": the block that is confirmed by 2/3 of all block producers and is thus irreversible!
"""
# Let's find out how often blocks are generated!
config = self.get_global_properties(**kwargs)
block_interval = config["parameters"]["block_interval"]
if not start:
props = self.get_dynamic_global_properties(**kwargs)
# Get block number
if mode == "head":
start = props['head_block_number']
elif mode == "irreversible":
start = props['last_irreversible_block_num']
else:
raise ValueError(
'"mode" has to be "head" or "irreversible"'
)
# We are going to loop indefinitely
while True:
# Get chain properies to identify the
# head/last reversible block
props = self.get_dynamic_global_properties(**kwargs)
# Get block number
if mode == "head":
head_block = props['head_block_number']
elif mode == "irreversible":
head_block = props['last_irreversible_block_num']
else:
raise ValueError(
'"mode" has to be "head" or "irreversible"'
)
# Blocks from start until head block
for blocknum in range(start, head_block + 1):
# Get full block
yield self.get_block(blocknum, **kwargs)
# Set new start
start = head_block + 1
# Sleep for one block
time.sleep(block_interval)
def stream(self, opName=None, *args, **kwargs):
""" Yield specific operations (e.g. transfers) only
:param str opName: Name of the operation, e.g. transfer,
limit_order_create, limit_order_cancel, call_order_update,
fill_order, account_create, account_update,
account_whitelist, account_upgrade, account_transfer,
asset_create, asset_update, asset_update_bitasset,
asset_update_feed_producers, asset_issue, asset_reserve,
asset_fund_fee_pool, asset_settle, asset_global_settle,
asset_publish_feed, witness_create, witness_update,
proposal_create, proposal_update, proposal_delete,
withdraw_permission_create, withdraw_permission_update,
withdraw_permission_claim, withdraw_permission_delete,
committee_member_create, committee_member_update,
committee_member_update_global_parameters,
vesting_balance_create, vesting_balance_withdraw,
worker_create, custom, assert, balance_claim,
override_transfer, transfer_to_blind, blind_transfer,
transfer_from_blind, asset_settle_cancel, asset_claim_fees
:param int start: Begin at this block
"""
from bitsharesbase.operations import getOperationNameForId
for block in self.block_stream(*args, **kwargs):
if not len(block["transactions"]):
continue
for tx in block["transactions"]:
for op in tx["operations"]:
if not opName or getOperationNameForId(op[0]) == opName:
yield {
**op[1],
"type": op[0],
"timestamp": block.get("timestamp"),
# "block_num": block.get("block_num"), # not part of the block data
}
def rpcexec(self, payload):
""" Execute a call by sending the payload.
It makes use of the GrapheneRPC library.
In here, we mostly deal with Steem specific error handling
:param json payload: Payload data
:raises ValueError: if the server does not respond in proper JSON format
:raises RPCError: if the server returns an error
"""
try:
# Forward call to GrapheneWebsocketRPC and catch+evaluate errors
return super(BitSharesNodeRPC, self).rpcexec(payload)
except exceptions.RPCError as e:
msg = exceptions.decodeRPCErrorMsg(e).strip()
if msg == "missing required active authority":
raise exceptions.MissingRequiredActiveAuthority
elif re.match("^no method with name.*", msg):
raise exceptions.NoMethodWithName(msg)
elif msg:
raise exceptions.UnhandledRPCError(msg)
else:
raise e
except Exception as e:
raise e
bitsharesdeprecated/client.py
+ 1
− 1
View file @ 4a375a3f
from bitsharesapi.api import BitSharesAPI
from grapheneapi.grapheneapi import GrapheneApi as BitSharesAPI
from .websocket import BitSharesWebsocket
from collections import OrderedDict
......
bitsharesdeprecated/websocket.py
+ 1
− 1
View file @ 4a375a3f
......@@ -14,7 +14,7 @@ except:
from autobahn.websocket.util import parse_url as parseWsUrl
from .websocketprotocol import BitSharesWebsocketProtocol
from bitsharesapi.noderpc import BitSharesNodeRPC
from bitsharesapi.bitsharesnoderpc import BitSharesNodeRPC
import logging
log = logging.getLogger(__name__)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment