Merge branch 'ElementsProject:master' into add-testnet4-support

Author: 2seaq

common/bolt12.c

@@ -489,7 +489,6 @@ struct tlv_invoice *invoice_decode(const tal_t *ctx,
 				   char **fail)
 {
 	struct tlv_invoice *invoice;
-	u64 expiry, now;
 
 	invoice = invoice_decode_minimal(ctx, b12, b12len, our_features,
 					 must_be_chain, fail);
@@ -527,27 +526,6 @@ struct tlv_invoice *invoice_decode(const tal_t *ctx,
 		return tal_free(invoice);
 	}
 
-	/* BOLT-offers #12:
-	 * - if `invoice_relative_expiry` is present:
-	 *   - MUST reject the invoice if the current time since 1970-01-01 UTC
-	 *     is greater than `invoice_created_at` plus `seconds_from_creation`.
-	 * - otherwise:
-	 *   - MUST reject the invoice if the current time since 1970-01-01 UTC
-	 *     is greater than `invoice_created_at` plus 7200.
-	 */
-	if (invoice->invoice_relative_expiry)
-		expiry = *invoice->invoice_relative_expiry;
-	else
-		expiry = 7200;
-	now = time_now().ts.tv_sec;
-	/* If it overflows, it's forever */
-	if (!add_overflows_u64(*invoice->invoice_created_at, expiry)
-	    && now > *invoice->invoice_created_at + expiry) {
-		*fail = tal_fmt(ctx, "expired %"PRIu64" seconds ago",
-				now - (*invoice->invoice_created_at + expiry));
-		return tal_free(invoice);
-	}
-
 	/* BOLT-offers #12:
 	 * - MUST reject the invoice if `invoice_paths` is not present or is
 	 *   empty. */
@@ -583,6 +561,30 @@ struct tlv_invoice *invoice_decode(const tal_t *ctx,
 	return invoice;
 }
 
+u64 invoice_expiry(const struct tlv_invoice *invoice)
+{
+	u64 expiry;
+
+	/* BOLT-offers #12:
+	 * - if `invoice_relative_expiry` is present:
+	 *   - MUST reject the invoice if the current time since 1970-01-01 UTC
+	 *     is greater than `invoice_created_at` plus `seconds_from_creation`.
+	 * - otherwise:
+	 *   - MUST reject the invoice if the current time since 1970-01-01 UTC
+	 *     is greater than `invoice_created_at` plus 7200.
+	 */
+	if (invoice->invoice_relative_expiry)
+		expiry = *invoice->invoice_relative_expiry;
+	else
+		expiry = 7200;
+
+	/* If it overflows, it's forever */
+	if (add_overflows_u64(*invoice->invoice_created_at, expiry))
+		return UINT64_MAX;
+
+	return *invoice->invoice_created_at + expiry;
+}
+
 static bool bolt12_has_invoice_prefix(const char *str)
 {
 	return strstarts(str, "lni1") || strstarts(str, "LNI1");

common/bolt12.h

@@ -75,13 +75,17 @@ char *invoice_encode(const tal_t *ctx, const struct tlv_invoice *bolt12_tlv);
  * is not expired).  It also checks signature.
  *
  * Note: blinded path features need to be checked by the caller before use!
+ * Note: expiration must be check by caller before use!
  */
 struct tlv_invoice *invoice_decode(const tal_t *ctx,
 				   const char *b12, size_t b12len,
 				   const struct feature_set *our_features,
 				   const struct chainparams *must_be_chain,
 				   char **fail);
 
+/* UINT64_MAX if no expiry. */
+u64 invoice_expiry(const struct tlv_invoice *invoice);
+
 /* This one only checks it decides, and optionally is correct chain/features */
 struct tlv_invoice *invoice_decode_minimal(const tal_t *ctx,
 					   const char *b12, size_t b12len,

contrib/msggen/msggen/schema.json

@@ -36330,6 +36330,7 @@
         "- -1: Catchall nonspecific error.",
         "- 203: Permanent failure from destination (e.g. it said it didn't recognize invoice)",
         "- 205: Couldn't find, or find a way to, the destination.",
+        "- 207: Invoice has expired.",
         "- 219: Invoice has already been paid.",
         "- 209: Other payment error."
       ],

doc/contribute-to-core-lightning/release-checklist.md

@@ -34,7 +34,7 @@ Here's a checklist for the release process.
 3. Confirm that the tag will show up for builds with `git describe`
 4. Push the tag to remote `git push --tags`.
 5. Draft a new `v<VERSION>rc1` release on Github and check `Set as a pre-release` option.
-6. Follow [reproducible build](https://docs.corelightning.org/docs/repro) for [Builder image setup](https://docs.corelightning.org/docs/repro#builder-image-setup). It will create builder images `cl-repro-<codename>` which are required for the next step.
+6. Run the script `contrib/cl-repro.sh` for [Builder image setup](https://docs.corelightning.org/docs/repro#builder-image-setup). This will create the required builder images `cl-repro-<codename>` for the next step.
 7. Run `tools/build-release.sh bin-Fedora-28-amd64 bin-Ubuntu sign` script to prepare required builds for the release. With `bin-Fedora-28-amd64 bin-Ubuntu sign`, it will build a zipfile, a non-reproducible Fedora, reproducible Ubuntu images. Once it is done, the script will sign the release contents and create SHA256SUMS and SHA256SUMS.asc in the release folder.
 8. Upload reproducible builds, SHA256SUMS and SHA256SUMS.asc from the release folder to newly drafted release.
 9. Announce rc1 release on core-lightning's release-chat channel on Discord & [BuildOnL2](https://community.corelightning.org/c/general-questions/).
@@ -117,7 +117,7 @@ Here's a checklist for the release process.
 7. Confirm that the tag is properly set up for builds by running `git describe`.
 8. Push the tag to the remote repository `git push --tags`.
 9. Create a new release draft for `v<VERSION>.<POINT_VERSION>` on GitHub, ensuring to check the `Set as a pre-release` option.
-10. Follow the [reproducible build](https://docs.corelightning.org/docs/repro) instructions for [Builder image setup](https://docs.corelightning.org/docs/repro#builder-image-setup) to create builder images named `cl-repro-<codename>` required for the next step.
+10. Execute the script contrib/cl-repro.sh for the [Builder image setup](https://docs.corelightning.org/docs/repro#builder-image-setup). This will generate the builder images `cl-repro-<codename>` needed for the next step.
 11. Run the following script to prepare the required builds `tools/build-release.sh bin-Fedora-28-amd64 bin-Ubuntu sign`.
 12. Upload the reproducible builds along with `SHA256SUMS` and `SHA256SUMS.asc` files from the release folder to the newly drafted release.
 13. Share the `SHA256SUMS` and `SHA256SUMS.asc` files with the team for verification and signing.

doc/getting-started/advanced-setup/repro.md

@@ -25,6 +25,10 @@ Note: Since your signature certifies the integrity of the resulting binaries, pl
 
 The build environments are a set of docker images that are created directly from the installation mediums and repositories from the OS provider. The following sections describe how to create those images. Don't worry, you only have to create each image once and can then reuse the images for future builds.
 
+## Script cl-repro
+
+The script `contrib/cl-repro.sh` covers below `Base image creation` and `Builder image setup` steps. You can skip these steps by simply running the `contrib/cl-repro.sh` script.
+
 ## Base image creation
 
 Depending on the distribution that we want to build for the instructions to create a base image can vary. In the following sections we discuss the specific instructions for each distribution, whereas the instructions are identical again once we have the base image.
@@ -93,10 +97,6 @@ sufficient to ensure that the resulting `cl-repro-<codename>` image is reproduci
 
 The dockerfiles assume that the base image has the codename as its image name.
 
-## Script cl-repro
-
-The script `contrib/cl-repro.sh` covers above `Base image creation` and `Builder image setup` steps. You can skip these steps by simply running the `contrib/cl-repro.sh` script.
-
 # Building using the builder image
 
 Finally, after building enviornment setup we can perform the actual build.  At this point we have a container image that has been prepared to build reproducibly. As you can see from the `Dockerfile` above we assume the source git repository gets mounted as `/repo` in the docker container. The container will clone the repository to an internal path, in order to keep the repository clean, build the artifacts there, and then copy them back to `/repo/release`.  

doc/schemas/lightning-xpay.json

@@ -107,6 +107,7 @@
     "- -1: Catchall nonspecific error.",
     "- 203: Permanent failure from destination (e.g. it said it didn't recognize invoice)",
     "- 205: Couldn't find, or find a way to, the destination.",
+    "- 207: Invoice has expired.",
     "- 219: Invoice has already been paid.",
     "- 209: Other payment error."
   ],

plugins/xpay/xpay.c

@@ -1414,6 +1414,7 @@ static struct command_result *json_xpay(struct command *cmd,
 	struct payment *payment = tal(cmd, struct payment);
 	unsigned int *retryfor;
 	struct out_req *req;
+	u64 now, invexpiry;
 	char *err;
 
 	if (!param_check(cmd, buffer, params,
@@ -1448,6 +1449,7 @@ static struct command_result *json_xpay(struct command *cmd,
 			return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
 					    "Invalid bolt12 invoice: %s", err);
 
+		invexpiry = invoice_expiry(b12inv);
 		payment->full_amount = amount_msat(*b12inv->invoice_amount);
 		if (msat)
 			return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
@@ -1517,8 +1519,16 @@ static struct command_result *json_xpay(struct command *cmd,
 			payment->full_amount = *b11->msat;
 		else
 			payment->full_amount = *msat;
+
+		invexpiry = b11->timestamp + b11->expiry;
 	}
 
+	now = time_now().ts.tv_sec;
+	if (now > invexpiry)
+		return command_fail(cmd, PAY_INVOICE_EXPIRED,
+				    "Invoice expired %"PRIu64" seconds ago",
+				    now - invexpiry);
+
 	if (partial) {
 		payment->amount = *partial;
 		if (amount_msat_greater(payment->amount, payment->full_amount))

tests/test_pay.py

@@ -6768,3 +6768,33 @@ def test_pay_unannounced_routehint(node_factory, bitcoind):
                          dev_routes=[routel2l3])
     result = l1.rpc.pay(inv['bolt11'])
     assert result["status"] == "complete", f"pay result is {result}"
+
+
+def test_decode_expired_bolt12(node_factory):
+    l1 = node_factory.get_node()
+
+    assert l1.rpc.decode('lni1qqgr7gm5fdxs3maw5tx94yx3k2hzxzqrqc0xsz3pwpkxz7t9wf0nwvpkxacku6tzxdhkuemfwdmrv6rywgmkxu35dvcrq93pqvvhnlnvurnfanndnxjtcjnmxrkj92xtsupa6lwjm7hkr8s8zflqkkppqgr5egnuvnfxvhzgemdljrkr5xhapg9zkjd73nqnmgxeesclr0j5skfud3hx7vt6vdehxwfjwakkxwt909skuamydfek67t2vau8zwfc0qukkennw9ensv3nvee8g7rww9jkwmrjwuursanpds6hydmy5zvqxxtelekwpe57eekenf9uffanpmfz4r9cwq7a0hfdltmpncr3ylstqvk0f8p94n8sk8r5pwh5um0v5sgs3atjnk54ja7yxle4putgwrv3sqgr72f645z9yjhe6f0r0ccfwhyufr0h734m2url2yputu25w7yzauxsqv4wftn76zuzrk9mkw203nfsz0kkc4ksk2d6ahd3ecslhrp5ecel7k0zy5r4s46fyjcr5x6kwcry08runv9zrsqqqqqqqqqqqqqqzgqqqqqqqqqqqqqayjedltzjqqqqqq9yq3n5ft0l4qs03nycmga9uqvexwyq2x59y8326r256clag77sq9z5m9wm9jz4ned2qvrpu69syyp3j707dnswd8kwdkv6f0z20vcw6g4gewrs8hta6t067cv7quf8uzlsgqjjt30e2udf5y3d79xpp7fhxktd4qflyexnsn3zthx2u9g5hzt2j45ky7q3mchmq75cqzxlr2x09dlhg6pj958xwgpykl0aczwepj6q') == {
+        'invoice_amount_msat': 401000,
+        'invoice_created_at': 1732554239,
+        'invoice_node_id': '031979fe6ce0e69ece6d99a4bc4a7b30ed22a8cb8703dd7dd2dfaf619e07127e0b',
+        'invoice_paths': [{'first_node_id': '031979fe6ce0e69ece6d99a4bc4a7b30ed22a8cb8703dd7dd2dfaf619e07127e0b',
+                           'first_path_key': '032cf49c25accf0b1c740baf4e6deca41108f5729da95977c437f350f16870d918',
+                           'path': [{'blinded_node_id': '03f293aad04524af9d25e37e30975c9c48df7f46bb5707f5103c5f15477882ef0d',
+                                     'encrypted_recipient_data': 'ae4ae7ed0b821d8bbb394f8cd3013ed6c56d0b29baeddb1ce21fb8c34ce33ff59e2250758574924b03a1b567606479c7c9b0'}],
+                           'payinfo': {'cltv_expiry_delta': 18,
+                                       'features': '',
+                                       'fee_base_msat': 0,
+                                       'fee_proportional_millionths': 0}}],
+        'invoice_payment_hash': 'f8cc98da3a5e01993388051a8521e2ad0d54d63fd47bd001454d95db2c8559e5',
+        'invoice_relative_expiry': 7200,
+        'invreq_metadata': '3f23744b4d08efaea2cc5a90d1b2ae23',
+        'invreq_payer_id': '02074ca27c64d2665c48cedbf90ec3a1afd0a0a2b49be8cc13da0d9cc31f1be548',
+        'invreq_payer_note': 'lno1zcss92wmc9eyanwdjsmyjgxq98x9kfsqs823frtxnqeglrw88val5r7d',
+        'offer_amount_msat': 401000,
+        'offer_description': 'player_7067qnib3ongisv6hdr7cr4k00',
+        'offer_id': '0a32bd421b9c2b1d2cc1c49a5ff1aa8adb5ce02b6dde496358d874e9ca181276',
+        'offer_issuer_id': '031979fe6ce0e69ece6d99a4bc4a7b30ed22a8cb8703dd7dd2dfaf619e07127e0b',
+        'signature': '2525c5f9571a9a122df14c10f9373596da813f264d384e225dccae1514b896a9569627811de2fb07a98008df1a8cf2b7f7468322d0e672024b7dfdc09d90cb40',
+        'type': 'bolt12 invoice',
+        'valid': True,
+    }