aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 07:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

funding: adjust_fee() to allow fee alterations.

Browse Source 
This is used for figuring out the close transaction balances,
but can also be used in the future for dynamic fee support.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-01-22 06:41:47 +10:30
parent d5c30ee30b
commit cc1b1d7de7
2 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
funding.c
View File

@@ -44,21 +44,18 @@ static uint64_t htlcs_total(const struct channel_htlc *htlcs)
return total; return total;
} }
bool funding_delta(bool a_is_funder, static bool change_funding(bool a_is_funder,
uint64_t anchor_satoshis, uint64_t anchor_satoshis,
int64_t delta_a_msat, int64_t delta_a_msat,
int64_t htlc_msat, int64_t htlc_msat,
struct channel_oneside *a_side, uint64_t a, uint64_t b, uint64_t fee,
struct channel_oneside *b_side) struct channel_oneside *a_side,
struct channel_oneside *b_side)
{ {
uint64_t a, b, a_fee, b_fee; uint64_t a_fee, b_fee;
int64_t delta_b_msat; int64_t delta_b_msat;
uint64_t fee;
bool got_fees; bool got_fees;
a = a_side->pay_msat + a_side->fee_msat;
b = b_side->pay_msat + b_side->fee_msat;
fee = a_side->fee_msat + b_side->fee_msat;
assert(a + b + htlcs_total(a_side->htlcs) + htlcs_total(b_side->htlcs) assert(a + b + htlcs_total(a_side->htlcs) + htlcs_total(b_side->htlcs)
== anchor_satoshis * 1000); == anchor_satoshis * 1000);
@@ -96,6 +93,27 @@ bool funding_delta(bool a_is_funder,
return true; return true;
} }
bool funding_delta(bool a_is_funder,
uint64_t anchor_satoshis,
int64_t delta_a_msat,
int64_t htlc_msat,
struct channel_oneside *a_side,
struct channel_oneside *b_side)
{
uint64_t a, b;
uint64_t fee;
/* Start with A and B's current contributions, and maintain fee. */
a = a_side->pay_msat + a_side->fee_msat;
b = b_side->pay_msat + b_side->fee_msat;
fee = a_side->fee_msat + b_side->fee_msat;
return change_funding(a_is_funder, anchor_satoshis,
delta_a_msat, htlc_msat,
a, b, fee,
a_side, b_side);
}
struct channel_state *initial_funding(const tal_t *ctx, struct channel_state *initial_funding(const tal_t *ctx,
bool am_funder, bool am_funder,
uint64_t anchor_satoshis, uint64_t anchor_satoshis,
@@ -126,6 +144,23 @@ struct channel_state *initial_funding(const tal_t *ctx,
return state; return state;
} }
bool adjust_fee(bool a_is_funder,
uint64_t anchor_satoshis,
uint64_t fee_satoshis,
struct channel_oneside *a_side,
struct channel_oneside *b_side)
{
uint64_t a, b;
a = a_side->pay_msat + a_side->fee_msat;
b = b_side->pay_msat + b_side->fee_msat;
/* No HTLC or delta, just fee recalculate. */
return change_funding(a_is_funder, anchor_satoshis,
0, 0, a, b, fee_satoshis * 1000,
a_side, b_side);
}
/* We take the minimum. If one side offers too little, it should be rejected */ /* We take the minimum. If one side offers too little, it should be rejected */
uint64_t commit_fee(uint64_t a_satoshis, uint64_t b_satoshis) uint64_t commit_fee(uint64_t a_satoshis, uint64_t b_satoshis)
{ {

14
funding.h
View File

@@ -61,6 +61,20 @@ bool funding_delta(bool a_is_funder,
struct channel_oneside *a_side, struct channel_oneside *a_side,
struct channel_oneside *b_side); struct channel_oneside *b_side);
/**
* adjust_fee: Change fee.
* @a_is_funder: is A paying for the anchor?
* @anchor_satoshis: The anchor amount.
* @fee_satoshis: The new fee amount.
* @a_side: channel a's state to update.
* @b_side: channel b's state to update.
*/
bool adjust_fee(bool a_is_funder,
uint64_t anchor_satoshis,
uint64_t fee_satoshis,
struct channel_oneside *a_side,
struct channel_oneside *b_side);
/** /**
* commit_fee: Fee amount for commit tx. * commit_fee: Fee amount for commit tx.
* @a_satoshis: A's openchannel->commitment_fee offer * @a_satoshis: A's openchannel->commitment_fee offer