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

Merge pull request #572 from lbryio/minor-wallet-updates

Browse source 
Minor wallet updates
This commit is contained in:
Alex Grin 2017-03-31 10:30:48 -04:00 committed by GitHub
commit 5ec891c9ac
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lbrynet/core/Wallet.py
View file

@ -1014,22 +1014,26 @@ class LBRYumWallet(Wallet):
def _get_claims_for_name(self, name): def _get_claims_for_name(self, name):
return self._run_cmd_as_defer_to_thread('getclaimsforname', name) return self._run_cmd_as_defer_to_thread('getclaimsforname', name)
@defer.inlineCallbacks
def _send_name_claim(self, name, val, amount): def _send_name_claim(self, name, val, amount):
broadcast = False broadcast = False
log.debug("Name claim %s %s %f", name, val, amount) log.debug("Name claim %s %s %f", name, val, amount)
d = self._run_cmd_as_defer_succeed('claim', name, json.dumps(val), amount, broadcast) tx = yield self._run_cmd_as_defer_succeed('claim', name, json.dumps(val), amount, broadcast)
d.addCallback(lambda claim_out: self._broadcast_claim_transaction(claim_out)) claim_out = yield self._broadcast_claim_transaction(tx)
return d defer.returnValue(claim_out)
@defer.inlineCallbacks
def _send_name_claim_update(self, name, claim_id, claim_outpoint, value, amount): def _send_name_claim_update(self, name, claim_id, claim_outpoint, value, amount):
metadata = json.dumps(value) metadata = json.dumps(value)
log.debug("Update %s %d %f %s %s '%s'", claim_outpoint['txid'], claim_outpoint['nout'], log.debug("Update %s %d %f %s %s '%s'", claim_outpoint['txid'], claim_outpoint['nout'],
amount, name, claim_id, metadata) amount, name, claim_id, metadata)
broadcast = False broadcast = False
d = self._run_cmd_as_defer_succeed('update', claim_outpoint['txid'], claim_outpoint['nout'], tx = yield self._run_cmd_as_defer_succeed(
name, claim_id, metadata, amount, broadcast) 'update', claim_outpoint['txid'], claim_outpoint['nout'],
d.addCallback(lambda claim_out: self._broadcast_claim_transaction(claim_out)) name, claim_id, metadata, amount, broadcast
return d )
claim_out = yield self._broadcast_claim_transaction(tx)
defer.returnValue(claim_out)
@defer.inlineCallbacks @defer.inlineCallbacks
def _abandon_claim(self, claim_outpoint): def _abandon_claim(self, claim_outpoint):
@ -1041,33 +1045,29 @@ class LBRYumWallet(Wallet):
claim_out = yield self._broadcast_claim_transaction(abandon_tx) claim_out = yield self._broadcast_claim_transaction(abandon_tx)
defer.returnValue(claim_out) defer.returnValue(claim_out)
@defer.inlineCallbacks
def _support_claim(self, name, claim_id, amount): def _support_claim(self, name, claim_id, amount):
log.debug("Support %s %s %f" % (name, claim_id, amount)) log.debug("Support %s %s %f" % (name, claim_id, amount))
broadcast = False broadcast = False
d = self._run_cmd_as_defer_succeed('support', name, claim_id, amount, broadcast) tx = yield self._run_cmd_as_defer_succeed('support', name, claim_id, amount, broadcast)
d.addCallback(lambda claim_out: self._broadcast_claim_transaction(claim_out)) claim_out = yield self._broadcast_claim_transaction(tx)
return d defer.returnValue(claim_out)
@defer.inlineCallbacks
def _broadcast_claim_transaction(self, claim_out): def _broadcast_claim_transaction(self, claim_out):
if 'success' not in claim_out: if 'success' not in claim_out:
raise Exception('Unexpected claim command output: {}'.format(claim_out)) raise Exception('Unexpected claim command output: {}'.format(claim_out))
if claim_out['success']: if claim_out['success']:
d = self._broadcast_transaction(claim_out['tx']) yield self._broadcast_transaction(claim_out['tx'])
d.addCallback(lambda _: claim_out) defer.returnValue(claim_out)
return d
else:
return defer.succeed(claim_out)
@defer.inlineCallbacks
def _broadcast_transaction(self, raw_tx): def _broadcast_transaction(self, raw_tx):
def _log_tx(r): txid = yield self._run_cmd_as_defer_to_thread('broadcast', raw_tx)
log.debug("Broadcast tx: %s", r) log.info("Broadcast tx: %s", txid)
return r if len(txid) != 64:
raise Exception("Transaction rejected. Raw tx: {}".format(raw_tx))
d = self._run_cmd_as_defer_to_thread('broadcast', raw_tx) defer.returnValue(txid)
d.addCallback(_log_tx)
d.addCallback(
lambda r: r if len(r) == 64 else defer.fail(Exception("Transaction rejected")))
return d
def _do_send_many(self, payments_to_send): def _do_send_many(self, payments_to_send):
def broadcast_send_many(paytomany_out): def broadcast_send_many(paytomany_out):