LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

--blocking

Browse source
This commit is contained in:
Lex Berezhny 2019-06-10 01:26:35 -04:00
parent 3abc98acc8
commit 262735c219
1 changed files with 42 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
lbrynet/extras/daemon/Daemon.py
View file

@ -1828,7 +1828,7 @@ class Daemon(metaclass=JSONRPCServerType):
@requires(WALLET_COMPONENT, conditions=[WALLET_IS_UNLOCKED]) @requires(WALLET_COMPONENT, conditions=[WALLET_IS_UNLOCKED])
async def jsonrpc_channel_create( async def jsonrpc_channel_create(
self, name, bid, allow_duplicate_name=False, account_id=None, claim_address=None, self, name, bid, allow_duplicate_name=False, account_id=None, claim_address=None,
preview=False, **kwargs): preview=False, blocking=False, **kwargs):
""" """
Create a new channel by generating a channel private key and establishing an '@' prefixed claim. Create a new channel by generating a channel private key and establishing an '@' prefixed claim.
@ -1839,7 +1839,8 @@ class Daemon(metaclass=JSONRPCServerType):
[--website_url=<website_url>] [--featured=<featured>...] [--website_url=<website_url>] [--featured=<featured>...]
[--tags=<tags>...] [--languages=<languages>...] [--locations=<locations>...] [--tags=<tags>...] [--languages=<languages>...] [--locations=<locations>...]
[--thumbnail_url=<thumbnail_url>] [--cover_url=<cover_url>] [--thumbnail_url=<thumbnail_url>] [--cover_url=<cover_url>]
[--account_id=<account_id>] [--claim_address=<claim_address>] [--preview] [--account_id=<account_id>] [--claim_address=<claim_address>]
[--preview] [--blocking]
Options: Options:
--name=<name> : (str) name of the channel prefixed with '@' --name=<name> : (str) name of the channel prefixed with '@'
@ -1896,6 +1897,7 @@ class Daemon(metaclass=JSONRPCServerType):
--claim_address=<claim_address>: (str) address where the channel is sent to, if not specified --claim_address=<claim_address>: (str) address where the channel is sent to, if not specified
it will be determined automatically from the account it will be determined automatically from the account
--preview : (bool) do not broadcast the transaction --preview : (bool) do not broadcast the transaction
--blocking : (bool) wait until transaction is in mempool
Returns: {Transaction} Returns: {Transaction}
""" """
@ -1922,7 +1924,7 @@ class Daemon(metaclass=JSONRPCServerType):
if not preview: if not preview:
await tx.sign([account]) await tx.sign([account])
await account.ledger.broadcast(tx) await self.broadcast_or_release(account, tx, blocking)
account.add_channel_private_key(txo.private_key) account.add_channel_private_key(txo.private_key)
self.default_wallet.save() self.default_wallet.save()
await self.storage.save_claims([self._old_get_temp_claim_info( await self.storage.save_claims([self._old_get_temp_claim_info(
@ -1937,7 +1939,7 @@ class Daemon(metaclass=JSONRPCServerType):
@requires(WALLET_COMPONENT, conditions=[WALLET_IS_UNLOCKED]) @requires(WALLET_COMPONENT, conditions=[WALLET_IS_UNLOCKED])
async def jsonrpc_channel_update( async def jsonrpc_channel_update(
self, claim_id, bid=None, account_id=None, claim_address=None, self, claim_id, bid=None, account_id=None, claim_address=None,
new_signing_key=False, preview=False, replace=False, **kwargs): new_signing_key=False, preview=False, blocking=False, replace=False, **kwargs):
""" """
Update an existing channel claim. Update an existing channel claim.
@ -1951,7 +1953,7 @@ class Daemon(metaclass=JSONRPCServerType):
[--locations=<locations>...] [--clear_locations] [--locations=<locations>...] [--clear_locations]
[--thumbnail_url=<thumbnail_url>] [--cover_url=<cover_url>] [--thumbnail_url=<thumbnail_url>] [--cover_url=<cover_url>]
[--account_id=<account_id>] [--claim_address=<claim_address>] [--new_signing_key] [--account_id=<account_id>] [--claim_address=<claim_address>] [--new_signing_key]
[--preview] [--replace] [--preview] [--blocking] [--replace]
Options: Options:
--claim_id=<claim_id> : (str) claim_id of the channel to update --claim_id=<claim_id> : (str) claim_id of the channel to update
@ -2010,6 +2012,7 @@ class Daemon(metaclass=JSONRPCServerType):
--claim_address=<claim_address>: (str) address where the channel is sent --claim_address=<claim_address>: (str) address where the channel is sent
--new_signing_key : (bool) generate a new signing key, will invalidate all previous publishes --new_signing_key : (bool) generate a new signing key, will invalidate all previous publishes
--preview : (bool) do not broadcast the transaction --preview : (bool) do not broadcast the transaction
--blocking : (bool) wait until transaction is in mempool
--replace : (bool) instead of modifying specific values on --replace : (bool) instead of modifying specific values on
the channel, this will clear all existing values the channel, this will clear all existing values
and only save passed in values, useful for form and only save passed in values, useful for form
@ -2060,7 +2063,7 @@ class Daemon(metaclass=JSONRPCServerType):
if not preview: if not preview:
await tx.sign([account]) await tx.sign([account])
await account.ledger.broadcast(tx) await self.broadcast_or_release(account, tx, blocking)
account.add_channel_private_key(new_txo.private_key) account.add_channel_private_key(new_txo.private_key)
self.default_wallet.save() self.default_wallet.save()
await self.storage.save_claims([self._old_get_temp_claim_info( await self.storage.save_claims([self._old_get_temp_claim_info(
@ -2112,10 +2115,8 @@ class Daemon(metaclass=JSONRPCServerType):
) )
if not preview: if not preview:
await account.ledger.broadcast(tx) await self.broadcast_or_release(account, tx, blocking)
await self.analytics_manager.send_claim_action('abandon') await self.analytics_manager.send_claim_action('abandon')
if blocking:
await account.ledger.wait(tx)
else: else:
await account.ledger.release_tx(tx) await account.ledger.release_tx(tx)
@ -2228,7 +2229,8 @@ class Daemon(metaclass=JSONRPCServerType):
[--release_time=<release_time>] [--width=<width>] [--height=<height>] [--duration=<duration>] [--release_time=<release_time>] [--width=<width>] [--height=<height>] [--duration=<duration>]
[--channel_id=<channel_id> | --channel_name=<channel_name>] [--channel_id=<channel_id> | --channel_name=<channel_name>]
[--channel_account_id=<channel_account_id>...] [--channel_account_id=<channel_account_id>...]
[--account_id=<account_id>] [--claim_address=<claim_address>] [--preview] [--account_id=<account_id>] [--claim_address=<claim_address>]
[--preview] [--blocking]
Options: Options:
--name=<name> : (str) name of the content (can only consist of a-z A-Z 0-9 and -(dash)) --name=<name> : (str) name of the content (can only consist of a-z A-Z 0-9 and -(dash))
@ -2299,6 +2301,7 @@ class Daemon(metaclass=JSONRPCServerType):
--claim_address=<claim_address>: (str) address where the claim is sent to, if not specified --claim_address=<claim_address>: (str) address where the claim is sent to, if not specified
it will be determined automatically from the account it will be determined automatically from the account
--preview : (bool) do not broadcast the transaction --preview : (bool) do not broadcast the transaction
--blocking : (bool) wait until transaction is in mempool
Returns: {Transaction} Returns: {Transaction}
""" """
@ -2325,7 +2328,8 @@ class Daemon(metaclass=JSONRPCServerType):
async def jsonrpc_stream_create( async def jsonrpc_stream_create(
self, name, bid, file_path, allow_duplicate_name=False, self, name, bid, file_path, allow_duplicate_name=False,
channel_id=None, channel_name=None, channel_account_id=None, channel_id=None, channel_name=None, channel_account_id=None,
account_id=None, claim_address=None, preview=False, **kwargs): account_id=None, claim_address=None, preview=False, blocking=False,
**kwargs):
""" """
Make a new stream claim and announce the associated file to lbrynet. Make a new stream claim and announce the associated file to lbrynet.
@ -2339,7 +2343,8 @@ class Daemon(metaclass=JSONRPCServerType):
[--release_time=<release_time>] [--width=<width>] [--height=<height>] [--duration=<duration>] [--release_time=<release_time>] [--width=<width>] [--height=<height>] [--duration=<duration>]
[--channel_id=<channel_id> | --channel_name=<channel_name>] [--channel_id=<channel_id> | --channel_name=<channel_name>]
[--channel_account_id=<channel_account_id>...] [--channel_account_id=<channel_account_id>...]
[--account_id=<account_id>] [--claim_address=<claim_address>] [--preview] [--account_id=<account_id>] [--claim_address=<claim_address>]
[--preview] [--blocking]
Options: Options:
--name=<name> : (str) name of the content (can only consist of a-z A-Z 0-9 and -(dash)) --name=<name> : (str) name of the content (can only consist of a-z A-Z 0-9 and -(dash))
@ -2412,6 +2417,7 @@ class Daemon(metaclass=JSONRPCServerType):
--claim_address=<claim_address>: (str) address where the claim is sent to, if not specified --claim_address=<claim_address>: (str) address where the claim is sent to, if not specified
it will be determined automatically from the account it will be determined automatically from the account
--preview : (bool) do not broadcast the transaction --preview : (bool) do not broadcast the transaction
--blocking : (bool) wait until transaction is in mempool
Returns: {Transaction} Returns: {Transaction}
""" """
@ -2448,7 +2454,7 @@ class Daemon(metaclass=JSONRPCServerType):
await tx.sign([account]) await tx.sign([account])
if not preview: if not preview:
await account.ledger.broadcast(tx) await self.broadcast_or_release(account, tx, blocking)
await self.storage.save_claims([self._old_get_temp_claim_info( await self.storage.save_claims([self._old_get_temp_claim_info(
tx, new_txo, claim_address, claim, name, dewies_to_lbc(amount) tx, new_txo, claim_address, claim, name, dewies_to_lbc(amount)
)]) )])
@ -2465,7 +2471,7 @@ class Daemon(metaclass=JSONRPCServerType):
self, claim_id, bid=None, file_path=None, self, claim_id, bid=None, file_path=None,
channel_id=None, channel_name=None, channel_account_id=None, clear_channel=False, channel_id=None, channel_name=None, channel_account_id=None, clear_channel=False,
account_id=None, claim_address=None, account_id=None, claim_address=None,
preview=False, replace=False, **kwargs): preview=False, blocking=False, replace=False, **kwargs):
""" """
Update an existing stream claim and if a new file is provided announce it to lbrynet. Update an existing stream claim and if a new file is provided announce it to lbrynet.
@ -2483,7 +2489,7 @@ class Daemon(metaclass=JSONRPCServerType):
[--channel_id=<channel_id> | --channel_name=<channel_name> | --clear_channel] [--channel_id=<channel_id> | --channel_name=<channel_name> | --clear_channel]
[--channel_account_id=<channel_account_id>...] [--channel_account_id=<channel_account_id>...]
[--account_id=<account_id>] [--claim_address=<claim_address>] [--account_id=<account_id>] [--claim_address=<claim_address>]
[--preview] [--replace] [--preview] [--blocking] [--replace]
Options: Options:
--claim_id=<claim_id> : (str) id of the stream claim to update --claim_id=<claim_id> : (str) id of the stream claim to update
@ -2562,6 +2568,7 @@ class Daemon(metaclass=JSONRPCServerType):
--claim_address=<claim_address>: (str) address where the claim is sent to, if not specified --claim_address=<claim_address>: (str) address where the claim is sent to, if not specified
it will be determined automatically from the account it will be determined automatically from the account
--preview : (bool) do not broadcast the transaction --preview : (bool) do not broadcast the transaction
--blocking : (bool) wait until transaction is in mempool
--replace : (bool) instead of modifying specific values on --replace : (bool) instead of modifying specific values on
the stream, this will clear all existing values the stream, this will clear all existing values
and only save passed in values, useful for form and only save passed in values, useful for form
@ -2639,7 +2646,7 @@ class Daemon(metaclass=JSONRPCServerType):
await tx.sign([account]) await tx.sign([account])
if not preview: if not preview:
await account.ledger.broadcast(tx) await self.broadcast_or_release(account, tx, blocking)
await self.storage.save_claims([self._old_get_temp_claim_info( await self.storage.save_claims([self._old_get_temp_claim_info(
tx, new_txo, claim_address, new_txo.claim, new_txo.claim_name, dewies_to_lbc(amount) tx, new_txo, claim_address, new_txo.claim, new_txo.claim_name, dewies_to_lbc(amount)
)]) )])
@ -2654,7 +2661,7 @@ class Daemon(metaclass=JSONRPCServerType):
@requires(WALLET_COMPONENT, conditions=[WALLET_IS_UNLOCKED]) @requires(WALLET_COMPONENT, conditions=[WALLET_IS_UNLOCKED])
async def jsonrpc_stream_abandon( async def jsonrpc_stream_abandon(
self, claim_id=None, txid=None, nout=None, account_id=None, self, claim_id=None, txid=None, nout=None, account_id=None,
preview=False, blocking=True): preview=False, blocking=False):
""" """
Abandon one of my stream claims. Abandon one of my stream claims.
@ -2691,10 +2698,8 @@ class Daemon(metaclass=JSONRPCServerType):
) )
if not preview: if not preview:
await account.ledger.broadcast(tx) await self.broadcast_or_release(account, tx, blocking)
await self.analytics_manager.send_claim_action('abandon') await self.analytics_manager.send_claim_action('abandon')
if blocking:
await account.ledger.wait(tx)
else: else:
await account.ledger.release_tx(tx) await account.ledger.release_tx(tx)
@ -2747,13 +2752,15 @@ class Daemon(metaclass=JSONRPCServerType):
""" """
@requires(WALLET_COMPONENT, conditions=[WALLET_IS_UNLOCKED]) @requires(WALLET_COMPONENT, conditions=[WALLET_IS_UNLOCKED])
async def jsonrpc_support_create(self, claim_id, amount, tip=False, account_id=None, preview=False): async def jsonrpc_support_create(
self, claim_id, amount, tip=False, account_id=None,
preview=False, blocking=False):
""" """
Create a support or a tip for name claim. Create a support or a tip for name claim.
Usage: Usage:
support_create (<claim_id> | --claim_id=<claim_id>) (<amount> | --amount=<amount>) support_create (<claim_id> | --claim_id=<claim_id>) (<amount> | --amount=<amount>)
[--tip] [--account_id=<account_id>] [--preview] [--tip] [--account_id=<account_id>] [--preview] [--blocking]
Options: Options:
--claim_id=<claim_id> : (str) claim_id of the claim to support --claim_id=<claim_id> : (str) claim_id of the claim to support
@ -2761,6 +2768,7 @@ class Daemon(metaclass=JSONRPCServerType):
--tip : (bool) send support to claim owner, default: false. --tip : (bool) send support to claim owner, default: false.
--account_id=<account_id> : (str) id of the account to use --account_id=<account_id> : (str) id of the account to use
--preview : (bool) do not broadcast the transaction --preview : (bool) do not broadcast the transaction
--blocking : (bool) wait until transaction is in mempool
Returns: {Transaction} Returns: {Transaction}
""" """
@ -2777,7 +2785,7 @@ class Daemon(metaclass=JSONRPCServerType):
if not preview: if not preview:
await tx.sign([account]) await tx.sign([account])
await account.ledger.broadcast(tx) await self.broadcast_or_release(account, tx, blocking)
await self.storage.save_supports({claim_id: [{ await self.storage.save_supports({claim_id: [{
'txid': tx.id, 'txid': tx.id,
'nout': tx.position, 'nout': tx.position,
@ -2817,7 +2825,7 @@ class Daemon(metaclass=JSONRPCServerType):
@requires(WALLET_COMPONENT, conditions=[WALLET_IS_UNLOCKED]) @requires(WALLET_COMPONENT, conditions=[WALLET_IS_UNLOCKED])
async def jsonrpc_support_abandon( async def jsonrpc_support_abandon(
self, claim_id=None, txid=None, nout=None, keep=None, self, claim_id=None, txid=None, nout=None, keep=None,
account_id=None, preview=False, blocking=True): account_id=None, preview=False, blocking=False):
""" """
Abandon supports, including tips, of a specific claim, optionally Abandon supports, including tips, of a specific claim, optionally
keeping some amount as supports. keeping some amount as supports.
@ -2867,10 +2875,8 @@ class Daemon(metaclass=JSONRPCServerType):
) )
if not preview: if not preview:
await account.ledger.broadcast(tx) await self.broadcast_or_release(account, tx, blocking)
await self.analytics_manager.send_claim_action('abandon') await self.analytics_manager.send_claim_action('abandon')
if blocking:
await account.ledger.wait(tx)
else: else:
await account.ledger.release_tx(tx) await account.ledger.release_tx(tx)
@ -3451,6 +3457,15 @@ class Daemon(metaclass=JSONRPCServerType):
}) })
return await jsonrpc_post(self.conf.comment_server, 'create_comment', **comment) return await jsonrpc_post(self.conf.comment_server, 'create_comment', **comment)
async def broadcast_or_release(self, account, tx, blocking=False):
try:
await account.ledger.broadcast(tx)
if blocking:
await account.ledger.wait(tx)
except:
await account.ledger.release_tx(tx)
raise
def valid_address_or_error(self, address): def valid_address_or_error(self, address):
try: try:
assert self.ledger.is_valid_address(address) assert self.ledger.is_valid_address(address)