From 33c21d8a980009683ffc587cb23c65f352843b96 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 31 Oct 2018 11:51:37 +1030 Subject: [PATCH] Revert "bolt11: better message when you try to 'lightning-cli pay' an onchain addr." This reverts commit 6af8f293929d7fd707c1422687f18692a0671cf9. Signed-off-by: Rusty Russell --- common/bolt11.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/bolt11.c b/common/bolt11.c index 9d32cbcae..56928ec94 100644 --- a/common/bolt11.c +++ b/common/bolt11.c @@ -467,11 +467,11 @@ struct bolt11 *bolt11_decode(const tal_t *ctx, const char *str, b11->routes = tal_arr(b11, struct route_info *, 0); - if (!strstarts(str, "ln")) - return decode_fail(b11, fail, "Invoices must start with ln"); + if (strlen(str) < 8) + return decode_fail(b11, fail, "Bad bech32 string"); - hrp = tal_arr(tmpctx, char, strlen(str)); - data = tal_arr(tmpctx, u5, strlen(str)); + hrp = tal_arr(tmpctx, char, strlen(str) - 6); + data = tal_arr(tmpctx, u5, strlen(str) - 8); if (!bech32_decode(hrp, data, &data_len, str, (size_t)-1)) return decode_fail(b11, fail, "Bad bech32 string");