LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lnbase: use correct delay

Browse source
This commit is contained in:
Janus 2018-05-01 14:12:14 +02:00 • committed by SomberNight
parent e3a33bdb5e
commit aa3723797c
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/lnbase.py
View file

@ -462,7 +462,7 @@ def make_commitment_using_open_channel(openchannel, ctn, for_us, pcp, local_sat,
openchannel.remote_config.payment_key.pubkey, openchannel.remote_config.payment_key.pubkey,
remote_revocation_pubkey, remote_revocation_pubkey,
derive_pubkey(conf.delayed_key.pubkey, pcp), derive_pubkey(conf.delayed_key.pubkey, pcp),
conf.to_self_delay, other_conf.to_self_delay,
*openchannel.funding_outpoint, *openchannel.funding_outpoint,
openchannel.constraints.capacity, openchannel.constraints.capacity,
local_sat, local_sat,
@ -768,7 +768,7 @@ class Peer(PrintError):
per_commitment_secret_index = 2**48 - 1 per_commitment_secret_index = 2**48 - 1
# amounts # amounts
local_feerate = 20000 local_feerate = 20000
to_self_delay = 144 to_self_delay = 143
dust_limit_sat = 10 dust_limit_sat = 10
# #
per_commitment_secret_first = get_per_commitment_secret_from_seed(per_commitment_secret_seed, per_commitment_secret_index) per_commitment_secret_first = get_per_commitment_secret_from_seed(per_commitment_secret_seed, per_commitment_secret_index)
@ -846,7 +846,7 @@ class Peer(PrintError):
0, 0,
remote_funding_pubkey, funding_key.pubkey, local_payment_pubkey, remote_funding_pubkey, funding_key.pubkey, local_payment_pubkey,
base_point.pubkey, remote_payment_basepoint, base_point.pubkey, remote_payment_basepoint,
revocation_pubkey, remote_delayedpubkey, remote_delay, revocation_pubkey, remote_delayedpubkey, to_self_delay,
funding_txid, funding_index, funding_sat, funding_txid, funding_index, funding_sat,
remote_amount, local_amount, remote_dust_limit_sat, local_feerate, False, htlcs=[]) remote_amount, local_amount, remote_dust_limit_sat, local_feerate, False, htlcs=[])
remote_ctx.sign({bh2u(funding_key.pubkey): (funding_key.privkey, True)}) remote_ctx.sign({bh2u(funding_key.pubkey): (funding_key.privkey, True)})
@ -869,7 +869,7 @@ class Peer(PrintError):
0, 0,
funding_key.pubkey, remote_funding_pubkey, remote_payment_pubkey, funding_key.pubkey, remote_funding_pubkey, remote_payment_pubkey,
base_point.pubkey, remote_payment_basepoint, base_point.pubkey, remote_payment_basepoint,
remote_revocation_pubkey, local_delayedpubkey, to_self_delay, remote_revocation_pubkey, local_delayedpubkey, remote_delay,
funding_txid, funding_index, funding_sat, funding_txid, funding_index, funding_sat,
local_amount, remote_amount, dust_limit_sat, local_feerate, True, htlcs=[]) local_amount, remote_amount, dust_limit_sat, local_feerate, True, htlcs=[])
pre_hash = bitcoin.Hash(bfh(local_ctx.serialize_preimage(0))) pre_hash = bitcoin.Hash(bfh(local_ctx.serialize_preimage(0)))
@ -1048,7 +1048,7 @@ class Peer(PrintError):
local_delayedpubkey=remote_delayedpubkey, local_delayedpubkey=remote_delayedpubkey,
amount_msat=amount_msat, amount_msat=amount_msat,
witness_script=bh2u(preimage_script)) witness_script=bh2u(preimage_script))
htlc_tx = make_htlc_tx(cltv_expiry, inputs=htlc_tx_inputs, output=htlc_tx_output) htlc_tx = make_htlc_tx(remote_delay, inputs=htlc_tx_inputs, output=htlc_tx_output)
# htlc_sig signs the HTLC transaction that spends from THEIR commitment transaction's offered_htlc output # htlc_sig signs the HTLC transaction that spends from THEIR commitment transaction's offered_htlc output
sig = bfh(htlc_tx.sign_txin(0, their_remote_htlc_privkey)) sig = bfh(htlc_tx.sign_txin(0, their_remote_htlc_privkey))