mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

peer_control: Correct roundoff of remote-side msatoshi.

Browse Source 
Fixes: #818
This commit is contained in:
ZmnSCPxj 2018-01-28 06:59:03 +00:00 committed by Rusty Russell
parent 7e8f1945f2
commit 8f5584d7d6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lightningd/peer_control.c
View File

@ -1826,6 +1826,7 @@ static void peer_start_closingd(struct peer *peer,
u8 *initmsg, *local_scriptpubkey; u8 *initmsg, *local_scriptpubkey;
u64 minfee, maxfee, startfee, feelimit; u64 minfee, maxfee, startfee, feelimit;
u64 num_revocations; u64 num_revocations;
u64 funding_msatoshi, our_msatoshi, their_msatoshi;
if (peer->local_shutdown_idx == -1 if (peer->local_shutdown_idx == -1
|| !peer->remote_shutdown_scriptpubkey) { || !peer->remote_shutdown_scriptpubkey) {
@ -1892,6 +1893,11 @@ static void peer_start_closingd(struct peer *peer,
* *
* The amounts for each output MUST BE rounded down to whole satoshis. * The amounts for each output MUST BE rounded down to whole satoshis.
*/ */
/* Convert unit */
funding_msatoshi = peer->funding_satoshi * 1000;
/* What is not ours is theirs */
our_msatoshi = *peer->our_msatoshi;
their_msatoshi = funding_msatoshi - our_msatoshi;
initmsg = towire_closing_init(tmpctx, initmsg = towire_closing_init(tmpctx,
cs, cs,
gossip_index, gossip_index,
@ -1901,9 +1907,8 @@ static void peer_start_closingd(struct peer *peer,
peer->funding_satoshi, peer->funding_satoshi,
&peer->channel_info->remote_fundingkey, &peer->channel_info->remote_fundingkey,
peer->funder, peer->funder,
*peer->our_msatoshi / 1000, our_msatoshi / 1000, /* Rounds down */
peer->funding_satoshi their_msatoshi / 1000, /* Rounds down */
- *peer->our_msatoshi / 1000,
peer->our_config.dust_limit_satoshis, peer->our_config.dust_limit_satoshis,
minfee, maxfee, startfee, minfee, maxfee, startfee,
local_scriptpubkey, local_scriptpubkey,