From 58317e66d3705cdbe94452cd70a032503dfdd92d Mon Sep 17 00:00:00 2001
From: Elle Mouton <elle.mouton@gmail.com>
Date: Mon, 5 Aug 2024 11:33:17 +0200
Subject: [PATCH 1/4] lnrpc/Dockerfile: update falafel version

Update the falafel version.
---
 lnrpc/Dockerfile                              | 2 +-
 lnrpc/autopilotrpc/autopilot.pb.json.go       | 2 +-
 lnrpc/chainrpc/chainkit.pb.json.go            | 2 +-
 lnrpc/chainrpc/chainnotifier.pb.json.go       | 2 +-
 lnrpc/devrpc/dev.pb.json.go                   | 2 +-
 lnrpc/invoicesrpc/invoices.pb.json.go         | 2 +-
 lnrpc/lightning.pb.json.go                    | 2 +-
 lnrpc/neutrinorpc/neutrinokit.pb.json.go      | 2 +-
 lnrpc/peersrpc/peers.pb.json.go               | 2 +-
 lnrpc/routerrpc/router.pb.json.go             | 2 +-
 lnrpc/signrpc/signer.pb.json.go               | 2 +-
 lnrpc/state.pb.json.go                        | 2 +-
 lnrpc/verrpc/versioner.pb.json.go             | 2 +-
 lnrpc/walletrpc/walletkit.pb.json.go          | 2 +-
 lnrpc/walletunlocker.pb.json.go               | 2 +-
 lnrpc/watchtowerrpc/watchtower.pb.json.go     | 2 +-
 lnrpc/wtclientrpc/watchtowerclient.pb.json.go | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lnrpc/Dockerfile b/lnrpc/Dockerfile
index 207ae694f..0f74d5e36 100644
--- a/lnrpc/Dockerfile
+++ b/lnrpc/Dockerfile
@@ -12,7 +12,7 @@ ARG PROTOBUF_VERSION
 ARG GRPC_GATEWAY_VERSION
 
 ENV PROTOC_GEN_GO_GRPC_VERSION="v1.1.0"
-ENV FALAFEL_VERSION="v0.9.1"
+ENV FALAFEL_VERSION="v0.9.2"
 ENV GOCACHE=/tmp/build/.cache
 ENV GOMODCACHE=/tmp/build/.modcache
 
diff --git a/lnrpc/autopilotrpc/autopilot.pb.json.go b/lnrpc/autopilotrpc/autopilot.pb.json.go
index 53b286315..cac68fa82 100644
--- a/lnrpc/autopilotrpc/autopilot.pb.json.go
+++ b/lnrpc/autopilotrpc/autopilot.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: autopilot.proto
 
 package autopilotrpc
diff --git a/lnrpc/chainrpc/chainkit.pb.json.go b/lnrpc/chainrpc/chainkit.pb.json.go
index 8979b593c..c4557064a 100644
--- a/lnrpc/chainrpc/chainkit.pb.json.go
+++ b/lnrpc/chainrpc/chainkit.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: chainkit.proto
 
 package chainrpc
diff --git a/lnrpc/chainrpc/chainnotifier.pb.json.go b/lnrpc/chainrpc/chainnotifier.pb.json.go
index c1a329487..5f06ab9a1 100644
--- a/lnrpc/chainrpc/chainnotifier.pb.json.go
+++ b/lnrpc/chainrpc/chainnotifier.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: chainnotifier.proto
 
 package chainrpc
diff --git a/lnrpc/devrpc/dev.pb.json.go b/lnrpc/devrpc/dev.pb.json.go
index 41f40609c..954917a1a 100644
--- a/lnrpc/devrpc/dev.pb.json.go
+++ b/lnrpc/devrpc/dev.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: dev.proto
 
 package devrpc
diff --git a/lnrpc/invoicesrpc/invoices.pb.json.go b/lnrpc/invoicesrpc/invoices.pb.json.go
index 6e2bb6f00..f41605eba 100644
--- a/lnrpc/invoicesrpc/invoices.pb.json.go
+++ b/lnrpc/invoicesrpc/invoices.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: invoices.proto
 
 package invoicesrpc
