mirror of
https://github.com/aljazceru/lightning.git
synced 2026-02-02 12:44:26 +01:00
plugin: Adding status to the pay plugin
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com> Rebase Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
This commit is contained in:
Vincenzo Palazzo
committed by
Rusty Russell
Rusty Russell
parent
62ef403d20
commit
9d5c992fc8
@@ -955,11 +955,12 @@ class LightningRpc(UnixDomainSocketRpc):
|
||||
}
|
||||
return self.call("listpeers", payload)
|
||||
|
||||
def listsendpays(self, bolt11=None, payment_hash=None):
|
||||
def listsendpays(self, bolt11=None, payment_hash=None, status=None):
|
||||
"""Show all sendpays results, or only for `bolt11` or `payment_hash`."""
|
||||
payload = {
|
||||
"bolt11": bolt11,
|
||||
"payment_hash": payment_hash
|
||||
"payment_hash": payment_hash,
|
||||
"status": status
|
||||
}
|
||||
return self.call("listsendpays", payload)
|
||||
|
||||
|
||||
2
doc/lightning-listpays.7
generated
2
doc/lightning-listpays.7
generated
@@ -75,4 +75,4 @@ Rusty Russell \fI<rusty@rustcorp.com.au\fR> is mainly responsible\.
|
||||
|
||||
Main web site: \fIhttps://github.com/ElementsProject/lightning\fR
|
||||
|
||||
\" SHA256STAMP:4cea0f219c2a99fed2db9b95ec4f0210ed4dfa903660849c74238b25d45a637a
|
||||
\" SHA256STAMP:1bcd6c9a5203a21cad1d12ff64eb7076fca915e2f8e582bcced71e1d1df67041
|
||||
|
||||
6
doc/lightning-listsendpays.7
generated
6
doc/lightning-listsendpays.7
generated
@@ -3,14 +3,14 @@
|
||||
lightning-listsendpays - Low-level command for querying sendpay status
|
||||
.SH SYNOPSIS
|
||||
|
||||
\fBlistsendpays\fR [\fIbolt11\fR] [\fIpayment_hash\fR]
|
||||
\fBlistsendpays\fR [\fIbolt11\fR] [\fIpayment_hash\fR] [*status*]
|
||||
|
||||
.SH DESCRIPTION
|
||||
|
||||
The \fBlistsendpays\fR RPC command gets the status of all \fIsendpay\fR
|
||||
commands (which is also used by the \fIpay\fR command), or with \fIbolt11\fR or
|
||||
\fIpayment_hash\fR limits results to that specific payment\. You cannot
|
||||
specify both\.
|
||||
specify both\. It is possible filter the payments also by status\.
|
||||
|
||||
|
||||
Note that in future there may be more than one concurrent \fIsendpay\fR
|
||||
@@ -75,4 +75,4 @@ responsible\.
|
||||
|
||||
Main web site: \fIhttps://github.com/ElementsProject/lightning\fR
|
||||
|
||||
\" SHA256STAMP:fa256733033686f8fd53735ba69f34b3fd72c463577e3ad1dfa942662638e42e
|
||||
\" SHA256STAMP:b764944a2853635154668dbcc89addb2ce87a476821e23d2841b6da5ba7943f3
|
||||
|
||||
@@ -4,7 +4,7 @@ lightning-listsendpays -- Low-level command for querying sendpay status
|
||||
SYNOPSIS
|
||||
--------
|
||||
|
||||
**listsendpays** \[*bolt11*\] \[*payment\_hash*\]
|
||||
**listsendpays** \[*bolt11*\] \[*payment\_hash*\] [\*status*\]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
@@ -12,7 +12,7 @@ DESCRIPTION
|
||||
The **listsendpays** RPC command gets the status of all *sendpay*
|
||||
commands (which is also used by the *pay* command), or with *bolt11* or
|
||||
*payment\_hash* limits results to that specific payment. You cannot
|
||||
specify both.
|
||||
specify both. It is possible filter the payments also by status.
|
||||
|
||||
Note that in future there may be more than one concurrent *sendpay*
|
||||
command per *pay*, so this command should be used with caution.
|
||||
|
||||
@@ -1894,7 +1894,7 @@ static struct command_result *json_listpays(struct command *cmd,
|
||||
const char *buf,
|
||||
const jsmntok_t *params)
|
||||
{
|
||||
const char *invstring;
|
||||
const char *invstring, *status_str;
|
||||
struct sha256 *payment_hash;
|
||||
struct out_req *req;
|
||||
|
||||
@@ -1903,6 +1903,7 @@ static struct command_result *json_listpays(struct command *cmd,
|
||||
/* FIXME: parameter should be invstring now */
|
||||
p_opt("bolt11", param_string, &invstring),
|
||||
p_opt("payment_hash", param_sha256, &payment_hash),
|
||||
p_opt("status", param_string, &status_str),
|
||||
NULL))
|
||||
return command_param_failed();
|
||||
|
||||
@@ -1915,6 +1916,8 @@ static struct command_result *json_listpays(struct command *cmd,
|
||||
if (payment_hash)
|
||||
json_add_sha256(req->js, "payment_hash", payment_hash);
|
||||
|
||||
if (status_str)
|
||||
json_add_string(req->js, "status", status_str);
|
||||
return send_outreq(cmd->plugin, req);
|
||||
}
|
||||
|
||||
|
||||
29
wallet/db_postgres_sqlgen.c
generated
29
wallet/db_postgres_sqlgen.c
generated
@@ -2080,15 +2080,7 @@ struct db_query db_postgres_queries[] = {
|
||||
},
|
||||
};
|
||||
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
#define DB_POSTGRES_QUERY_COUNT 343
|
||||
=======
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
#define DB_POSTGRES_QUERY_COUNT 342
|
||||
=======
|
||||
#define DB_POSTGRES_QUERY_COUNT 337
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
#define DB_POSTGRES_QUERY_COUNT 345
|
||||
|
||||
#endif /* HAVE_POSTGRES */
|
||||
|
||||
@@ -2097,12 +2089,15 @@ struct db_query db_postgres_queries[] = {
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
// SHA256STAMP:d812809c7895cea0ed904084e48c523ea01a8cd9525e4b6be1b4e05bec2a90d1
|
||||
=======
|
||||
=======
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
=======
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
// SHA256STAMP:e356b7327b760559f9a7c31a7ea4a09d50194c7aacc6daef6ba9fb5caf43ae83
|
||||
=======
|
||||
@@ -2110,6 +2105,8 @@ struct db_query db_postgres_queries[] = {
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
=======
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
// SHA256STAMP:a70af01d3b2f3a7003703b7feb0b2ef12359e0d2850bde1697a53780e2f5dbae
|
||||
=======
|
||||
@@ -2117,6 +2114,8 @@ struct db_query db_postgres_queries[] = {
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
=======
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
// SHA256STAMP:f929ee6db13bdf55b5e0cdf54840091948b664a61c63a4aaaef403dc7e6f23ad
|
||||
=======
|
||||
@@ -2239,6 +2238,18 @@ struct db_query db_postgres_queries[] = {
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
// SHA256STAMP:d6c1c3aced24e67abe2596259beb7599406c070622ef70f88f07d2672c4f4eb9
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
|
||||
29
wallet/db_sqlite3_sqlgen.c
generated
29
wallet/db_sqlite3_sqlgen.c
generated
@@ -2080,15 +2080,7 @@ struct db_query db_sqlite3_queries[] = {
|
||||
},
|
||||
};
|
||||
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
#define DB_SQLITE3_QUERY_COUNT 343
|
||||
=======
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
#define DB_SQLITE3_QUERY_COUNT 342
|
||||
=======
|
||||
#define DB_SQLITE3_QUERY_COUNT 337
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
#define DB_SQLITE3_QUERY_COUNT 345
|
||||
|
||||
#endif /* HAVE_SQLITE3 */
|
||||
|
||||
@@ -2097,12 +2089,15 @@ struct db_query db_sqlite3_queries[] = {
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
// SHA256STAMP:d812809c7895cea0ed904084e48c523ea01a8cd9525e4b6be1b4e05bec2a90d1
|
||||
=======
|
||||
=======
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
=======
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
// SHA256STAMP:e356b7327b760559f9a7c31a7ea4a09d50194c7aacc6daef6ba9fb5caf43ae83
|
||||
=======
|
||||
@@ -2110,6 +2105,8 @@ struct db_query db_sqlite3_queries[] = {
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
=======
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
// SHA256STAMP:a70af01d3b2f3a7003703b7feb0b2ef12359e0d2850bde1697a53780e2f5dbae
|
||||
=======
|
||||
@@ -2117,6 +2114,8 @@ struct db_query db_sqlite3_queries[] = {
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
=======
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
// SHA256STAMP:f929ee6db13bdf55b5e0cdf54840091948b664a61c63a4aaaef403dc7e6f23ad
|
||||
=======
|
||||
@@ -2239,6 +2238,18 @@ struct db_query db_sqlite3_queries[] = {
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
// SHA256STAMP:d6c1c3aced24e67abe2596259beb7599406c070622ef70f88f07d2672c4f4eb9
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
|
||||
162
wallet/statements_gettextgen.po
generated
162
wallet/statements_gettextgen.po
generated
@@ -1142,12 +1142,15 @@ msgstr ""
|
||||
msgid "UPDATE payments SET failonionreply=? , faildestperm=? , failindex=? , failcode=? , failnode=? , failchannel=? , failupdate=? , faildetail=? , faildirection=? WHERE payment_hash=? AND partid=?;"
|
||||
msgstr ""
|
||||
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
#: wallet/wallet.c:3352
|
||||
=======
|
||||
=======
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
=======
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
#: wallet/wallet.c:3355
|
||||
=======
|
||||
@@ -1248,86 +1251,89 @@ msgstr ""
|
||||
#: wallet/wallet.c:3341
|
||||
=======
|
||||
#: wallet/wallet.c:3344
|
||||
=======
|
||||
#: wallet/wallet.c:3351
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
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 status = ? ORDER BY id;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3369
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
#: wallet/wallet.c:3376
|
||||
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:3392
|
||||
#: wallet/wallet.c:3399
|
||||
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 status = ? ORDER BY id;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3415
|
||||
#: wallet/wallet.c:3422
|
||||
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:3466
|
||||
#: wallet/wallet.c:3473
|
||||
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:3511
|
||||
#: wallet/wallet.c:3518
|
||||
msgid "DELETE FROM htlc_sigs WHERE channelid = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3518
|
||||
#: wallet/wallet.c:3525
|
||||
msgid "INSERT INTO htlc_sigs (channelid, signature) VALUES (?, ?)"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3530
|
||||
#: wallet/wallet.c:3537
|
||||
msgid "SELECT blobval FROM vars WHERE name='genesis_hash'"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3554
|
||||
#: wallet/wallet.c:3561
|
||||
msgid "INSERT INTO vars (name, blobval) VALUES ('genesis_hash', ?);"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3572
|
||||
#: wallet/wallet.c:3579
|
||||
msgid "SELECT txid, outnum FROM utxoset WHERE spendheight < ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3584
|
||||
#: wallet/wallet.c:3591
|
||||
msgid "DELETE FROM utxoset WHERE spendheight < ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3592 wallet/wallet.c:3706
|
||||
#: wallet/wallet.c:3599 wallet/wallet.c:3713
|
||||
msgid "INSERT INTO blocks (height, hash, prev_hash) VALUES (?, ?, ?);"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3611
|
||||
#: wallet/wallet.c:3618
|
||||
msgid "DELETE FROM blocks WHERE hash = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3617
|
||||
#: wallet/wallet.c:3624
|
||||
msgid "SELECT * FROM blocks WHERE height >= ?;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3626
|
||||
#: wallet/wallet.c:3633
|
||||
msgid "DELETE FROM blocks WHERE height > ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3638
|
||||
#: wallet/wallet.c:3645
|
||||
msgid "UPDATE outputs SET spend_height = ?, status = ? WHERE prev_out_tx = ? AND prev_out_index = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3656
|
||||
#: wallet/wallet.c:3663
|
||||
msgid "UPDATE utxoset SET spendheight = ? WHERE txid = ? AND outnum = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3679 wallet/wallet.c:3717
|
||||
#: wallet/wallet.c:3686 wallet/wallet.c:3724
|
||||
msgid "INSERT INTO utxoset ( txid, outnum, blockheight, spendheight, txindex, scriptpubkey, satoshis) VALUES(?, ?, ?, ?, ?, ?, ?);"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3743
|
||||
#: wallet/wallet.c:3750
|
||||
msgid "SELECT height FROM blocks WHERE height = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3756
|
||||
#: wallet/wallet.c:3763
|
||||
msgid "SELECT txid, spendheight, scriptpubkey, satoshis FROM utxoset WHERE blockheight = ? AND txindex = ? AND outnum = ? AND spendheight IS NULL"
|
||||
msgstr ""
|
||||
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
#: wallet/wallet.c:3768
|
||||
@@ -1484,101 +1490,125 @@ msgid "UPDATE transactions SET blockheight = ?, txindex = ? WHERE id = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3877
|
||||
msgid "INSERT INTO transaction_annotations (txid, idx, location, type, channel) VALUES (?, ?, ?, ?, ?) ON CONFLICT(txid,idx) DO NOTHING;"
|
||||
=======
|
||||
#: wallet/wallet.c:3827
|
||||
msgid "SELECT blockheight, txindex, outnum FROM utxoset WHERE spendheight = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3844
|
||||
msgid "SELECT blockheight, txindex, outnum FROM utxoset WHERE blockheight = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3861 wallet/wallet.c:4021
|
||||
msgid "SELECT blockheight FROM transactions WHERE id=?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3871
|
||||
msgid "INSERT INTO transactions ( id, blockheight, txindex, rawtx) VALUES (?, ?, ?, ?);"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3892
|
||||
msgid "UPDATE transactions SET blockheight = ?, txindex = ? WHERE id = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3909
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
msgid "INSERT INTO transaction_annotations (txid, idx, location, type, channel) VALUES (?, ?, ?, ?, ?) ON CONFLICT(txid,idx) DO NOTHING;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3941
|
||||
msgid "SELECT type, channel_id FROM transactions WHERE id=?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3925
|
||||
#: wallet/wallet.c:3957
|
||||
msgid "UPDATE transactions SET type = ?, channel_id = ? WHERE id = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3944
|
||||
#: wallet/wallet.c:3976
|
||||
msgid "SELECT type FROM transactions WHERE id=?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:3967
|
||||
#: wallet/wallet.c:3999
|
||||
msgid "SELECT rawtx FROM transactions WHERE id=?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4013
|
||||
#: wallet/wallet.c:4045
|
||||
msgid "SELECT blockheight, txindex FROM transactions WHERE id=?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4041
|
||||
#: wallet/wallet.c:4073
|
||||
msgid "SELECT id FROM transactions WHERE blockheight=?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4060
|
||||
#: wallet/wallet.c:4092
|
||||
msgid "INSERT INTO channeltxs ( channel_id, type, transaction_id, input_num, blockheight) VALUES (?, ?, ?, ?, ?);"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4084
|
||||
#: wallet/wallet.c:4116
|
||||
msgid "SELECT DISTINCT(channel_id) FROM channeltxs WHERE type = ?;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4105
|
||||
#: wallet/wallet.c:4137
|
||||
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:4150
|
||||
#: wallet/wallet.c:4182
|
||||
msgid "UPDATE forwarded_payments SET in_msatoshi=?, out_msatoshi=?, state=?, resolved_time=?, failcode=? WHERE in_htlc_id=?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4208
|
||||
#: wallet/wallet.c:4240
|
||||
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:4267
|
||||
#: wallet/wallet.c:4299
|
||||
msgid "SELECT CAST(COALESCE(SUM(in_msatoshi - out_msatoshi), 0) AS BIGINT)FROM forwarded_payments WHERE state = ?;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4316
|
||||
#: wallet/wallet.c:4348
|
||||
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:4438
|
||||
#: wallet/wallet.c:4470
|
||||
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:4532
|
||||
#: wallet/wallet.c:4564
|
||||
msgid "INSERT INTO penalty_bases ( channel_id, commitnum, txid, outnum, amount) VALUES (?, ?, ?, ?, ?);"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4557
|
||||
#: wallet/wallet.c:4589
|
||||
msgid "SELECT commitnum, txid, outnum, amount FROM penalty_bases WHERE channel_id = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4581
|
||||
#: wallet/wallet.c:4613
|
||||
msgid "DELETE FROM penalty_bases WHERE channel_id = ? AND commitnum = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4599
|
||||
#: wallet/wallet.c:4631
|
||||
msgid "SELECT 1 FROM offers WHERE offer_id = ?;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4612
|
||||
#: wallet/wallet.c:4644
|
||||
msgid "INSERT INTO offers ( offer_id, bolt12, label, status) VALUES (?, ?, ?, ?);"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4639
|
||||
#: wallet/wallet.c:4671
|
||||
msgid "SELECT bolt12, label, status FROM offers WHERE offer_id = ?;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4667
|
||||
#: wallet/wallet.c:4699
|
||||
msgid "SELECT offer_id FROM offers;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4693
|
||||
#: wallet/wallet.c:4725
|
||||
msgid "UPDATE offers SET status=? WHERE offer_id = ?;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4704
|
||||
#: wallet/wallet.c:4736
|
||||
msgid "UPDATE invoices SET state=? WHERE state=? AND local_offer_id = ?;"
|
||||
msgstr ""
|
||||
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
#: wallet/wallet.c:4707
|
||||
>>>>>>> rpc: Integrate the status flow in the listsendpays command
|
||||
@@ -1620,7 +1650,34 @@ msgstr ""
|
||||
msgid "SELECT key, data, generation FROM datastore WHERE key >= ? ORDER BY key;"
|
||||
msgstr ""
|
||||
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
#: wallet/wallet.c:4848
|
||||
=======
|
||||
#: wallet/wallet.c:4851
|
||||
=======
|
||||
#: wallet/wallet.c:4764
|
||||
msgid "SELECT status FROM offers WHERE offer_id = ?;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4849
|
||||
msgid "UPDATE datastore SET data=?, generation=generation+1 WHERE key=?;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4860
|
||||
msgid "INSERT INTO datastore VALUES (?, ?, 0);"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4871
|
||||
msgid "DELETE FROM datastore WHERE key = ?"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4888
|
||||
msgid "SELECT key, data, generation FROM datastore WHERE key >= ? ORDER BY key;"
|
||||
msgstr ""
|
||||
|
||||
#: wallet/wallet.c:4895
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
msgid "SELECT key, data, generation FROM datastore ORDER BY key;"
|
||||
msgstr ""
|
||||
|
||||
@@ -1642,12 +1699,15 @@ msgstr ""
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
# SHA256STAMP:826f40774d133dbfa18209685ab964d2915e303346b964107ac4974275910111
|
||||
=======
|
||||
=======
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
=======
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
# SHA256STAMP:0b3b17a4eb95067fdebc9d90c962c46e40fdef2002f92856cc31800ab37fbe59
|
||||
=======
|
||||
@@ -1655,6 +1715,8 @@ msgstr ""
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
=======
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
# SHA256STAMP:651a6c15e8780351cd32a4e6dc3011b1c5fc2af6308b0e65a442dda2a3874e19
|
||||
=======
|
||||
@@ -1662,6 +1724,8 @@ msgstr ""
|
||||
>>>>>>> wallet db: Support the query on database with status and payment hash.
|
||||
=======
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
# SHA256STAMP:35e10cb3ec34af54b6d78d9eea1aefa0861ef9acbfe0e78745d24b8e49e50b05
|
||||
=======
|
||||
@@ -1784,6 +1848,18 @@ msgstr ""
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
<<<<<<< refs/remotes/ElementsProject/master
|
||||
>>>>>>> doc: Update doc with the new parameter supported
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
=======
|
||||
# SHA256STAMP:721561d65cdfbde26634a75453d7816c6533f3ff3f32f2f7ee67337ce58b39a7
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
>>>>>>> plugin: Adding status to the pay plugin
|
||||
|
||||
Reference in New Issue
Block a user