aljaz/plugins
1
0
Fork 0
mirror of https://github.com/aljazceru/plugins.git synced 2025-12-23 08:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

drain: fix for latest lightningd which require payment_secret.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-07-23 21:23:58 +09:30
parent a6e8a10618
commit 76b16a60b3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drain/drain.py
View File

@@ -238,6 +238,8 @@ def try_for_htlc_fee(plugin, payload, peer_id, amount, chunk, spendable_before):
description = "%s %s %s%s [%d/%d]" % (payload['command'], payload['scid'], payload['percentage'], '%', chunk + 1, payload['chunks']) description = "%s %s %s%s [%d/%d]" % (payload['command'], payload['scid'], payload['percentage'], '%', chunk + 1, payload['chunks'])
invoice = plugin.rpc.invoice("any", label, description, retry_for + 60) invoice = plugin.rpc.invoice("any", label, description, retry_for + 60)
payment_hash = invoice['payment_hash'] payment_hash = invoice['payment_hash']
# The requirement for payment_secret coincided with its addition to the invoice output.
payment_secret = invoice.get('payment_secret')
plugin.log("Invoice payment_hash: %s" % payment_hash) plugin.log("Invoice payment_hash: %s" % payment_hash)
# exclude selected channel to prevent unwanted shortcuts # exclude selected channel to prevent unwanted shortcuts
@@ -284,7 +286,7 @@ def try_for_htlc_fee(plugin, payload, peer_id, amount, chunk, spendable_before):
try: try:
ours = get_ours(plugin, payload['scid']) ours = get_ours(plugin, payload['scid'])
plugin.rpc.sendpay(route, payment_hash, label) plugin.rpc.sendpay(route, payment_hash, label, payment_secret=payment_secret)
running_for = int(time.time()) - start_ts running_for = int(time.time()) - start_ts
result = plugin.rpc.waitsendpay(payment_hash, max(retry_for - running_for, 0)) result = plugin.rpc.waitsendpay(payment_hash, max(retry_for - running_for, 0))
if not result.get('status') == 'complete': if not result.get('status') == 'complete':