mirror of
https://github.com/ElementsProject/lightning.git
synced 2024-11-20 02:27:51 +01:00
a1f1f1eda8
Firstly, we need to update the staging fee amount when we queue a change. Secondly we need to remove completed fee updates, otherwise we hit a database constraint that peer & state are unique. Reported-by: Christian Decker Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
145 lines
3.8 KiB
C
145 lines
3.8 KiB
C
#include "db.h"
|
|
#include "feechange.h"
|
|
#include "log.h"
|
|
#include "peer.h"
|
|
#include <ccan/array_size/array_size.h>
|
|
#include <inttypes.h>
|
|
#include "gen_feechange_state_names.h"
|
|
|
|
/* This is the HTLC-like flags for each state. */
|
|
static const int per_state_bits[] = {
|
|
[SENT_FEECHANGE] = HTLC_ADDING + HTLC_LOCAL_F_OWNER
|
|
+ HTLC_REMOTE_F_PENDING,
|
|
|
|
[SENT_FEECHANGE_COMMIT] = HTLC_ADDING + HTLC_LOCAL_F_OWNER
|
|
+ HTLC_REMOTE_F_COMMITTED
|
|
+ HTLC_REMOTE_F_WAS_COMMITTED,
|
|
|
|
[RCVD_FEECHANGE_REVOCATION] = HTLC_ADDING + HTLC_LOCAL_F_OWNER
|
|
+ HTLC_REMOTE_F_COMMITTED
|
|
+ HTLC_REMOTE_F_REVOKED
|
|
+ HTLC_LOCAL_F_PENDING
|
|
+ HTLC_REMOTE_F_WAS_COMMITTED,
|
|
|
|
[RCVD_FEECHANGE_ACK_COMMIT] = HTLC_ADDING + HTLC_LOCAL_F_OWNER
|
|
+ HTLC_REMOTE_F_COMMITTED
|
|
+ HTLC_REMOTE_F_REVOKED
|
|
+ HTLC_LOCAL_F_COMMITTED
|
|
+ HTLC_LOCAL_F_WAS_COMMITTED
|
|
+ HTLC_REMOTE_F_WAS_COMMITTED,
|
|
|
|
[SENT_FEECHANGE_ACK_REVOCATION] = HTLC_LOCAL_F_OWNER
|
|
+ HTLC_REMOTE_F_COMMITTED
|
|
+ HTLC_REMOTE_F_REVOKED
|
|
+ HTLC_LOCAL_F_COMMITTED
|
|
+ HTLC_LOCAL_F_REVOKED
|
|
+ HTLC_LOCAL_F_WAS_COMMITTED
|
|
+ HTLC_REMOTE_F_WAS_COMMITTED,
|
|
|
|
[RCVD_FEECHANGE] = HTLC_ADDING + HTLC_REMOTE_F_OWNER
|
|
+ HTLC_LOCAL_F_PENDING,
|
|
|
|
[RCVD_FEECHANGE_COMMIT] = HTLC_ADDING + HTLC_REMOTE_F_OWNER
|
|
+ HTLC_LOCAL_F_COMMITTED
|
|
+ HTLC_LOCAL_F_WAS_COMMITTED,
|
|
|
|
[SENT_FEECHANGE_REVOCATION] = HTLC_ADDING + HTLC_REMOTE_F_OWNER
|
|
+ HTLC_LOCAL_F_COMMITTED
|
|
+ HTLC_LOCAL_F_REVOKED
|
|
+ HTLC_REMOTE_F_PENDING
|
|
+ HTLC_LOCAL_F_WAS_COMMITTED,
|
|
|
|
[SENT_FEECHANGE_ACK_COMMIT] = HTLC_ADDING + HTLC_REMOTE_F_OWNER
|
|
+ HTLC_LOCAL_F_COMMITTED
|
|
+ HTLC_LOCAL_F_REVOKED
|
|
+ HTLC_REMOTE_F_COMMITTED
|
|
+ HTLC_LOCAL_F_WAS_COMMITTED
|
|
+ HTLC_REMOTE_F_WAS_COMMITTED,
|
|
|
|
[RCVD_FEECHANGE_ACK_REVOCATION] = HTLC_REMOTE_F_OWNER
|
|
+ HTLC_LOCAL_F_COMMITTED
|
|
+ HTLC_LOCAL_F_REVOKED
|
|
+ HTLC_REMOTE_F_COMMITTED
|
|
+ HTLC_REMOTE_F_REVOKED
|
|
+ HTLC_LOCAL_F_WAS_COMMITTED
|
|
+ HTLC_REMOTE_F_WAS_COMMITTED,
|
|
};
|
|
|
|
int feechange_state_flags(enum feechange_state state)
|
|
{
|
|
assert(state < ARRAY_SIZE(per_state_bits));
|
|
assert(per_state_bits[state]);
|
|
return per_state_bits[state];
|
|
}
|
|
|
|
const char *feechange_state_name(enum feechange_state s)
|
|
{
|
|
size_t i;
|
|
|
|
for (i = 0; enum_feechange_state_names[i].name; i++)
|
|
if (enum_feechange_state_names[i].v == s)
|
|
return enum_feechange_state_names[i].name;
|
|
return "unknown";
|
|
}
|
|
|
|
enum feechange_state feechange_state_from_name(const char *name)
|
|
{
|
|
size_t i;
|
|
|
|
for (i = 0; enum_feechange_state_names[i].name; i++)
|
|
if (streq(enum_feechange_state_names[i].name, name))
|
|
return enum_feechange_state_names[i].v;
|
|
return FEECHANGE_STATE_INVALID;
|
|
}
|
|
|
|
struct feechange *new_feechange(struct peer *peer,
|
|
u64 fee_rate,
|
|
enum feechange_state state)
|
|
{
|
|
struct feechange *f = tal(peer, struct feechange);
|
|
f->state = state;
|
|
f->fee_rate = fee_rate;
|
|
|
|
return f;
|
|
}
|
|
|
|
void feechange_changestate(struct peer *peer,
|
|
struct feechange *f,
|
|
enum feechange_state oldstate,
|
|
enum feechange_state newstate,
|
|
bool db_commit)
|
|
{
|
|
log_debug(peer->log, "feechange: %s->%s",
|
|
feechange_state_name(f->state),
|
|
feechange_state_name(newstate));
|
|
assert(f->state == oldstate);
|
|
assert(peer->feechanges[f->state] == f);
|
|
|
|
/* You can only go to consecutive states. */
|
|
assert(newstate == f->state + 1);
|
|
|
|
/* You can't change sides. */
|
|
assert(feechange_side(f->state) == feechange_side(newstate));
|
|
|
|
f->state = newstate;
|
|
|
|
/* We can have multiple dead feestates, but only one in any other */
|
|
if (!feechange_is_dead(f))
|
|
assert(!peer->feechanges[f->state]);
|
|
|
|
peer->feechanges[oldstate] = NULL;
|
|
peer->feechanges[newstate] = f;
|
|
|
|
if (db_commit) {
|
|
if (newstate == RCVD_FEECHANGE_COMMIT
|
|
|| newstate == SENT_FEECHANGE_COMMIT)
|
|
db_new_feechange(peer, f);
|
|
else if (newstate == RCVD_FEECHANGE_ACK_REVOCATION
|
|
|| SENT_FEECHANGE_ACK_REVOCATION)
|
|
db_remove_feechange(peer, f, oldstate);
|
|
else
|
|
db_update_feechange_state(peer, f, oldstate);
|
|
}
|
|
}
|
|
|