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

lease_rates, funder: use overflow helpers

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-07-11 16:29:42 +09:30
committed by neil saitug
parent 888774e2ad
commit 30c57f9d35
2 changed files with 34 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/lease_rates.c
View File

@@ -5,6 +5,7 @@
#include <ccan/ccan/tal/str/str.h> #include <ccan/ccan/tal/str/str.h>
#include <common/amount.h> #include <common/amount.h>
#include <common/lease_rates.h> #include <common/lease_rates.h>
#include <common/overflows.h>
#include <common/type_to_string.h> #include <common/type_to_string.h>
#include <wire/peer_wire.h> #include <wire/peer_wire.h>
@@ -102,15 +103,15 @@ bool lease_rates_calc_fee(struct lease_rates *rates,
bool lease_rates_set_chan_fee_base_msat(struct lease_rates *rates, bool lease_rates_set_chan_fee_base_msat(struct lease_rates *rates,
struct amount_msat amt) struct amount_msat amt)
{ {
rates->channel_fee_max_base_msat = amt.millisatoshis; /* Raw: conversion */ return assign_overflow_u32(&rates->channel_fee_max_base_msat,
return rates->channel_fee_max_base_msat == amt.millisatoshis; /* Raw: comparsion */ amt.millisatoshis); /* Raw: conversion */
} }
bool lease_rates_set_lease_fee_sat(struct lease_rates *rates, bool lease_rates_set_lease_fee_sat(struct lease_rates *rates,
struct amount_sat amt) struct amount_sat amt)
{ {
rates->lease_fee_base_sat = amt.satoshis; /* Raw: conversion */ return assign_overflow_u32(&rates->lease_fee_base_sat,
return rates->lease_fee_base_sat == amt.satoshis; /* Raw: comparsion */ amt.satoshis); /* Raw: conversion */
} }
char *lease_rates_tohex(const tal_t *ctx, const struct lease_rates *rates) char *lease_rates_tohex(const tal_t *ctx, const struct lease_rates *rates)

76
plugins/funder.c
View File

@@ -19,6 +19,7 @@
#include <common/json_stream.h> #include <common/json_stream.h>
#include <common/lease_rates.h> #include <common/lease_rates.h>
#include <common/node_id.h> #include <common/node_id.h>
#include <common/overflows.h>
#include <common/psbt_open.h> #include <common/psbt_open.h>
#include <common/type_to_string.h> #include <common/type_to_string.h>
#include <common/utils.h> #include <common/utils.h>
@@ -832,7 +833,7 @@ parse_lease_rates(struct command *cmd, const char *buffer,
u32 *lease_fee_basis, u32 *lease_fee_basis,
struct amount_sat *lease_fee_sats, struct amount_sat *lease_fee_sats,
u32 *funding_weight, u32 *funding_weight,
u32 *chan_fee_ppt, u32 *channel_fee_max_proportional_thousandths,
struct amount_msat *chan_fee_msats) struct amount_msat *chan_fee_msats)
{ {
@@ -843,58 +844,36 @@ parse_lease_rates(struct command *cmd, const char *buffer,
else if (lease_fee_basis else if (lease_fee_basis
|| lease_fee_sats || lease_fee_sats
|| funding_weight || funding_weight
|| chan_fee_ppt || channel_fee_max_proportional_thousandths
|| chan_fee_msats) || chan_fee_msats)
policy->rates = default_lease_rates(policy); policy->rates = default_lease_rates(policy);
else else
policy->rates = NULL; policy->rates = NULL;
/* Sometimes a local macro is neater than the alternative */
#define ASSIGN_OR_RETURN_FAIL(type, member) \
do { \
if (member && \
!assign_overflow_##type(&policy->rates->member, *member)) \
return command_fail_badparam(cmd, #member, \
buffer, tok, "overflow"); \
} while(0)
if (lease_fee_basis) { ASSIGN_OR_RETURN_FAIL(u16, lease_fee_basis);
policy->rates->lease_fee_basis = *lease_fee_basis; ASSIGN_OR_RETURN_FAIL(u16, funding_weight);
ASSIGN_OR_RETURN_FAIL(u16, channel_fee_max_proportional_thousandths);
#undef ASSIGN_OR_RETURN_FAIL
/* Check for overflow */ if (chan_fee_msats
if (policy->rates->lease_fee_basis != *lease_fee_basis) && !assign_overflow_u32(&policy->rates->channel_fee_max_base_msat,
return command_fail_badparam(cmd, "lease_fee_basis", chan_fee_msats->millisatoshis /* Raw: conversion */)) {
return command_fail_badparam(cmd, "channel_fee_max_base_msat",
buffer, tok, "overflow"); buffer, tok, "overflow");
} }
if (lease_fee_sats
if (lease_fee_sats) { && !assign_overflow_u32(&policy->rates->lease_fee_base_sat,
policy->rates->lease_fee_base_sat lease_fee_sats->satoshis /* Raw: conversion */)) {
= lease_fee_sats->satoshis; /* Raw: conversion */ return command_fail_badparam(cmd, "lease_fee_base_sat",
if (policy->rates->lease_fee_base_sat
!= lease_fee_sats->satoshis) /* Raw: comparison */
return command_fail_badparam(cmd, "lease_fee_base_msat",
buffer, tok, "overflow");
}
if (funding_weight) {
policy->rates->funding_weight = *funding_weight;
/* Check for overflow */
if (policy->rates->funding_weight != *funding_weight)
return command_fail_badparam(cmd, "funding_weight",
buffer, tok, "overflow");
}
if (chan_fee_ppt) {
policy->rates->channel_fee_max_proportional_thousandths
= *chan_fee_ppt;
/* Check for overflow */
if (policy->rates->channel_fee_max_proportional_thousandths
!= *chan_fee_ppt)
return command_fail_badparam(cmd, "channel_fee_max_proportional_thousandths",
buffer, tok, "overflow");
}
if (chan_fee_msats) {
policy->rates->channel_fee_max_base_msat
= chan_fee_msats->millisatoshis; /* Raw: conversion */
if (policy->rates->channel_fee_max_base_msat
!= chan_fee_msats->millisatoshis) /* Raw: comparison */
return command_fail_badparam(cmd,
"channel_fee_max_base_msat",
buffer, tok, "overflow"); buffer, tok, "overflow");
} }
@@ -1126,9 +1105,8 @@ static char *option_channel_base(const char *arg, struct funder_policy *policy)
if (!policy->rates) if (!policy->rates)
policy->rates = default_lease_rates(policy); policy->rates = default_lease_rates(policy);
policy->rates->channel_fee_max_base_msat = amt.millisatoshis; /* Raw: conversion */ if (!assign_overflow_u32(&policy->rates->channel_fee_max_base_msat,
amt.millisatoshis)) /* Raw: conversion */
if (policy->rates->channel_fee_max_base_msat != amt.millisatoshis) /* Raw: comparison */
return tal_fmt(NULL, "channel_fee_max_base_msat overflowed"); return tal_fmt(NULL, "channel_fee_max_base_msat overflowed");
return NULL; return NULL;
@@ -1163,8 +1141,8 @@ static char *option_lease_fee_base(const char *arg,
if (err) if (err)
return err; return err;
policy->rates->lease_fee_base_sat = amt.satoshis; /* Raw: conversion */ if (!assign_overflow_u32(&policy->rates->lease_fee_base_sat,
if (policy->rates->lease_fee_base_sat != amt.satoshis) /* Raw: comparison */ amt.satoshis)) /* Raw: conversion */
return tal_fmt(NULL, "lease_fee_base_sat overflowed"); return tal_fmt(NULL, "lease_fee_base_sat overflowed");
return NULL; return NULL;