diff --git a/lnrpc/lightning.pb.json.go b/lnrpc/lightning.pb.json.go
index 330b07628..2ea9b620c 100644
--- a/lnrpc/lightning.pb.json.go
+++ b/lnrpc/lightning.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: lightning.proto
 
 package lnrpc
diff --git a/lnrpc/neutrinorpc/neutrinokit.pb.json.go b/lnrpc/neutrinorpc/neutrinokit.pb.json.go
index 11cc19d30..77b191dc2 100644
--- a/lnrpc/neutrinorpc/neutrinokit.pb.json.go
+++ b/lnrpc/neutrinorpc/neutrinokit.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: neutrino.proto
 
 package neutrinorpc
diff --git a/lnrpc/peersrpc/peers.pb.json.go b/lnrpc/peersrpc/peers.pb.json.go
index b47ba5a96..ac3521c25 100644
--- a/lnrpc/peersrpc/peers.pb.json.go
+++ b/lnrpc/peersrpc/peers.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: peers.proto
 
 package peersrpc
diff --git a/lnrpc/routerrpc/router.pb.json.go b/lnrpc/routerrpc/router.pb.json.go
index d59f9401c..03b9e8a24 100644
--- a/lnrpc/routerrpc/router.pb.json.go
+++ b/lnrpc/routerrpc/router.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: router.proto
 
 package routerrpc
diff --git a/lnrpc/signrpc/signer.pb.json.go b/lnrpc/signrpc/signer.pb.json.go
index 1a18042db..6adf032c5 100644
--- a/lnrpc/signrpc/signer.pb.json.go
+++ b/lnrpc/signrpc/signer.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: signer.proto
 
 package signrpc
diff --git a/lnrpc/state.pb.json.go b/lnrpc/state.pb.json.go
index 31130849b..cd4b9e9a8 100644
--- a/lnrpc/state.pb.json.go
+++ b/lnrpc/state.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: stateservice.proto
 
 package lnrpc
diff --git a/lnrpc/verrpc/versioner.pb.json.go b/lnrpc/verrpc/versioner.pb.json.go
index fc7f0fcad..040feb676 100644
--- a/lnrpc/verrpc/versioner.pb.json.go
+++ b/lnrpc/verrpc/versioner.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: verrpc.proto
 
 package verrpc
diff --git a/lnrpc/walletrpc/walletkit.pb.json.go b/lnrpc/walletrpc/walletkit.pb.json.go
index 9860db46b..1d2700e21 100644
--- a/lnrpc/walletrpc/walletkit.pb.json.go
+++ b/lnrpc/walletrpc/walletkit.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: walletkit.proto
 
 package walletrpc
diff --git a/lnrpc/walletunlocker.pb.json.go b/lnrpc/walletunlocker.pb.json.go
index 98ae21c45..8b6780fbc 100644
--- a/lnrpc/walletunlocker.pb.json.go
+++ b/lnrpc/walletunlocker.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: walletunlocker.proto
 
 package lnrpc
diff --git a/lnrpc/watchtowerrpc/watchtower.pb.json.go b/lnrpc/watchtowerrpc/watchtower.pb.json.go
index 92c3f7334..88bd05a0f 100644
--- a/lnrpc/watchtowerrpc/watchtower.pb.json.go
+++ b/lnrpc/watchtowerrpc/watchtower.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: watchtower.proto
 
 package watchtowerrpc
diff --git a/lnrpc/wtclientrpc/watchtowerclient.pb.json.go b/lnrpc/wtclientrpc/watchtowerclient.pb.json.go
index f9773c5d9..deff25ba4 100644
--- a/lnrpc/wtclientrpc/watchtowerclient.pb.json.go
+++ b/lnrpc/wtclientrpc/watchtowerclient.pb.json.go
@@ -1,4 +1,4 @@
-// Code generated by falafel 0.9.1. DO NOT EDIT.
+// Code generated by falafel 0.9.2. DO NOT EDIT.
 // source: wtclient.proto
 
 package wtclientrpc

