From ea30c34d82e4c4c3ffeeafdede96663e4c91c8cb Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 16 Sep 2021 14:30:42 +0930 Subject: [PATCH] cleanup: remove unneeded includes in header files. Signed-off-by: Rusty Russell --- bitcoin/address.h | 1 - bitcoin/base58.h | 4 - bitcoin/block.h | 2 - bitcoin/chainparams.c | 1 + bitcoin/chainparams.h | 3 - bitcoin/psbt.h | 1 - bitcoin/pubkey.h | 2 - bitcoin/script.h | 2 - bitcoin/short_channel_id.h | 3 +- bitcoin/signature.h | 1 - bitcoin/tx.c | 1 + bitcoin/tx.h | 3 - bitcoin/tx_parts.h | 1 - channeld/channeld_htlc.h | 4 +- channeld/commit_tx.h | 3 - channeld/full_channel.c | 1 + channeld/watchtower.h | 3 - closingd/closingd.c | 2 + common/addr.h | 2 - common/amount.h | 2 - common/bech32_util.h | 2 - common/bolt11.h | 3 - common/bolt11_json.c | 2 + common/bolt12.c | 2 + common/bolt12_merkle.c | 1 + common/channel_config.h | 2 - common/close_tx.h | 4 - common/coin_mvt.c | 2 + common/coin_mvt.h | 6 - common/configdir.h | 1 - common/crypto_state.h | 2 - common/cryptomsg.h | 1 - common/daemon_conn.h | 2 - common/decode_array.h | 1 - common/derive_basepoints.h | 1 - common/dijkstra.c | 1 + common/dijkstra.h | 2 - common/errcode.h | 1 - common/hsm_encryption.h | 1 - common/htlc.h | 4 - common/htlc_tx.h | 1 - common/htlc_wire.h | 3 - common/initial_channel.h | 6 - common/initial_commit_tx.h | 1 - common/io_lock.h | 1 - common/json.h | 5 - common/json_command.h | 2 - common/json_helpers.h | 2 +- common/json_stream.h | 6 - common/json_tok.c | 1 + common/keyset.h | 1 - common/memleak.c | 1 + common/memleak.h | 2 - common/msg_queue.h | 1 - common/onion.c | 1 + common/onion.h | 1 - common/param.c | 1 + common/param.h | 2 - common/penalty_base.h | 2 - common/psbt_open.h | 2 - common/sphinx.c | 1 + common/sphinx.h | 4 - common/status.h | 5 - common/status_wire.c | 1 + common/status_wire.csv | 1 + common/status_wiregen.c | 2 +- common/status_wiregen.h | 3 +- common/subdaemon.c | 1 + common/subdaemon.h | 1 + common/timeout.h | 2 - common/type_to_string.h | 2 - common/utxo.h | 7 - common/version.c | 2 + common/version.h | 1 - common/wire_error.h | 2 - common/wireaddr.h | 2 - connectd/handshake.h | 2 - connectd/netaddress.h | 1 - devtools/bolt12-cli.c | 1 + devtools/gossipwith.c | 1 + gossipd/broadcast.h | 2 - gossipd/gossip_generation.c | 1 + gossipd/gossip_store.h | 1 + gossipd/gossipd.c | 1 + gossipd/gossipd.h | 4 - hsmd/hsmd.c | 1 + hsmd/libhsmd.c | 7 + hsmd/libhsmd.h | 7 - lightningd/bitcoind.c | 1 + lightningd/bitcoind.h | 5 - lightningd/chaintopology.c | 4 + lightningd/chaintopology.h | 8 - lightningd/channel.c | 1 + lightningd/channel.h | 4 +- lightningd/channel_control.c | 6 + lightningd/closing_control.c | 10 + lightningd/coin_mvts.c | 1 + lightningd/coin_mvts.h | 2 - lightningd/connect_control.c | 2 + lightningd/datastore.c | 3 + lightningd/dual_open_control.c | 13 +- lightningd/gossip_control.c | 1 + lightningd/hsm_control.c | 1 + lightningd/hsm_control.h | 3 - lightningd/htlc_end.c | 1 + lightningd/htlc_end.h | 3 - lightningd/htlc_set.c | 2 + lightningd/invoice.c | 3 + lightningd/json.c | 1 + lightningd/jsonrpc.c | 1 + lightningd/jsonrpc.h | 3 - lightningd/lightningd.c | 7 + lightningd/lightningd.h | 10 - lightningd/log.h | 5 - lightningd/log_status.h | 1 - lightningd/memdump.h | 2 - lightningd/notification.c | 1 + lightningd/notification.h | 17 - lightningd/offer.c | 5 + lightningd/onchain_control.c | 5 + lightningd/onchain_control.h | 2 - lightningd/onion_message.c | 4 + lightningd/opening_common.c | 1 + lightningd/opening_control.c | 8 + lightningd/options.c | 4 + lightningd/options.h | 2 - lightningd/pay.c | 3 + lightningd/pay.h | 1 - lightningd/peer_control.c | 4 + lightningd/peer_control.h | 4 - lightningd/peer_htlcs.c | 4 + lightningd/peer_htlcs.h | 1 - lightningd/ping.c | 1 + lightningd/plugin.c | 10 + lightningd/plugin.h | 16 - lightningd/plugin_control.c | 8 + lightningd/plugin_hook.h | 5 - lightningd/routehint.c | 2 + lightningd/signmessage.c | 3 + lightningd/watch.c | 2 + lightningd/watch.h | 4 - onchaind/onchaind.c | 1 + onchaind/test/run-grind_feerate.c | 1 + openingd/dualopend.c | 10 +- plugins/autoclean.c | 1 + plugins/bcli.c | 1 + plugins/fetchinvoice.c | 2 + plugins/funder.c | 1 + plugins/funder_policy.h | 1 - plugins/keysend.c | 2 + plugins/libplugin.c | 1 + plugins/libplugin.h | 2 + plugins/offers.c | 1 + plugins/offers_inv_hook.c | 1 + plugins/offers_invreq_hook.c | 2 + plugins/offers_offer.c | 2 + plugins/pay.c | 1 + plugins/spender/fundchannel.c | 1 + plugins/spender/multifundchannel.c | 1 + plugins/spender/multiwithdraw.c | 2 + plugins/spender/openchannel.c | 1 + plugins/topology.c | 1 + plugins/txprepare.c | 1 + tests/plugins/test_libplugin.c | 1 + tools/hsmtool.c | 1 + wallet/db.c | 1 + wallet/db.h | 6 - wallet/db_common.h | 1 - wallet/db_postgres_sqlgen.c | 2 +- wallet/db_sqlite3_sqlgen.c | 2 +- wallet/invoices.h | 2 - wallet/reservation.c | 8 + wallet/statements_gettextgen.po | 650 ++++++++++++++--------------- wallet/txfilter.c | 1 + wallet/txfilter.h | 2 - wallet/wallet.c | 5 + wallet/wallet.h | 13 - wallet/walletrpc.c | 6 + wire/onion_printgen.h | 2 - wire/peer_printgen.h | 1 - wire/peer_wire.c | 1 + wire/tlvstream.c | 1 + wire/wire.h | 1 - 183 files changed, 548 insertions(+), 608 deletions(-) diff --git a/bitcoin/address.h b/bitcoin/address.h index d7960b564..c5fbbf712 100644 --- a/bitcoin/address.h +++ b/bitcoin/address.h @@ -2,7 +2,6 @@ #define LIGHTNING_BITCOIN_ADDRESS_H #include "config.h" #include -#include /* An address is the RIPEMD160 of the SHA of the public key. */ struct bitcoin_address { diff --git a/bitcoin/base58.h b/bitcoin/base58.h index a60265a5f..0af3a16bd 100644 --- a/bitcoin/base58.h +++ b/bitcoin/base58.h @@ -4,10 +4,6 @@ #include #include -#include -#include -#include -#include struct pubkey; struct privkey; diff --git a/bitcoin/block.h b/bitcoin/block.h index 227fc211f..e6f460a9b 100644 --- a/bitcoin/block.h +++ b/bitcoin/block.h @@ -3,10 +3,8 @@ #include "config.h" #include "bitcoin/shadouble.h" #include -#include #include #include -#include struct chainparams; diff --git a/bitcoin/chainparams.c b/bitcoin/chainparams.c index ea2593eb7..ed1eeaf05 100644 --- a/bitcoin/chainparams.c +++ b/bitcoin/chainparams.c @@ -1,6 +1,7 @@ #include "chainparams.h" #include #include +#include #include #include diff --git a/bitcoin/chainparams.h b/bitcoin/chainparams.h index eade2344b..0a4cc5a3f 100644 --- a/bitcoin/chainparams.h +++ b/bitcoin/chainparams.h @@ -3,11 +3,8 @@ #include "config.h" #include -#include -#include #include #include -#include #define ELEMENTS_ASSET_LEN 33 diff --git a/bitcoin/psbt.h b/bitcoin/psbt.h index e1fa9b406..7b98c14ae 100644 --- a/bitcoin/psbt.h +++ b/bitcoin/psbt.h @@ -3,7 +3,6 @@ #include "config.h" #include #include -#include struct wally_psbt; struct wally_psbt_input; diff --git a/bitcoin/pubkey.h b/bitcoin/pubkey.h index 80afb3d18..b24cc2aa2 100644 --- a/bitcoin/pubkey.h +++ b/bitcoin/pubkey.h @@ -2,11 +2,9 @@ #define LIGHTNING_BITCOIN_PUBKEY_H #include "config.h" #include -#include #include #include #include -#include #include struct privkey; diff --git a/bitcoin/script.h b/bitcoin/script.h index 807bd830e..6ef701f0b 100644 --- a/bitcoin/script.h +++ b/bitcoin/script.h @@ -3,8 +3,6 @@ #include "config.h" #include "signature.h" #include "tx.h" -#include -#include #include struct bitcoin_address; diff --git a/bitcoin/short_channel_id.h b/bitcoin/short_channel_id.h index 5ebc103b7..240772987 100644 --- a/bitcoin/short_channel_id.h +++ b/bitcoin/short_channel_id.h @@ -1,12 +1,11 @@ #ifndef LIGHTNING_BITCOIN_SHORT_CHANNEL_ID_H #define LIGHTNING_BITCOIN_SHORT_CHANNEL_ID_H #include "config.h" +#include #include #include #include #include -#include -#include /* Short Channel ID is composed of 3 bytes for the block height, 3 * bytes of tx index in block and 2 bytes of output index. */ diff --git a/bitcoin/signature.h b/bitcoin/signature.h index c70bdfbc3..29d368148 100644 --- a/bitcoin/signature.h +++ b/bitcoin/signature.h @@ -4,7 +4,6 @@ #include #include #include -#include struct sha256_double; struct sha256_ctx; diff --git a/bitcoin/tx.c b/bitcoin/tx.c index 01e723caa..eed329c0c 100644 --- a/bitcoin/tx.c +++ b/bitcoin/tx.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #define SEGREGATED_WITNESS_FLAG 0x1 diff --git a/bitcoin/tx.h b/bitcoin/tx.h index 255155ee3..0d6651d71 100644 --- a/bitcoin/tx.h +++ b/bitcoin/tx.h @@ -4,11 +4,8 @@ #include "shadouble.h" #include "signature.h" #include "varint.h" -#include #include -#include #include -#include #include #define BITCOIN_TX_DEFAULT_SEQUENCE 0xFFFFFFFF diff --git a/bitcoin/tx_parts.h b/bitcoin/tx_parts.h index dbbc031d0..bd38833d4 100644 --- a/bitcoin/tx_parts.h +++ b/bitcoin/tx_parts.h @@ -5,7 +5,6 @@ #define LIGHTNING_BITCOIN_TX_PARTS_H #include "config.h" #include -#include struct tx_parts { /* The txid of this transacation */ diff --git a/channeld/channeld_htlc.h b/channeld/channeld_htlc.h index 118d9321f..fcb4e0841 100644 --- a/channeld/channeld_htlc.h +++ b/channeld/channeld_htlc.h @@ -1,9 +1,7 @@ #ifndef LIGHTNING_CHANNELD_CHANNELD_HTLC_H #define LIGHTNING_CHANNELD_CHANNELD_HTLC_H #include "config.h" -#include -#include -#include +#include #include #include #include diff --git a/channeld/commit_tx.h b/channeld/commit_tx.h index 31fe5ac6e..ec8c42059 100644 --- a/channeld/commit_tx.h +++ b/channeld/commit_tx.h @@ -1,10 +1,7 @@ #ifndef LIGHTNING_CHANNELD_COMMIT_TX_H #define LIGHTNING_CHANNELD_COMMIT_TX_H #include "config.h" -#include -#include #include -#include #include struct keyset; diff --git a/channeld/full_channel.c b/channeld/full_channel.c index 4dcd66688..c355a8b76 100644 --- a/channeld/full_channel.c +++ b/channeld/full_channel.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/channeld/watchtower.h b/channeld/watchtower.h index 456e3a37d..90fe01e90 100644 --- a/channeld/watchtower.h +++ b/channeld/watchtower.h @@ -1,9 +1,6 @@ #ifndef LIGHTNING_CHANNELD_WATCHTOWER_H #define LIGHTNING_CHANNELD_WATCHTOWER_H #include "config.h" -#include -#include -#include #include const struct bitcoin_tx * diff --git a/closingd/closingd.c b/closingd/closingd.c index 80bb3a053..2a8577b99 100644 --- a/closingd/closingd.c +++ b/closingd/closingd.c @@ -1,5 +1,7 @@ #include +#include #include +#include #include #include #include diff --git a/common/addr.h b/common/addr.h index ba241784a..bc58ae0d2 100644 --- a/common/addr.h +++ b/common/addr.h @@ -2,8 +2,6 @@ #define LIGHTNING_COMMON_ADDR_H #include "config.h" #include -#include -#include /* Given a scriptPubkey, return an encoded address */ char *encode_scriptpubkey_to_addr(const tal_t *ctx, diff --git a/common/amount.h b/common/amount.h index 46d95d99d..616318740 100644 --- a/common/amount.h +++ b/common/amount.h @@ -1,10 +1,8 @@ #ifndef LIGHTNING_COMMON_AMOUNT_H #define LIGHTNING_COMMON_AMOUNT_H #include "config.h" -#include #include #include -#include #define MSAT_PER_SAT ((u64)1000) #define SAT_PER_BTC ((u64)100000000) diff --git a/common/bech32_util.h b/common/bech32_util.h index 9299c0bb6..f2857bde4 100644 --- a/common/bech32_util.h +++ b/common/bech32_util.h @@ -2,10 +2,8 @@ #define LIGHTNING_COMMON_BECH32_UTIL_H #include "config.h" -#include #include #include -#include /** * Push the bytes in src in 5 bit format onto the end of data. diff --git a/common/bolt11.h b/common/bolt11.h index 9a89fb3ba..3dea30b82 100644 --- a/common/bolt11.h +++ b/common/bolt11.h @@ -2,11 +2,8 @@ #define LIGHTNING_COMMON_BOLT11_H #include "config.h" -#include #include #include -#include -#include #include #include #include diff --git a/common/bolt11_json.c b/common/bolt11_json.c index 6c75de73f..804c7fcf1 100644 --- a/common/bolt11_json.c +++ b/common/bolt11_json.c @@ -2,12 +2,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include static void json_add_fallback(struct json_stream *response, const char *fieldname, diff --git a/common/bolt12.c b/common/bolt12.c index f284fcd6c..30589c63f 100644 --- a/common/bolt12.c +++ b/common/bolt12.c @@ -3,11 +3,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include diff --git a/common/bolt12_merkle.c b/common/bolt12_merkle.c index daf035b3c..2c5067b9e 100644 --- a/common/bolt12_merkle.c +++ b/common/bolt12_merkle.c @@ -4,6 +4,7 @@ #include #include #include +#include #ifndef SUPERVERBOSE #define SUPERVERBOSE(...) diff --git a/common/channel_config.h b/common/channel_config.h index e8b2a8e10..7078c83dd 100644 --- a/common/channel_config.h +++ b/common/channel_config.h @@ -1,8 +1,6 @@ #ifndef LIGHTNING_COMMON_CHANNEL_CONFIG_H #define LIGHTNING_COMMON_CHANNEL_CONFIG_H #include "config.h" -#include -#include #include /* BOLT #2: diff --git a/common/close_tx.h b/common/close_tx.h index 8767737a7..445cd8132 100644 --- a/common/close_tx.h +++ b/common/close_tx.h @@ -1,11 +1,7 @@ #ifndef LIGHTNING_COMMON_CLOSE_TX_H #define LIGHTNING_COMMON_CLOSE_TX_H #include "config.h" -#include #include -#include -#include -#include struct pubkey; diff --git a/common/coin_mvt.c b/common/coin_mvt.c index 870df4366..9e48398e8 100644 --- a/common/coin_mvt.c +++ b/common/coin_mvt.c @@ -1,9 +1,11 @@ #include "config.h" #include +#include #include #include #include #include +#include static const char *mvt_types[] = { "chain_mvt", "channel_mvt" }; const char *mvt_type_str(enum mvt_type type) diff --git a/common/coin_mvt.h b/common/coin_mvt.h index 683bdba4b..efda8ef90 100644 --- a/common/coin_mvt.h +++ b/common/coin_mvt.h @@ -2,14 +2,8 @@ #define LIGHTNING_COMMON_COIN_MVT_H #include "config.h" -#include -#include -#include -#include #include #include -#include -#include #define COIN_MVT_VERSION 1 diff --git a/common/configdir.h b/common/configdir.h index 9a66e3690..1f2d713d2 100644 --- a/common/configdir.h +++ b/common/configdir.h @@ -1,7 +1,6 @@ #ifndef LIGHTNING_COMMON_CONFIGDIR_H #define LIGHTNING_COMMON_CONFIGDIR_H #include "config.h" -#include #include /* Put things we're going to get rid of behind this, so testers can catch diff --git a/common/crypto_state.h b/common/crypto_state.h index d5ec88cf3..c2fa658c8 100644 --- a/common/crypto_state.h +++ b/common/crypto_state.h @@ -2,8 +2,6 @@ #define LIGHTNING_COMMON_CRYPTO_STATE_H #include "config.h" #include -#include -#include struct crypto_state { /* Received and sent nonces. */ diff --git a/common/cryptomsg.h b/common/cryptomsg.h index 7e4a84fa0..19c6d3e90 100644 --- a/common/cryptomsg.h +++ b/common/cryptomsg.h @@ -1,7 +1,6 @@ #ifndef LIGHTNING_COMMON_CRYPTOMSG_H #define LIGHTNING_COMMON_CRYPTOMSG_H #include "config.h" -#include #include #include diff --git a/common/daemon_conn.h b/common/daemon_conn.h index 580b3fd69..3b0a8b3e8 100644 --- a/common/daemon_conn.h +++ b/common/daemon_conn.h @@ -2,8 +2,6 @@ #define LIGHTNING_COMMON_DAEMON_CONN_H #include "config.h" -#include -#include #include /** diff --git a/common/decode_array.h b/common/decode_array.h index 2ea41f245..c1f09c4bf 100644 --- a/common/decode_array.h +++ b/common/decode_array.h @@ -1,7 +1,6 @@ #ifndef LIGHTNING_COMMON_DECODE_ARRAY_H #define LIGHTNING_COMMON_DECODE_ARRAY_H #include "config.h" -#include #include #include diff --git a/common/derive_basepoints.h b/common/derive_basepoints.h index e3c00ea5e..efe1adb42 100644 --- a/common/derive_basepoints.h +++ b/common/derive_basepoints.h @@ -4,7 +4,6 @@ #include #include #include -#include #include struct sha256; diff --git a/common/dijkstra.c b/common/dijkstra.c index a0fbef341..cb7eedb89 100644 --- a/common/dijkstra.c +++ b/common/dijkstra.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/common/dijkstra.h b/common/dijkstra.h index 4a43d99b8..3672c59a8 100644 --- a/common/dijkstra.h +++ b/common/dijkstra.h @@ -1,8 +1,6 @@ #ifndef LIGHTNING_COMMON_DIJKSTRA_H #define LIGHTNING_COMMON_DIJKSTRA_H #include "config.h" -#include -#include #include struct gossmap; diff --git a/common/errcode.h b/common/errcode.h index 78aa8dd38..2b2412262 100644 --- a/common/errcode.h +++ b/common/errcode.h @@ -4,7 +4,6 @@ #include "config.h" #include -#include typedef s32 errcode_t; diff --git a/common/hsm_encryption.h b/common/hsm_encryption.h index e620e1d6c..1cfa92e25 100644 --- a/common/hsm_encryption.h +++ b/common/hsm_encryption.h @@ -2,7 +2,6 @@ #define LIGHTNING_COMMON_HSM_ENCRYPTION_H #include "config.h" #include -#include #include #include diff --git a/common/htlc.h b/common/htlc.h index bdbde5aad..c300f0ffe 100644 --- a/common/htlc.h +++ b/common/htlc.h @@ -4,11 +4,7 @@ #include "bitcoin/locktime.h" #include "htlc_state.h" #include -#include -#include #include -#include -#include #define NUM_SIDES (REMOTE + 1) enum side { diff --git a/common/htlc_tx.h b/common/htlc_tx.h index 2ab1f1c42..6ffea256c 100644 --- a/common/htlc_tx.h +++ b/common/htlc_tx.h @@ -2,7 +2,6 @@ #define LIGHTNING_COMMON_HTLC_TX_H #include "config.h" #include -#include #include #include diff --git a/common/htlc_wire.h b/common/htlc_wire.h index cbf332394..73a1236f8 100644 --- a/common/htlc_wire.h +++ b/common/htlc_wire.h @@ -2,11 +2,8 @@ #define LIGHTNING_COMMON_HTLC_WIRE_H #include "config.h" #include -#include -#include #include #include -#include struct bitcoin_tx; struct shachain; diff --git a/common/initial_channel.h b/common/initial_channel.h index a084cf3b6..03e8140ba 100644 --- a/common/initial_channel.h +++ b/common/initial_channel.h @@ -3,17 +3,11 @@ #define LIGHTNING_COMMON_INITIAL_CHANNEL_H #include "config.h" -#include -#include #include -#include -#include -#include #include #include #include #include -#include struct signature; struct added_htlc; diff --git a/common/initial_commit_tx.h b/common/initial_commit_tx.h index 4e89f2d4d..c5b6bca12 100644 --- a/common/initial_commit_tx.h +++ b/common/initial_commit_tx.h @@ -4,7 +4,6 @@ #include "config.h" #include #include -#include #include #include diff --git a/common/io_lock.h b/common/io_lock.h index f995f17ae..03823c47d 100644 --- a/common/io_lock.h +++ b/common/io_lock.h @@ -3,7 +3,6 @@ #include "config.h" #include -#include struct io_lock; /** diff --git a/common/json.h b/common/json.h index 2e570de4f..922d5a94f 100644 --- a/common/json.h +++ b/common/json.h @@ -2,13 +2,8 @@ #define LIGHTNING_COMMON_JSON_H #include "config.h" #include -#include #include #include -#include -#include -#include -#include #define JSMN_STRICT 1 # include diff --git a/common/json_command.h b/common/json_command.h index 95ae8a192..5c44f1c8e 100644 --- a/common/json_command.h +++ b/common/json_command.h @@ -4,10 +4,8 @@ #define LIGHTNING_COMMON_JSON_COMMAND_H #include "config.h" #include -#include #include #include -#include struct command; struct command_result; diff --git a/common/json_helpers.h b/common/json_helpers.h index cfe12c5fd..e4af90a7c 100644 --- a/common/json_helpers.h +++ b/common/json_helpers.h @@ -2,7 +2,6 @@ #ifndef LIGHTNING_COMMON_JSON_HELPERS_H #define LIGHTNING_COMMON_JSON_HELPERS_H #include "config.h" -#include #include #include #include @@ -18,6 +17,7 @@ struct pubkey; struct pubkey32; struct secret; struct short_channel_id; +struct short_channel_id_dir; struct wireaddr; struct wireaddr_internal; struct wally_psbt; diff --git a/common/json_stream.h b/common/json_stream.h index 816a09fe0..f47f4cf38 100644 --- a/common/json_stream.h +++ b/common/json_stream.h @@ -4,13 +4,7 @@ #ifndef LIGHTNING_COMMON_JSON_STREAM_H #define LIGHTNING_COMMON_JSON_STREAM_H #include "config.h" -#include -#include #include -#include -#include -#include -#include struct command; struct io_conn; diff --git a/common/json_tok.c b/common/json_tok.c index dd4ace1ae..b32ad859c 100644 --- a/common/json_tok.c +++ b/common/json_tok.c @@ -16,6 +16,7 @@ #include #include #include +#include struct command_result *param_array(struct command *cmd, const char *name, const char *buffer, const jsmntok_t *tok, diff --git a/common/keyset.h b/common/keyset.h index fcb371d9a..ba74ceeb0 100644 --- a/common/keyset.h +++ b/common/keyset.h @@ -2,7 +2,6 @@ #define LIGHTNING_COMMON_KEYSET_H #include "config.h" #include -#include struct basepoints; diff --git a/common/memleak.c b/common/memleak.c index 597889549..b19d739e0 100644 --- a/common/memleak.c +++ b/common/memleak.c @@ -22,6 +22,7 @@ #include "config.h" #include #include +#include #include #include #include diff --git a/common/memleak.h b/common/memleak.h index 25762460b..3460988cf 100644 --- a/common/memleak.h +++ b/common/memleak.h @@ -1,10 +1,8 @@ #ifndef LIGHTNING_COMMON_MEMLEAK_H #define LIGHTNING_COMMON_MEMLEAK_H #include "config.h" -#include #include #include -#include #include struct htable; diff --git a/common/msg_queue.h b/common/msg_queue.h index 0d4975d48..15c9c66d4 100644 --- a/common/msg_queue.h +++ b/common/msg_queue.h @@ -4,7 +4,6 @@ #include "config.h" #include #include -#include /* Reserved type used to indicate we're actually passing an fd. */ #define MSG_PASS_FD 0xFFFF diff --git a/common/onion.c b/common/onion.c index 9484884dd..75265f3ed 100644 --- a/common/onion.c +++ b/common/onion.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include diff --git a/common/onion.h b/common/onion.h index a84301f21..44b10ab26 100644 --- a/common/onion.h +++ b/common/onion.h @@ -2,7 +2,6 @@ #define LIGHTNING_COMMON_ONION_H #include "config.h" #include -#include #include struct route_step; diff --git a/common/param.c b/common/param.c index 7d860225a..ef58c7c13 100644 --- a/common/param.c +++ b/common/param.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include diff --git a/common/param.h b/common/param.h index f301b6132..2dd04232a 100644 --- a/common/param.h +++ b/common/param.h @@ -2,8 +2,6 @@ #define LIGHTNING_COMMON_PARAM_H #include "config.h" #include -#include -#include /*~ Greetings adventurer! * diff --git a/common/penalty_base.h b/common/penalty_base.h index 91e1b6aa1..e43cc75b9 100644 --- a/common/penalty_base.h +++ b/common/penalty_base.h @@ -2,8 +2,6 @@ #define LIGHTNING_COMMON_PENALTY_BASE_H #include "config.h" #include -#include -#include /* To create a penalty, all we need are these. */ struct penalty_base { diff --git a/common/psbt_open.h b/common/psbt_open.h index b3d0a2c66..8e41a4e13 100644 --- a/common/psbt_open.h +++ b/common/psbt_open.h @@ -4,9 +4,7 @@ #include #include #include -#include #include -#include struct channel_id; struct wally_tx_input; diff --git a/common/sphinx.c b/common/sphinx.c index 3a6d0bf86..0105ad53b 100644 --- a/common/sphinx.c +++ b/common/sphinx.c @@ -16,6 +16,7 @@ #include #include +#include #include diff --git a/common/sphinx.h b/common/sphinx.h index 0605443ab..dcce024c1 100644 --- a/common/sphinx.h +++ b/common/sphinx.h @@ -5,11 +5,7 @@ #include "bitcoin/privkey.h" #include "bitcoin/pubkey.h" -#include -#include #include -#include -#include #include struct node_id; diff --git a/common/status.h b/common/status.h index b14286bb8..4d96a3745 100644 --- a/common/status.h +++ b/common/status.h @@ -1,13 +1,8 @@ #ifndef LIGHTNING_COMMON_STATUS_H #define LIGHTNING_COMMON_STATUS_H #include "config.h" -#include #include -#include #include -#include -#include -#include struct channel_id; struct daemon_conn; diff --git a/common/status_wire.c b/common/status_wire.c index 25afd376b..d83d9acd2 100644 --- a/common/status_wire.c +++ b/common/status_wire.c @@ -1,3 +1,4 @@ +#include #include #include diff --git a/common/status_wire.csv b/common/status_wire.csv index 93bf2e89e..003857aa7 100644 --- a/common/status_wire.csv +++ b/common/status_wire.csv @@ -1,6 +1,7 @@ #include #include #include +#include msgtype,status_log,0xFFF0 msgdata,status_log,level,enum log_level, diff --git a/common/status_wiregen.c b/common/status_wiregen.c index 4d911a9e2..807da0975 100644 --- a/common/status_wiregen.c +++ b/common/status_wiregen.c @@ -214,4 +214,4 @@ bool fromwire_status_version(const tal_t *ctx, const void *p, wirestring **versi *version = fromwire_wirestring(ctx, &cursor, &plen); return cursor != NULL; } -// SHA256STAMP:83a462b28754c5b0c5a496b7e719f15ef6f6c1560f0eea12f76fa4b114189caa +// SHA256STAMP:6910f83360952ba00ee6a56e96a7402d9b973eb125a6c98bec4d52fa97740457 diff --git a/common/status_wiregen.h b/common/status_wiregen.h index 45c6624c8..a76887562 100644 --- a/common/status_wiregen.h +++ b/common/status_wiregen.h @@ -10,6 +10,7 @@ #include #include #include +#include enum status_wire { WIRE_STATUS_LOG = 0xFFF0, @@ -58,4 +59,4 @@ bool fromwire_status_version(const tal_t *ctx, const void *p, wirestring **versi #endif /* LIGHTNING_COMMON_STATUS_WIREGEN_H */ -// SHA256STAMP:83a462b28754c5b0c5a496b7e719f15ef6f6c1560f0eea12f76fa4b114189caa +// SHA256STAMP:6910f83360952ba00ee6a56e96a7402d9b973eb125a6c98bec4d52fa97740457 diff --git a/common/subdaemon.c b/common/subdaemon.c index 5465da548..e4e2d656c 100644 --- a/common/subdaemon.c +++ b/common/subdaemon.c @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/common/subdaemon.h b/common/subdaemon.h index 2617dd2f3..ad159ee62 100644 --- a/common/subdaemon.h +++ b/common/subdaemon.h @@ -2,6 +2,7 @@ #define LIGHTNING_COMMON_SUBDAEMON_H #include "config.h" #include + struct htable; /* daemon_setup, but for subdaemons */ diff --git a/common/timeout.h b/common/timeout.h index 4906d0c8b..d53d9a92c 100644 --- a/common/timeout.h +++ b/common/timeout.h @@ -3,9 +3,7 @@ #include "config.h" #include -#include #include -#include /* tal_free this to disable timer. */ struct oneshot *new_reltimer_(struct timers *timers, diff --git a/common/type_to_string.h b/common/type_to_string.h index fda0df7d1..3597271ad 100644 --- a/common/type_to_string.h +++ b/common/type_to_string.h @@ -3,8 +3,6 @@ #include "config.h" #include "utils.h" #include -#include -#include /* This must match the type_to_string_ cases. */ union printable_types { diff --git a/common/utxo.h b/common/utxo.h index 11910af5b..415bdd80c 100644 --- a/common/utxo.h +++ b/common/utxo.h @@ -2,15 +2,8 @@ #define LIGHTNING_COMMON_UTXO_H #include "config.h" #include -#include -#include -#include #include -#include -#include -#include #include -#include struct ext_key; diff --git a/common/version.c b/common/version.c index 713d2ee0b..f96c8798c 100644 --- a/common/version.c +++ b/common/version.c @@ -1,5 +1,7 @@ #include "version.h" +#include #include +#include /* Only common/version.c can safely include this. */ # include "version_gen.h" diff --git a/common/version.h b/common/version.h index 2c52b4a86..b2db426df 100644 --- a/common/version.h +++ b/common/version.h @@ -1,7 +1,6 @@ #ifndef LIGHTNING_COMMON_VERSION_H #define LIGHTNING_COMMON_VERSION_H #include "config.h" -#include char *version_and_exit(const void *unused); const char *version(void); diff --git a/common/wire_error.h b/common/wire_error.h index 2afd741e9..b3f67e11e 100644 --- a/common/wire_error.h +++ b/common/wire_error.h @@ -1,10 +1,8 @@ #ifndef LIGHTNING_COMMON_WIRE_ERROR_H #define LIGHTNING_COMMON_WIRE_ERROR_H #include "config.h" -#include #include #include -#include struct channel_id; diff --git a/common/wireaddr.h b/common/wireaddr.h index c24e87b74..7ca73b46a 100644 --- a/common/wireaddr.h +++ b/common/wireaddr.h @@ -3,8 +3,6 @@ #include "config.h" #include #include -#include -#include #include #include diff --git a/connectd/handshake.h b/connectd/handshake.h index 5312ac9c8..733178bee 100644 --- a/connectd/handshake.h +++ b/connectd/handshake.h @@ -1,8 +1,6 @@ #ifndef LIGHTNING_CONNECTD_HANDSHAKE_H #define LIGHTNING_CONNECTD_HANDSHAKE_H #include "config.h" -#include -#include struct crypto_state; struct io_conn; diff --git a/connectd/netaddress.h b/connectd/netaddress.h index 3f82d4d78..44c824f77 100644 --- a/connectd/netaddress.h +++ b/connectd/netaddress.h @@ -1,7 +1,6 @@ #ifndef LIGHTNING_CONNECTD_NETADDRESS_H #define LIGHTNING_CONNECTD_NETADDRESS_H #include "config.h" -#include #include /* Address is a wildcard: try to guess what it looks like to outside world */ diff --git a/devtools/bolt12-cli.c b/devtools/bolt12-cli.c index 4f454eff5..276fe88a7 100644 --- a/devtools/bolt12-cli.c +++ b/devtools/bolt12-cli.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include diff --git a/devtools/gossipwith.c b/devtools/gossipwith.c index 9f0a715f3..1429c831c 100644 --- a/devtools/gossipwith.c +++ b/devtools/gossipwith.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/gossipd/broadcast.h b/gossipd/broadcast.h index 567206cb9..d07f98b38 100644 --- a/gossipd/broadcast.h +++ b/gossipd/broadcast.h @@ -2,9 +2,7 @@ #define LIGHTNING_GOSSIPD_BROADCAST_H #include "config.h" -#include #include -#include /* This is nested inside a node, chan or half_chan; rewriting the store can * cause it to change! */ diff --git a/gossipd/gossip_generation.c b/gossipd/gossip_generation.c index a90178616..deaf5564b 100644 --- a/gossipd/gossip_generation.c +++ b/gossipd/gossip_generation.c @@ -1,5 +1,6 @@ /* Routines to make our own gossip messages. Not as in "we're the gossip * generation, man!" */ +#include #include #include #include diff --git a/gossipd/gossip_store.h b/gossipd/gossip_store.h index e5c831907..597c781c7 100644 --- a/gossipd/gossip_store.h +++ b/gossipd/gossip_store.h @@ -4,6 +4,7 @@ #include "config.h" #include +#include #include #include #include diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c index eefe3ede4..538e4b251 100644 --- a/gossipd/gossipd.c +++ b/gossipd/gossipd.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/gossipd/gossipd.h b/gossipd/gossipd.h index 2d54e4279..13f317cd7 100644 --- a/gossipd/gossipd.h +++ b/gossipd/gossipd.h @@ -1,11 +1,7 @@ #ifndef LIGHTNING_GOSSIPD_GOSSIPD_H #define LIGHTNING_GOSSIPD_GOSSIPD_H #include "config.h" -#include -#include -#include #include -#include #include #include diff --git a/hsmd/hsmd.c b/hsmd/hsmd.c index 338372d13..ea40c9f0c 100644 --- a/hsmd/hsmd.c +++ b/hsmd/hsmd.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include diff --git a/hsmd/libhsmd.c b/hsmd/libhsmd.c index d43edee78..541d812de 100644 --- a/hsmd/libhsmd.c +++ b/hsmd/libhsmd.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -7,6 +8,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include #if DEVELOPER diff --git a/hsmd/libhsmd.h b/hsmd/libhsmd.h index cf0016d63..5918fa57b 100644 --- a/hsmd/libhsmd.h +++ b/hsmd/libhsmd.h @@ -1,16 +1,9 @@ #ifndef LIGHTNING_HSMD_LIBHSMD_H #define LIGHTNING_HSMD_LIBHSMD_H -#include -#include -#include #include #include #include -#include -#include -#include -#include /*~ A struct that holds some context about the origin of an * incoming request. It can either be a main daemon client, which is diff --git a/lightningd/bitcoind.c b/lightningd/bitcoind.c index ed309e2ac..19a7b8a88 100644 --- a/lightningd/bitcoind.c +++ b/lightningd/bitcoind.c @@ -29,6 +29,7 @@ #include #include #include +#include #include /* The names of the requests we can make to our Bitcoin backend. */ diff --git a/lightningd/bitcoind.h b/lightningd/bitcoind.h index d17a28605..1e04fb683 100644 --- a/lightningd/bitcoind.h +++ b/lightningd/bitcoind.h @@ -4,12 +4,7 @@ #include #include #include -#include #include -#include -#include -#include -#include struct bitcoin_blkid; struct bitcoin_tx_output; diff --git a/lightningd/chaintopology.c b/lightningd/chaintopology.c index 780293e27..9f724dce2 100644 --- a/lightningd/chaintopology.c +++ b/lightningd/chaintopology.c @@ -23,12 +23,16 @@ #include #include #include +#include #include #include #include #include #include #include +#include +#include +#include /* Mutual recursion via timer. */ static void try_extend_tip(struct chain_topology *topo); diff --git a/lightningd/chaintopology.h b/lightningd/chaintopology.h index 2cb0b3407..a9125b1c7 100644 --- a/lightningd/chaintopology.h +++ b/lightningd/chaintopology.h @@ -2,16 +2,8 @@ #define LIGHTNING_LIGHTNINGD_CHAINTOPOLOGY_H #include "config.h" #include -#include #include -#include -#include -#include -#include -#include #include -#include -#include struct bitcoin_tx; struct bitcoind; diff --git a/lightningd/channel.c b/lightningd/channel.c index c5eef7a43..7dfff4570 100644 --- a/lightningd/channel.c +++ b/lightningd/channel.c @@ -26,6 +26,7 @@ #include #include #include +#include #include static bool connects_to_peer(struct subd *owner) diff --git a/lightningd/channel.h b/lightningd/channel.h index eb7988a7d..7726fa880 100644 --- a/lightningd/channel.h +++ b/lightningd/channel.h @@ -1,13 +1,11 @@ #ifndef LIGHTNING_LIGHTNINGD_CHANNEL_H #define LIGHTNING_LIGHTNINGD_CHANNEL_H #include "config.h" -#include #include #include -#include #include +#include #include -#include #include struct channel_id; diff --git a/lightningd/channel_control.c b/lightningd/channel_control.c index 7ab03b5ef..392210ce5 100644 --- a/lightningd/channel_control.c +++ b/lightningd/channel_control.c @@ -8,18 +8,24 @@ #include #include #include +#include #include #include +#include #include #include #include #include +#include #include #include #include #include +#include #include +#include #include +#include #include #include #include diff --git a/lightningd/closing_control.c b/lightningd/closing_control.c index 26f09a856..0adf12ad6 100644 --- a/lightningd/closing_control.c +++ b/lightningd/closing_control.c @@ -1,18 +1,26 @@ #include #include +#include #include +#include #include #include #include #include #include #include +#include #include +#include +#include #include #include +#include +#include #include #include #include +#include #include #include #include @@ -20,6 +28,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/lightningd/coin_mvts.c b/lightningd/coin_mvts.c index 0fda3c77b..068d5b122 100644 --- a/lightningd/coin_mvts.c +++ b/lightningd/coin_mvts.c @@ -1,3 +1,4 @@ +#include #include #include diff --git a/lightningd/coin_mvts.h b/lightningd/coin_mvts.h index e64df0653..30f89c28f 100644 --- a/lightningd/coin_mvts.h +++ b/lightningd/coin_mvts.h @@ -3,8 +3,6 @@ #include "config.h" #include -#include -#include #include void notify_channel_mvt(struct lightningd *ld, const struct channel_coin_mvt *mvt); diff --git a/lightningd/connect_control.c b/lightningd/connect_control.c index b5981da61..1c058a5cf 100644 --- a/lightningd/connect_control.c +++ b/lightningd/connect_control.c @@ -8,12 +8,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include diff --git a/lightningd/datastore.c b/lightningd/datastore.c index 861260f08..14b229b30 100644 --- a/lightningd/datastore.c +++ b/lightningd/datastore.c @@ -1,3 +1,6 @@ +#include +#include +#include #include #include #include diff --git a/lightningd/dual_open_control.c b/lightningd/dual_open_control.c index 38a802775..5633a0060 100644 --- a/lightningd/dual_open_control.c +++ b/lightningd/dual_open_control.c @@ -5,9 +5,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -17,16 +19,20 @@ #include #include #include +#include #include #include #include +#include #include #include #include #include #include +#include #include #include +#include #include #include #include @@ -35,6 +41,7 @@ #include #include #include +#include #include #include #include diff --git a/lightningd/gossip_control.c b/lightningd/gossip_control.c index b783621d0..6716616c2 100644 --- a/lightningd/gossip_control.c +++ b/lightningd/gossip_control.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/lightningd/hsm_control.c b/lightningd/hsm_control.c index b05e5a219..2299bb627 100644 --- a/lightningd/hsm_control.c +++ b/lightningd/hsm_control.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/lightningd/hsm_control.h b/lightningd/hsm_control.h index 8060c721d..e32326c7c 100644 --- a/lightningd/hsm_control.h +++ b/lightningd/hsm_control.h @@ -2,9 +2,6 @@ #define LIGHTNING_LIGHTNINGD_HSM_CONTROL_H #include "config.h" #include -#include -#include -#include struct lightningd; struct node_id; diff --git a/lightningd/htlc_end.c b/lightningd/htlc_end.c index a5c5fc831..0e0b98f6f 100644 --- a/lightningd/htlc_end.c +++ b/lightningd/htlc_end.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include diff --git a/lightningd/htlc_end.h b/lightningd/htlc_end.h index 1220b5cb4..1ea13da65 100644 --- a/lightningd/htlc_end.h +++ b/lightningd/htlc_end.h @@ -2,12 +2,9 @@ #define LIGHTNING_LIGHTNINGD_HTLC_END_H #include "config.h" #include -#include #include -#include #include #include -#include /* We look up HTLCs by channel & id */ struct htlc_key { diff --git a/lightningd/htlc_set.c b/lightningd/htlc_set.c index 618b46ba1..a53d264b8 100644 --- a/lightningd/htlc_set.c +++ b/lightningd/htlc_set.c @@ -1,7 +1,9 @@ #include #include +#include #include #include +#include #include #include diff --git a/lightningd/invoice.c b/lightningd/invoice.c index 542b6ac5b..912854617 100644 --- a/lightningd/invoice.c +++ b/lightningd/invoice.c @@ -1,6 +1,7 @@ #include "invoice.h" #include #include +#include #include #include #include @@ -14,12 +15,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include diff --git a/lightningd/json.c b/lightningd/json.c index 7ed02edb3..0dfda2c11 100644 --- a/lightningd/json.c +++ b/lightningd/json.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/lightningd/jsonrpc.c b/lightningd/jsonrpc.c index a8103e008..360d490df 100644 --- a/lightningd/jsonrpc.c +++ b/lightningd/jsonrpc.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/lightningd/jsonrpc.h b/lightningd/jsonrpc.h index b01a03046..4d0789eaa 100644 --- a/lightningd/jsonrpc.h +++ b/lightningd/jsonrpc.h @@ -1,14 +1,11 @@ #ifndef LIGHTNING_LIGHTNINGD_JSONRPC_H #define LIGHTNING_LIGHTNINGD_JSONRPC_H #include "config.h" -#include #include #include -#include #include #include #include -#include struct jsonrpc; diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c index 83d6ed44b..ddf733e29 100644 --- a/lightningd/lightningd.c +++ b/lightningd/lightningd.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -62,6 +63,7 @@ #include #include #include +#include #include #include @@ -70,6 +72,7 @@ #include #include #include +#include #include #include #include @@ -80,11 +83,15 @@ #include #include #include +#include #include #include #include +#include #include #include +#include +#include static void destroy_alt_subdaemons(struct lightningd *ld); #if DEVELOPER diff --git a/lightningd/lightningd.h b/lightningd/lightningd.h index 329279576..9cf551307 100644 --- a/lightningd/lightningd.h +++ b/lightningd/lightningd.h @@ -1,18 +1,8 @@ #ifndef LIGHTNING_LIGHTNINGD_LIGHTNINGD_H #define LIGHTNING_LIGHTNINGD_LIGHTNINGD_H #include "config.h" -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include #include /* Various adjustable things. */ diff --git a/lightningd/log.h b/lightningd/log.h index 276a13ae2..e66e10100 100644 --- a/lightningd/log.h +++ b/lightningd/log.h @@ -1,14 +1,9 @@ #ifndef LIGHTNING_LIGHTNINGD_LOG_H #define LIGHTNING_LIGHTNINGD_LOG_H #include "config.h" -#include -#include #include -#include #include -#include #include -#include struct command; struct json_stream; diff --git a/lightningd/log_status.h b/lightningd/log_status.h index 9a5b70d65..a27fd1b7f 100644 --- a/lightningd/log_status.h +++ b/lightningd/log_status.h @@ -1,7 +1,6 @@ #ifndef LIGHTNING_LIGHTNINGD_LOG_STATUS_H #define LIGHTNING_LIGHTNINGD_LOG_STATUS_H #include "config.h" -#include #include /* Returns true (and writes it to log) if it's a status_log message. */ diff --git a/lightningd/memdump.h b/lightningd/memdump.h index 45c452495..3f9f6b377 100644 --- a/lightningd/memdump.h +++ b/lightningd/memdump.h @@ -1,8 +1,6 @@ #ifndef LIGHTNING_LIGHTNINGD_MEMDUMP_H #define LIGHTNING_LIGHTNINGD_MEMDUMP_H #include "config.h" -#include -#include struct command; struct htable; diff --git a/lightningd/notification.c b/lightningd/notification.c index 79701a74a..e81be3956 100644 --- a/lightningd/notification.c +++ b/lightningd/notification.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include diff --git a/lightningd/notification.h b/lightningd/notification.h index ac27c8c14..931357276 100644 --- a/lightningd/notification.h +++ b/lightningd/notification.h @@ -1,26 +1,9 @@ #ifndef LIGHTNING_LIGHTNINGD_NOTIFICATION_H #define LIGHTNING_LIGHTNINGD_NOTIFICATION_H #include "config.h" -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include struct onionreply; struct wally_psbt; diff --git a/lightningd/offer.c b/lightningd/offer.c index 0330e4bf8..a2bf006cb 100644 --- a/lightningd/offer.c +++ b/lightningd/offer.c @@ -4,12 +4,17 @@ #include #include #include +#include #include #include +#include +#include +#include #include #include #include #include +#include #include #include diff --git a/lightningd/onchain_control.c b/lightningd/onchain_control.c index cc46f927b..135f00e7b 100644 --- a/lightningd/onchain_control.c +++ b/lightningd/onchain_control.c @@ -1,10 +1,13 @@ #include #include #include +#include #include #include +#include #include #include +#include #include #include #include @@ -12,6 +15,8 @@ #include #include #include +#include +#include #include /* We dump all the known preimages when onchaind starts up. */ diff --git a/lightningd/onchain_control.h b/lightningd/onchain_control.h index 262375d57..dedd09e30 100644 --- a/lightningd/onchain_control.h +++ b/lightningd/onchain_control.h @@ -1,9 +1,7 @@ #ifndef LIGHTNING_LIGHTNINGD_ONCHAIN_CONTROL_H #define LIGHTNING_LIGHTNINGD_ONCHAIN_CONTROL_H #include "config.h" -#include #include -#include struct channel; struct bitcoin_tx; diff --git a/lightningd/onion_message.c b/lightningd/onion_message.c index 1851b9509..822a784c5 100644 --- a/lightningd/onion_message.c +++ b/lightningd/onion_message.c @@ -1,5 +1,9 @@ +#include #include +#include +#include #include +#include #include #include #include diff --git a/lightningd/opening_common.c b/lightningd/opening_common.c index 449efd4b5..c77d7bd60 100644 --- a/lightningd/opening_common.c +++ b/lightningd/opening_common.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include diff --git a/lightningd/opening_control.c b/lightningd/opening_control.c index 9a1b98620..0ff94494c 100644 --- a/lightningd/opening_control.c +++ b/lightningd/opening_control.c @@ -2,24 +2,31 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include +#include #include +#include #include #include #include #include #include +#include #include #include #include #include +#include #include +#include #include #include #include @@ -34,6 +41,7 @@ #include #include #include +#include #include #include #include diff --git a/lightningd/options.c b/lightningd/options.c index a6fae5f62..2cabdccf8 100644 --- a/lightningd/options.c +++ b/lightningd/options.c @@ -11,16 +11,20 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include +#include #include #include #include +#include #include #include #include diff --git a/lightningd/options.h b/lightningd/options.h index 05219e849..f46a86bda 100644 --- a/lightningd/options.h +++ b/lightningd/options.h @@ -1,8 +1,6 @@ #ifndef LIGHTNING_LIGHTNINGD_OPTIONS_H #define LIGHTNING_LIGHTNINGD_OPTIONS_H #include "config.h" -#include -#include struct lightningd; diff --git a/lightningd/pay.c b/lightningd/pay.c index f792d268c..6d1f2c65d 100644 --- a/lightningd/pay.c +++ b/lightningd/pay.c @@ -6,13 +6,16 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include +#include #include #include #include diff --git a/lightningd/pay.h b/lightningd/pay.h index cc6e60af1..1aace68bb 100644 --- a/lightningd/pay.h +++ b/lightningd/pay.h @@ -1,7 +1,6 @@ #ifndef LIGHTNING_LIGHTNINGD_PAY_H #define LIGHTNING_LIGHTNINGD_PAY_H #include "config.h" -#include #include struct htlc_out; diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c index 7fd89b78d..0be6ae8fd 100644 --- a/lightningd/peer_control.c +++ b/lightningd/peer_control.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -30,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -40,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -57,6 +60,7 @@ #include #include #include +#include #include #include #include diff --git a/lightningd/peer_control.h b/lightningd/peer_control.h index 85377efdb..97d96753b 100644 --- a/lightningd/peer_control.h +++ b/lightningd/peer_control.h @@ -9,11 +9,7 @@ #include #include #include -#include -#include -#include #include -#include struct per_peer_state; struct wally_psbt; diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c index 518c7f87f..bcea016be 100644 --- a/lightningd/peer_htlcs.c +++ b/lightningd/peer_htlcs.c @@ -8,9 +8,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -18,8 +20,10 @@ #include #include #include +#include #include #include +#include #include #include #include diff --git a/lightningd/peer_htlcs.h b/lightningd/peer_htlcs.h index e4bbb2751..35375756e 100644 --- a/lightningd/peer_htlcs.h +++ b/lightningd/peer_htlcs.h @@ -2,7 +2,6 @@ #ifndef LIGHTNING_LIGHTNINGD_PEER_HTLCS_H #define LIGHTNING_LIGHTNINGD_PEER_HTLCS_H #include "config.h" -#include #include #include #include diff --git a/lightningd/ping.c b/lightningd/ping.c index fd7337b4f..e1bcd4963 100644 --- a/lightningd/ping.c +++ b/lightningd/ping.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include diff --git a/lightningd/plugin.c b/lightningd/plugin.c index e983ddb36..4675bde78 100644 --- a/lightningd/plugin.c +++ b/lightningd/plugin.c @@ -1,15 +1,25 @@ #include #include #include +#include #include #include #include +#include +#include #include #include +#include #include +#include #include +#include +#include #include #include +#include +#include +#include #include #include #include diff --git a/lightningd/plugin.h b/lightningd/plugin.h index 99ab5422d..dcb378046 100644 --- a/lightningd/plugin.h +++ b/lightningd/plugin.h @@ -2,24 +2,8 @@ #define LIGHTNING_LIGHTNINGD_PLUGIN_H #include "config.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include enum plugin_state { diff --git a/lightningd/plugin_control.c b/lightningd/plugin_control.c index db8836c2b..4a35c9550 100644 --- a/lightningd/plugin_control.c +++ b/lightningd/plugin_control.c @@ -1,10 +1,18 @@ #include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include #include +#include /* A dummy structure used to give multiple arguments to callbacks. */ struct plugin_command { diff --git a/lightningd/plugin_hook.h b/lightningd/plugin_hook.h index 7279dc5bf..c1a5f3fd9 100644 --- a/lightningd/plugin_hook.h +++ b/lightningd/plugin_hook.h @@ -2,11 +2,6 @@ #define LIGHTNING_LIGHTNINGD_PLUGIN_HOOK_H #include "config.h" -#include -#include -#include -#include -#include #include /** diff --git a/lightningd/routehint.c b/lightningd/routehint.c index d87d0b73d..6e833fcfb 100644 --- a/lightningd/routehint.c +++ b/lightningd/routehint.c @@ -1,7 +1,9 @@ #include #include +#include #include #include +#include #include #include #include diff --git a/lightningd/signmessage.c b/lightningd/signmessage.c index ae9047208..4c0b0d280 100644 --- a/lightningd/signmessage.c +++ b/lightningd/signmessage.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -9,8 +10,10 @@ #include #include #include +#include #include #include +#include #include #include #include diff --git a/lightningd/watch.c b/lightningd/watch.c index f5a041295..c011b8a10 100644 --- a/lightningd/watch.c +++ b/lightningd/watch.c @@ -31,7 +31,9 @@ #include #include #include +#include #include +#include #include #include #include diff --git a/lightningd/watch.h b/lightningd/watch.h index b5c7f2544..fc67b43c1 100644 --- a/lightningd/watch.h +++ b/lightningd/watch.h @@ -2,11 +2,7 @@ #define LIGHTNING_LIGHTNINGD_WATCH_H #include "config.h" #include -#include #include -#include -#include -#include struct bitcoin_tx; struct block; diff --git a/onchaind/onchaind.c b/onchaind/onchaind.c index 823247678..249d4d9a9 100644 --- a/onchaind/onchaind.c +++ b/onchaind/onchaind.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/onchaind/test/run-grind_feerate.c b/onchaind/test/run-grind_feerate.c index b22630942..aeae019a0 100644 --- a/onchaind/test/run-grind_feerate.c +++ b/onchaind/test/run-grind_feerate.c @@ -1,5 +1,6 @@ #include #include +#include #include #include diff --git a/openingd/dualopend.c b/openingd/dualopend.c index f939cd44e..5f23fba65 100644 --- a/openingd/dualopend.c +++ b/openingd/dualopend.c @@ -16,10 +16,12 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/plugins/autoclean.c b/plugins/autoclean.c index 3b80815b0..a5da39b26 100644 --- a/plugins/autoclean.c +++ b/plugins/autoclean.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include diff --git a/plugins/bcli.c b/plugins/bcli.c index 3556877d5..2a619a24e 100644 --- a/plugins/bcli.c +++ b/plugins/bcli.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/plugins/fetchinvoice.c b/plugins/fetchinvoice.c index b8f4387ea..62f470b8a 100644 --- a/plugins/fetchinvoice.c +++ b/plugins/fetchinvoice.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -23,6 +24,7 @@ #include #include #include +#include static struct gossmap *global_gossmap; static struct node_id local_id; diff --git a/plugins/funder.c b/plugins/funder.c index 80fa692b6..b0bb2416d 100644 --- a/plugins/funder.c +++ b/plugins/funder.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/plugins/funder_policy.h b/plugins/funder_policy.h index f554bdbe5..80840b3e6 100644 --- a/plugins/funder_policy.h +++ b/plugins/funder_policy.h @@ -2,7 +2,6 @@ #define LIGHTNING_PLUGINS_FUNDER_POLICY_H #include "config.h" #include -#include struct lease_rates; struct node_id; diff --git a/plugins/keysend.c b/plugins/keysend.c index 81a3ab61d..07f2ea40c 100644 --- a/plugins/keysend.c +++ b/plugins/keysend.c @@ -4,9 +4,11 @@ #include #include #include +#include #include #include #include +#include #include #define PREIMAGE_TLV_TYPE 5482373484 diff --git a/plugins/libplugin.c b/plugins/libplugin.c index 5a9fdda62..21bf429bd 100644 --- a/plugins/libplugin.c +++ b/plugins/libplugin.c @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/plugins/libplugin.h b/plugins/libplugin.h index 8ff96612f..cf1979c89 100644 --- a/plugins/libplugin.h +++ b/plugins/libplugin.h @@ -14,8 +14,10 @@ #include #include #include +#include #include #include +#include struct json_out; struct plugin; diff --git a/plugins/offers.c b/plugins/offers.c index cef4db1af..3eae1a88d 100644 --- a/plugins/offers.c +++ b/plugins/offers.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/plugins/offers_inv_hook.c b/plugins/offers_inv_hook.c index caba93f69..7551117e2 100644 --- a/plugins/offers_inv_hook.c +++ b/plugins/offers_inv_hook.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include diff --git a/plugins/offers_invreq_hook.c b/plugins/offers_invreq_hook.c index 2facf35ee..9c8eba0a1 100644 --- a/plugins/offers_invreq_hook.c +++ b/plugins/offers_invreq_hook.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include @@ -12,6 +13,7 @@ #include #include #include +#include /* We need to keep the reply path around so we can reply with invoice */ struct invreq { diff --git a/plugins/offers_offer.c b/plugins/offers_offer.c index 8e0503b7a..4b2960c4f 100644 --- a/plugins/offers_offer.c +++ b/plugins/offers_offer.c @@ -1,8 +1,10 @@ #include #include +#include #include #include #include +#include #include #include #include diff --git a/plugins/pay.c b/plugins/pay.c index 5925354ae..a002b4d1b 100644 --- a/plugins/pay.c +++ b/plugins/pay.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include diff --git a/plugins/spender/fundchannel.c b/plugins/spender/fundchannel.c index 1423b191c..799e09117 100644 --- a/plugins/spender/fundchannel.c +++ b/plugins/spender/fundchannel.c @@ -2,6 +2,7 @@ #include #include #include +#include #include static struct command_result * diff --git a/plugins/spender/multifundchannel.c b/plugins/spender/multifundchannel.c index 5cce683f0..a60d425db 100644 --- a/plugins/spender/multifundchannel.c +++ b/plugins/spender/multifundchannel.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/plugins/spender/multiwithdraw.c b/plugins/spender/multiwithdraw.c index 76a047a10..e53a56b9f 100644 --- a/plugins/spender/multiwithdraw.c +++ b/plugins/spender/multiwithdraw.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -14,6 +15,7 @@ #include #include #include +#include /*----------------------------------------------------------------------------- Command Access diff --git a/plugins/spender/openchannel.c b/plugins/spender/openchannel.c index 7a401cdc7..d8c6392bd 100644 --- a/plugins/spender/openchannel.c +++ b/plugins/spender/openchannel.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/plugins/topology.c b/plugins/topology.c index 4402c8c25..1cd6edad6 100644 --- a/plugins/topology.c +++ b/plugins/topology.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/plugins/txprepare.c b/plugins/txprepare.c index b20f2c934..3e628b94c 100644 --- a/plugins/txprepare.c +++ b/plugins/txprepare.c @@ -17,6 +17,7 @@ #include #include #include +#include struct tx_output { struct amount_sat amount; diff --git a/tests/plugins/test_libplugin.c b/tests/plugins/test_libplugin.c index 63f9d7134..464a9722d 100644 --- a/tests/plugins/test_libplugin.c +++ b/tests/plugins/test_libplugin.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include diff --git a/tools/hsmtool.c b/tools/hsmtool.c index 656e9b47f..809841b0c 100644 --- a/tools/hsmtool.c +++ b/tools/hsmtool.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #define ERROR_HSM_FILE errno diff --git a/wallet/db.c b/wallet/db.c index 3bfb7a933..32fbd62bc 100644 --- a/wallet/db.c +++ b/wallet/db.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/wallet/db.h b/wallet/db.h index dadc02f26..00986d4f8 100644 --- a/wallet/db.h +++ b/wallet/db.h @@ -6,14 +6,8 @@ #include #include #include -#include #include -#include -#include #include -#include -#include -#include struct channel_id; struct ext_key; diff --git a/wallet/db_common.h b/wallet/db_common.h index 8da1e5e85..dca2381b1 100644 --- a/wallet/db_common.h +++ b/wallet/db_common.h @@ -4,7 +4,6 @@ #include #include #include -#include /* For testing, we want to catch fatal messages. */ #ifndef db_fatal diff --git a/wallet/db_postgres_sqlgen.c b/wallet/db_postgres_sqlgen.c index 2e3ce8481..4ecc4d7d2 100644 --- a/wallet/db_postgres_sqlgen.c +++ b/wallet/db_postgres_sqlgen.c @@ -2074,4 +2074,4 @@ struct db_query db_postgres_queries[] = { #endif /* LIGHTNINGD_WALLET_GEN_DB_POSTGRES */ -// SHA256STAMP:e356b7327b760559f9a7c31a7ea4a09d50194c7aacc6daef6ba9fb5caf43ae83 +// SHA256STAMP:998001f2c1b3d3d1c6e4324a4a808cc2ed915b918bfdef88e259901b7fa2a735 diff --git a/wallet/db_sqlite3_sqlgen.c b/wallet/db_sqlite3_sqlgen.c index d8d886dcb..58ddd8949 100644 --- a/wallet/db_sqlite3_sqlgen.c +++ b/wallet/db_sqlite3_sqlgen.c @@ -2074,4 +2074,4 @@ struct db_query db_sqlite3_queries[] = { #endif /* LIGHTNINGD_WALLET_GEN_DB_SQLITE3 */ -// SHA256STAMP:e356b7327b760559f9a7c31a7ea4a09d50194c7aacc6daef6ba9fb5caf43ae83 +// SHA256STAMP:998001f2c1b3d3d1c6e4324a4a808cc2ed915b918bfdef88e259901b7fa2a735 diff --git a/wallet/invoices.h b/wallet/invoices.h index 0e069cbb7..7a65971f5 100644 --- a/wallet/invoices.h +++ b/wallet/invoices.h @@ -2,8 +2,6 @@ #define LIGHTNING_WALLET_INVOICES_H #include "config.h" #include -#include -#include #include struct amount_msat; diff --git a/wallet/reservation.c b/wallet/reservation.c index 4b754b6ef..45d9ec35c 100644 --- a/wallet/reservation.c +++ b/wallet/reservation.c @@ -2,15 +2,23 @@ #include #include #include +#include #include #include #include +#include #include #include +#include +#include +#include +#include #include #include +#include #include #include +#include /* 12 hours is usually enough reservation time */ #define RESERVATION_DEFAULT (6 * 12) diff --git a/wallet/statements_gettextgen.po b/wallet/statements_gettextgen.po index 8933f0207..b15751107 100644 --- a/wallet/statements_gettextgen.po +++ b/wallet/statements_gettextgen.po @@ -1,772 +1,772 @@ -#: wallet/db.c:73 +#: wallet/db.c:74 msgid "CREATE TABLE version (version INTEGER)" msgstr "" -#: wallet/db.c:74 +#: wallet/db.c:75 msgid "INSERT INTO version VALUES (1)" msgstr "" -#: wallet/db.c:75 +#: wallet/db.c:76 msgid "CREATE TABLE outputs ( prev_out_tx BLOB, prev_out_index INTEGER, value BIGINT, type INTEGER, status INTEGER, keyindex INTEGER, PRIMARY KEY (prev_out_tx, prev_out_index));" msgstr "" -#: wallet/db.c:84 +#: wallet/db.c:85 msgid "CREATE TABLE vars ( name VARCHAR(32), val VARCHAR(255), PRIMARY KEY (name));" msgstr "" -#: wallet/db.c:90 +#: wallet/db.c:91 msgid "CREATE TABLE shachains ( id BIGSERIAL, min_index BIGINT, num_valid BIGINT, PRIMARY KEY (id));" msgstr "" -#: wallet/db.c:97 +#: wallet/db.c:98 msgid "CREATE TABLE shachain_known ( shachain_id BIGINT REFERENCES shachains(id) ON DELETE CASCADE, pos INTEGER, idx BIGINT, hash BLOB, PRIMARY KEY (shachain_id, pos));" msgstr "" -#: wallet/db.c:105 +#: wallet/db.c:106 msgid "CREATE TABLE peers ( id BIGSERIAL, node_id BLOB UNIQUE, address TEXT, PRIMARY KEY (id));" msgstr "" -#: wallet/db.c:112 +#: wallet/db.c:113 msgid "CREATE TABLE channels ( id BIGSERIAL, peer_id BIGINT REFERENCES peers(id) ON DELETE CASCADE, short_channel_id TEXT, channel_config_local BIGINT, channel_config_remote BIGINT, state INTEGER, funder INTEGER, channel_flags INTEGER, minimum_depth INTEGER, next_index_local BIGINT, next_index_remote BIGINT, next_htlc_id BIGINT, funding_tx_id BLOB, funding_tx_outnum INTEGER, funding_satoshi BIGINT, funding_locked_remote INTEGER, push_msatoshi BIGINT, msatoshi_local BIGINT, fundingkey_remote BLOB, revocation_basepoint_remote BLOB, payment_basepoint_remote BLOB, htlc_basepoint_remote BLOB, delayed_payment_basepoint_remote BLOB, per_commit_remote BLOB, old_per_commit_remote BLOB, local_feerate_per_kw INTEGER, remote_feerate_per_kw INTEGER, shachain_remote_id BIGINT, shutdown_scriptpubkey_remote BLOB, shutdown_keyidx_local BIGINT, last_sent_commit_state BIGINT, last_sent_commit_id INTEGER, last_tx BLOB, last_sig BLOB, closing_fee_received INTEGER, closing_sig_received BLOB, PRIMARY KEY (id));" msgstr "" -#: wallet/db.c:154 +#: wallet/db.c:155 msgid "CREATE TABLE channel_configs ( id BIGSERIAL, dust_limit_satoshis BIGINT, max_htlc_value_in_flight_msat BIGINT, channel_reserve_satoshis BIGINT, htlc_minimum_msat BIGINT, to_self_delay INTEGER, max_accepted_htlcs INTEGER, PRIMARY KEY (id));" msgstr "" -#: wallet/db.c:165 +#: wallet/db.c:166 msgid "CREATE TABLE channel_htlcs ( id BIGSERIAL, channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE, channel_htlc_id BIGINT, direction INTEGER, origin_htlc BIGINT, msatoshi BIGINT, cltv_expiry INTEGER, payment_hash BLOB, payment_key BLOB, routing_onion BLOB, failuremsg BLOB, malformed_onion INTEGER, hstate INTEGER, shared_secret BLOB, PRIMARY KEY (id), UNIQUE (channel_id, channel_htlc_id, direction));" msgstr "" -#: wallet/db.c:185 +#: wallet/db.c:186 msgid "CREATE TABLE invoices ( id BIGSERIAL, state INTEGER, msatoshi BIGINT, payment_hash BLOB, payment_key BLOB, label TEXT, PRIMARY KEY (id), UNIQUE (label), UNIQUE (payment_hash));" msgstr "" -#: wallet/db.c:197 +#: wallet/db.c:198 msgid "CREATE TABLE payments ( id BIGSERIAL, timestamp INTEGER, status INTEGER, payment_hash BLOB, direction INTEGER, destination BLOB, msatoshi BIGINT, PRIMARY KEY (id), UNIQUE (payment_hash));" msgstr "" -#: wallet/db.c:210 +#: wallet/db.c:211 msgid "ALTER TABLE invoices ADD expiry_time BIGINT;" msgstr "" -#: wallet/db.c:211 +#: wallet/db.c:212 msgid "UPDATE invoices SET expiry_time=9223372036854775807;" msgstr "" -#: wallet/db.c:213 +#: wallet/db.c:214 msgid "ALTER TABLE invoices ADD pay_index BIGINT;" msgstr "" -#: wallet/db.c:214 +#: wallet/db.c:215 msgid "CREATE UNIQUE INDEX invoices_pay_index ON invoices(pay_index);" msgstr "" -#: wallet/db.c:216 +#: wallet/db.c:217 msgid "UPDATE invoices SET pay_index=id WHERE state=1;" msgstr "" -#: wallet/db.c:219 +#: wallet/db.c:220 msgid "INSERT INTO vars(name, val) VALUES('next_pay_index', COALESCE((SELECT MAX(pay_index) FROM invoices WHERE state=1), 0) + 1 );" msgstr "" -#: wallet/db.c:228 +#: wallet/db.c:229 msgid "ALTER TABLE channels ADD first_blocknum BIGINT;" msgstr "" -#: wallet/db.c:229 +#: wallet/db.c:230 msgid "UPDATE channels SET first_blocknum=1 WHERE short_channel_id IS NOT NULL;" msgstr "" -#: wallet/db.c:231 +#: wallet/db.c:232 msgid "ALTER TABLE outputs ADD COLUMN channel_id BIGINT;" msgstr "" -#: wallet/db.c:232 +#: wallet/db.c:233 msgid "ALTER TABLE outputs ADD COLUMN peer_id BLOB;" msgstr "" -#: wallet/db.c:233 +#: wallet/db.c:234 msgid "ALTER TABLE outputs ADD COLUMN commitment_point BLOB;" msgstr "" -#: wallet/db.c:234 +#: wallet/db.c:235 msgid "ALTER TABLE invoices ADD COLUMN msatoshi_received BIGINT;" msgstr "" -#: wallet/db.c:236 +#: wallet/db.c:237 msgid "UPDATE invoices SET msatoshi_received=0 WHERE state=1;" msgstr "" -#: wallet/db.c:237 +#: wallet/db.c:238 msgid "ALTER TABLE channels ADD COLUMN last_was_revoke INTEGER;" msgstr "" -#: wallet/db.c:241 wallet/db.c:534 +#: wallet/db.c:242 wallet/db.c:535 msgid "ALTER TABLE payments RENAME TO temp_payments;" msgstr "" -#: wallet/db.c:242 +#: wallet/db.c:243 msgid "CREATE TABLE payments ( id BIGSERIAL, timestamp INTEGER, status INTEGER, payment_hash BLOB, destination BLOB, msatoshi BIGINT, PRIMARY KEY (id), UNIQUE (payment_hash));" msgstr "" -#: wallet/db.c:253 +#: wallet/db.c:254 msgid "INSERT INTO payments SELECT id, timestamp, status, payment_hash, destination, msatoshi FROM temp_payments WHERE direction=1;" msgstr "" -#: wallet/db.c:256 wallet/db.c:609 +#: wallet/db.c:257 wallet/db.c:610 msgid "DROP TABLE temp_payments;" msgstr "" -#: wallet/db.c:258 +#: wallet/db.c:259 msgid "ALTER TABLE payments ADD COLUMN payment_preimage BLOB;" msgstr "" -#: wallet/db.c:260 +#: wallet/db.c:261 msgid "ALTER TABLE payments ADD COLUMN path_secrets BLOB;" msgstr "" -#: wallet/db.c:263 +#: wallet/db.c:264 msgid "ALTER TABLE invoices ADD paid_timestamp BIGINT;" msgstr "" -#: wallet/db.c:264 +#: wallet/db.c:265 msgid "UPDATE invoices SET paid_timestamp = CURRENT_TIMESTAMP() WHERE state = 1;" msgstr "" -#: wallet/db.c:272 +#: wallet/db.c:273 msgid "ALTER TABLE payments ADD COLUMN route_nodes BLOB;" msgstr "" -#: wallet/db.c:273 +#: wallet/db.c:274 msgid "ALTER TABLE payments ADD COLUMN route_channels BLOB;" msgstr "" -#: wallet/db.c:274 +#: wallet/db.c:275 msgid "CREATE TABLE htlc_sigs (channelid INTEGER REFERENCES channels(id) ON DELETE CASCADE, signature BLOB);" msgstr "" -#: wallet/db.c:277 +#: wallet/db.c:278 msgid "CREATE INDEX channel_idx ON htlc_sigs (channelid)" msgstr "" -#: wallet/db.c:279 +#: wallet/db.c:280 msgid "DELETE FROM channels WHERE state=1" msgstr "" -#: wallet/db.c:281 +#: wallet/db.c:282 msgid "CREATE TABLE db_upgrades (upgrade_from INTEGER, lightning_version TEXT);" msgstr "" -#: wallet/db.c:285 wallet/db.c:475 +#: wallet/db.c:286 wallet/db.c:476 msgid "DELETE FROM peers WHERE id NOT IN (SELECT peer_id FROM channels);" msgstr "" -#: wallet/db.c:289 +#: wallet/db.c:290 msgid "UPDATE channels SET STATE = 8 WHERE state > 8;" msgstr "" -#: wallet/db.c:291 +#: wallet/db.c:292 msgid "ALTER TABLE invoices ADD bolt11 TEXT;" msgstr "" -#: wallet/db.c:295 +#: wallet/db.c:296 msgid "CREATE TABLE blocks (height INT, hash BLOB, prev_hash BLOB, UNIQUE(height));" msgstr "" -#: wallet/db.c:305 +#: wallet/db.c:306 msgid "ALTER TABLE outputs ADD COLUMN confirmation_height INTEGER REFERENCES blocks(height) ON DELETE SET NULL;" msgstr "" -#: wallet/db.c:308 +#: wallet/db.c:309 msgid "ALTER TABLE outputs ADD COLUMN spend_height INTEGER REFERENCES blocks(height) ON DELETE SET NULL;" msgstr "" -#: wallet/db.c:312 +#: wallet/db.c:313 msgid "CREATE INDEX output_height_idx ON outputs (confirmation_height, spend_height);" msgstr "" -#: wallet/db.c:315 +#: wallet/db.c:316 msgid "CREATE TABLE utxoset ( txid BLOB, outnum INT, blockheight INT REFERENCES blocks(height) ON DELETE CASCADE, spendheight INT REFERENCES blocks(height) ON DELETE SET NULL, txindex INT, scriptpubkey BLOB, satoshis BIGINT, PRIMARY KEY(txid, outnum));" msgstr "" -#: wallet/db.c:325 +#: wallet/db.c:326 msgid "CREATE INDEX short_channel_id ON utxoset (blockheight, txindex, outnum)" msgstr "" -#: wallet/db.c:330 +#: wallet/db.c:331 msgid "CREATE INDEX utxoset_spend ON utxoset (spendheight)" msgstr "" -#: wallet/db.c:332 +#: wallet/db.c:333 msgid "UPDATE channels SET shutdown_keyidx_local=0 WHERE shutdown_keyidx_local = -1;" msgstr "" -#: wallet/db.c:338 +#: wallet/db.c:339 msgid "ALTER TABLE payments ADD failonionreply BLOB;" msgstr "" -#: wallet/db.c:340 +#: wallet/db.c:341 msgid "ALTER TABLE payments ADD faildestperm INTEGER;" msgstr "" -#: wallet/db.c:342 +#: wallet/db.c:343 msgid "ALTER TABLE payments ADD failindex INTEGER;" msgstr "" -#: wallet/db.c:344 +#: wallet/db.c:345 msgid "ALTER TABLE payments ADD failcode INTEGER;" msgstr "" -#: wallet/db.c:345 +#: wallet/db.c:346 msgid "ALTER TABLE payments ADD failnode BLOB;" msgstr "" -#: wallet/db.c:346 +#: wallet/db.c:347 msgid "ALTER TABLE payments ADD failchannel TEXT;" msgstr "" -#: wallet/db.c:348 +#: wallet/db.c:349 msgid "ALTER TABLE payments ADD failupdate BLOB;" msgstr "" -#: wallet/db.c:352 +#: wallet/db.c:353 msgid "UPDATE payments SET path_secrets = NULL , route_nodes = NULL , route_channels = NULL WHERE status <> 0;" msgstr "" -#: wallet/db.c:359 +#: wallet/db.c:360 msgid "ALTER TABLE channels ADD in_payments_offered INTEGER DEFAULT 0;" msgstr "" -#: wallet/db.c:360 +#: wallet/db.c:361 msgid "ALTER TABLE channels ADD in_payments_fulfilled INTEGER DEFAULT 0;" msgstr "" -#: wallet/db.c:361 +#: wallet/db.c:362 msgid "ALTER TABLE channels ADD in_msatoshi_offered BIGINT DEFAULT 0;" msgstr "" -#: wallet/db.c:362 +#: wallet/db.c:363 msgid "ALTER TABLE channels ADD in_msatoshi_fulfilled BIGINT DEFAULT 0;" msgstr "" -#: wallet/db.c:363 +#: wallet/db.c:364 msgid "ALTER TABLE channels ADD out_payments_offered INTEGER DEFAULT 0;" msgstr "" -#: wallet/db.c:364 +#: wallet/db.c:365 msgid "ALTER TABLE channels ADD out_payments_fulfilled INTEGER DEFAULT 0;" msgstr "" -#: wallet/db.c:365 +#: wallet/db.c:366 msgid "ALTER TABLE channels ADD out_msatoshi_offered BIGINT DEFAULT 0;" msgstr "" -#: wallet/db.c:366 +#: wallet/db.c:367 msgid "ALTER TABLE channels ADD out_msatoshi_fulfilled BIGINT DEFAULT 0;" msgstr "" -#: wallet/db.c:367 +#: wallet/db.c:368 msgid "UPDATE channels SET in_payments_offered = 0, in_payments_fulfilled = 0 , in_msatoshi_offered = 0, in_msatoshi_fulfilled = 0 , out_payments_offered = 0, out_payments_fulfilled = 0 , out_msatoshi_offered = 0, out_msatoshi_fulfilled = 0 ;" msgstr "" -#: wallet/db.c:376 +#: wallet/db.c:377 msgid "ALTER TABLE payments ADD msatoshi_sent BIGINT;" msgstr "" -#: wallet/db.c:377 +#: wallet/db.c:378 msgid "UPDATE payments SET msatoshi_sent = msatoshi;" msgstr "" -#: wallet/db.c:379 +#: wallet/db.c:380 msgid "DELETE FROM utxoset WHERE blockheight IN ( SELECT DISTINCT(blockheight) FROM utxoset LEFT OUTER JOIN blocks on (blockheight = blocks.height) WHERE blocks.hash IS NULL);" msgstr "" -#: wallet/db.c:387 +#: wallet/db.c:388 msgid "ALTER TABLE channels ADD min_possible_feerate INTEGER;" msgstr "" -#: wallet/db.c:388 +#: wallet/db.c:389 msgid "ALTER TABLE channels ADD max_possible_feerate INTEGER;" msgstr "" -#: wallet/db.c:391 +#: wallet/db.c:392 msgid "UPDATE channels SET min_possible_feerate=0, max_possible_feerate=250000;" msgstr "" -#: wallet/db.c:395 +#: wallet/db.c:396 msgid "ALTER TABLE channels ADD msatoshi_to_us_min BIGINT;" msgstr "" -#: wallet/db.c:396 +#: wallet/db.c:397 msgid "ALTER TABLE channels ADD msatoshi_to_us_max BIGINT;" msgstr "" -#: wallet/db.c:397 +#: wallet/db.c:398 msgid "UPDATE channels SET msatoshi_to_us_min = msatoshi_local , msatoshi_to_us_max = msatoshi_local ;" msgstr "" -#: wallet/db.c:406 +#: wallet/db.c:407 msgid "CREATE TABLE transactions ( id BLOB, blockheight INTEGER REFERENCES blocks(height) ON DELETE SET NULL, txindex INTEGER, rawtx BLOB, PRIMARY KEY (id));" msgstr "" -#: wallet/db.c:415 +#: wallet/db.c:416 msgid "ALTER TABLE payments ADD faildetail TEXT;" msgstr "" -#: wallet/db.c:416 +#: wallet/db.c:417 msgid "UPDATE payments SET faildetail = 'unspecified payment failure reason' WHERE status = 2;" msgstr "" -#: wallet/db.c:421 +#: wallet/db.c:422 msgid "CREATE TABLE channeltxs ( id BIGSERIAL, channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE, type INTEGER, transaction_id BLOB REFERENCES transactions(id) ON DELETE CASCADE, input_num INTEGER, blockheight INTEGER REFERENCES blocks(height) ON DELETE CASCADE, PRIMARY KEY(id));" msgstr "" -#: wallet/db.c:437 +#: wallet/db.c:438 msgid "DELETE FROM blocks WHERE height > (SELECT MIN(first_blocknum) FROM channels);" msgstr "" -#: wallet/db.c:443 +#: wallet/db.c:444 msgid "INSERT INTO blocks (height) VALUES ((SELECT MIN(first_blocknum) FROM channels)) ON CONFLICT(height) DO NOTHING;" msgstr "" -#: wallet/db.c:447 +#: wallet/db.c:448 msgid "DELETE FROM blocks WHERE height IS NULL;" msgstr "" -#: wallet/db.c:449 +#: wallet/db.c:450 msgid "ALTER TABLE invoices ADD description TEXT;" msgstr "" -#: wallet/db.c:451 +#: wallet/db.c:452 msgid "ALTER TABLE payments ADD description TEXT;" msgstr "" -#: wallet/db.c:453 +#: wallet/db.c:454 msgid "ALTER TABLE channels ADD future_per_commitment_point BLOB;" msgstr "" -#: wallet/db.c:455 +#: wallet/db.c:456 msgid "ALTER TABLE channels ADD last_sent_commit BLOB;" msgstr "" -#: wallet/db.c:460 +#: wallet/db.c:461 msgid "CREATE TABLE forwarded_payments ( in_htlc_id BIGINT REFERENCES channel_htlcs(id) ON DELETE SET NULL, out_htlc_id BIGINT REFERENCES channel_htlcs(id) ON DELETE SET NULL, in_channel_scid BIGINT, out_channel_scid BIGINT, in_msatoshi BIGINT, out_msatoshi BIGINT, state INTEGER, UNIQUE(in_htlc_id, out_htlc_id));" msgstr "" -#: wallet/db.c:472 +#: wallet/db.c:473 msgid "ALTER TABLE payments ADD faildirection INTEGER;" msgstr "" -#: wallet/db.c:477 +#: wallet/db.c:478 msgid "ALTER TABLE outputs ADD scriptpubkey BLOB;" msgstr "" -#: wallet/db.c:479 +#: wallet/db.c:480 msgid "ALTER TABLE payments ADD bolt11 TEXT;" msgstr "" -#: wallet/db.c:481 +#: wallet/db.c:482 msgid "ALTER TABLE channels ADD feerate_base INTEGER;" msgstr "" -#: wallet/db.c:482 +#: wallet/db.c:483 msgid "ALTER TABLE channels ADD feerate_ppm INTEGER;" msgstr "" -#: wallet/db.c:484 +#: wallet/db.c:485 msgid "ALTER TABLE channel_htlcs ADD received_time BIGINT" msgstr "" -#: wallet/db.c:485 +#: wallet/db.c:486 msgid "ALTER TABLE forwarded_payments ADD received_time BIGINT" msgstr "" -#: wallet/db.c:486 +#: wallet/db.c:487 msgid "ALTER TABLE forwarded_payments ADD resolved_time BIGINT" msgstr "" -#: wallet/db.c:487 +#: wallet/db.c:488 msgid "ALTER TABLE channels ADD remote_upfront_shutdown_script BLOB;" msgstr "" -#: wallet/db.c:490 +#: wallet/db.c:491 msgid "ALTER TABLE forwarded_payments ADD failcode INTEGER;" msgstr "" -#: wallet/db.c:492 +#: wallet/db.c:493 msgid "ALTER TABLE channels ADD remote_ann_node_sig BLOB;" msgstr "" -#: wallet/db.c:493 +#: wallet/db.c:494 msgid "ALTER TABLE channels ADD remote_ann_bitcoin_sig BLOB;" msgstr "" -#: wallet/db.c:495 +#: wallet/db.c:496 msgid "ALTER TABLE transactions ADD type BIGINT;" msgstr "" -#: wallet/db.c:500 +#: wallet/db.c:501 msgid "ALTER TABLE transactions ADD channel_id BIGINT;" msgstr "" -#: wallet/db.c:502 +#: wallet/db.c:503 msgid "UPDATE channels SET short_channel_id = REPLACE(short_channel_id, ':', 'x') WHERE short_channel_id IS NOT NULL;" msgstr "" -#: wallet/db.c:505 +#: wallet/db.c:506 msgid "UPDATE payments SET failchannel = REPLACE(failchannel, ':', 'x') WHERE failchannel IS NOT NULL;" msgstr "" -#: wallet/db.c:508 +#: wallet/db.c:509 msgid "ALTER TABLE channels ADD COLUMN option_static_remotekey INTEGER DEFAULT 0;" msgstr "" -#: wallet/db.c:510 +#: wallet/db.c:511 msgid "ALTER TABLE vars ADD COLUMN intval INTEGER" msgstr "" -#: wallet/db.c:511 +#: wallet/db.c:512 msgid "ALTER TABLE vars ADD COLUMN blobval BLOB" msgstr "" -#: wallet/db.c:512 +#: wallet/db.c:513 msgid "UPDATE vars SET intval = CAST(val AS INTEGER) WHERE name IN ('bip32_max_index', 'last_processed_block', 'next_pay_index')" msgstr "" -#: wallet/db.c:513 +#: wallet/db.c:514 msgid "UPDATE vars SET blobval = CAST(val AS BLOB) WHERE name = 'genesis_hash'" msgstr "" -#: wallet/db.c:514 +#: wallet/db.c:515 msgid "CREATE TABLE transaction_annotations ( txid BLOB, idx INTEGER, location INTEGER, type INTEGER, channel BIGINT REFERENCES channels(id), UNIQUE(txid, idx));" msgstr "" -#: wallet/db.c:526 +#: wallet/db.c:527 msgid "ALTER TABLE channels ADD shutdown_scriptpubkey_local BLOB;" msgstr "" -#: wallet/db.c:529 +#: wallet/db.c:530 msgid "UPDATE forwarded_payments SET received_time=0 WHERE received_time IS NULL;" msgstr "" -#: wallet/db.c:531 +#: wallet/db.c:532 msgid "ALTER TABLE invoices ADD COLUMN features BLOB DEFAULT '';" msgstr "" -#: wallet/db.c:535 +#: wallet/db.c:536 msgid "CREATE TABLE payments ( id BIGSERIAL, timestamp INTEGER, status INTEGER, payment_hash BLOB, destination BLOB, msatoshi BIGINT, payment_preimage BLOB, path_secrets BLOB, route_nodes BLOB, route_channels BLOB, failonionreply BLOB, faildestperm INTEGER, failindex INTEGER, failcode INTEGER, failnode BLOB, failchannel TEXT, failupdate BLOB, msatoshi_sent BIGINT, faildetail TEXT, description TEXT, faildirection INTEGER, bolt11 TEXT, total_msat BIGINT, partid BIGINT, PRIMARY KEY (id), UNIQUE (payment_hash, partid))" msgstr "" -#: wallet/db.c:562 +#: wallet/db.c:563 msgid "INSERT INTO payments (id, timestamp, status, payment_hash, destination, msatoshi, payment_preimage, path_secrets, route_nodes, route_channels, failonionreply, faildestperm, failindex, failcode, failnode, failchannel, failupdate, msatoshi_sent, faildetail, description, faildirection, bolt11)SELECT id, timestamp, status, payment_hash, destination, msatoshi, payment_preimage, path_secrets, route_nodes, route_channels, failonionreply, faildestperm, failindex, failcode, failnode, failchannel, failupdate, msatoshi_sent, faildetail, description, faildirection, bolt11 FROM temp_payments;" msgstr "" -#: wallet/db.c:607 +#: wallet/db.c:608 msgid "UPDATE payments SET total_msat = msatoshi;" msgstr "" -#: wallet/db.c:608 +#: wallet/db.c:609 msgid "UPDATE payments SET partid = 0;" msgstr "" -#: wallet/db.c:610 +#: wallet/db.c:611 msgid "ALTER TABLE channel_htlcs ADD partid BIGINT;" msgstr "" -#: wallet/db.c:611 +#: wallet/db.c:612 msgid "UPDATE channel_htlcs SET partid = 0;" msgstr "" -#: wallet/db.c:612 +#: wallet/db.c:613 msgid "CREATE TABLE channel_feerates ( channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE, hstate INTEGER, feerate_per_kw INTEGER, UNIQUE (channel_id, hstate));" msgstr "" -#: wallet/db.c:623 +#: wallet/db.c:624 msgid "INSERT INTO channel_feerates(channel_id, hstate, feerate_per_kw) SELECT id, 4, local_feerate_per_kw FROM channels WHERE funder = 0;" msgstr "" -#: wallet/db.c:627 +#: wallet/db.c:628 msgid "INSERT INTO channel_feerates(channel_id, hstate, feerate_per_kw) SELECT id, 1, remote_feerate_per_kw FROM channels WHERE funder = 0 and local_feerate_per_kw != remote_feerate_per_kw;" msgstr "" -#: wallet/db.c:632 +#: wallet/db.c:633 msgid "INSERT INTO channel_feerates(channel_id, hstate, feerate_per_kw) SELECT id, 14, remote_feerate_per_kw FROM channels WHERE funder = 1;" msgstr "" -#: wallet/db.c:636 +#: wallet/db.c:637 msgid "INSERT INTO channel_feerates(channel_id, hstate, feerate_per_kw) SELECT id, 11, local_feerate_per_kw FROM channels WHERE funder = 1 and local_feerate_per_kw != remote_feerate_per_kw;" msgstr "" -#: wallet/db.c:640 +#: wallet/db.c:641 msgid "INSERT INTO vars (name, intval) VALUES ('data_version', 0);" msgstr "" -#: wallet/db.c:643 +#: wallet/db.c:644 msgid "ALTER TABLE channel_htlcs ADD localfailmsg BLOB;" msgstr "" -#: wallet/db.c:644 +#: wallet/db.c:645 msgid "UPDATE channel_htlcs SET localfailmsg=decode('2002', 'hex') WHERE malformed_onion != 0 AND direction = 1;" msgstr "" -#: wallet/db.c:645 +#: wallet/db.c:646 msgid "ALTER TABLE channels ADD our_funding_satoshi BIGINT DEFAULT 0;" msgstr "" -#: wallet/db.c:646 +#: wallet/db.c:647 msgid "CREATE TABLE penalty_bases ( channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE, commitnum BIGINT, txid BLOB, outnum INTEGER, amount BIGINT, PRIMARY KEY (channel_id, commitnum));" msgstr "" -#: wallet/db.c:656 +#: wallet/db.c:657 msgid "ALTER TABLE channel_htlcs ADD we_filled INTEGER;" msgstr "" -#: wallet/db.c:658 +#: wallet/db.c:659 msgid "INSERT INTO vars (name, intval) VALUES ('coin_moves_count', 0);" msgstr "" -#: wallet/db.c:660 +#: wallet/db.c:661 msgid "ALTER TABLE outputs ADD reserved_til INTEGER DEFAULT NULL;" msgstr "" -#: wallet/db.c:663 +#: wallet/db.c:664 msgid "ALTER TABLE channels ADD COLUMN option_anchor_outputs INTEGER DEFAULT 0;" msgstr "" -#: wallet/db.c:666 +#: wallet/db.c:667 msgid "ALTER TABLE outputs ADD option_anchor_outputs INTEGER DEFAULT 0;" msgstr "" -#: wallet/db.c:668 +#: wallet/db.c:669 msgid "ALTER TABLE channels ADD full_channel_id BLOB DEFAULT NULL;" msgstr "" -#: wallet/db.c:669 +#: wallet/db.c:670 msgid "ALTER TABLE channels ADD funding_psbt BLOB DEFAULT NULL;" msgstr "" -#: wallet/db.c:671 +#: wallet/db.c:672 msgid "ALTER TABLE channels ADD closer INTEGER DEFAULT 2;" msgstr "" -#: wallet/db.c:672 +#: wallet/db.c:673 msgid "ALTER TABLE channels ADD state_change_reason INTEGER DEFAULT 0;" msgstr "" -#: wallet/db.c:673 +#: wallet/db.c:674 msgid "CREATE TABLE channel_state_changes ( channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE, timestamp BIGINT, old_state INTEGER, new_state INTEGER, cause INTEGER, message TEXT);" msgstr "" -#: wallet/db.c:681 +#: wallet/db.c:682 msgid "CREATE TABLE offers ( offer_id BLOB, bolt12 TEXT, label TEXT, status INTEGER, PRIMARY KEY (offer_id));" msgstr "" -#: wallet/db.c:689 +#: wallet/db.c:690 msgid "ALTER TABLE invoices ADD COLUMN local_offer_id BLOB DEFAULT NULL REFERENCES offers(offer_id);" msgstr "" -#: wallet/db.c:691 +#: wallet/db.c:692 msgid "ALTER TABLE payments ADD COLUMN local_offer_id BLOB DEFAULT NULL REFERENCES offers(offer_id);" msgstr "" -#: wallet/db.c:692 +#: wallet/db.c:693 msgid "ALTER TABLE channels ADD funding_tx_remote_sigs_received INTEGER DEFAULT 0;" msgstr "" -#: wallet/db.c:695 +#: wallet/db.c:696 msgid "CREATE INDEX forwarded_payments_out_htlc_id ON forwarded_payments (out_htlc_id);" msgstr "" -#: wallet/db.c:697 +#: wallet/db.c:698 msgid "UPDATE channel_htlcs SET malformed_onion = 0 WHERE malformed_onion IS NULL" msgstr "" -#: wallet/db.c:699 +#: wallet/db.c:700 msgid "CREATE INDEX forwarded_payments_state ON forwarded_payments (state)" msgstr "" -#: wallet/db.c:700 +#: wallet/db.c:701 msgid "CREATE TABLE channel_funding_inflights ( channel_id BIGSERIAL REFERENCES channels(id) ON DELETE CASCADE, funding_tx_id BLOB, funding_tx_outnum INTEGER, funding_feerate INTEGER, funding_satoshi BIGINT, our_funding_satoshi BIGINT, funding_psbt BLOB, last_tx BLOB, last_sig BLOB, funding_tx_remote_sigs_received INTEGER, PRIMARY KEY (channel_id, funding_tx_id));" msgstr "" -#: wallet/db.c:714 +#: wallet/db.c:715 msgid "ALTER TABLE channels ADD revocation_basepoint_local BLOB" msgstr "" -#: wallet/db.c:715 +#: wallet/db.c:716 msgid "ALTER TABLE channels ADD payment_basepoint_local BLOB" msgstr "" -#: wallet/db.c:716 +#: wallet/db.c:717 msgid "ALTER TABLE channels ADD htlc_basepoint_local BLOB" msgstr "" -#: wallet/db.c:717 +#: wallet/db.c:718 msgid "ALTER TABLE channels ADD delayed_payment_basepoint_local BLOB" msgstr "" -#: wallet/db.c:718 +#: wallet/db.c:719 msgid "ALTER TABLE channels ADD funding_pubkey_local BLOB" msgstr "" -#: wallet/db.c:721 +#: wallet/db.c:722 msgid "ALTER TABLE channels ADD shutdown_wrong_txid BLOB DEFAULT NULL" msgstr "" -#: wallet/db.c:722 +#: wallet/db.c:723 msgid "ALTER TABLE channels ADD shutdown_wrong_outnum INTEGER DEFAULT NULL" msgstr "" -#: wallet/db.c:725 +#: wallet/db.c:726 msgid "ALTER TABLE channels ADD local_static_remotekey_start BIGINT DEFAULT 0" msgstr "" -#: wallet/db.c:727 +#: wallet/db.c:728 msgid "ALTER TABLE channels ADD remote_static_remotekey_start BIGINT DEFAULT 0" msgstr "" -#: wallet/db.c:730 +#: wallet/db.c:731 msgid "UPDATE channels SET remote_static_remotekey_start = 9223372036854775807, local_static_remotekey_start = 9223372036854775807 WHERE option_static_remotekey = 0" msgstr "" -#: wallet/db.c:735 +#: wallet/db.c:736 msgid "ALTER TABLE channel_funding_inflights ADD lease_commit_sig BLOB DEFAULT NULL" msgstr "" -#: wallet/db.c:736 +#: wallet/db.c:737 msgid "ALTER TABLE channel_funding_inflights ADD lease_chan_max_msat BIGINT DEFAULT NULL" msgstr "" -#: wallet/db.c:737 +#: wallet/db.c:738 msgid "ALTER TABLE channel_funding_inflights ADD lease_chan_max_ppt INTEGER DEFAULT NULL" msgstr "" -#: wallet/db.c:738 +#: wallet/db.c:739 msgid "ALTER TABLE channel_funding_inflights ADD lease_expiry INTEGER DEFAULT 0" msgstr "" -#: wallet/db.c:739 +#: wallet/db.c:740 msgid "ALTER TABLE channel_funding_inflights ADD lease_blockheight_start INTEGER DEFAULT 0" msgstr "" -#: wallet/db.c:740 +#: wallet/db.c:741 msgid "ALTER TABLE channels ADD lease_commit_sig BLOB DEFAULT NULL" msgstr "" -#: wallet/db.c:741 +#: wallet/db.c:742 msgid "ALTER TABLE channels ADD lease_chan_max_msat INTEGER DEFAULT NULL" msgstr "" -#: wallet/db.c:742 +#: wallet/db.c:743 msgid "ALTER TABLE channels ADD lease_chan_max_ppt INTEGER DEFAULT NULL" msgstr "" -#: wallet/db.c:743 +#: wallet/db.c:744 msgid "ALTER TABLE channels ADD lease_expiry INTEGER DEFAULT 0" msgstr "" -#: wallet/db.c:744 +#: wallet/db.c:745 msgid "CREATE TABLE channel_blockheights ( channel_id BIGINT REFERENCES channels(id) ON DELETE CASCADE, hstate INTEGER, blockheight INTEGER, UNIQUE (channel_id, hstate));" msgstr "" -#: wallet/db.c:751 +#: wallet/db.c:752 msgid "ALTER TABLE outputs ADD csv_lock INTEGER DEFAULT 1;" msgstr "" -#: wallet/db.c:752 +#: wallet/db.c:753 msgid "CREATE TABLE datastore ( key BLOB, data BLOB, generation BIGINT, PRIMARY KEY (key));" msgstr "" -#: wallet/db.c:759 +#: wallet/db.c:760 msgid "CREATE INDEX channel_state_changes_channel_id ON channel_state_changes (channel_id);" msgstr "" -#: wallet/db.c:987 +#: wallet/db.c:988 msgid "UPDATE vars SET intval = intval + 1 WHERE name = 'data_version' AND intval = ?" msgstr "" -#: wallet/db.c:1087 +#: wallet/db.c:1088 msgid "SELECT version FROM version LIMIT 1" msgstr "" -#: wallet/db.c:1149 +#: wallet/db.c:1150 msgid "UPDATE version SET version=?;" msgstr "" -#: wallet/db.c:1157 +#: wallet/db.c:1158 msgid "INSERT INTO db_upgrades VALUES (?, ?);" msgstr "" -#: wallet/db.c:1169 +#: wallet/db.c:1170 msgid "SELECT intval FROM vars WHERE name = 'data_version'" msgstr "" -#: wallet/db.c:1196 +#: wallet/db.c:1197 msgid "SELECT intval FROM vars WHERE name= ? LIMIT 1" msgstr "" -#: wallet/db.c:1212 +#: wallet/db.c:1213 msgid "UPDATE vars SET intval=? WHERE name=?;" msgstr "" -#: wallet/db.c:1221 +#: wallet/db.c:1222 msgid "INSERT INTO vars (name, intval) VALUES (?, ?);" msgstr "" -#: wallet/db.c:1235 +#: wallet/db.c:1236 msgid "UPDATE channels SET feerate_base = ?, feerate_ppm = ?;" msgstr "" -#: wallet/db.c:1256 +#: wallet/db.c:1257 msgid "UPDATE channels SET our_funding_satoshi = funding_satoshi WHERE funder = 0;" msgstr "" -#: wallet/db.c:1272 +#: wallet/db.c:1273 msgid "SELECT type, keyindex, prev_out_tx, prev_out_index, channel_id, peer_id, commitment_point FROM outputs WHERE scriptpubkey IS NULL;" msgstr "" -#: wallet/db.c:1334 +#: wallet/db.c:1335 msgid "UPDATE outputs SET scriptpubkey = ? WHERE prev_out_tx = ? AND prev_out_index = ?" msgstr "" -#: wallet/db.c:1359 +#: wallet/db.c:1360 msgid "SELECT id, funding_tx_id, funding_tx_outnum FROM channels;" msgstr "" -#: wallet/db.c:1378 +#: wallet/db.c:1379 msgid "UPDATE channels SET full_channel_id = ? WHERE id = ?;" msgstr "" -#: wallet/db.c:1399 +#: wallet/db.c:1400 msgid "SELECT channels.id, peers.node_id FROM channels JOIN peers ON (peers.id = channels.peer_id)" msgstr "" -#: wallet/db.c:1432 +#: wallet/db.c:1433 msgid "UPDATE channels SET revocation_basepoint_local = ?, payment_basepoint_local = ?, htlc_basepoint_local = ?, delayed_payment_basepoint_local = ?, funding_pubkey_local = ? WHERE id = ?;" msgstr "" -#: wallet/db.c:1465 +#: wallet/db.c:1466 msgid "INSERT INTO channel_blockheights (channel_id, hstate, blockheight) SELECT id, 4, 0 FROM channels WHERE funder = 0;" msgstr "" -#: wallet/db.c:1473 +#: wallet/db.c:1474 msgid "INSERT INTO channel_blockheights (channel_id, hstate, blockheight) SELECT id, 14, 0 FROM channels WHERE funder = 1;" msgstr "" -#: wallet/db.c:1485 +#: wallet/db.c:1486 msgid "SELECT c.id, p.node_id, c.fundingkey_remote, inflight.last_tx, inflight.last_sig, inflight.funding_satoshi, inflight.funding_tx_id FROM channels c LEFT OUTER JOIN peers p ON p.id = c.peer_id LEFT OUTER JOIN channel_funding_inflights inflight ON c.id = inflight.channel_id WHERE inflight.last_tx IS NOT NULL;" msgstr "" -#: wallet/db.c:1552 +#: wallet/db.c:1553 msgid "UPDATE channel_funding_inflights SET last_tx = ? WHERE channel_id = ? AND funding_tx_id = ?;" msgstr "" -#: wallet/db.c:1576 +#: wallet/db.c:1577 msgid "SELECT c.id, p.node_id, c.last_tx, c.funding_satoshi, c.fundingkey_remote, c.last_sig FROM channels c LEFT OUTER JOIN peers p ON p.id = c.peer_id;" msgstr "" -#: wallet/db.c:1643 +#: wallet/db.c:1644 msgid "UPDATE channels SET last_tx = ? WHERE id = ?;" msgstr "" @@ -830,527 +830,527 @@ msgstr "" msgid "SELECT state, payment_key, payment_hash, label, msatoshi, expiry_time, pay_index, msatoshi_received, paid_timestamp, bolt11, description, features, local_offer_id FROM invoices WHERE id = ?;" msgstr "" -#: wallet/wallet.c:67 +#: wallet/wallet.c:72 msgid "SELECT txid, outnum FROM utxoset WHERE spendheight is NULL" msgstr "" -#: wallet/wallet.c:108 wallet/wallet.c:612 +#: wallet/wallet.c:113 wallet/wallet.c:617 msgid "SELECT * from outputs WHERE prev_out_tx=? AND prev_out_index=?" msgstr "" -#: wallet/wallet.c:122 +#: wallet/wallet.c:127 msgid "INSERT INTO outputs ( prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:240 +#: wallet/wallet.c:245 msgid "UPDATE outputs SET status=? WHERE status=? AND prev_out_tx=? AND prev_out_index=?" msgstr "" -#: wallet/wallet.c:248 +#: wallet/wallet.c:253 msgid "UPDATE outputs SET status=? WHERE prev_out_tx=? AND prev_out_index=?" msgstr "" -#: wallet/wallet.c:267 +#: wallet/wallet.c:272 msgid "SELECT prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey , reserved_til , csv_lock FROM outputs" msgstr "" -#: wallet/wallet.c:285 +#: wallet/wallet.c:290 msgid "SELECT prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey , reserved_til , csv_lock FROM outputs WHERE status= ? " msgstr "" -#: wallet/wallet.c:324 +#: wallet/wallet.c:329 msgid "SELECT prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey, reserved_til, csv_lock FROM outputs WHERE channel_id IS NOT NULL AND confirmation_height IS NULL" msgstr "" -#: wallet/wallet.c:362 +#: wallet/wallet.c:367 msgid "SELECT prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey, reserved_til, csv_lock FROM outputs WHERE prev_out_tx = ? AND prev_out_index = ?" msgstr "" -#: wallet/wallet.c:455 +#: wallet/wallet.c:460 msgid "UPDATE outputs SET status=?, reserved_til=? WHERE prev_out_tx=? AND prev_out_index=?" msgstr "" -#: wallet/wallet.c:558 +#: wallet/wallet.c:563 msgid "SELECT prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey , reserved_til, csv_lock FROM outputs WHERE status = ? OR (status = ? AND reserved_til <= ?)ORDER BY RANDOM();" msgstr "" -#: wallet/wallet.c:626 +#: wallet/wallet.c:631 msgid "INSERT INTO outputs ( prev_out_tx, prev_out_index, value, type, status, keyindex, channel_id, peer_id, commitment_point, option_anchor_outputs, confirmation_height, spend_height, scriptpubkey, csv_lock) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:733 +#: wallet/wallet.c:738 msgid "INSERT INTO shachains (min_index, num_valid) VALUES (?, 0);" msgstr "" -#: wallet/wallet.c:777 +#: wallet/wallet.c:782 msgid "UPDATE shachains SET num_valid=?, min_index=? WHERE id=?" msgstr "" -#: wallet/wallet.c:784 +#: wallet/wallet.c:789 msgid "UPDATE shachain_known SET idx=?, hash=? WHERE shachain_id=? AND pos=?" msgstr "" -#: wallet/wallet.c:796 +#: wallet/wallet.c:801 msgid "INSERT INTO shachain_known (shachain_id, pos, idx, hash) VALUES (?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:818 +#: wallet/wallet.c:823 msgid "SELECT min_index, num_valid FROM shachains WHERE id=?" msgstr "" -#: wallet/wallet.c:833 +#: wallet/wallet.c:838 msgid "SELECT idx, hash, pos FROM shachain_known WHERE shachain_id=?" msgstr "" -#: wallet/wallet.c:856 +#: wallet/wallet.c:861 msgid "SELECT id, node_id, address FROM peers WHERE id=?;" msgstr "" -#: wallet/wallet.c:889 +#: wallet/wallet.c:894 msgid "SELECT signature FROM htlc_sigs WHERE channelid = ?" msgstr "" -#: wallet/wallet.c:923 +#: wallet/wallet.c:928 msgid "SELECT remote_ann_node_sig, remote_ann_bitcoin_sig FROM channels WHERE id = ?" msgstr "" -#: wallet/wallet.c:967 +#: wallet/wallet.c:972 msgid "SELECT hstate, feerate_per_kw FROM channel_feerates WHERE channel_id = ?" msgstr "" -#: wallet/wallet.c:1003 +#: wallet/wallet.c:1008 msgid "SELECT hstate, blockheight FROM channel_blockheights WHERE channel_id = ?" msgstr "" -#: wallet/wallet.c:1036 +#: wallet/wallet.c:1041 msgid "INSERT INTO channel_funding_inflights ( channel_id, funding_tx_id, funding_tx_outnum, funding_feerate, funding_satoshi, our_funding_satoshi, funding_psbt, last_tx, last_sig, lease_commit_sig, lease_chan_max_msat, lease_chan_max_ppt, lease_expiry, lease_blockheight_start) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:1092 +#: wallet/wallet.c:1097 msgid "UPDATE channel_funding_inflights SET funding_psbt=?, funding_tx_remote_sigs_received=? WHERE channel_id=? AND funding_tx_id=? AND funding_tx_outnum=?" msgstr "" -#: wallet/wallet.c:1115 +#: wallet/wallet.c:1120 msgid "DELETE FROM channel_funding_inflights WHERE channel_id = ?" msgstr "" -#: wallet/wallet.c:1185 +#: wallet/wallet.c:1190 msgid "SELECT funding_tx_id, funding_tx_outnum, funding_feerate, funding_satoshi, our_funding_satoshi, funding_psbt, last_tx, last_sig, funding_tx_remote_sigs_received, lease_expiry, lease_commit_sig, lease_chan_max_msat, lease_chan_max_ppt, lease_blockheight_start FROM channel_funding_inflights WHERE channel_id = ? ORDER BY funding_feerate" msgstr "" -#: wallet/wallet.c:1461 +#: wallet/wallet.c:1466 msgid "SELECT id FROM channels ORDER BY id DESC LIMIT 1;" msgstr "" -#: wallet/wallet.c:1478 +#: wallet/wallet.c:1483 msgid "SELECT id, peer_id, short_channel_id, full_channel_id, channel_config_local, channel_config_remote, state, funder, channel_flags, minimum_depth, next_index_local, next_index_remote, next_htlc_id, funding_tx_id, funding_tx_outnum, funding_satoshi, our_funding_satoshi, funding_locked_remote, push_msatoshi, msatoshi_local, fundingkey_remote, revocation_basepoint_remote, payment_basepoint_remote, htlc_basepoint_remote, delayed_payment_basepoint_remote, per_commit_remote, old_per_commit_remote, local_feerate_per_kw, remote_feerate_per_kw, shachain_remote_id, shutdown_scriptpubkey_remote, shutdown_keyidx_local, last_sent_commit_state, last_sent_commit_id, last_tx, last_sig, last_was_revoke, first_blocknum, min_possible_feerate, max_possible_feerate, msatoshi_to_us_min, msatoshi_to_us_max, future_per_commitment_point, last_sent_commit, feerate_base, feerate_ppm, remote_upfront_shutdown_script, local_static_remotekey_start, remote_static_remotekey_start, option_anchor_outputs, shutdown_scriptpubkey_local, closer, state_change_reason, revocation_basepoint_local, payment_basepoint_local, htlc_basepoint_local, delayed_payment_basepoint_local, funding_pubkey_local, shutdown_wrong_txid, shutdown_wrong_outnum, lease_expiry, lease_commit_sig, lease_chan_max_msat, lease_chan_max_ppt FROM channels WHERE state != ?;" msgstr "" -#: wallet/wallet.c:1590 +#: wallet/wallet.c:1595 msgid "UPDATE channels SET in_payments_offered = COALESCE(in_payments_offered, 0) + 1 , in_msatoshi_offered = COALESCE(in_msatoshi_offered, 0) + ? WHERE id = ?;" msgstr "" -#: wallet/wallet.c:1596 +#: wallet/wallet.c:1601 msgid "UPDATE channels SET in_payments_fulfilled = COALESCE(in_payments_fulfilled, 0) + 1 , in_msatoshi_fulfilled = COALESCE(in_msatoshi_fulfilled, 0) + ? WHERE id = ?;" msgstr "" -#: wallet/wallet.c:1602 +#: wallet/wallet.c:1607 msgid "UPDATE channels SET out_payments_offered = COALESCE(out_payments_offered, 0) + 1 , out_msatoshi_offered = COALESCE(out_msatoshi_offered, 0) + ? WHERE id = ?;" msgstr "" -#: wallet/wallet.c:1608 +#: wallet/wallet.c:1613 msgid "UPDATE channels SET out_payments_fulfilled = COALESCE(out_payments_fulfilled, 0) + 1 , out_msatoshi_fulfilled = COALESCE(out_msatoshi_fulfilled, 0) + ? WHERE id = ?;" msgstr "" -#: wallet/wallet.c:1653 +#: wallet/wallet.c:1658 msgid "SELECT in_payments_offered, in_payments_fulfilled, in_msatoshi_offered, in_msatoshi_fulfilled, out_payments_offered, out_payments_fulfilled, out_msatoshi_offered, out_msatoshi_fulfilled FROM channels WHERE id = ?" msgstr "" -#: wallet/wallet.c:1682 +#: wallet/wallet.c:1687 msgid "SELECT MIN(height), MAX(height) FROM blocks;" msgstr "" -#: wallet/wallet.c:1704 +#: wallet/wallet.c:1709 msgid "INSERT INTO channel_configs DEFAULT VALUES;" msgstr "" -#: wallet/wallet.c:1716 +#: wallet/wallet.c:1721 msgid "UPDATE channel_configs SET dust_limit_satoshis=?, max_htlc_value_in_flight_msat=?, channel_reserve_satoshis=?, htlc_minimum_msat=?, to_self_delay=?, max_accepted_htlcs=? WHERE id=?;" msgstr "" -#: wallet/wallet.c:1740 +#: wallet/wallet.c:1745 msgid "SELECT id, dust_limit_satoshis, max_htlc_value_in_flight_msat, channel_reserve_satoshis, htlc_minimum_msat, to_self_delay, max_accepted_htlcs FROM channel_configs WHERE id= ? ;" msgstr "" -#: wallet/wallet.c:1774 +#: wallet/wallet.c:1779 msgid "UPDATE channels SET remote_ann_node_sig=?, remote_ann_bitcoin_sig=? WHERE id=?" msgstr "" -#: wallet/wallet.c:1793 +#: wallet/wallet.c:1798 msgid "UPDATE channels SET shachain_remote_id=?, short_channel_id=?, full_channel_id=?, state=?, funder=?, channel_flags=?, minimum_depth=?, next_index_local=?, next_index_remote=?, next_htlc_id=?, funding_tx_id=?, funding_tx_outnum=?, funding_satoshi=?, our_funding_satoshi=?, funding_locked_remote=?, push_msatoshi=?, msatoshi_local=?, shutdown_scriptpubkey_remote=?, shutdown_keyidx_local=?, channel_config_local=?, last_tx=?, last_sig=?, last_was_revoke=?, min_possible_feerate=?, max_possible_feerate=?, msatoshi_to_us_min=?, msatoshi_to_us_max=?, feerate_base=?, feerate_ppm=?, remote_upfront_shutdown_script=?, local_static_remotekey_start=?, remote_static_remotekey_start=?, option_anchor_outputs=?, shutdown_scriptpubkey_local=?, closer=?, state_change_reason=?, shutdown_wrong_txid=?, shutdown_wrong_outnum=?, lease_expiry=?, lease_commit_sig=?, lease_chan_max_msat=?, lease_chan_max_ppt=? WHERE id=?" msgstr "" -#: wallet/wallet.c:1902 +#: wallet/wallet.c:1907 msgid "UPDATE channels SET fundingkey_remote=?, revocation_basepoint_remote=?, payment_basepoint_remote=?, htlc_basepoint_remote=?, delayed_payment_basepoint_remote=?, per_commit_remote=?, old_per_commit_remote=?, channel_config_remote=?, future_per_commitment_point=? WHERE id=?" msgstr "" -#: wallet/wallet.c:1929 +#: wallet/wallet.c:1934 msgid "DELETE FROM channel_feerates WHERE channel_id=?" msgstr "" -#: wallet/wallet.c:1939 +#: wallet/wallet.c:1944 msgid "INSERT INTO channel_feerates VALUES(?, ?, ?)" msgstr "" -#: wallet/wallet.c:1948 +#: wallet/wallet.c:1953 msgid "DELETE FROM channel_blockheights WHERE channel_id=?" msgstr "" -#: wallet/wallet.c:1958 +#: wallet/wallet.c:1963 msgid "INSERT INTO channel_blockheights VALUES(?, ?, ?)" msgstr "" -#: wallet/wallet.c:1975 +#: wallet/wallet.c:1980 msgid "UPDATE channels SET last_sent_commit=? WHERE id=?" msgstr "" -#: wallet/wallet.c:1998 +#: wallet/wallet.c:2003 msgid "INSERT INTO channel_state_changes ( channel_id, timestamp, old_state, new_state, cause, message) VALUES (?, ?, ?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:2026 +#: wallet/wallet.c:2031 msgid "SELECT timestamp, old_state, new_state, cause, message FROM channel_state_changes WHERE channel_id = ? ORDER BY timestamp ASC;" msgstr "" -#: wallet/wallet.c:2055 +#: wallet/wallet.c:2060 msgid "SELECT id FROM peers WHERE node_id = ?" msgstr "" -#: wallet/wallet.c:2067 +#: wallet/wallet.c:2072 msgid "UPDATE peers SET address = ? WHERE id = ?" msgstr "" -#: wallet/wallet.c:2076 +#: wallet/wallet.c:2081 msgid "INSERT INTO peers (node_id, address) VALUES (?, ?);" msgstr "" -#: wallet/wallet.c:2097 +#: wallet/wallet.c:2102 msgid "INSERT INTO channels ( peer_id, first_blocknum, id, revocation_basepoint_local, payment_basepoint_local, htlc_basepoint_local, delayed_payment_basepoint_local, funding_pubkey_local) VALUES (?, ?, ?, ?, ?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:2138 +#: wallet/wallet.c:2143 msgid "DELETE FROM channel_htlcs WHERE channel_id=?" msgstr "" -#: wallet/wallet.c:2144 +#: wallet/wallet.c:2149 msgid "DELETE FROM htlc_sigs WHERE channelid=?" msgstr "" -#: wallet/wallet.c:2150 +#: wallet/wallet.c:2155 msgid "DELETE FROM channeltxs WHERE channel_id=?" msgstr "" -#: wallet/wallet.c:2157 +#: wallet/wallet.c:2162 msgid "DELETE FROM channel_funding_inflights WHERE channel_id=?" msgstr "" -#: wallet/wallet.c:2163 +#: wallet/wallet.c:2168 msgid "DELETE FROM shachains WHERE id IN ( SELECT shachain_remote_id FROM channels WHERE channels.id=?)" msgstr "" -#: wallet/wallet.c:2173 +#: wallet/wallet.c:2178 msgid "UPDATE channels SET state=?, peer_id=? WHERE channels.id=?" msgstr "" -#: wallet/wallet.c:2187 +#: wallet/wallet.c:2192 msgid "SELECT * FROM channels WHERE peer_id = ?;" msgstr "" -#: wallet/wallet.c:2195 +#: wallet/wallet.c:2200 msgid "DELETE FROM peers WHERE id=?" msgstr "" -#: wallet/wallet.c:2206 +#: wallet/wallet.c:2211 msgid "UPDATE outputs SET confirmation_height = ? WHERE prev_out_tx = ?" msgstr "" -#: wallet/wallet.c:2309 +#: wallet/wallet.c:2314 msgid "INSERT INTO channel_htlcs ( channel_id, channel_htlc_id, direction, msatoshi, cltv_expiry, payment_hash, payment_key, hstate, shared_secret, routing_onion, received_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:2362 +#: wallet/wallet.c:2367 msgid "INSERT INTO channel_htlcs ( channel_id, channel_htlc_id, direction, origin_htlc, msatoshi, cltv_expiry, payment_hash, payment_key, hstate, routing_onion, malformed_onion, partid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?);" msgstr "" -#: wallet/wallet.c:2423 +#: wallet/wallet.c:2428 msgid "UPDATE channel_htlcs SET hstate=?, payment_key=?, malformed_onion=?, failuremsg=?, localfailmsg=?, we_filled=? WHERE id=?" msgstr "" -#: wallet/wallet.c:2640 +#: wallet/wallet.c:2645 msgid "SELECT id, channel_htlc_id, msatoshi, cltv_expiry, hstate, payment_hash, payment_key, routing_onion, failuremsg, malformed_onion, origin_htlc, shared_secret, received_time, we_filled FROM channel_htlcs WHERE direction= ? AND channel_id= ? AND hstate != ?" msgstr "" -#: wallet/wallet.c:2687 +#: wallet/wallet.c:2692 msgid "SELECT id, channel_htlc_id, msatoshi, cltv_expiry, hstate, payment_hash, payment_key, routing_onion, failuremsg, malformed_onion, origin_htlc, shared_secret, received_time, partid, localfailmsg FROM channel_htlcs WHERE direction = ? AND channel_id = ? AND hstate != ?" msgstr "" -#: wallet/wallet.c:2818 +#: wallet/wallet.c:2823 msgid "SELECT channel_id, direction, cltv_expiry, channel_htlc_id, payment_hash FROM channel_htlcs WHERE channel_id = ?;" msgstr "" -#: wallet/wallet.c:2852 +#: wallet/wallet.c:2857 msgid "DELETE FROM channel_htlcs WHERE direction = ? AND origin_htlc = ? AND payment_hash = ? AND partid = ?;" msgstr "" -#: wallet/wallet.c:2905 +#: wallet/wallet.c:2910 msgid "SELECT status FROM payments WHERE payment_hash=? AND partid = ?;" msgstr "" -#: wallet/wallet.c:2923 +#: wallet/wallet.c:2928 msgid "INSERT INTO payments ( status, payment_hash, destination, msatoshi, timestamp, path_secrets, route_nodes, route_channels, msatoshi_sent, description, bolt11, total_msat, partid, local_offer_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:3012 +#: wallet/wallet.c:3017 msgid "DELETE FROM payments WHERE payment_hash = ? AND partid = ?" msgstr "" -#: wallet/wallet.c:3026 +#: wallet/wallet.c:3031 msgid "DELETE FROM payments WHERE payment_hash = ?" msgstr "" -#: wallet/wallet.c:3127 +#: wallet/wallet.c:3132 msgid "SELECT id, status, destination, msatoshi, payment_hash, timestamp, payment_preimage, path_secrets, route_nodes, route_channels, msatoshi_sent, description, bolt11, failonionreply, total_msat, partid, local_offer_id FROM payments WHERE payment_hash = ? AND partid = ?" msgstr "" -#: wallet/wallet.c:3177 +#: wallet/wallet.c:3182 msgid "UPDATE payments SET status=? WHERE payment_hash=? AND partid=?" msgstr "" -#: wallet/wallet.c:3187 +#: wallet/wallet.c:3192 msgid "UPDATE payments SET payment_preimage=? WHERE payment_hash=? AND partid=?" msgstr "" -#: wallet/wallet.c:3197 +#: wallet/wallet.c:3202 msgid "UPDATE payments SET path_secrets = NULL , route_nodes = NULL , route_channels = NULL WHERE payment_hash = ? AND partid = ?;" msgstr "" -#: wallet/wallet.c:3229 +#: wallet/wallet.c:3234 msgid "SELECT failonionreply, faildestperm, failindex, failcode, failnode, failchannel, failupdate, faildetail, faildirection FROM payments WHERE payment_hash=? AND partid=?;" msgstr "" -#: wallet/wallet.c:3296 +#: wallet/wallet.c:3301 msgid "UPDATE payments SET failonionreply=? , faildestperm=? , failindex=? , failcode=? , failnode=? , failchannel=? , failupdate=? , faildetail=? , faildirection=? WHERE payment_hash=? AND partid=?;" msgstr "" -#: wallet/wallet.c:3355 +#: wallet/wallet.c:3360 msgid "SELECT id, status, destination, msatoshi, payment_hash, timestamp, payment_preimage, path_secrets, route_nodes, route_channels, msatoshi_sent, description, bolt11, failonionreply, total_msat, partid, local_offer_id FROM payments WHERE payment_hash = ? ORDER BY id;" msgstr "" -#: wallet/wallet.c:3378 +#: wallet/wallet.c:3383 msgid "SELECT id, status, destination, msatoshi, payment_hash, timestamp, payment_preimage, path_secrets, route_nodes, route_channels, msatoshi_sent, description, bolt11, failonionreply, total_msat, partid, local_offer_id FROM payments ORDER BY id;" msgstr "" -#: wallet/wallet.c:3429 +#: wallet/wallet.c:3434 msgid "SELECT id, status, destination, msatoshi, payment_hash, timestamp, payment_preimage, path_secrets, route_nodes, route_channels, msatoshi_sent, description, bolt11, failonionreply, total_msat, partid, local_offer_id FROM payments WHERE local_offer_id = ?;" msgstr "" -#: wallet/wallet.c:3474 +#: wallet/wallet.c:3479 msgid "DELETE FROM htlc_sigs WHERE channelid = ?" msgstr "" -#: wallet/wallet.c:3481 +#: wallet/wallet.c:3486 msgid "INSERT INTO htlc_sigs (channelid, signature) VALUES (?, ?)" msgstr "" -#: wallet/wallet.c:3493 +#: wallet/wallet.c:3498 msgid "SELECT blobval FROM vars WHERE name='genesis_hash'" msgstr "" -#: wallet/wallet.c:3517 +#: wallet/wallet.c:3522 msgid "INSERT INTO vars (name, blobval) VALUES ('genesis_hash', ?);" msgstr "" -#: wallet/wallet.c:3535 +#: wallet/wallet.c:3540 msgid "SELECT txid, outnum FROM utxoset WHERE spendheight < ?" msgstr "" -#: wallet/wallet.c:3547 +#: wallet/wallet.c:3552 msgid "DELETE FROM utxoset WHERE spendheight < ?" msgstr "" -#: wallet/wallet.c:3555 wallet/wallet.c:3669 +#: wallet/wallet.c:3560 wallet/wallet.c:3674 msgid "INSERT INTO blocks (height, hash, prev_hash) VALUES (?, ?, ?);" msgstr "" -#: wallet/wallet.c:3574 +#: wallet/wallet.c:3579 msgid "DELETE FROM blocks WHERE hash = ?" msgstr "" -#: wallet/wallet.c:3580 +#: wallet/wallet.c:3585 msgid "SELECT * FROM blocks WHERE height >= ?;" msgstr "" -#: wallet/wallet.c:3589 +#: wallet/wallet.c:3594 msgid "DELETE FROM blocks WHERE height > ?" msgstr "" -#: wallet/wallet.c:3601 +#: wallet/wallet.c:3606 msgid "UPDATE outputs SET spend_height = ?, status = ? WHERE prev_out_tx = ? AND prev_out_index = ?" msgstr "" -#: wallet/wallet.c:3619 +#: wallet/wallet.c:3624 msgid "UPDATE utxoset SET spendheight = ? WHERE txid = ? AND outnum = ?" msgstr "" -#: wallet/wallet.c:3642 wallet/wallet.c:3680 +#: wallet/wallet.c:3647 wallet/wallet.c:3685 msgid "INSERT INTO utxoset ( txid, outnum, blockheight, spendheight, txindex, scriptpubkey, satoshis) VALUES(?, ?, ?, ?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:3706 +#: wallet/wallet.c:3711 msgid "SELECT height FROM blocks WHERE height = ?" msgstr "" -#: wallet/wallet.c:3719 +#: wallet/wallet.c:3724 msgid "SELECT txid, spendheight, scriptpubkey, satoshis FROM utxoset WHERE blockheight = ? AND txindex = ? AND outnum = ? AND spendheight IS NULL" msgstr "" -#: wallet/wallet.c:3783 +#: wallet/wallet.c:3788 msgid "SELECT blockheight, txindex, outnum FROM utxoset WHERE spendheight = ?" msgstr "" -#: wallet/wallet.c:3800 +#: wallet/wallet.c:3805 msgid "SELECT blockheight, txindex, outnum FROM utxoset WHERE blockheight = ?" msgstr "" -#: wallet/wallet.c:3817 wallet/wallet.c:3977 +#: wallet/wallet.c:3822 wallet/wallet.c:3982 msgid "SELECT blockheight FROM transactions WHERE id=?" msgstr "" -#: wallet/wallet.c:3827 +#: wallet/wallet.c:3832 msgid "INSERT INTO transactions ( id, blockheight, txindex, rawtx) VALUES (?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:3848 +#: wallet/wallet.c:3853 msgid "UPDATE transactions SET blockheight = ?, txindex = ? WHERE id = ?" msgstr "" -#: wallet/wallet.c:3865 +#: wallet/wallet.c:3870 msgid "INSERT INTO transaction_annotations (txid, idx, location, type, channel) VALUES (?, ?, ?, ?, ?) ON CONFLICT(txid,idx) DO NOTHING;" msgstr "" -#: wallet/wallet.c:3897 +#: wallet/wallet.c:3902 msgid "SELECT type, channel_id FROM transactions WHERE id=?" msgstr "" -#: wallet/wallet.c:3913 +#: wallet/wallet.c:3918 msgid "UPDATE transactions SET type = ?, channel_id = ? WHERE id = ?" msgstr "" -#: wallet/wallet.c:3932 +#: wallet/wallet.c:3937 msgid "SELECT type FROM transactions WHERE id=?" msgstr "" -#: wallet/wallet.c:3955 +#: wallet/wallet.c:3960 msgid "SELECT rawtx FROM transactions WHERE id=?" msgstr "" -#: wallet/wallet.c:4001 +#: wallet/wallet.c:4006 msgid "SELECT blockheight, txindex FROM transactions WHERE id=?" msgstr "" -#: wallet/wallet.c:4029 +#: wallet/wallet.c:4034 msgid "SELECT id FROM transactions WHERE blockheight=?" msgstr "" -#: wallet/wallet.c:4048 +#: wallet/wallet.c:4053 msgid "INSERT INTO channeltxs ( channel_id, type, transaction_id, input_num, blockheight) VALUES (?, ?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:4072 +#: wallet/wallet.c:4077 msgid "SELECT DISTINCT(channel_id) FROM channeltxs WHERE type = ?;" msgstr "" -#: wallet/wallet.c:4093 +#: wallet/wallet.c:4098 msgid "SELECT c.type, c.blockheight, t.rawtx, c.input_num, c.blockheight - t.blockheight + 1 AS depth, t.id as txid FROM channeltxs c JOIN transactions t ON t.id = c.transaction_id WHERE c.channel_id = ? ORDER BY c.id ASC;" msgstr "" -#: wallet/wallet.c:4138 +#: wallet/wallet.c:4143 msgid "UPDATE forwarded_payments SET in_msatoshi=?, out_msatoshi=?, state=?, resolved_time=?, failcode=? WHERE in_htlc_id=?" msgstr "" -#: wallet/wallet.c:4196 +#: wallet/wallet.c:4201 msgid "INSERT INTO forwarded_payments ( in_htlc_id, out_htlc_id, in_channel_scid, out_channel_scid, in_msatoshi, out_msatoshi, state, received_time, resolved_time, failcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:4255 +#: wallet/wallet.c:4260 msgid "SELECT CAST(COALESCE(SUM(in_msatoshi - out_msatoshi), 0) AS BIGINT)FROM forwarded_payments WHERE state = ?;" msgstr "" -#: wallet/wallet.c:4304 +#: wallet/wallet.c:4309 msgid "SELECT f.state, in_msatoshi, out_msatoshi, hin.payment_hash as payment_hash, in_channel_scid, out_channel_scid, f.received_time, f.resolved_time, f.failcode FROM forwarded_payments f LEFT JOIN channel_htlcs hin ON (f.in_htlc_id = hin.id) WHERE (1 = ? OR f.state = ?) AND (1 = ? OR f.in_channel_scid = ?) AND (1 = ? OR f.out_channel_scid = ?)" msgstr "" -#: wallet/wallet.c:4426 +#: wallet/wallet.c:4431 msgid "SELECT t.id, t.rawtx, t.blockheight, t.txindex, t.type as txtype, c2.short_channel_id as txchan, a.location, a.idx as ann_idx, a.type as annotation_type, c.short_channel_id FROM transactions t LEFT JOIN transaction_annotations a ON (a.txid = t.id) LEFT JOIN channels c ON (a.channel = c.id) LEFT JOIN channels c2 ON (t.channel_id = c2.id) ORDER BY t.blockheight, t.txindex ASC" msgstr "" -#: wallet/wallet.c:4520 +#: wallet/wallet.c:4525 msgid "INSERT INTO penalty_bases ( channel_id, commitnum, txid, outnum, amount) VALUES (?, ?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:4545 +#: wallet/wallet.c:4550 msgid "SELECT commitnum, txid, outnum, amount FROM penalty_bases WHERE channel_id = ?" msgstr "" -#: wallet/wallet.c:4569 +#: wallet/wallet.c:4574 msgid "DELETE FROM penalty_bases WHERE channel_id = ? AND commitnum = ?" msgstr "" -#: wallet/wallet.c:4587 +#: wallet/wallet.c:4592 msgid "SELECT 1 FROM offers WHERE offer_id = ?;" msgstr "" -#: wallet/wallet.c:4600 +#: wallet/wallet.c:4605 msgid "INSERT INTO offers ( offer_id, bolt12, label, status) VALUES (?, ?, ?, ?);" msgstr "" -#: wallet/wallet.c:4627 +#: wallet/wallet.c:4632 msgid "SELECT bolt12, label, status FROM offers WHERE offer_id = ?;" msgstr "" -#: wallet/wallet.c:4655 +#: wallet/wallet.c:4660 msgid "SELECT offer_id FROM offers;" msgstr "" -#: wallet/wallet.c:4681 +#: wallet/wallet.c:4686 msgid "UPDATE offers SET status=? WHERE offer_id = ?;" msgstr "" -#: wallet/wallet.c:4692 +#: wallet/wallet.c:4697 msgid "UPDATE invoices SET state=? WHERE state=? AND local_offer_id = ?;" msgstr "" -#: wallet/wallet.c:4720 +#: wallet/wallet.c:4725 msgid "SELECT status FROM offers WHERE offer_id = ?;" msgstr "" -#: wallet/wallet.c:4805 +#: wallet/wallet.c:4810 msgid "UPDATE datastore SET data=?, generation=generation+1 WHERE key=?;" msgstr "" -#: wallet/wallet.c:4816 +#: wallet/wallet.c:4821 msgid "INSERT INTO datastore VALUES (?, ?, 0);" msgstr "" -#: wallet/wallet.c:4827 +#: wallet/wallet.c:4832 msgid "DELETE FROM datastore WHERE key = ?" msgstr "" -#: wallet/wallet.c:4844 +#: wallet/wallet.c:4849 msgid "SELECT key, data, generation FROM datastore WHERE key >= ? ORDER BY key;" msgstr "" -#: wallet/wallet.c:4851 +#: wallet/wallet.c:4856 msgid "SELECT key, data, generation FROM datastore ORDER BY key;" msgstr "" @@ -1369,4 +1369,4 @@ msgstr "" #: wallet/test/run-wallet.c:1721 msgid "INSERT INTO channels (id) VALUES (1);" msgstr "" -# SHA256STAMP:0b3b17a4eb95067fdebc9d90c962c46e40fdef2002f92856cc31800ab37fbe59 +# SHA256STAMP:85132b49c0d7238708371adbf692cc53395edb7f2db7a585c9317e6ee5212733 diff --git a/wallet/txfilter.c b/wallet/txfilter.c index 41f0816e4..41f014981 100644 --- a/wallet/txfilter.c +++ b/wallet/txfilter.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include diff --git a/wallet/txfilter.h b/wallet/txfilter.h index 16471e086..6e8621006 100644 --- a/wallet/txfilter.h +++ b/wallet/txfilter.h @@ -3,8 +3,6 @@ #include "config.h" #include #include -#include -#include struct txfilter; diff --git a/wallet/wallet.c b/wallet/wallet.c index 23a7648b6..82511e2a8 100644 --- a/wallet/wallet.c +++ b/wallet/wallet.c @@ -13,8 +13,11 @@ #include #include #include +#include #include #include +#include +#include #include #include #include @@ -22,6 +25,8 @@ #include #include #include +#include +#include #define SQLITE_MAX_UINT 0x7FFFFFFFFFFFFFFF #define DIRECTION_INCOMING 0 diff --git a/wallet/wallet.h b/wallet/wallet.h index a28c3f6f9..4299dcd27 100644 --- a/wallet/wallet.h +++ b/wallet/wallet.h @@ -3,25 +3,12 @@ #include "config.h" #include "db.h" -#include -#include -#include -#include -#include -#include -#include #include #include #include #include -#include -#include -#include #include #include -#include -#include -#include struct amount_msat; struct invoices; diff --git a/wallet/walletrpc.c b/wallet/walletrpc.c index fbd0dabe6..2db67e8f5 100644 --- a/wallet/walletrpc.c +++ b/wallet/walletrpc.c @@ -6,13 +6,16 @@ #include #include #include +#include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -20,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -28,9 +32,11 @@ #include #include #include +#include #include #include #include +#include #include /* May return NULL if encoding error occurs. */ diff --git a/wire/onion_printgen.h b/wire/onion_printgen.h index ff649fe19..06b1c4585 100644 --- a/wire/onion_printgen.h +++ b/wire/onion_printgen.h @@ -3,9 +3,7 @@ /* Template located at tools/gen/print_header_template */ #ifndef LIGHTNING_WIRE_ONION_PRINTGEN_H #define LIGHTNING_WIRE_ONION_PRINTGEN_H -#include #include -#include void printonion_wire_message(const u8 *msg); diff --git a/wire/peer_printgen.h b/wire/peer_printgen.h index 57145b258..737aceebf 100644 --- a/wire/peer_printgen.h +++ b/wire/peer_printgen.h @@ -3,7 +3,6 @@ /* Template located at tools/gen/print_header_template */ #ifndef LIGHTNING_WIRE_PEER_PRINTGEN_H #define LIGHTNING_WIRE_PEER_PRINTGEN_H -#include #include void printpeer_wire_message(const u8 *msg); diff --git a/wire/peer_wire.c b/wire/peer_wire.c index 21a6f6e52..72db6395d 100644 --- a/wire/peer_wire.c +++ b/wire/peer_wire.c @@ -1,4 +1,5 @@ #include +#include #include static bool unknown_type(enum peer_wire t) diff --git a/wire/tlvstream.c b/wire/tlvstream.c index f71966fe7..1f0b79bfd 100644 --- a/wire/tlvstream.c +++ b/wire/tlvstream.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include diff --git a/wire/wire.h b/wire/wire.h index 26e30058c..c6c528784 100644 --- a/wire/wire.h +++ b/wire/wire.h @@ -6,7 +6,6 @@ #include #include #include -#include struct ripemd160; struct sha256;