Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

use reworked lbryum payto command

Browse source
This commit is contained in:
Kay Kurokawa 2018-01-08 15:13:51 -05:00
parent c29456b130
commit 1c608a09a9
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lbrynet/core/Wallet.py
View file

@ -1400,9 +1400,7 @@ class LBRYumWallet(Wallet):
addresses.append(address) addresses.append(address)
outputs = [[address, amount] for address in addresses] outputs = [[address, amount] for address in addresses]
tx = yield self._run_cmd_as_defer_succeed('paytomany', outputs) tx = yield self._run_cmd_as_defer_succeed('payto', outputs, broadcast=broadcast)
if broadcast and tx['complete']:
tx['txid'] = yield self._broadcast_transaction(tx)
defer.returnValue(tx) defer.returnValue(tx)
# Return an address with no balance in it, if # Return an address with no balance in it, if
@ -1475,23 +1473,15 @@ class LBRYumWallet(Wallet):
claim_out = yield self._run_cmd_as_defer_succeed('sendwithsupport', claim_id, amount) claim_out = yield self._run_cmd_as_defer_succeed('sendwithsupport', claim_id, amount)
defer.returnValue(claim_out) defer.returnValue(claim_out)
@defer.inlineCallbacks
def _broadcast_transaction(self, raw_tx):
txid = yield self._run_cmd_as_defer_succeed('broadcast', raw_tx)
log.info("Broadcast tx: %s", txid)
if len(txid) != 64:
raise Exception("Transaction rejected. Raw tx: {}".format(raw_tx))
defer.returnValue(txid)
def _do_send_many(self, payments_to_send): def _do_send_many(self, payments_to_send):
def broadcast_send_many(paytomany_out): def handle_payto_out(payto_out):
if 'hex' not in paytomany_out: if not payto_out['success']:
raise Exception('Unexpected paytomany output:{}'.format(paytomany_out)) raise Exception("Failed payto, reason:{}".format(payto_out['reason']))
return self._broadcast_transaction(paytomany_out['hex']) return payto_out['txid']
log.debug("Doing send many. payments to send: %s", str(payments_to_send)) log.debug("Doing send many. payments to send: %s", str(payments_to_send))
d = self._run_cmd_as_defer_succeed('paytomany', payments_to_send.iteritems()) d = self._run_cmd_as_defer_succeed('payto', payments_to_send.iteritems())
d.addCallback(lambda out: broadcast_send_many(out)) d.addCallback(lambda out: handle_payto_out(out))
return d return d
def _get_value_for_name(self, name): def _get_value_for_name(self, name):