From e8da2fa0bdb0f8548b2381eb7531ba7364869aa0 Mon Sep 17 00:00:00 2001
From: Elle Mouton <elle.mouton@gmail.com>
Date: Mon, 5 Aug 2024 11:35:52 +0200
Subject: [PATCH 2/4] lnrpc/gen_protos: remove manual_imports

With the updated falafel version, there is no longer a need to specify
manual imports.
---
 lnrpc/gen_protos.sh | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lnrpc/gen_protos.sh b/lnrpc/gen_protos.sh
index 9919c11b5..ef61249a1 100755
--- a/lnrpc/gen_protos.sh
+++ b/lnrpc/gen_protos.sh
@@ -50,18 +50,7 @@ function generate() {
   
   PACKAGES="autopilotrpc chainrpc invoicesrpc neutrinorpc peersrpc routerrpc signrpc verrpc walletrpc watchtowerrpc wtclientrpc devrpc"
   for package in $PACKAGES; do
-    # Special import for the wallet kit.
-    manual_import=""
-    if [[ "$package" == "walletrpc" ]]; then
-      manual_import="github.com/lightningnetwork/lnd/lnrpc/signrpc"
-    fi
-
-    # Special import for devrpc.
-    if [[ "$package" == "devrpc" ]]; then
-        manual_import="github.com/lightningnetwork/lnd/lnrpc"
-    fi
-
-    opts="package_name=$package,manual_import=$manual_import,js_stubs=1"
+    opts="package_name=$package,js_stubs=1"
     pushd $package
     protoc -I/usr/local/include -I. -I.. \
       --plugin=protoc-gen-custom=$falafel\

From 66e10fda060bf87098cb02a685e6cb632d8747bf Mon Sep 17 00:00:00 2001
From: Elle Mouton <elle.mouton@gmail.com>
Date: Mon, 5 Aug 2024 11:38:29 +0200
Subject: [PATCH 3/4] docs: update release notes

---
 docs/release-notes/release-notes-0.18.3.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/release-notes/release-notes-0.18.3.md b/docs/release-notes/release-notes-0.18.3.md
index 3038d22c5..0a98e6054 100644
--- a/docs/release-notes/release-notes-0.18.3.md
+++ b/docs/release-notes/release-notes-0.18.3.md
@@ -118,6 +118,10 @@ commitment when the channel was force closed.
 * [Added](https://github.com/lightningnetwork/lnd/pull/8836) a new failure
   reason `FailureReasonCanceled` to the list of payment failure reasons. It
   indicates that a payment was manually cancelled by the user.
+
+* [Update the version](https://github.com/lightningnetwork/lnd/pull/8974) of 
+  [falafel](https://github.com/lightninglabs/falafel) used to generate JSON/wasm 
+  stubs. This latest version of falafel also supports proto3 optional fields. 
  
 ## Breaking Changes
 ## Performance Improvements

From 2d00859b75dad72b42a5f1ad2ddd7208afc44118 Mon Sep 17 00:00:00 2001
From: Elle Mouton <elle.mouton@gmail.com>
Date: Mon, 5 Aug 2024 12:45:22 +0200
Subject: [PATCH 4/4] mobile: correct output directory for generated files

---
 mobile/gen_bindings.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/gen_bindings.sh b/mobile/gen_bindings.sh
index 035cf79bd..8d4e9301b 100755
--- a/mobile/gen_bindings.sh
+++ b/mobile/gen_bindings.sh
@@ -48,7 +48,7 @@ for file in $PROTOS; do
 
   protoc -I/usr/local/include -I. \
          --plugin=protoc-gen-custom=$falafel\
-         --custom_out=./build \
+         --custom_out=. \
          --custom_opt="$opts" \
          --proto_path=../lnrpc \
          "${file}"
@@ -78,7 +78,7 @@ do
     protoc -I/usr/local/include -I. \
            -I../lnrpc \
            --plugin=protoc-gen-custom=$falafel \
-           --custom_out=./build \
+           --custom_out=. \
            --custom_opt="$opts" \
            --proto_path=${DIRECTORY} \
            ${file}