bookkeeper crash fixes #5477
Merged
bookkeeper crash fixes #5477
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
plugins/bkpr/incomestmt.c
Outdated
| @@ -437,7 +437,7 @@ void json_add_income_event(struct json_stream *out, struct income_event *ev) | |||
|
|
|||
| const char *csv_filename(const tal_t *ctx, const struct csv_fmt *fmt) | |||
| { | |||
| return tal_fmt(ctx, "cln_incomestmt_%s_%zu.csv", | |||
| return tal_fmt(ctx, "cln_incomestmt_%s_%li.csv", | |||
| fmt->fmt_name, | |||
| time_now().ts.tv_sec); | |||
There was a problem hiding this comment.
That will break on some platforms too! Use an "unsigned long" cast...
9cad7d6 changed the behavior of `channel_active`, which slightly broke how our balance snapshots work (we need info about channels that aren't on-chain yet). This patches adds AWAITING_UNILATERAL back in.
niftynei
force-pushed
the
nifty/acct_push
branch
from
08f7faf
to
e0ccdd5
Compare
First, how we record "our_funds" and then apply pushes vs lease_fees (for liquidity ad buys/sales) was exactly opposite. For pushes we were reporting the total funded into the channel, with the push representing how much we'd later moved to the peer. For lease_fees we were rerporting the total in the channel, with the push representing how much was already moved to the peer. We fix this (from a view perspective) by re-adding lease fees to what's reported in the channel funding totals. Since this is now new behavior (for leased channel values), we added new fields so we can take the old field names thru a deprecation cycle. We also make it possible to differentiate btw a push and a lease_fee (before they were all the same), by adding to new fields to `listpeers`: `fee_paid_msat` and `fee_rcvd_msat`. This allows us to avoid math in the bookkeeper, instead we just pick the numbers out directly and record them. Fixes ElementsProject#5472 Changelog-Added: JSON-RPC: `listpeers` now has a few new fields for `funding` (`remote_funds_msat`, `local_funds_msat`, `fee_paid_msat`, `fee_rcvd_msat`). Changelog-Deprecated: JSON-RPC: `listpeers`.`funded` fields `local_msat` and `remote_msat` are now deprecated.
niftynei
force-pushed
the
nifty/acct_push
branch
from
e0ccdd5
to
31e5b82
Compare
|
Ack 31e5b82 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes two crash reports, and adds back some missing functionality for the snapshots in coin-moves.