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

pay, wallet: rename internal bolt11 vars to invstring.

Browse Source 
And handle bolt12 strings if EXPERIMENTAL_FEATURES.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-12-14 11:54:37 +10:30
committed by Christian Decker
parent 4c4288e3e5
commit a33e39b7e8
11 changed files with 123 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wallet/db_postgres_sqlgen.c generated
View File

@@ -1762,4 +1762,4 @@ struct db_query db_postgres_queries[] = {
#endif /* LIGHTNINGD_WALLET_GEN_DB_POSTGRES */
// SHA256STAMP:93d29f78f9f38cc779f4fbea480b90ce38899ff1c2f534e4160b2bf8a05b57ee
// SHA256STAMP:774d5116e102d98351730072b4aa0b48d27b05c364680fc406f8b12bf4c7e293

2
wallet/db_sqlite3_sqlgen.c generated
View File

@@ -1762,4 +1762,4 @@ struct db_query db_sqlite3_queries[] = {
#endif /* LIGHTNINGD_WALLET_GEN_DB_SQLITE3 */
// SHA256STAMP:93d29f78f9f38cc779f4fbea480b90ce38899ff1c2f534e4160b2bf8a05b57ee
// SHA256STAMP:774d5116e102d98351730072b4aa0b48d27b05c364680fc406f8b12bf4c7e293

2
wallet/statements_gettextgen.po generated
View File

@@ -1161,4 +1161,4 @@ msgstr ""
#: wallet/test/run-wallet.c:1378
msgid "INSERT INTO channels (id) VALUES (1);"
msgstr ""
# SHA256STAMP:f567e217e4f94d8fd86c0c8d6997931d891df4f8295517fa527b80a323b256a8
# SHA256STAMP:50622dd1a8b0f2fe71efa1c1d175f7ad130f3042db84e0c9547f849a328e8f5d

8
wallet/wallet.c
View File

@@ -2530,8 +2530,8 @@ void wallet_payment_store(struct wallet *wallet,
else
db_bind_null(stmt, 9);
if (payment->bolt11 != NULL)
db_bind_text(stmt, 10, payment->bolt11);
if (payment->invstring != NULL)
db_bind_text(stmt, 10, payment->invstring);
else
db_bind_null(stmt, 10);
@@ -2641,10 +2641,10 @@ static struct wallet_payment *wallet_stmt2payment(const tal_t *ctx,
payment->label = NULL;
if (!db_column_is_null(stmt, 12) && db_column_text(stmt, 12) != NULL)
payment->bolt11 = tal_strdup(
payment->invstring = tal_strdup(
payment, (const char *)db_column_text(stmt, 12));
else
payment->bolt11 = NULL;
payment->invstring = NULL;
if (!db_column_is_null(stmt, 13))
payment->failonion =

4
wallet/wallet.h
View File

@@ -236,8 +236,8 @@ struct wallet_payment {
struct secret *path_secrets;
struct node_id *route_nodes;
struct short_channel_id *route_channels;
/* bolt11 string; NULL for old payments. */
const char *bolt11;
/* bolt11/bolt12 string; NULL for old payments. */
const char *invstring;
/* The label of the payment. Must support `tal_len` */
const char *label;