From 380eb4af83d03d239c02705a4ef6d9e5dceeb828 Mon Sep 17 00:00:00 2001 From: bruwbird Date: Thu, 12 Jan 2023 09:17:12 +0900 Subject: [PATCH 1/3] lncli: fix addinvoice expiry flag comment --- cmd/lncli/cmd_invoice.go | 4 ++-- cmd/lncli/invoicesrpc_active.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/lncli/cmd_invoice.go b/cmd/lncli/cmd_invoice.go index 87686d013..3419f8192 100644 --- a/cmd/lncli/cmd_invoice.go +++ b/cmd/lncli/cmd_invoice.go @@ -57,8 +57,8 @@ var addInvoiceCommand = cli.Command{ cli.Int64Flag{ Name: "expiry", Usage: "the invoice's expiry time in seconds. If not " + - "specified an expiry of 3600 seconds (1 hour) " + - "is implied.", + "specified, an expiry of " + + "86400 seconds (24 hours) is implied.", }, cli.BoolFlag{ Name: "private", diff --git a/cmd/lncli/invoicesrpc_active.go b/cmd/lncli/invoicesrpc_active.go index 17a5e1abb..095911b66 100644 --- a/cmd/lncli/invoicesrpc_active.go +++ b/cmd/lncli/invoicesrpc_active.go @@ -181,8 +181,8 @@ var addHoldInvoiceCommand = cli.Command{ cli.Int64Flag{ Name: "expiry", Usage: "the invoice's expiry time in seconds. If not " + - "specified, an expiry of 3600 seconds (1 hour) " + - "is implied.", + "specified, an expiry of " + + "86400 seconds (24 hours) is implied.", }, cli.BoolFlag{ Name: "private", From 71f26151909989d3f9b6234ad0b1e9c4b6d4b0a5 Mon Sep 17 00:00:00 2001 From: bruwbird Date: Thu, 12 Jan 2023 09:17:34 +0900 Subject: [PATCH 2/3] lnrpc: update invoice request expiry comment --- lnrpc/invoicesrpc/invoices.pb.go | 2 +- lnrpc/invoicesrpc/invoices.proto | 2 +- lnrpc/invoicesrpc/invoices.swagger.json | 4 ++-- lnrpc/lightning.pb.go | 2 +- lnrpc/lightning.proto | 2 +- lnrpc/lightning.swagger.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lnrpc/invoicesrpc/invoices.pb.go b/lnrpc/invoicesrpc/invoices.pb.go index f4f56dccf..12fdd7cef 100644 --- a/lnrpc/invoicesrpc/invoices.pb.go +++ b/lnrpc/invoicesrpc/invoices.pb.go @@ -188,7 +188,7 @@ type AddHoldInvoiceRequest struct { // payment (memo) is too long to naturally fit within the description field // of an encoded payment request. DescriptionHash []byte `protobuf:"bytes,4,opt,name=description_hash,json=descriptionHash,proto3" json:"description_hash,omitempty"` - // Payment request expiry time in seconds. Default is 3600 (1 hour). + // Payment request expiry time in seconds. Default is 86400 (24 hours). Expiry int64 `protobuf:"varint,5,opt,name=expiry,proto3" json:"expiry,omitempty"` // Fallback on-chain address. FallbackAddr string `protobuf:"bytes,6,opt,name=fallback_addr,json=fallbackAddr,proto3" json:"fallback_addr,omitempty"` diff --git a/lnrpc/invoicesrpc/invoices.proto b/lnrpc/invoicesrpc/invoices.proto index f98c64a03..12317d02c 100644 --- a/lnrpc/invoicesrpc/invoices.proto +++ b/lnrpc/invoicesrpc/invoices.proto @@ -84,7 +84,7 @@ message AddHoldInvoiceRequest { */ bytes description_hash = 4; - // Payment request expiry time in seconds. Default is 3600 (1 hour). + // Payment request expiry time in seconds. Default is 86400 (24 hours). int64 expiry = 5; // Fallback on-chain address. diff --git a/lnrpc/invoicesrpc/invoices.swagger.json b/lnrpc/invoicesrpc/invoices.swagger.json index 6dee4c978..2fca20090 100644 --- a/lnrpc/invoicesrpc/invoices.swagger.json +++ b/lnrpc/invoicesrpc/invoices.swagger.json @@ -261,7 +261,7 @@ "expiry": { "type": "string", "format": "int64", - "description": "Payment request expiry time in seconds. Default is 3600 (1 hour)." + "description": "Payment request expiry time in seconds. Default is 86400 (24 hours)." }, "fallback_addr": { "type": "string", @@ -493,7 +493,7 @@ "expiry": { "type": "string", "format": "int64", - "description": "Payment request expiry time in seconds. Default is 3600 (1 hour)." + "description": "Payment request expiry time in seconds. Default is 86400 (24 hours)." }, "fallback_addr": { "type": "string", diff --git a/lnrpc/lightning.pb.go b/lnrpc/lightning.pb.go index 4c0727b09..106ec6bcb 100644 --- a/lnrpc/lightning.pb.go +++ b/lnrpc/lightning.pb.go @@ -11632,7 +11632,7 @@ type Invoice struct { // of an encoded payment request. When using REST, this field must be encoded // as base64. DescriptionHash []byte `protobuf:"bytes,10,opt,name=description_hash,json=descriptionHash,proto3" json:"description_hash,omitempty"` - // Payment request expiry time in seconds. Default is 3600 (1 hour). + // Payment request expiry time in seconds. Default is 86400 (24 hours). Expiry int64 `protobuf:"varint,11,opt,name=expiry,proto3" json:"expiry,omitempty"` // Fallback on-chain address. FallbackAddr string `protobuf:"bytes,12,opt,name=fallback_addr,json=fallbackAddr,proto3" json:"fallback_addr,omitempty"` diff --git a/lnrpc/lightning.proto b/lnrpc/lightning.proto index 5fa726ac9..e4e0f09a5 100644 --- a/lnrpc/lightning.proto +++ b/lnrpc/lightning.proto @@ -3387,7 +3387,7 @@ message Invoice { */ bytes description_hash = 10; - // Payment request expiry time in seconds. Default is 3600 (1 hour). + // Payment request expiry time in seconds. Default is 86400 (24 hours). int64 expiry = 11; // Fallback on-chain address. diff --git a/lnrpc/lightning.swagger.json b/lnrpc/lightning.swagger.json index aa6112f42..004a9c40e 100644 --- a/lnrpc/lightning.swagger.json +++ b/lnrpc/lightning.swagger.json @@ -5059,7 +5059,7 @@ "expiry": { "type": "string", "format": "int64", - "description": "Payment request expiry time in seconds. Default is 3600 (1 hour)." + "description": "Payment request expiry time in seconds. Default is 86400 (24 hours)." }, "fallback_addr": { "type": "string", From 71a5dab1a99feb5d8035cd0e7f7c37be6a751ba4 Mon Sep 17 00:00:00 2001 From: bruwbird Date: Thu, 12 Jan 2023 09:17:47 +0900 Subject: [PATCH 3/3] docs: add release notes --- docs/release-notes/release-notes-0.16.0.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/release-notes/release-notes-0.16.0.md b/docs/release-notes/release-notes-0.16.0.md index d6c889a90..5cb917794 100644 --- a/docs/release-notes/release-notes-0.16.0.md +++ b/docs/release-notes/release-notes-0.16.0.md @@ -192,6 +192,8 @@ certain large transactions](https://github.com/lightningnetwork/lnd/pull/7100). that caused additional failure message data to be interpreted as being part of a channel update. +* [Fix addinvoice expiry flag comment](https://github.com/lightningnetwork/lnd/pull/7306). + ## `lncli` * [Add an `insecure` flag to skip tls auth as well as a `metadata` string slice @@ -361,3 +363,4 @@ refactor the itest for code health and maintenance. * Roei Erez * Tommy Volk * Yong Yu +* Yusuke Shimizu