Merge branch 'nbd-wtf:master' into master

go.mod

@@ -4,8 +4,8 @@ go 1.16
 
 require (
 	github.com/cockroachdb/pebble v0.0.0-20210812144839-61318a019370
-	github.com/fiatjaf/go-lnurl v1.4.0
-	github.com/fiatjaf/makeinvoice v1.5.3
+	github.com/fiatjaf/go-lnurl v1.13.1
+	github.com/fiatjaf/makeinvoice v1.5.5
 	github.com/gorilla/mux v1.8.0
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/lib/pq v1.10.3

lnurl.go

@@ -63,7 +63,7 @@ func handleLNURL(w http.ResponseWriter, r *http.Request) {
 			maxSendable = 1000000000
 		}
 
-		json.NewEncoder(w).Encode(lnurl.LNURLPayResponse1{
+		json.NewEncoder(w).Encode(lnurl.LNURLPayParams{
 			LNURLResponse:   lnurl.LNURLResponse{Status: "OK"},
 			Callback:        fmt.Sprintf("https://%s/.well-known/lnurlp/%s", domain, username),
 			MinSendable:     minSendable,
@@ -87,10 +87,10 @@ func handleLNURL(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		json.NewEncoder(w).Encode(lnurl.LNURLPayResponse2{
+		json.NewEncoder(w).Encode(lnurl.LNURLPayValues{
 			LNURLResponse: lnurl.LNURLResponse{Status: "OK"},
 			PR:            bolt11,
-			Routes:        make([][]lnurl.RouteInfo, 0),
+			Routes:        make([]interface{}, 0),
 			Disposable:    lnurl.FALSE,
 			SuccessAction: lnurl.Action("Payment received!", ""),
 		})

makeinvoice.go

@@ -38,6 +38,7 @@ func makeInvoice(
 		backend = makeinvoice.LNDParams{
 			Host:     params.Host,
 			Macaroon: params.Key,
+			Private:  true,
 		}
 	case "lnbits":
 		backend = makeinvoice.LNBitsParams{